Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scan multi label from local storage; fix list column chunk lookup #3332

Merged
merged 1 commit into from
Apr 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/storage/local_storage/local_node_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 4 additions & 0 deletions src/storage/local_storage/local_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/storage/store/list_column_chunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading