Skip to content

[4.1](column) remove IDataType get_default (#62582) #63308

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
yiguolei merged 2 commits into from
May 20, 2026
Merged

[4.1](column) remove IDataType get_default (#62582) #63308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b69137f
[refine](column) remove IDataType get_default (#62582)
Mryange May 7, 2026
1d59863
upd
Mryange May 16, 2026
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
Prev Previous commit
upd
  • Loading branch information
@Mryange
Mryange committed May 16, 2026
commit 1d59863778d051a8f537c9a986ef92a18d45ca18
57 changes: 11 additions & 46 deletions be/src/core/column/column_variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2620,64 +2620,29 @@ bool ColumnVariant::try_insert_many_defaults_from_nested(const Subcolumns::NodeP
return true;
}

/// Visitor that keeps @num_dimensions_to_keep dimensions in arrays
/// and replaces all scalars or nested arrays to @replacement at that level.
class FieldVisitorReplaceScalars : public StaticVisitor<Field> {
public:
FieldVisitorReplaceScalars(const Field& replacement_, size_t num_dimensions_to_keep_)
: replacement(replacement_), num_dimensions_to_keep(num_dimensions_to_keep_) {}

template <PrimitiveType T>
Field apply(const typename PrimitiveTypeTraits<T>::CppType& x) const {
if constexpr (T == TYPE_ARRAY) {
if (num_dimensions_to_keep == 0) {
return replacement;
}

const size_t size = x.size();
Array res(size);
for (size_t i = 0; i < size; ++i) {
res[i] = apply_visitor(
FieldVisitorReplaceScalars(replacement, num_dimensions_to_keep - 1), x[i]);
}
return Field::create_field<TYPE_ARRAY>(res);
} else {
return replacement;
}
}

private:
const Field& replacement;
size_t num_dimensions_to_keep;
};

bool ColumnVariant::try_insert_default_from_nested(const Subcolumns::NodePtr& entry) const {
const auto* leaf = get_leaf_of_the_same_nested(entry);
if (!leaf) {
return false;
}

auto last_field = leaf->data.get_last_field();
if (last_field.is_null()) {
size_t leaf_size = leaf->data.size();
if (leaf_size == 0) {
return false;
}

size_t leaf_num_dimensions = leaf->data.get_dimensions();
size_t entry_num_dimensions = entry->data.get_dimensions();

if (entry_num_dimensions > leaf_num_dimensions) {
throw doris::Exception(
ErrorCode::INVALID_ARGUMENT,
"entry_num_dimensions > leaf_num_dimensions, entry_num_dimensions={}, "
"leaf_num_dimensions={}",
entry_num_dimensions, leaf_num_dimensions);
if (leaf->data.is_null_at(leaf_size - 1)) {
return false;
}

auto default_scalar = entry->data.get_least_common_type()->get_default();
FieldInfo field_info = {
.scalar_type_id = entry->data.least_common_type.get_base_type_id(),
.num_dimensions = entry->data.get_dimensions(),
};

auto default_field = apply_visitor(
FieldVisitorReplaceScalars(default_scalar, leaf_num_dimensions), last_field);
entry->data.insert(std::move(default_field));
auto new_subcolumn = leaf->data.cut(leaf_size - 1, 1).clone_with_default_values(field_info);
entry->data.insert_range_from(new_subcolumn, 0, 1);
ENABLE_CHECK_CONSISTENCY(this);
return true;
}

Expand Down
24 changes: 0 additions & 24 deletions be/test/core/column/column_variant_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3085,30 +3085,6 @@ TEST_F(ColumnVariantTest, get_field_info_all_types) {
}
}

TEST_F(ColumnVariantTest, field_visitor) {
// Test replacing scalar values in a flat array
{
Array array;
array.push_back(Field::create_field<TYPE_BIGINT>(Int64(1)));
array.push_back(Field::create_field<TYPE_BIGINT>(Int64(2)));
array.push_back(Field::create_field<TYPE_BIGINT>(Int64(3)));

Field field = Field::create_field<TYPE_ARRAY>(std::move(array));
Field replacement = Field::create_field<TYPE_BIGINT>(Int64(42));
Field result = apply_visitor(FieldVisitorReplaceScalars(replacement, 0), field);

EXPECT_EQ(result.get<TYPE_BIGINT>(), 42);

Field replacement1 = Field::create_field<TYPE_BIGINT>(Int64(42));
Field result1 = apply_visitor(FieldVisitorReplaceScalars(replacement, 1), field);

EXPECT_EQ(result1.get<TYPE_ARRAY>().size(), 3);
EXPECT_EQ(result1.get<TYPE_ARRAY>()[0].get<TYPE_BIGINT>(), 42);
EXPECT_EQ(result1.get<TYPE_ARRAY>()[1].get<TYPE_BIGINT>(), 42);
EXPECT_EQ(result1.get<TYPE_ARRAY>()[2].get<TYPE_BIGINT>(), 42);
}
}

TEST_F(ColumnVariantTest, subcolumn_operations_coverage) {
// Test insert_range_from
{
Expand Down
Loading