This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new fe7651db245 [fix](variant) fix variant column data_serdes not synced
(#60908) (#61096)
fe7651db245 is described below
commit fe7651db245301671513d9ce04b8812055477580
Author: Chenyang Sun <[email protected]>
AuthorDate: Fri Mar 6 14:22:43 2026 +0800
[fix](variant) fix variant column data_serdes not synced (#60908) (#61096)
pick from master #60908
---
be/src/vec/columns/column_variant.cpp | 2 +
.../variant_p0/mv/variant_mv_rowstore_crash.out | 11 +++
.../variant_p0/mv/variant_mv_rowstore_crash.groovy | 93 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/be/src/vec/columns/column_variant.cpp
b/be/src/vec/columns/column_variant.cpp
index ffc7bd7afce..009c8df6545 100644
--- a/be/src/vec/columns/column_variant.cpp
+++ b/be/src/vec/columns/column_variant.cpp
@@ -1348,6 +1348,7 @@ void ColumnVariant::Subcolumn::wrapp_array_nullable() {
}
result_column = ColumnNullable::create(std::move(result_column),
std::move(new_null_map));
data_types[0] = make_nullable(data_types[0]);
+ data_serdes[0] = generate_data_serdes(data_types[0], is_root);
least_common_type = LeastCommonType {data_types[0], is_root};
}
}
@@ -1878,6 +1879,7 @@ void ColumnVariant::ensure_root_node_type(const
DataTypePtr& expected_root_type)
expected_root_type, &casted_column));
root.data[0] = casted_column;
root.data_types[0] = expected_root_type;
+ root.data_serdes[0] =
Subcolumn::generate_data_serdes(expected_root_type, true);
root.least_common_type = Subcolumn::LeastCommonType
{expected_root_type, true};
root.num_rows = casted_column->size();
}
diff --git a/regression-test/data/variant_p0/mv/variant_mv_rowstore_crash.out
b/regression-test/data/variant_p0/mv/variant_mv_rowstore_crash.out
new file mode 100644
index 00000000000..77086f5235b
--- /dev/null
+++ b/regression-test/data/variant_p0/mv/variant_mv_rowstore_crash.out
@@ -0,0 +1,11 @@
+-- This file is automatically generated. You should know what you did if you
want to edit this
+-- !mv --
+1 1 [{"x":1},{"x":2}]
+2 2 [{"x":3}]
+3 3 [{"x":4},{"x":5},{"x":6}]
+
+-- !direct --
+1 [{"x":1},{"x":2}]
+2 [{"x":3}]
+3 [{"x":4},{"x":5},{"x":6}]
+
diff --git
a/regression-test/suites/variant_p0/mv/variant_mv_rowstore_crash.groovy
b/regression-test/suites/variant_p0/mv/variant_mv_rowstore_crash.groovy
new file mode 100644
index 00000000000..e50171221fe
--- /dev/null
+++ b/regression-test/suites/variant_p0/mv/variant_mv_rowstore_crash.groovy
@@ -0,0 +1,93 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// Regression test for variant column with rowstore MV crash
+// Bug: wrapp_array_nullable() updates data_types but not data_serdes,
+// and ensure_root_node_type() updates data/data_types but not data_serdes,
+// causing assert_cast failure during row store serialization in MV refresh.
+
+suite("variant_mv_rowstore_crash", "variant_type") {
+
+ def tbl = "var_mv_rs_tbl"
+ def mv_name = "var_mv_rs_mv"
+
+ sql "DROP MATERIALIZED VIEW IF EXISTS ${mv_name}"
+ sql "DROP TABLE IF EXISTS ${tbl}"
+
+ // Test 1: MV with variant array extraction + rowstore
+ sql """
+ CREATE TABLE ${tbl} (
+ k int,
+ v variant NULL
+ ) ENGINE=OLAP
+ DUPLICATE KEY(k)
+ DISTRIBUTED BY HASH(k) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1",
+ "store_row_column" = "true"
+ );
+ """
+
+ // All rows have non-null array values in a single batch
+ sql """INSERT INTO ${tbl} VALUES
+ (1, '{"a":1,"arr":[{"x":1},{"x":2}]}'),
+ (2, '{"a":2,"arr":[{"x":3}]}'),
+ (3, '{"a":3,"arr":[{"x":4},{"x":5},{"x":6}]}')"""
+
+ sql "DROP MATERIALIZED VIEW IF EXISTS ${mv_name}"
+ sql """
+ CREATE MATERIALIZED VIEW ${mv_name}
+ BUILD IMMEDIATE REFRESH AUTO ON MANUAL
+ DISTRIBUTED BY RANDOM BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1",
+ "store_row_column" = "true"
+ )
+ AS SELECT k, v['a'] AS a, v['arr'] AS arr FROM ${tbl};
+ """
+
+ String db = context.config.getDbNameByFile(context.file)
+ def job_name = getJobName(db, mv_name)
+ waitingMTMVTaskFinished(job_name)
+
+ order_qt_mv "SELECT * FROM ${mv_name} ORDER BY k"
+
+ // Test 2: INSERT INTO ... SELECT variant subcolumn into rowstore table
+ // This ensures variant goes through parse_and_materialize_variant_columns
+ // with ensure_root_node_type path
+ def tbl3 = "var_rs_target_tbl"
+ sql "DROP TABLE IF EXISTS ${tbl3}"
+ sql """
+ CREATE TABLE ${tbl3} (
+ k int,
+ arr variant NULL
+ ) ENGINE=OLAP
+ DUPLICATE KEY(k)
+ DISTRIBUTED BY HASH(k) BUCKETS 1
+ PROPERTIES (
+ "replication_num" = "1",
+ "store_row_column" = "true"
+ );
+ """
+ // Insert variant subcolumn (array type) into rowstore table
+ sql """INSERT INTO ${tbl3} SELECT k, cast(v['arr'] as string) FROM
${tbl}"""
+ order_qt_direct "SELECT * FROM ${tbl3} ORDER BY k"
+
+ sql "DROP MATERIALIZED VIEW IF EXISTS ${mv_name}"
+ sql "DROP TABLE IF EXISTS ${tbl}"
+ sql "DROP TABLE IF EXISTS ${tbl3}"
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
