This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 c2371a30b54 branch-3.0: [test](mv) Fix regression test case to make
stable #47880 (#48070)
c2371a30b54 is described below
commit c2371a30b547cc5f08555eb4b9efc37c4cfad93e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Feb 20 15:17:51 2025 +0800
branch-3.0: [test](mv) Fix regression test case to make stable #47880
(#48070)
Cherry-picked from #47880
Co-authored-by: seawinde <[email protected]>
---
.../multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.out | Bin 199 -> 253 bytes
.../data/nereids_rules_p0/mv/partition_mv_rewrite.out | Bin 2790 -> 2856 bytes
.../ddl_p0/test_create_table_like_nereids.groovy | 15 +++++++--------
.../multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.groovy | 8 +++++++-
regression-test/suites/mv_p0/ssb/q_1_1/q_1_1.groovy | 3 ++-
.../agg_optimize_when_uniform.groovy | 11 +++++++++--
.../nereids_rules_p0/mv/partition_mv_rewrite.groovy | 18 ++++++++++++++++++
.../nereids_syntax_p0/mv/aggregate/agg_sync_mv.groovy | 2 +-
.../nereids_syntax_p1/mv/aggregate/agg_sync_mv.groovy | 4 ++--
9 files changed, 46 insertions(+), 15 deletions(-)
diff --git
a/regression-test/data/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.out
b/regression-test/data/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.out
index 02e8884310a..df66dc33760 100644
Binary files
a/regression-test/data/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.out and
b/regression-test/data/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.out
differ
diff --git a/regression-test/data/nereids_rules_p0/mv/partition_mv_rewrite.out
b/regression-test/data/nereids_rules_p0/mv/partition_mv_rewrite.out
index bf22739583a..c6b66a59749 100644
Binary files
a/regression-test/data/nereids_rules_p0/mv/partition_mv_rewrite.out and
b/regression-test/data/nereids_rules_p0/mv/partition_mv_rewrite.out differ
diff --git
a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
index 24e5170ebd3..dec4eb74f43 100644
--- a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
+++ b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy
@@ -20,21 +20,20 @@ suite("test_create_table_like_nereids") {
sql "SET enable_fallback_to_original_planner=false;"
sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
+ String db = context.config.getDbNameByFile(context.file)
+ sql "use ${db}"
+
sql "drop table if exists mal_test_create_table_like"
sql """create table mal_test_create_table_like(pk int, a int, b int)
distributed by hash(pk) buckets 10
properties('replication_num' = '1');"""
sql """insert into mal_test_create_table_like
values(2,1,3),(1,1,2),(3,5,6),(6,null,6),(4,5,6),(2,1,4),(2,3,5),(1,1,4)
,(3,5,6),(3,5,null),(6,7,1),(2,1,7),(2,4,2),(2,3,9),(1,3,6),(3,5,8),(3,2,8);"""
+
sql "alter table mal_test_create_table_like add rollup ru1(a,pk);"
- waitForSchemaChangeDone {
- sql """show alter table rollup where
tablename='mal_test_create_table_like' order by createtime desc limit 1"""
- time 600
- }
+ waitingMVTaskFinishedByMvName(db, "mal_test_create_table_like", "ru1")
+
sql "alter table mal_test_create_table_like add rollup ru2(b,pk)"
- waitForSchemaChangeDone {
- sql """show alter table rollup where
tablename='mal_test_create_table_like' order by createtime desc limit 1"""
- time 600
- }
+ waitingMVTaskFinishedByMvName(db, "mal_test_create_table_like", "ru2")
// no rollup
sql "drop table if exists table_like"
diff --git
a/regression-test/suites/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.groovy
b/regression-test/suites/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.groovy
index 248cfbbb33f..72be29b843e 100644
---
a/regression-test/suites/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.groovy
+++
b/regression-test/suites/mv_p0/multi_slot_k1p2ap3ps/multi_slot_k1p2ap3ps.groovy
@@ -33,7 +33,13 @@ suite ("multi_slot_k1p2ap3ps") {
"""
sql "insert into d_table select 1,1,1,'a';"
+ sql "insert into d_table select 1,1,1,'a';"
+ sql "insert into d_table select 1,1,1,'a';"
+ sql "insert into d_table select 2,2,2,'b';"
sql "insert into d_table select 2,2,2,'b';"
+ sql "insert into d_table select 2,2,2,'b';"
+ sql "insert into d_table select 3,-3,null,'c';"
+ sql "insert into d_table select 3,-3,null,'c';"
sql "insert into d_table select 3,-3,null,'c';"
createMV ("create materialized view k1p2ap3ps as select
k1+1,sum(abs(k2+2)+k3+3) from d_table group by k1+1;")
@@ -42,7 +48,7 @@ suite ("multi_slot_k1p2ap3ps") {
sql "insert into d_table select -4,-4,-4,'d';"
sql "analyze table d_table with sync;"
- sql """alter table d_table modify column k1 set stats ('row_count'='5');"""
+ sql """alter table d_table modify column k1 set stats
('row_count'='11');"""
sql """set enable_stats=false;"""
qt_select_star "select * from d_table order by k1;"
diff --git a/regression-test/suites/mv_p0/ssb/q_1_1/q_1_1.groovy
b/regression-test/suites/mv_p0/ssb/q_1_1/q_1_1.groovy
index c7aa6e67c6e..5ff94e88522 100644
--- a/regression-test/suites/mv_p0/ssb/q_1_1/q_1_1.groovy
+++ b/regression-test/suites/mv_p0/ssb/q_1_1/q_1_1.groovy
@@ -80,7 +80,7 @@ suite ("mv_ssb_q_1_1") {
(19930101 , 1 , 1 , 1 , 1 , 1 , '1' , 1 , 1 , 1 , 1 , 100 , 1 , 1
, 1 , '2023-06-09' , 'shipmode' , 'name' , 'address' , 'city' , 'nation' ,
'AMERICA' , 'phone' , 'mktsegment' , 'name' , 'address' , 'city' , 'nation' ,
'AMERICA' ,'phone', 'name', 'MFGR#1', 'category', 'brand', 'color', 'type', 4
,'container'),
(19930101 , 1 , 1 , 1 , 1 , 1 , '1' , 1 , 1 , 1 , 1 , 100 , 1 , 1
, 1 , '2023-06-09' , 'shipmode' , 'name' , 'address' , 'city' , 'nation' ,
'AMERICA' , 'phone' , 'mktsegment' , 'name' , 'address' , 'city' , 'nation' ,
'AMERICA' ,'phone', 'name', 'MFGR#1', 'category', 'brand', 'color', 'type', 4
,'container');"""
- sql """alter table lineorder_flat modify column LO_ORDERDATE set stats
('row_count'='6');"""
+ sql """alter table lineorder_flat modify column C_CITY set stats
('row_count'='6');"""
createMV ("""create materialized view lineorder_q_1_1 as
SELECT LO_ORDERKEY, SUM(LO_EXTENDEDPRICE * LO_DISCOUNT) AS
revenue
@@ -101,6 +101,7 @@ suite ("mv_ssb_q_1_1") {
qt_select_star "select * from lineorder_flat order by 1,2, P_MFGR;"
sql "analyze table lineorder_flat with sync;"
+ sql """alter table lineorder_flat modify column C_CITY set stats
('row_count'='6');"""
mv_rewrite_success("""SELECT SUM(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
FROM lineorder_flat
WHERE
diff --git
a/regression-test/suites/nereids_rules_p0/mv/agg_optimize_when_uniform/agg_optimize_when_uniform.groovy
b/regression-test/suites/nereids_rules_p0/mv/agg_optimize_when_uniform/agg_optimize_when_uniform.groovy
index e0f33a2b0db..77f4a5ee45a 100644
---
a/regression-test/suites/nereids_rules_p0/mv/agg_optimize_when_uniform/agg_optimize_when_uniform.groovy
+++
b/regression-test/suites/nereids_rules_p0/mv/agg_optimize_when_uniform/agg_optimize_when_uniform.groovy
@@ -369,6 +369,10 @@ suite("agg_optimize_when_uniform") {
"""
order_qt_query6_0_before "${query6_0}"
async_mv_rewrite_success(db, mv6_0, query6_0, "mv6_0")
+
+ def plan_6 = """explain verbose ${query6_0}"""
+ logger.info("plan_6 is " + plan_6)
+
qt_shape6_0_after """explain shape plan ${query6_0}"""
order_qt_query6_0_after "${query6_0}"
sql """ DROP MATERIALIZED VIEW IF EXISTS mv6_0"""
@@ -442,7 +446,6 @@ suite("agg_optimize_when_uniform") {
order_qt_query7_1_before "${query7_1}"
// query where has a column not in agg output
async_mv_rewrite_fail(db, mv7_1, query7_1, "mv7_1")
- qt_shape7_1_after """explain shape plan ${query7_1}"""
order_qt_query7_1_after "${query7_1}"
sql """ DROP MATERIALIZED VIEW IF EXISTS mv7_1"""
@@ -478,7 +481,11 @@ suite("agg_optimize_when_uniform") {
order_qt_query8_0_before "${query8_0}"
// query success but add agg
async_mv_rewrite_success(db, mv8_0, query8_0, "mv8_0")
+
+ def plan_8 = """explain verbose ${query6_0}"""
+ logger.info("plan_8 is " + plan_8)
+
qt_shape8_0_after """explain shape plan ${query8_0}"""
order_qt_query8_0_after "${query8_0}"
- sql """ DROP MATERIALIZED VIEW IF EXISTS mv8_0"""
+ sql """ DROP MATERIALIZED VIEW IF EXISTS mv8_0;"""
}
diff --git
a/regression-test/suites/nereids_rules_p0/mv/partition_mv_rewrite.groovy
b/regression-test/suites/nereids_rules_p0/mv/partition_mv_rewrite.groovy
index f8023a9e1e4..eba1edd94b6 100644
--- a/regression-test/suites/nereids_rules_p0/mv/partition_mv_rewrite.groovy
+++ b/regression-test/suites/nereids_rules_p0/mv/partition_mv_rewrite.groovy
@@ -84,14 +84,32 @@ suite("partition_mv_rewrite") {
sql"""
insert into orders values
(1, 1, 'ok', 99.5, '2023-10-17', 'a', 'b', 1, 'yy'),
+ (1, 1, 'ok', 99.5, '2023-10-17', 'a', 'b', 1, 'yy'),
+ (1, 1, 'ok', 99.5, '2023-10-17', 'a', 'b', 1, 'yy'),
+ (1, 1, 'ok', 99.5, '2023-10-17', 'a', 'b', 1, 'yy'),
+ (2, 2, 'ok', 109.2, '2023-10-18', 'c','d',2, 'mm'),
+ (2, 2, 'ok', 109.2, '2023-10-18', 'c','d',2, 'mm'),
+ (2, 2, 'ok', 109.2, '2023-10-18', 'c','d',2, 'mm'),
(2, 2, 'ok', 109.2, '2023-10-18', 'c','d',2, 'mm'),
+ (3, 3, 'ok', 99.5, '2023-10-19', 'a', 'b', 1, 'yy'),
+ (3, 3, 'ok', 99.5, '2023-10-19', 'a', 'b', 1, 'yy'),
+ (3, 3, 'ok', 99.5, '2023-10-19', 'a', 'b', 1, 'yy'),
(3, 3, 'ok', 99.5, '2023-10-19', 'a', 'b', 1, 'yy');
"""
sql """
insert into lineitem values
(1, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-17', '2023-10-17',
'2023-10-17', 'a', 'b', 'yyyyyyyyy'),
+ (1, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-17', '2023-10-17',
'2023-10-17', 'a', 'b', 'yyyyyyyyy'),
+ (1, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-17', '2023-10-17',
'2023-10-17', 'a', 'b', 'yyyyyyyyy'),
+ (1, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-17', '2023-10-17',
'2023-10-17', 'a', 'b', 'yyyyyyyyy'),
+ (2, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-18', '2023-10-18',
'2023-10-18', 'a', 'b', 'yyyyyyyyy'),
+ (2, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-18', '2023-10-18',
'2023-10-18', 'a', 'b', 'yyyyyyyyy'),
+ (2, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-18', '2023-10-18',
'2023-10-18', 'a', 'b', 'yyyyyyyyy'),
(2, 2, 3, 4, 5.5, 6.5, 7.5, 8.5, 'o', 'k', '2023-10-18', '2023-10-18',
'2023-10-18', 'a', 'b', 'yyyyyyyyy'),
+ (3, 2, 3, 6, 7.5, 8.5, 9.5, 10.5, 'k', 'o', '2023-10-19', '2023-10-19',
'2023-10-19', 'c', 'd', 'xxxxxxxxx'),
+ (3, 2, 3, 6, 7.5, 8.5, 9.5, 10.5, 'k', 'o', '2023-10-19', '2023-10-19',
'2023-10-19', 'c', 'd', 'xxxxxxxxx'),
+ (3, 2, 3, 6, 7.5, 8.5, 9.5, 10.5, 'k', 'o', '2023-10-19', '2023-10-19',
'2023-10-19', 'c', 'd', 'xxxxxxxxx'),
(3, 2, 3, 6, 7.5, 8.5, 9.5, 10.5, 'k', 'o', '2023-10-19', '2023-10-19',
'2023-10-19', 'c', 'd', 'xxxxxxxxx');
"""
diff --git
a/regression-test/suites/nereids_syntax_p0/mv/aggregate/agg_sync_mv.groovy
b/regression-test/suites/nereids_syntax_p0/mv/aggregate/agg_sync_mv.groovy
index 9ee0610e5e5..ed4debebbc6 100644
--- a/regression-test/suites/nereids_syntax_p0/mv/aggregate/agg_sync_mv.groovy
+++ b/regression-test/suites/nereids_syntax_p0/mv/aggregate/agg_sync_mv.groovy
@@ -310,7 +310,7 @@ suite("agg_sync_mv") {
qt_select_variance """select id, variance(kint) from agg_mv_test group by
id order by id;"""
sql """drop materialized view if exists mv_sync47 on agg_mv_test;"""
createMV("""create materialized view mv_sync47 as select id,
variance(kint) from agg_mv_test group by id order by id;""")
- mv_rewrite_success("select id, variance(kint) from agg_mv_test group by id
order by id;", "mv_sync47")
+ mv_rewrite_any_success("select id, variance(kint) from agg_mv_test group
by id order by id;", ["mv_sync47", "mv_sync48"])
qt_select_variance_mv """select id, variance(kint) from agg_mv_test group
by id order by id;"""
qt_select_var_pop """select id, var_pop(kint) from agg_mv_test group by id
order by id;"""
diff --git
a/regression-test/suites/nereids_syntax_p1/mv/aggregate/agg_sync_mv.groovy
b/regression-test/suites/nereids_syntax_p1/mv/aggregate/agg_sync_mv.groovy
index 205acdf71df..8ef34fd7948 100644
--- a/regression-test/suites/nereids_syntax_p1/mv/aggregate/agg_sync_mv.groovy
+++ b/regression-test/suites/nereids_syntax_p1/mv/aggregate/agg_sync_mv.groovy
@@ -311,13 +311,13 @@ suite("agg_sync_mv") {
qt_select_variance """select id, variance(kint) from agg_mv_test group by
id order by id;"""
sql """drop materialized view if exists mv_sync47 on agg_mv_test;"""
createMV("""create materialized view mv_sync47 as select id,
variance(kint) from agg_mv_test group by id order by id;""")
- mv_rewrite_success("select id, variance(kint) from agg_mv_test group by id
order by id;", "mv_sync47")
+ mv_rewrite_any_success("select id, variance(kint) from agg_mv_test group
by id order by id;", ["mv_sync47", "mv_sync48"])
qt_select_variance_mv """select id, variance(kint) from agg_mv_test group
by id order by id;"""
qt_select_var_pop """select id, var_pop(kint) from agg_mv_test group by id
order by id;"""
sql """drop materialized view if exists mv_sync48 on agg_mv_test;"""
createMV("""create materialized view mv_sync48 as select id, var_pop(kint)
from agg_mv_test group by id order by id;""")
- mv_rewrite_success("select id, var_pop(kint) from agg_mv_test group by id
order by id;", "mv_sync47")
+ mv_rewrite_any_success("select id, var_pop(kint) from agg_mv_test group by
id order by id;", ["mv_sync47", "mv_sync48"])
qt_select_var_pop_mv """select id, var_pop(kint) from agg_mv_test group by
id order by id;"""
qt_select_variance_samp """select id, variance_samp(kint) from agg_mv_test
group by id order by id;"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
