This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push: new 083125812c [testcase] Fix regression test case failure (#11286) 083125812c is described below commit 083125812c006acfb5b88f5603481f141a8f3d63 Author: TengJianPing <18241664+jackte...@users.noreply.github.com> AuthorDate: Thu Jul 28 14:12:56 2022 +0800 [testcase] Fix regression test case failure (#11286) --- .../suites/correctness/test_lag_lead_window.groovy | 4 ++-- .../correctness/test_last_value_window.groovy | 2 +- .../correctness/test_select_variance_agg.groovy | 4 +++- .../window_functions/test_ntile_function.groovy | 16 ++++++------- .../window_functions/test_window_function.groovy | 28 +++++++++++++++------- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/regression-test/suites/correctness/test_lag_lead_window.groovy b/regression-test/suites/correctness/test_lag_lead_window.groovy index 69ad1eeab4..365700c4d6 100644 --- a/regression-test/suites/correctness/test_lag_lead_window.groovy +++ b/regression-test/suites/correctness/test_lag_lead_window.groovy @@ -35,9 +35,9 @@ suite("test_lag_lead_window") { sql """ set enable_vectorized_engine = false """ qt_select_default """ select min(t.cc) over(PARTITION by t.cc order by t.aa) , - lag(t.cc,1,'') over (PARTITION by t.cc order by t.aa) as l1 from ${tableName} t; """ + lag(t.cc,1,'') over (PARTITION by t.cc order by t.aa) as l1 from ${tableName} t order by aa, bb, cc; """ qt_select_default2 """ select min(t.cc) over(PARTITION by t.cc order by t.aa) , - lead(t.cc,1,'') over (PARTITION by t.cc order by t.aa) as l1 from ${tableName} t; """ + lead(t.cc,1,'') over (PARTITION by t.cc order by t.aa) as l1 from ${tableName} t order by aa, bb, cc; """ } \ No newline at end of file diff --git a/regression-test/suites/correctness/test_last_value_window.groovy b/regression-test/suites/correctness/test_last_value_window.groovy index fab1543d2b..20d915d3fd 100644 --- a/regression-test/suites/correctness/test_last_value_window.groovy +++ b/regression-test/suites/correctness/test_last_value_window.groovy @@ -46,6 +46,6 @@ suite("test_last_value_window") { // not_vectorized sql """ set enable_vectorized_engine = false; """ - qt_select_default """ select *,last_value(state) over(partition by myday order by time_col) from ${tableName}; """ + qt_select_default """ select *,last_value(state) over(partition by myday order by time_col) from ${tableName} order by myday, time_col, state; """ } \ No newline at end of file diff --git a/regression-test/suites/correctness/test_select_variance_agg.groovy b/regression-test/suites/correctness/test_select_variance_agg.groovy index 318679fac5..3ce7281790 100644 --- a/regression-test/suites/correctness/test_select_variance_agg.groovy +++ b/regression-test/suites/correctness/test_select_variance_agg.groovy @@ -36,6 +36,8 @@ qt_select_default """ select variance(aa) from ${tableName}; """ - qt_select_default2 """ select variance(bb) from ${tableName}; """ + // doris decimal variance implementation have deviation, + // use round to check result + qt_select_default2 """ select round(variance(bb), 6) from ${tableName}; """ } \ No newline at end of file diff --git a/regression-test/suites/query/sql_functions/window_functions/test_ntile_function.groovy b/regression-test/suites/query/sql_functions/window_functions/test_ntile_function.groovy index c0d79248e2..ab0a8cc17a 100644 --- a/regression-test/suites/query/sql_functions/window_functions/test_ntile_function.groovy +++ b/regression-test/suites/query/sql_functions/window_functions/test_ntile_function.groovy @@ -67,18 +67,18 @@ suite("test_ntile_function", "query") { // Not Vectorized sql """ set enable_vectorized_engine = false """ - qt_select "select k1, k2, k3, ntile(3) over (partition by k1 order by k2) as ntile from ${tableName};" - qt_select "select k1, k2, k3, ntile(5) over (partition by k1 order by k2) as ntile from ${tableName};" - qt_select "select k2, k1, k3, ntile(3) over (order by k2) as ntile from ${tableName};" - qt_select "select k3, k2, k1, ntile(3) over (partition by k3 order by k2) as ntile from ${tableName};" + qt_select "select k1, k2, k3, ntile(3) over (partition by k1 order by k2) as ntile from ${tableName} order by k1, k2, k3 desc;" + qt_select "select k1, k2, k3, ntile(5) over (partition by k1 order by k2) as ntile from ${tableName} order by k1, k2, k3 desc;" + qt_select "select k2, k1, k3, ntile(3) over (order by k2) as ntile from ${tableName} order by k2, k1, k3 desc;" + qt_select "select k3, k2, k1, ntile(3) over (partition by k3 order by k2) as ntile from ${tableName} order by k3, k2, k1;" // vectorized sql """ set enable_vectorized_engine = true """ - qt_select "select k1, k2, k3, ntile(3) over (partition by k1 order by k2) as ntile from ${tableName};" - qt_select "select k1, k2, k3, ntile(5) over (partition by k1 order by k2) as ntile from ${tableName};" - qt_select "select k2, k1, k3, ntile(3) over (order by k2) as ntile from ${tableName};" - qt_select "select k3, k2, k1, ntile(3) over (partition by k3 order by k2) as ntile from ${tableName};" + qt_select "select k1, k2, k3, ntile(3) over (partition by k1 order by k2) as ntile from ${tableName} order by k1, k2, k3 desc;" + qt_select "select k1, k2, k3, ntile(5) over (partition by k1 order by k2) as ntile from ${tableName} order by k1, k2, k3 desc;" + qt_select "select k2, k1, k3, ntile(3) over (order by k2) as ntile from ${tableName} order by k2, k1, k3 desc;" + qt_select "select k3, k2, k1, ntile(3) over (partition by k3 order by k2) as ntile from ${tableName} order by k3, k2, k1;" } diff --git a/regression-test/suites/query/sql_functions/window_functions/test_window_function.groovy b/regression-test/suites/query/sql_functions/window_functions/test_window_function.groovy index da6b76e0f7..e6463111fc 100644 --- a/regression-test/suites/query/sql_functions/window_functions/test_window_function.groovy +++ b/regression-test/suites/query/sql_functions/window_functions/test_window_function.groovy @@ -32,6 +32,10 @@ suite("test_window_function", "query") { avg( closing_price ) over ( PARTITION BY stock_symbol ORDER BY closing_date rows BETWEEN 1 preceding AND 1 following ) AS moving_average FROM ${windowFunctionTable1} + ORDER BY + stock_symbol, + closing_date, + closing_price """ // LEAD qt_sql """ @@ -50,7 +54,7 @@ suite("test_window_function", "query") { // LEAD not nullable coredump qt_sql """ - select t1.new_time from (select closing_date, lead(closing_date, 1, '2014-10-02 00:00:00') over () as new_time from ${windowFunctionTable1}) as t1 left join ${windowFunctionTable1} t2 on t2.closing_date = t1.closing_date; + select t1.new_time from (select closing_date, lead(closing_date, 1, '2014-10-02 00:00:00') over () as new_time from ${windowFunctionTable1}) as t1 left join ${windowFunctionTable1} t2 on t2.closing_date = t1.closing_date order by t1.new_time desc; """ // LAG @@ -82,7 +86,9 @@ suite("test_window_function", "query") { FROM ${windowFunctionTable2} WHERE - property IN ( 'odd', 'even' ); + property IN ( 'odd', 'even' ) + ORDER BY + property, x; """ // AVG qt_sql """ @@ -93,7 +99,9 @@ suite("test_window_function", "query") { FROM ${windowFunctionTable2} WHERE - property IN ( 'odd', 'even' ); + property IN ( 'odd', 'even' ) + ORDER BY + property, x; """ // COUNT qt_sql """ @@ -104,7 +112,9 @@ suite("test_window_function", "query") { FROM ${windowFunctionTable2} WHERE - property IN ( 'odd', 'even' ); + property IN ( 'odd', 'even' ) + ORDER BY + property, x; """ sql """ truncate table ${windowFunctionTable2} """ sql """ insert into ${windowFunctionTable2} values (2,'even'),(4,'even'),(6,'even'),(8,'even'),(10,'even'),(1,'odd'),(3,'odd'),(5,'odd'),(7,'odd'),(9,'odd'); """ @@ -140,11 +150,11 @@ suite("test_window_function", "query") { sql """ insert into ${windowFunctionTable3} values (1,1),(1,2),(1,2),(2,1),(2,2),(2,3),(3,1),(3,1),(3,2); """ // RANK - qt_sql """ select x, y, rank() over(partition by x order by y) as rank from ${windowFunctionTable3} ; """ + qt_sql """ select x, y, rank() over(partition by x order by y) as rank from ${windowFunctionTable3} order by x, y; """ // DENSE_RANK - qt_sql """ select x, y, dense_rank() over(partition by x order by y) as rank from ${windowFunctionTable3} ; """ + qt_sql """ select x, y, dense_rank() over(partition by x order by y) as rank from ${windowFunctionTable3} order by x, y; """ // ROW_NUMBER - qt_sql """ select x, y, row_number() over(partition by x order by y) as rank from ${windowFunctionTable3} ; """ + qt_sql """ select x, y, row_number() over(partition by x order by y) as rank from ${windowFunctionTable3} order by x, y; """ sql """ drop table ${windowFunctionTable3} """ @@ -155,9 +165,9 @@ suite("test_window_function", "query") { sql """ insert into ${windowFunctionTable4} VALUES ('Pete','USA','Hello'),('John','USA','Hi'),('Boris','Germany','Guten tag'),('Michael','Germany','Guten morgen'),('Bjorn','Sweden','Hej'),('Mats','Sweden','Tja')""" // first_value - qt_sql """ select country, name,first_value(greeting) over (partition by country order by name, greeting) as greeting from ${windowFunctionTable4}; """ + qt_sql """ select country, name,first_value(greeting) over (partition by country order by name, greeting) as greeting from ${windowFunctionTable4} order by country, name; """ // last_value - qt_sql """ select country, name,last_value(greeting) over (partition by country order by name, greeting) as greeting from ${windowFunctionTable4} ; """ + qt_sql """ select country, name,last_value(greeting) over (partition by country order by name, greeting) as greeting from ${windowFunctionTable4} order by country, name; """ sql """ drop table ${windowFunctionTable4} """ } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org