Merge pull request #2108 from kuzudb/copy-to-csv-fix

Fix copy to csv
kuzudb · Sep 29, 2023 · 5b6fdf8 · 5b6fdf8
2 parents f05d348 + e4caa51
commit 5b6fdf8
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 1,022 deletions.
diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp
@@ -93,11 +93,15 @@ std::string TypeUtils::toString(const list_entry_t& val, void* valueVector) {
     auto childType = VarListType::getChildType(&listVector->dataType);
     auto dataVector = ListVector::getDataVector(listVector);
     for (auto i = 0u; i < val.size - 1; ++i) {
-        result += castValueToString(*childType, values, dataVector);
+        result += dataVector->isNull(val.offset + i) ?
+                      "" :
+                      castValueToString(*childType, values, dataVector);
         result += ",";
         values += ListVector::getDataVector(listVector)->getNumBytesPerValue();
     }
-    result += castValueToString(*childType, values, dataVector);
+    result += dataVector->isNull(val.offset + val.size - 1) ?
+                  "" :
+                  castValueToString(*childType, values, dataVector);
     result += "]";
     return result;
 }

diff --git a/src/processor/operator/persistent/csv_file_writer.cpp b/src/processor/operator/persistent/csv_file_writer.cpp
@@ -57,7 +57,7 @@ void CSVFileWriter::writeValues(std::vector<common::ValueVector*>& outputVectors
 template<typename T>
 void CSVFileWriter::writeToBuffer(common::ValueVector* vector, bool escapeStringValue) {
     auto selPos = vector->state->selVector->selectedPositions[0];
-    auto value = TypeUtils::toString(vector->getValue<T>(selPos));
+    auto value = vector->isNull(selPos) ? "" : TypeUtils::toString(vector->getValue<T>(selPos));
     if (escapeStringValue) {
         escapeString(value);
     }
@@ -68,7 +68,8 @@ template<typename T>
 void CSVFileWriter::writeListToBuffer(common::ValueVector* vector) {
     // vectors are always flat
     auto selPos = vector->state->selVector->selectedPositions[0];
-    auto value = TypeUtils::toString(vector->getValue<T>(selPos), vector);
+    auto value =
+        vector->isNull(selPos) ? "" : TypeUtils::toString(vector->getValue<T>(selPos), vector);
     escapeString(value);
     writeToBuffer(value);
 }

diff --git a/src/storage/store/var_list_column_chunk.cpp b/src/storage/store/var_list_column_chunk.cpp
@@ -89,8 +89,11 @@ void VarListColumnChunk::append(common::ValueVector* vector, common::offset_t st
     dataVector->setState(std::make_unique<DataChunkState>());
     dataVector->state->selVector->resetSelectorToValuePosBuffer();
     for (auto i = 0u; i < vector->state->selVector->selectedSize; i++) {
-        auto listEntry =
-            vector->getValue<list_entry_t>(vector->state->selVector->selectedPositions[i]);
+        auto pos = vector->state->selVector->selectedPositions[i];
+        if (vector->isNull(pos)) {
+            continue;
+        }
+        auto listEntry = vector->getValue<list_entry_t>(pos);
         dataVector->state->selVector->selectedSize = listEntry.size;
         for (auto j = 0u; j < listEntry.size; j++) {
             dataVector->state->selVector->selectedPositions[j] = listEntry.offset + j;