Merge pull request #1822 from kuzudb/resize-fix

Fix struct datavector resizing
kuzudb · Jul 17, 2023 · f6159a4 · f6159a4
2 parents 01da5ef + bc11927
commit f6159a4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/src/common/vector/auxiliary_buffer.cpp b/src/common/vector/auxiliary_buffer.cpp
@@ -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);
+    }
+}
+
+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());
     }
 }
 

diff --git a/src/include/common/vector/auxiliary_buffer.h b/src/include/common/vector/auxiliary_buffer.h
@@ -81,6 +81,8 @@ class ListAuxiliaryBuffer : public AuxiliaryBuffer {
 private:
     void resizeDataVector(ValueVector* dataVector);
 
+    void resizeStructDataVector(ValueVector* dataVector);
+
 private:
     uint64_t capacity;
     uint64_t size;