Skip to content

fix bug with load/save Array with empty arrays #272

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

Merged
merged 1 commit into from
Dec 22, 2022
Merged

fix bug with load/save Array with empty arrays #272

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions clickhouse/columns/array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ bool ColumnArray::LoadBody(InputStream* input, size_t rows) {
if (!offsets_->LoadBody(input, rows)) {
return false;
}
if (!data_->LoadBody(input, (*offsets_)[rows - 1])) {
const auto nested_rows = (*offsets_)[rows - 1];
if (nested_rows == 0) {
return true;
}
if (!data_->LoadBody(input, nested_rows)) {
return false;
}
return true;
Expand All @@ -96,7 +100,9 @@ void ColumnArray::SavePrefix(OutputStream* output) {

void ColumnArray::SaveBody(OutputStream* output) {
offsets_->SaveBody(output);
data_->SaveBody(output);
if (data_->Size() > 0) {
data_->SaveBody(output);
}
}

void ColumnArray::Clear() {
Expand Down
25 changes: 25 additions & 0 deletions ut/client_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,31 @@ TEST_P(ClientCase, RoundtripArrayTString) {
EXPECT_TRUE(CompareRecursive(*array, *result_typed));
}

TEST_P(ClientCase, RoundtripArrayLowCardinalityTString) {
// TODO replase by Roundtrip test
using TestColumn = ColumnArrayT<ColumnLowCardinalityT<ColumnString>>;

Block block;
auto array = createTableWithOneColumn<TestColumn>(block);
array->Append(std::vector<std::string>{});
array->Append(std::vector<std::string>{});

block.RefreshRowCount();
client_->Insert(table_name, block);

size_t total_rows = 0;
client_->Select(getOneColumnSelectQuery(),
[&total_rows](const Block& block) {
total_rows += block.GetRowCount();
if (block.GetRowCount() == 0) {
return;
}
}
);

ASSERT_EQ(total_rows, 2u);
}

TEST_P(ClientCase, RoundtripMapTUint64String) {
using Map = ColumnMapT<ColumnUInt64, ColumnString>;
auto map = std::make_shared<Map>(std::make_shared<ColumnUInt64>(), std::make_shared<ColumnString>());
Expand Down