Fix scan multi label from local storage; fix list column chunk lookup (…

…#3332)
kuzudb · Apr 21, 2024 · 49ad7a7 · 49ad7a7
1 parent 58b8222
commit 49ad7a7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/storage/local_storage/local_node_table.cpp b/src/storage/local_storage/local_node_table.cpp
@@ -33,6 +33,10 @@ void LocalNodeNG::lookup(const common::ValueVector& nodeIDVector,
     for (auto i = 0u; i < columnIDs.size(); i++) {
         auto posInOutputVector =
             outputVectors[i]->state->selVector->selectedPositions[offsetInVectorToLookup];
+        if (columnIDs[i] == INVALID_COLUMN_ID) {
+            outputVectors[i]->setNull(posInOutputVector, true);
+            continue;
+        }
         getUpdateChunks(columnIDs[i])
             .read(nodeOffset, 0 /*columnID*/, outputVectors[i], posInOutputVector);
     }

diff --git a/src/storage/local_storage/local_table.cpp b/src/storage/local_storage/local_table.cpp
@@ -66,6 +66,10 @@ bool LocalChunkedGroupCollection::read(offset_t offset, const std::vector<column
     for (auto i = 0u; i < columnIDs.size(); i++) {
         auto posInOutputVector =
             outputVectors[i]->state->selVector->selectedPositions[offsetInOutputVector];
+        if (columnIDs[i] == INVALID_COLUMN_ID) {
+            outputVectors[i]->setNull(posInOutputVector, true);
+            continue;
+        }
         readValueAtRowIdx(rowIdx, columnIDs[i], outputVectors[i], posInOutputVector);
     }
     return true;

diff --git a/src/storage/store/list_column_chunk.cpp b/src/storage/store/list_column_chunk.cpp
@@ -158,7 +158,7 @@ void ListColumnChunk::lookup(offset_t offsetInChunk, ValueVector& output,
     if (output.isNull(posInOutputVector)) {
         return;
     }
-    auto startOffset = offsetInChunk == 0 ? 0 : getValue<offset_t>(offsetInChunk - 1);
+    auto startOffset = getListStartOffset(offsetInChunk);
     auto listSize = getListSize(offsetInChunk);
     output.setValue<list_entry_t>(posInOutputVector, list_entry_t{startOffset, listSize});
     auto dataVector = ListVector::getDataVector(&output);