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 copy to csv #2108

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Fix copy to csv #2108

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
8 changes: 6 additions & 2 deletions src/common/type_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions src/processor/operator/persistent/csv_file_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
7 changes: 5 additions & 2 deletions src/storage/store/var_list_column_chunk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down