This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 1832dc25e46 [fix](test) fix some unstable p2 test cases (#33637)
(#33655)
1832dc25e46 is described below
commit 1832dc25e461b42278ada68dcf6321d6acddd7b5
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Mon Apr 15 15:58:53 2024 +0800
[fix](test) fix some unstable p2 test cases (#33637) (#33655)
bp #33637
---
.../external_table_p0/hive/test_hive_other.groovy | 4 +--
.../hive/test_select_count_optimize.groovy | 42 +++++-----------------
2 files changed, 11 insertions(+), 35 deletions(-)
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
index a7502ac1dc2..809a36de2ed 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
@@ -18,7 +18,7 @@
suite("test_hive_other",
"p0,external,hive,external_docker,external_docker_hive") {
def q01 = {
- qt_q24 """ select name, count(1) as c from student group by name order
by c desc;"""
+ qt_q24 """ select name, count(1) as c from student group by name order
by name desc;"""
qt_q25 """ select lo_orderkey, count(1) as c from lineorder group by
lo_orderkey order by lo_orderkey asc, c desc;"""
qt_q26 """ select * from test1 order by col_1;"""
qt_q27 """ select * from string_table order by p_partkey desc;"""
@@ -99,6 +99,6 @@ suite("test_hive_other",
"p0,external,hive,external_docker,external_docker_hive"
sql """refresh table `default`.table_with_vertical_line"""
order_qt_after_refresh """ select dt, dt, k2, k5, dt from
table_with_vertical_line where dt in ('2022-11-25') or dt in ('2022-11-24')
order by k2 desc limit 10;"""
- sql """drop catalog if exists ${catalog_name}"""
+ // sql """drop catalog if exists ${catalog_name}"""
}
}
diff --git
a/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy
b/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy
index 840ab77da2c..ea7f5701df8 100644
---
a/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy
@@ -88,106 +88,82 @@ suite("test_select_count_optimize",
"p2,external,hive,external_remote,external_r
qt_sql """ select count(*) as a from tpch_1000.nation group by
n_regionkey order by a;"""
+ sql "select count(*) from tpch_1000_parquet.nation;"
explain {
-
sql "select count(*) from tpch_1000_parquet.nation;"
-
contains "pushdown agg=COUNT"
}
explain {
-
sql "select count(1) from tpch_1000_parquet.nation;"
-
contains "pushdown agg=COUNT"
}
explain {
-
sql "select count(2) from tpch_1000_parquet.nation;"
-
contains "pushdown agg=COUNT"
}
explain {
-
sql "select count(n_name) from tpch_1000_parquet.nation;"
-
notContains "pushdown agg=COUNT"
}
explain {
-
sql "select count(n_name) from tpch_1000_parquet.nation where
n_nationkey = 1;"
-
notContains "pushdown agg=COUNT"
}
explain {
-
sql "select count(*) from tpch_1000_parquet.nation group by
n_regionkey ;"
-
notContains "pushdown agg=COUNT"
}
-
+ sql " select count(*) from multi_catalog.test_csv_format_error; "
explain {
-
sql " select count(*) from multi_catalog.test_csv_format_error; "
-
contains "pushdown agg=COUNT"
}
+ sql "select count(*) from multi_catalog.hits_orc ; "
explain {
sql "select count(*) from multi_catalog.hits_orc ; "
-
contains "pushdown agg=COUNT"
-
}
-
explain {
- sql "select count(*) from multi_catalog.hits_orc ; "
-
+ sql "select count(1) from multi_catalog.hits_orc ; "
contains "pushdown agg=COUNT"
-
}
-
+ sql "select count(*) from multi_catalog.parquet_one_column;"
explain {
-
sql "select count(*) from multi_catalog.parquet_one_column;"
-
contains "pushdown agg=COUNT"
}
explain {
-
sql "select count(col1) from multi_catalog.parquet_one_column;"
-
notContains "pushdown agg=COUNT"
}
+ sql "select count(*) from multi_catalog.parquet_two_column;"
explain {
-
sql "select count(*) from multi_catalog.parquet_two_column;"
-
contains "pushdown agg=COUNT"
}
- explain {
+ sql "select count(*) from multi_catalog.parquet_two_column where col1
= 1;"
+ explain {
sql "select count(*) from multi_catalog.parquet_two_column where
col1 = 1;"
-
notContains "pushdown agg=COUNT"
}
-
+ sql "select count(*) from multi_catalog.logs2_orc;"
explain {
-
sql "select count(*) from multi_catalog.logs2_orc;"
-
contains "pushdown agg=COUNT"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
