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.

Sign up for GitHub

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

Jump to bottom

Fix struct datavector resizing #1822

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Fix struct datavector resizing #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/common/vector/auxiliary_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,25 @@ list_entry_t ListAuxiliaryBuffer::addList(uint64_t listSize) {
}

void ListAuxiliaryBuffer::resizeDataVector(ValueVector* dataVector) {
auto buffer = std::make_unique<uint8_t[]>(capacity * dataVector->getNumBytesPerValue());
memcpy(buffer.get(), dataVector->valueBuffer.get(), size * dataVector->getNumBytesPerValue());
dataVector->valueBuffer = std::move(buffer);
dataVector->nullMask->resize(capacity);
// If the dataVector is a struct vector, we need to resize its field vectors.
if (dataVector->dataType.getPhysicalType() == PhysicalTypeID::STRUCT) {
auto fieldVectors = StructVector::getFieldVectors(dataVector);
for (auto& fieldVector : fieldVectors) {
resizeDataVector(fieldVector.get());
}
} else {
auto buffer = std::make_unique<uint8_t[]>(capacity * dataVector->getNumBytesPerValue());
memcpy(
buffer.get(), dataVector->valueBuffer.get(), size * dataVector->getNumBytesPerValue());
dataVector->valueBuffer = std::move(buffer);
dataVector->nullMask->resize(capacity);
resizeStructDataVector(dataVector);
acquamarin marked this conversation as resolved.
Show resolved Hide resolved
}
}

void ListAuxiliaryBuffer::resizeStructDataVector(ValueVector* dataVector) {
std::iota(reinterpret_cast<int64_t*>(
dataVector->getData() + dataVector->getNumBytesPerValue() * size),
reinterpret_cast<int64_t*>(
dataVector->getData() + dataVector->getNumBytesPerValue() * capacity),
size);
auto fieldVectors = StructVector::getFieldVectors(dataVector);
for (auto& fieldVector : fieldVectors) {
resizeDataVector(fieldVector.get());
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/include/common/vector/auxiliary_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class ListAuxiliaryBuffer : public AuxiliaryBuffer {
private:
void resizeDataVector(ValueVector* dataVector);

void resizeStructDataVector(ValueVector* dataVector);

private:
uint64_t capacity;
uint64_t size;
Expand Down