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

[fix](resize)fix array/map resize impl missing data resize #41708

Merged
merged 2 commits into from
Oct 15, 2024
Merged

[fix](resize)fix array/map resize impl missing data resize #41708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d6b44
fix resize
amorynan Oct 9, 2024
f0a94db
add ut and fix outfile
amorynan Oct 14, 2024
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
2 changes: 2 additions & 0 deletions be/src/vec/columns/column_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,8 @@ void ColumnArray::reserve(size_t n) {
void ColumnArray::resize(size_t n) {
auto last_off = get_offsets().back();
get_offsets().resize_fill(n, last_off);
// make new size of data column
get_data().resize(get_offsets().back());
}

size_t ColumnArray::byte_size() const {
Expand Down
3 changes: 3 additions & 0 deletions be/src/vec/columns/column_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ void ColumnMap::reserve(size_t n) {
void ColumnMap::resize(size_t n) {
auto last_off = get_offsets().back();
get_offsets().resize_fill(n, last_off);
// make new size of data column
get_keys().resize(get_offsets().back());
get_values().resize(get_offsets().back());
}

size_t ColumnMap::byte_size() const {
Expand Down
99 changes: 99 additions & 0 deletions be/test/vec/columns/column_resize_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,103 @@ TEST(ResizeTest, StructTypeTest) {
EXPECT_EQ(b->size(), 10);
}

TEST(ResizeTest, ResizeColumnArray) {
ColumnArray::MutablePtr col_arr =
ColumnArray::create(ColumnInt64::create(), ColumnArray::ColumnOffsets::create());
Array array1 = {1, 2, 3};
Array array2 = {4};
col_arr->insert(array1);
col_arr->insert(Array());
col_arr->insert(array2);

// check column array result
// array : [[1,2,3],[],[4]]
col_arr->resize(2);
EXPECT_EQ(col_arr->size(), 2);
auto data_col = assert_cast<const ColumnArray&>(*col_arr).get_data_ptr();
EXPECT_EQ(data_col->size(), 3);
auto v = get<Array>(col_arr->operator[](0));
EXPECT_EQ(v.size(), 3);
EXPECT_EQ(get<int32_t>(v[0]), 1);
EXPECT_EQ(get<int32_t>(v[1]), 2);
EXPECT_EQ(get<int32_t>(v[2]), 3);
v = get<Array>(col_arr->operator[](1));
EXPECT_EQ(v.size(), 0);
EXPECT_EQ(get<int32_t>(data_col->operator[](0)), 1);
EXPECT_EQ(get<int32_t>(data_col->operator[](1)), 2);
EXPECT_EQ(get<int32_t>(data_col->operator[](2)), 3);

// expand will not make data expand
EXPECT_EQ(col_arr->size(), 2);
col_arr->resize(10);
EXPECT_EQ(col_arr->size(), 10);
data_col = assert_cast<const ColumnArray&>(*col_arr).get_data_ptr();
EXPECT_EQ(data_col->size(), 3);
v = get<Array>(col_arr->operator[](0));
EXPECT_EQ(v.size(), 3);
EXPECT_EQ(get<int32_t>(v[0]), 1);
EXPECT_EQ(get<int32_t>(v[1]), 2);
EXPECT_EQ(get<int32_t>(v[2]), 3);
v = get<Array>(col_arr->operator[](1));
EXPECT_EQ(v.size(), 0);
v = get<Array>(col_arr->operator[](2));
EXPECT_EQ(v.size(), 0);
}

TEST(ResizeTest, ResizeColumnMap) {
ColumnMap::MutablePtr col_map = ColumnMap::create(ColumnString::create(), ColumnInt64::create(),
ColumnArray::ColumnOffsets::create());
Array k1 = {"a", "b", "c"};
Array v1 = {1, 2, 3};
Array k2 = {"d"};
Array v2 = {4};
Array a = Array();
Map map1, map2, map3;
map1.push_back(k1);
map1.push_back(v1);
col_map->insert(map1);
map3.push_back(a);
map3.push_back(a);
col_map->insert(map3);
map2.push_back(k2);
map2.push_back(v2);
col_map->insert(map2);
// check column map result
// map : {"a":1,"b":2,"c":3},{:},{"d":4}
col_map->resize(2);
EXPECT_EQ(col_map->size(), 2);
auto data_col = assert_cast<const ColumnMap&>(*col_map).get_values_ptr();
EXPECT_EQ(data_col->size(), 3);
auto v = get<Map>(col_map->operator[](0));
EXPECT_EQ(v.size(), 2);
EXPECT_EQ(get<Array>(v[0]), Array({"a", "b", "c"}));
EXPECT_EQ(get<Array>(v[1]), Array({1, 2, 3}));
v = get<Map>(col_map->operator[](1));
EXPECT_EQ(v.size(), 2);
EXPECT_EQ(get<Array>(v[0]), Array());
EXPECT_EQ(get<Array>(v[1]), Array());
EXPECT_EQ(get<int32_t>(data_col->operator[](0)), 1);
EXPECT_EQ(get<int32_t>(data_col->operator[](1)), 2);
EXPECT_EQ(get<int32_t>(data_col->operator[](2)), 3);

// expand will not make data expand
EXPECT_EQ(col_map->size(), 2);
col_map->resize(10);
EXPECT_EQ(col_map->size(), 10);
data_col = assert_cast<const ColumnMap&>(*col_map).get_values_ptr();
EXPECT_EQ(data_col->size(), 3);
v = get<Map>(col_map->operator[](0));
EXPECT_EQ(v.size(), 2);
EXPECT_EQ(get<Array>(v[0]), Array({"a", "b", "c"}));
EXPECT_EQ(get<Array>(v[1]), Array({1, 2, 3}));
v = get<Map>(col_map->operator[](1));
EXPECT_EQ(v.size(), 2);
EXPECT_EQ(get<Array>(v[0]), Array());
EXPECT_EQ(get<Array>(v[1]), Array());
v = get<Map>(col_map->operator[](2));
EXPECT_EQ(v.size(), 2);
EXPECT_EQ(get<Array>(v[0]), Array());
EXPECT_EQ(get<Array>(v[1]), Array());
}

} // namespace doris::vectorized
200 changes: 200 additions & 0 deletions regression-test/data/datatype_p0/nested_types/query/test_nested_type_with_resize.csv
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading