patch

kuzudb · May 15, 2023 · bb12971 · bb12971
1 parent 5d5ecd7
commit bb12971
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/src/storage/storage_structure/column.cpp b/src/storage/storage_structure/column.cpp
@@ -281,6 +281,9 @@ void Column::scan(transaction::Transaction* transaction, common::ValueVector* no
             while (
                 nodeIDVector->state->selVector->selectedPositions[posInSelVector] < numValuesRead) {
                 posInSelVector++;
+                if (posInSelVector >= nodeIDVector->state->selVector->selectedSize) {
+                    return;
+                }
             }
         }
     }

diff --git a/src/storage/storage_structure/storage_structure_utils.cpp b/src/storage/storage_structure/storage_structure_utils.cpp
@@ -8,29 +8,13 @@ namespace storage {
 std::pair<BMFileHandle*, page_idx_t> StorageStructureUtils::getFileHandleAndPhysicalPageIdxToPin(
     BMFileHandle& fileHandle, page_idx_t physicalPageIdx, WAL& wal,
     transaction::TransactionType trxType) {
-    if (trxType == transaction::TransactionType::READ_ONLY) {
+    if (trxType == transaction::TransactionType::READ_ONLY ||
+        !fileHandle.hasWALPageVersionNoWALPageIdxLock(physicalPageIdx)) {
         return std::make_pair(&fileHandle, physicalPageIdx);
     } else {
-        if (fileHandle.hasWALPageGroup(physicalPageIdx)) {
-            fileHandle.acquireWALPageIdxLock(physicalPageIdx);
-            if (fileHandle.hasWALPageVersionNoWALPageIdxLock(physicalPageIdx)) {
-                auto result = std::make_pair(wal.fileHandle.get(),
-                    fileHandle.getWALPageIdxNoWALPageIdxLock(physicalPageIdx));
-                fileHandle.releaseWALPageIdxLock(physicalPageIdx);
-                return result;
-            } else {
-                fileHandle.releaseWALPageIdxLock(physicalPageIdx);
-            }
-        }
-        return std::make_pair(&fileHandle, physicalPageIdx);
+        return std::make_pair(
+            wal.fileHandle.get(), fileHandle.getWALPageIdxNoWALPageIdxLock(physicalPageIdx));
     }
-    //    if (trxType == transaction::TransactionType::READ_ONLY ||
-    //        !fileHandle.hasWALPageVersionNoWALPageIdxLock(physicalPageIdx)) {
-    //        return std::make_pair(&fileHandle, physicalPageIdx);
-    //    } else {
-    //        return std::make_pair(
-    //            wal.fileHandle.get(), fileHandle.getWALPageIdxNoWALPageIdxLock(physicalPageIdx));
-    //    }
 }
 
 void StorageStructureUtils::updatePage(BMFileHandle& fileHandle,