This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 30b7c94c134 branch-3.0: [fix](variant) fix schema change for variant
from not null to null #46279 (#46346)
30b7c94c134 is described below
commit 30b7c94c13448d3f82dc27f52bc11bc9007ef61f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 3 15:52:45 2025 +0800
branch-3.0: [fix](variant) fix schema change for variant from not null to
null #46279 (#46346)
Cherry-picked from #46279
Co-authored-by: lihangyu <lihan...@selectdb.com>
---
.../rowset/segment_v2/hierarchical_data_reader.h | 7 +++++
be/src/vec/common/schema_util.cpp | 22 ++++++++++------
.../variant_p0/schema_change/schema_change.out | 10 ++++++++
.../variant_p0/schema_change/schema_change.groovy | 30 ++++++++++++++++++++++
4 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
index f85038713ca..c6f325aacea 100644
--- a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
+++ b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
@@ -242,6 +242,13 @@ private:
assert_cast<ColumnNullable&>(*_root_reader->column).get_nested_column())
.clear_subcolumns_data();
} else {
+ if (dst->is_nullable()) {
+ // No nullable info exist in hirearchical data, fill
nullmap with all none null
+ ColumnUInt8& dst_null_map =
+
assert_cast<ColumnNullable&>(*dst).get_null_map_column();
+ auto fake_nullable_column = ColumnUInt8::create(nrows, 0);
+ dst_null_map.insert_range_from(*fake_nullable_column, 0,
nrows);
+ }
ColumnObject& root_column =
assert_cast<ColumnObject&>(*_root_reader->column);
root_column.clear_subcolumns_data();
}
diff --git a/be/src/vec/common/schema_util.cpp
b/be/src/vec/common/schema_util.cpp
index 47192f38079..c1255318e7a 100644
--- a/be/src/vec/common/schema_util.cpp
+++ b/be/src/vec/common/schema_util.cpp
@@ -149,20 +149,17 @@ bool is_conversion_required_between_integers(const
TypeIndex& lhs, const TypeInd
Status cast_column(const ColumnWithTypeAndName& arg, const DataTypePtr& type,
ColumnPtr* result) {
ColumnsWithTypeAndName arguments {arg, {nullptr, type, type->get_name()}};
- auto function = SimpleFunctionFactory::instance().get_function("CAST",
arguments, type);
- if (!function) {
- return Status::InternalError("Not found cast function {} to {}",
arg.type->get_name(),
- type->get_name());
- }
- Block tmp_block {arguments};
- size_t result_column = tmp_block.columns();
- auto ctx = FunctionContext::create_context(nullptr, {}, {});
// To prevent from null info lost, we should not call function since the
function framework will wrap
// nullable to Variant instead of the root of Variant
// correct output: Nullable(Array(int)) ->
Nullable(Variant(Nullable(Array(int))))
// incorrect output: Nullable(Array(int)) -> Nullable(Variant(Array(int)))
if (WhichDataType(remove_nullable(type)).is_variant_type()) {
+ // If source column is variant, so the nullable info is different from
dst column
+ if (WhichDataType(remove_nullable(arg.type)).is_variant_type()) {
+ *result = type->is_nullable() ? make_nullable(arg.column) :
remove_nullable(arg.column);
+ return Status::OK();
+ }
// set variant root column/type to from column/type
auto variant = ColumnObject::create(true /*always nullable*/);
CHECK(arg.column->is_nullable());
@@ -174,6 +171,15 @@ Status cast_column(const ColumnWithTypeAndName& arg, const
DataTypePtr& type, Co
return Status::OK();
}
+ auto function = SimpleFunctionFactory::instance().get_function("CAST",
arguments, type);
+ if (!function) {
+ return Status::InternalError("Not found cast function {} to {}",
arg.type->get_name(),
+ type->get_name());
+ }
+ Block tmp_block {arguments};
+ size_t result_column = tmp_block.columns();
+ auto ctx = FunctionContext::create_context(nullptr, {}, {});
+
if (WhichDataType(arg.type).is_nothing()) {
// cast from nothing to any type should result in nulls
*result =
type->create_column_const_with_default_value(arg.column->size())
diff --git a/regression-test/data/variant_p0/schema_change/schema_change.out
b/regression-test/data/variant_p0/schema_change/schema_change.out
index 4956e8311b0..cbc4488d93b 100644
--- a/regression-test/data/variant_p0/schema_change/schema_change.out
+++ b/regression-test/data/variant_p0/schema_change/schema_change.out
@@ -71,3 +71,13 @@
1 hello world
1 hello world
+-- !sql --
+1 {"a":1.0}
+2 {"a":111.1111}
+3 {"a":"11111"}
+
+-- !sql --
+1 {"a":1.0}
+2 {"a":111.1111}
+3 {"a":"11111"}
+
diff --git
a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
index 877874b7e03..9c39b3ad8ba 100644
--- a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
+++ b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
@@ -79,4 +79,34 @@ suite("regression_test_variant_schema_change",
"variant_type"){
sql """INSERT INTO ${table_name} SELECT k, v,v from ${table_name} limit
1111"""
// select from mv
qt_sql """select v['k1'], cast(v['k2'] as string) from ${table_name} order
by k desc limit 10"""
+
+ // not null to null
+ sql "drop table if exists t"
+ sql """
+ create table t (
+ col0 int not null,
+ col1 variant NOT NULL
+ ) UNIQUE KEY(`col0`)
+ DISTRIBUTED BY HASH(col0) BUCKETS 1 PROPERTIES ("replication_num"
= "1", "disable_auto_compaction" = "false");
+ """
+
+ sql """insert into t values (1, '{"a" : 1.0}')"""
+ sql """insert into t values (2, '{"a" : 111.1111}')"""
+ sql """insert into t values (3, '{"a" : "11111"}')"""
+ sql """insert into t values (4, '{"a" : 1111111111}')"""
+ sql """insert into t values (5, '{"a" : 1111.11111}')"""
+ sql """insert into t values (6, '{"a" : "11111"}')"""
+ sql """insert into t values (7, '{"a" : 11111.11111}')"""
+ sql "alter table t modify column col1 variant;"
+ wait_for_latest_op_on_table_finish("t", timeout)
+ qt_sql "select * from t order by col0 limit 3"
+ sql """insert into t values (1, '{"a" : 1.0}')"""
+ sql """insert into t values (2, '{"a" : 111.1111}')"""
+ sql """insert into t values (3, '{"a" : "11111"}')"""
+ sql """insert into t values (4, '{"a" : 1111111111}')"""
+ sql """insert into t values (5, '{"a" : 1111.11111}')"""
+ sql """insert into t values (6, '{"a" : "11111"}')"""
+ sql """insert into t values (7, '{"a" : 11111.11111}')"""
+ trigger_and_wait_compaction("t", "cumulative")
+ qt_sql "select * from t order by col0 limit 3"
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
