patch

kuzudb · Sep 28, 2023 · fbcd84e · fbcd84e
1 parent 09afb2e
commit fbcd84e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/include/storage/store/column_chunk.h b/src/include/storage/store/column_chunk.h
@@ -129,6 +129,7 @@ class ColumnChunk {
 
     void populateWithDefaultVal(common::ValueVector* defaultValueVector);
 
+    inline uint64_t getCapacity() const { return capacity; }
     inline uint64_t getNumValues() const { return numValues; }
 
     inline void setNumValues(uint64_t numValues_) { this->numValues = numValues_; }

diff --git a/src/storage/store/node_column.cpp b/src/storage/store/node_column.cpp
@@ -207,16 +207,17 @@ void NodeColumn::scan(node_group_idx_t nodeGroupIdx, ColumnChunk* columnChunk) {
         auto numValuesPerPage =
             chunkMetadata.compMeta.numValues(BufferPoolConstants::PAGE_4KB_SIZE, dataType);
         // numValuesPerPage being UINT64_MAX is a special case that bit_width is 0.
-        auto numValuesToScanInPage = numValuesPerPage == UINT64_MAX ? 0 : numValuesPerPage;
-        auto numValuesScanned = 0u, numPagesScanned = 0u;
-        while (numPagesScanned < chunkMetadata.numPages) {
+        auto numValuesToScanPerPage = numValuesPerPage == UINT64_MAX ? 0 : numValuesPerPage;
+        auto numValuesScanned = 0u;
+        while (numValuesScanned < columnChunk->getCapacity()) {
+            auto numValuesToReadInPage =
+                std::min(numValuesToScanPerPage, columnChunk->getCapacity() - numValuesScanned);
             readFromPage(&DUMMY_READ_TRANSACTION, cursor.pageIdx, [&](uint8_t* frame) -> void {
                 readToPageFunc(frame, cursor, columnChunk->getData(), numValuesScanned,
-                    numValuesToScanInPage, chunkMetadata.compMeta);
+                    numValuesToReadInPage, chunkMetadata.compMeta);
             });
-            numValuesScanned += numValuesToScanInPage;
+            numValuesScanned += numValuesToReadInPage;
             cursor.nextPage();
-            numPagesScanned++;
         }
         columnChunk->setNumValues(chunkMetadata.numValues);
     }