Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions be/src/core/column/column_variant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@ void ColumnVariant::Subcolumn::insert_range_from(const Subcolumn& src, size_t st
if (pos < src.data.size() && processed_rows < end) {
size_t part_end = end - processed_rows;
insert_from_part(src.data[pos], src.data_types[pos], 0, part_end);
processed_rows = end;
}
if (processed_rows < end) {
data.back()->insert_many_defaults(end - processed_rows);
}
}

Expand Down
28 changes: 28 additions & 0 deletions be/test/core/column/column_variant_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "core/column/subcolumn_tree.h"
#include "core/data_type/data_type_array.h"
#include "core/data_type/data_type_factory.hpp"
#include "core/data_type/data_type_number.h"
#include "core/data_type/define_primitive_type.h"
#include "core/field.h"
#include "core/string_ref.h"
Expand Down Expand Up @@ -1061,6 +1062,33 @@ TEST_F(ColumnVariantTest, test_insert_indices_from) {
}
}

TEST_F(ColumnVariantTest, insert_range_from_materializes_pending_default_suffix) {
auto nested = ColumnInt64::create();
nested->insert_value(7);
auto null_map = ColumnUInt8::create();
null_map->insert_value(0);

auto root_type = make_nullable(std::make_shared<DataTypeInt64>());
auto root_column = ColumnNullable::create(std::move(nested), std::move(null_map));
ColumnVariant::Subcolumn root(std::move(root_column), root_type, true, true);
root.increment_default_counter();

ColumnVariant::Subcolumns subcolumns;
subcolumns.create_root(std::move(root));
auto src = ColumnVariant::create(0, false, std::move(subcolumns));
EXPECT_EQ(src->size(), 2);

auto dst = ColumnVariant::create(0, false);
dst->insert_range_from(*src, 0, 2);
dst->finalize();

const auto& copied_root =
assert_cast<const ColumnNullable&>(*static_cast<const ColumnVariant&>(*dst).get_root());
EXPECT_EQ(copied_root.size(), 2);
EXPECT_EQ(copied_root.get_null_map_data()[0], 0);
EXPECT_EQ(copied_root.get_null_map_data()[1], 1);
}

TEST_F(ColumnVariantTest, is_variable_length) {
EXPECT_TRUE(column_variant->is_variable_length());
}
Expand Down
Loading