Move createNewBlock() out of the critical section in getBlockForInsertion
diff --git a/storage/InsertDestination.cpp b/storage/InsertDestination.cpp
index 354bed4..be679cd 100644
--- a/storage/InsertDestination.cpp
+++ b/storage/InsertDestination.cpp
@@ -339,21 +339,20 @@
}
MutableBlockReference BlockPoolInsertDestination::getBlockForInsertion() {
- SpinMutexLock lock(mutex_);
- if (available_block_refs_.empty()) {
- if (available_block_ids_.empty()) {
- return createNewBlock();
- } else {
+ {
+ SpinMutexLock lock(mutex_);
+ if (!available_block_refs_.empty()) {
+ MutableBlockReference retval = std::move(available_block_refs_.back());
+ available_block_refs_.pop_back();
+ return retval;
+ } else if (!available_block_ids_.empty()) {
const block_id id = available_block_ids_.back();
available_block_ids_.pop_back();
MutableBlockReference retval = storage_manager_->getBlockMutable(id, relation_);
return retval;
}
- } else {
- MutableBlockReference retval = std::move(available_block_refs_.back());
- available_block_refs_.pop_back();
- return retval;
}
+ return createNewBlock();
}
void BlockPoolInsertDestination::returnBlock(MutableBlockReference &&block, const bool full) {
