This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 d2709f86001 [fix](test) fix `test_numbers` case (#39303)
d2709f86001 is described below
commit d2709f86001ea58191fb96b234894f04e1da4b19
Author: Tiewei Fang <43782773+bepppo...@users.noreply.github.com>
AuthorDate: Tue Aug 13 22:26:39 2024 +0800
[fix](test) fix `test_numbers` case (#39303)
bp: #38687
we use `order_qt` rather than `qt` to promise the order of results.
---
.../data/external_table_p0/tvf/test_numbers.out | 122 +++++++++---------
.../external_table_p0/tvf/test_numbers.groovy | 138 ++++++++++-----------
2 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/regression-test/data/external_table_p0/tvf/test_numbers.out
b/regression-test/data/external_table_p0/tvf/test_numbers.out
index 72ae8c9e44f..2634ad0e149 100644
--- a/regression-test/data/external_table_p0/tvf/test_numbers.out
+++ b/regression-test/data/external_table_p0/tvf/test_numbers.out
@@ -17,14 +17,6 @@
-- !basic3 --
0
1
-2
-3
-4
-5
-6
-7
-8
-9
10
11
12
@@ -35,6 +27,7 @@
17
18
19
+2
20
21
22
@@ -45,6 +38,7 @@
27
28
29
+3
30
31
32
@@ -55,6 +49,7 @@
37
38
39
+4
40
41
42
@@ -65,6 +60,7 @@
47
48
49
+5
50
51
52
@@ -75,6 +71,7 @@
57
58
59
+6
60
61
62
@@ -85,6 +82,7 @@
67
68
69
+7
70
71
72
@@ -95,6 +93,7 @@
77
78
79
+8
80
81
82
@@ -105,6 +104,7 @@
87
88
89
+9
90
91
92
@@ -206,16 +206,16 @@
9 \N
-- !right_join --
-0 0
-1 1
-2 2
-3 3
-4 4
\N 5
\N 6
\N 7
\N 8
\N 9
+0 0
+1 1
+2 2
+3 3
+4 4
-- !where_equal --
1
@@ -281,6 +281,7 @@
-- !window_1 --
1 0
+10 9
2 1
3 2
4 3
@@ -289,7 +290,6 @@
7 6
8 7
9 8
-10 9
-- !window_2 --
0 1
@@ -486,6 +486,8 @@
-- !stringfunction_5 --
48
49
+49
+49
50
51
52
@@ -494,18 +496,16 @@
55
56
57
-49
-49
-- !stringfunction_6 --
-8
-8
-8
-8
16
16
16
16
+8
+8
+8
+8
-- !stringfunction_7 --
1
@@ -518,18 +518,20 @@
2
-- !stringfunction_8 --
-6-a
-7-a
-8-a
-9-a
10-a
11-a
12-a
13-a
+6-a
+7-a
+8-a
+9-a
-- !stringfunction_9 --
0 false
1 true
+10 false
+11 true
2 false
3 false
4 false
@@ -538,8 +540,6 @@
7 false
8 false
9 false
-10 false
-11 true
-- !stringfunction_10 --
0 1
@@ -554,31 +554,31 @@
9 0
-- !stringfunction_11 --
+10 A
+11 B
+12 C
6 6
7 7
8 8
9 9
-10 A
-11 B
-12 C
-- !stringfunction_12 --
+10 3130
+11 3131
+12 3132
6 36
7 37
8 38
9 39
-10 3130
-11 3131
-12 3132
-- !stringfunction_13 --
+10 1
+11 1
+12 1
6 0
7 0
8 0
9 0
-10 1
-11 1
-12 1
-- !stringfunction_14 --
121 12
@@ -629,10 +629,6 @@
130 0
-- !stringfunction_18 --
-96 096
-97 097
-98 098
-99 099
100 100
101 101
102 102
@@ -644,6 +640,10 @@
108 108
109 109
110 110
+96 096
+97 097
+98 098
+99 099
-- !stringfunction_19 --
a0
@@ -659,7 +659,10 @@ a9
-- !stringfunction_20 --
00
+1010
11
+1111
+1212
22
33
44
@@ -668,13 +671,9 @@ a9
77
88
99
-1010
-1111
-1212
-- !stringfunction_21 --
0
-a
2
3
4
@@ -683,9 +682,10 @@ a
7
8
9
+a
a0
-aa
a2
+aa
-- !stringfunction_22 --
01
@@ -712,10 +712,6 @@ a2
9
-- !stringfunction_24 --
-96 960
-97 970
-98 980
-99 990
100 100
101 101
102 102
@@ -727,10 +723,13 @@ a2
108 108
109 109
110 110
+96 960
+97 970
+98 980
+99 990
-- !stringfunction_25 --
false
-true
false
false
false
@@ -744,6 +743,7 @@ true
true
true
true
+true
-- !stringfunction_26 --
10
@@ -782,28 +782,20 @@ true
15
-- !stringfunction_29 --
-6
-7
-8
-9
0
1
2
3
4
5
+6
+7
+8
+9
-- !stringfunction_30 --
0
1
-2
-3
-4
-5
-6
-7
-8
-9
10
11
12
@@ -814,6 +806,7 @@ true
17
18
19
+2
20
21 !
22 "
@@ -824,6 +817,13 @@ true
27 '
28 (
29 )
+3
+4
+5
+6
+7
+8
+9
-- !subquery_1 --
0
diff --git a/regression-test/suites/external_table_p0/tvf/test_numbers.groovy
b/regression-test/suites/external_table_p0/tvf/test_numbers.groovy
index 1580233c6c0..6f0f74f6433 100644
--- a/regression-test/suites/external_table_p0/tvf/test_numbers.groovy
+++ b/regression-test/suites/external_table_p0/tvf/test_numbers.groovy
@@ -18,112 +18,112 @@
suite("test_numbers","p0,external,external_docker") {
// Test basic features
- qt_basic1 """ select * from numbers("number" = "1"); """
- qt_basic2 """ select * from numbers("number" = "10"); """
- qt_basic3 """ select * from numbers("number" = "100"); """
- qt_basic4_limit """ select * from numbers("number" = "10") limit 5; """
+ order_qt_basic1 """ select * from numbers("number" = "1"); """
+ order_qt_basic2 """ select * from numbers("number" = "10"); """
+ order_qt_basic3 """ select * from numbers("number" = "100"); """
+ order_qt_basic4_limit """ select * from numbers("number" = "10") limit 5;
"""
- qt_const1 """ select * from numbers("number" = "5", "const_value" = "1");
"""
- qt_const2 """ select * from numbers("number" = "5", "const_value" =
"-123"); """
- qt_const3 """ select * from numbers("number" = "-10", "const_value" =
"1"); """
- qt_const4 """ select avg(number) from numbers("number" = "100",
"const_value" = "123"); """
+ order_qt_const1 """ select * from numbers("number" = "5", "const_value" =
"1"); """
+ order_qt_const2 """ select * from numbers("number" = "5", "const_value" =
"-123"); """
+ order_qt_const3 """ select * from numbers("number" = "-10", "const_value"
= "1"); """
+ order_qt_const4 """ select avg(number) from numbers("number" = "100",
"const_value" = "123"); """
// Test aggregate function withh numbers("number" = N)
- qt_agg_sum """ select sum(number) from numbers("number" = "100"); """
- qt_agg_avg """ select avg(number) from numbers("number" = "100"); """
- qt_agg_count """ select count(*) from numbers("number" = "100"); """
- qt_agg_min """ select min(number) from numbers("number" = "100"); """
- qt_agg_max """ select max(number) from numbers("number" = "100"); """
+ order_qt_agg_sum """ select sum(number) from numbers("number" = "100"); """
+ order_qt_agg_avg """ select avg(number) from numbers("number" = "100"); """
+ order_qt_agg_count """ select count(*) from numbers("number" = "100"); """
+ order_qt_agg_min """ select min(number) from numbers("number" = "100"); """
+ order_qt_agg_max """ select max(number) from numbers("number" = "100"); """
// Test join with numbers("number" = N)
- qt_inner_join1 """
+ order_qt_inner_join1 """
select a.number as num1, b.number as num2
from numbers("number" = "10") a inner join
numbers("number" = "10") b
on a.number=b.number;
"""
- qt_inner_join2 """
+ order_qt_inner_join2 """
select a.number as num1, b.number as num2
from numbers("number" = "6") a inner join numbers("number"
= "6") b
on a.number>b.number;
"""
- qt_inner_join3 """
+ order_qt_inner_join3 """
select a.number as num1, b.number as num2
from numbers("number" = "10") a inner join
numbers("number" = "10") b
on a.number=b.number and b.number%2 = 0;
"""
- qt_left_join """
+ order_qt_left_join """
select a.number as num1, b.number as num2
from numbers("number" = "10") a left join numbers("number"
= "5") b
on a.number=b.number order by num1;
"""
- qt_right_join """
+ order_qt_right_join """
select a.number as num1, b.number as num2
from numbers("number" = "5") a right join numbers("number"
= "10") b
on a.number=b.number order by num2;
"""
// Test where and GroupBy
- qt_where_equal """ select * from numbers("number" = "10") where number%2 =
1; """
- qt_where_gt """ select * from numbers("number" = "10") where number-1 > 1;
"""
- qt_where_lt """ select * from numbers("number" = "10") where number+1 < 9;
"""
- qt_groupby """ select number from numbers("number" = "10") where number>=4
group by number order by number; """
- qt_join_where """
+ order_qt_where_equal """ select * from numbers("number" = "10") where
number%2 = 1; """
+ order_qt_where_gt """ select * from numbers("number" = "10") where
number-1 > 1; """
+ order_qt_where_lt """ select * from numbers("number" = "10") where
number+1 < 9; """
+ order_qt_groupby """ select number from numbers("number" = "10") where
number>=4 group by number order by number; """
+ order_qt_join_where """
select a.number as num1, b.number as num2
from numbers("number" = "10") a inner join
numbers("number" = "10") b
on a.number=b.number where a.number>4 order by num1,num2;
"""
// Test Sub Query
- qt_subquery1 """ select * from numbers("number" = "10") where number =
(select number from numbers("number" = "10") where number=1); """
- qt_subquery2 """ select * from numbers("number" = "10") where number in
(select number from numbers("number" = "10") where number>5); """
- qt_subquery3 """ select a.number from numbers("number" = "10") a where
number in (select number from numbers("number" = "10") b where
a.number=b.number); """
+ order_qt_subquery1 """ select * from numbers("number" = "10") where number
= (select number from numbers("number" = "10") where number=1); """
+ order_qt_subquery2 """ select * from numbers("number" = "10") where number
in (select number from numbers("number" = "10") where number>5); """
+ order_qt_subquery3 """ select a.number from numbers("number" = "10") a
where number in (select number from numbers("number" = "10") b where
a.number=b.number); """
// Test window function
- qt_window_1 """ SELECT row_number() OVER (ORDER BY number) AS id,number
from numbers("number" = "10"); """
- qt_window_2 """ SELECT number, rank() OVER (order by number) AS sum_three
from numbers("number" = "10"); """
- qt_window_3 """ SELECT number, dense_rank() OVER (order by number) AS
sum_three from numbers("number" = "10"); """
- qt_window_4 """ SELECT number, sum(number) OVER (ORDER BY number rows
between 1 preceding and 1 following) AS result from numbers("number" = "10");
"""
- qt_window_5 """ SELECT number, min(number) OVER (ORDER BY number rows
between 1 PRECEDING and 1 following) AS result from numbers("number" = "10");
"""
- qt_window_6 """ SELECT number, min(number) OVER (ORDER BY number rows
between UNBOUNDED PRECEDING and 1 following) AS result from numbers("number" =
"10"); """
- qt_window_7 """ SELECT number, max(number) OVER (ORDER BY number rows
between 1 preceding and 1 following) AS result from numbers("number" = "10");
"""
- qt_window_8 """ SELECT number, max(number) OVER (ORDER BY number rows
between UNBOUNDED PRECEDING and 1 following) AS result from numbers("number" =
"10"); """
- qt_window_9 """ SELECT number, avg(number) OVER (ORDER BY number rows
between 1 preceding and 1 following) AS result from numbers("number" = "10");
"""
- qt_window_10 """ SELECT number, count(number) OVER (ORDER BY number rows
between 1 preceding and 1 following) AS result from numbers("number" = "10");
"""
- qt_window_11 """ SELECT number, first_value(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
- qt_window_12 """ SELECT number, last_value(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
- qt_window_13 """ SELECT number, LAG(number,2,-1) OVER (ORDER BY number) AS
result from numbers("number" = "10"); """
+ order_qt_window_1 """ SELECT row_number() OVER (ORDER BY number) AS
id,number from numbers("number" = "10"); """
+ order_qt_window_2 """ SELECT number, rank() OVER (order by number) AS
sum_three from numbers("number" = "10"); """
+ order_qt_window_3 """ SELECT number, dense_rank() OVER (order by number)
AS sum_three from numbers("number" = "10"); """
+ order_qt_window_4 """ SELECT number, sum(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
+ order_qt_window_5 """ SELECT number, min(number) OVER (ORDER BY number
rows between 1 PRECEDING and 1 following) AS result from numbers("number" =
"10"); """
+ order_qt_window_6 """ SELECT number, min(number) OVER (ORDER BY number
rows between UNBOUNDED PRECEDING and 1 following) AS result from
numbers("number" = "10"); """
+ order_qt_window_7 """ SELECT number, max(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
+ order_qt_window_8 """ SELECT number, max(number) OVER (ORDER BY number
rows between UNBOUNDED PRECEDING and 1 following) AS result from
numbers("number" = "10"); """
+ order_qt_window_9 """ SELECT number, avg(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
+ order_qt_window_10 """ SELECT number, count(number) OVER (ORDER BY number
rows between 1 preceding and 1 following) AS result from numbers("number" =
"10"); """
+ order_qt_window_11 """ SELECT number, first_value(number) OVER (ORDER BY
number rows between 1 preceding and 1 following) AS result from
numbers("number" = "10"); """
+ order_qt_window_12 """ SELECT number, last_value(number) OVER (ORDER BY
number rows between 1 preceding and 1 following) AS result from
numbers("number" = "10"); """
+ order_qt_window_13 """ SELECT number, LAG(number,2,-1) OVER (ORDER BY
number) AS result from numbers("number" = "10"); """
// Cast BITINT to STRING and test string function.
- qt_stringfunction_1 """ select cast (number as string) as string_num from
numbers("number" = "10"); """
- qt_stringfunction_2 """ select append_trailing_char_if_absent(cast (number
as string),'a') as string_fucntion_res from numbers("number" = "10"); """
- qt_stringfunction_3 """ select concat(cast (number as string),'abc','d')
as string_fucntion_res from numbers("number" = "10"); """
- qt_stringfunction_4 """ select concat(cast (number as string), cast
(number as string)) as string_fucntion_res from numbers("number" = "10"); """
- qt_stringfunction_5 """ select ascii(cast (number as string)) as
string_fucntion_res from numbers("number" = "12"); """
- qt_stringfunction_6 """ select bit_length(cast (number as string)) as
string_fucntion_res from numbers("number" = "14") where number>5; """
- qt_stringfunction_7 """ select char_length(cast (number as string)) as
string_fucntion_res from numbers("number" = "14") where number>5; """
- qt_stringfunction_8 """ select concat_ws('-',cast (number as string),'a')
as string_fucntion_res from numbers("number" = "14") where number>5; """
- qt_stringfunction_9 """ select number, ends_with(cast (number as
string),'1') as string_fucntion_res from numbers("number" = "12"); """
- qt_stringfunction_10 """ select number,find_in_set(cast (number as
string),'0,1,2,3,4,5,6,7') as string_fucntion_res from numbers("number" =
"10"); """
- qt_stringfunction_11 """ select number,hex(number) as string_fucntion_res
from numbers("number" = "13") where number>5; """
- qt_stringfunction_12 """ select number,hex(cast (number as string)) as
string_fucntion_res from numbers("number" = "13") where number>5; """
- qt_stringfunction_13 """ select number,instr(cast (number as string),'1')
as string_fucntion_res from numbers("number" = "13") where number>5; """
- qt_stringfunction_14 """ select number,left(cast (number as string),'2')
as string_fucntion_res from numbers("number" = "1000") where number>120 limit
10; """
- qt_stringfunction_15 """ select number,length(cast (number as string)) as
string_fucntion_res from numbers("number" = "1000") where number>120 limit 10;
"""
- qt_stringfunction_16 """ select number,locate('2',cast (number as string))
as string_fucntion_res from numbers("number" = "1000") where number>120 limit
10; """
- qt_stringfunction_17 """ select number,locate('2',cast (number as
string),3) as string_fucntion_res from numbers("number" = "1000") where
number>120 limit 10; """
- qt_stringfunction_18 """ select number,lpad(cast (number as string),3,'0')
as string_fucntion_res from numbers("number" = "1000") where number>95 limit
15; """
- qt_stringfunction_19 """ select ltrim( concat(' a',cast (number as
string))) as string_fucntion_res from numbers("number" = "10"); """
- qt_stringfunction_20 """ select repeat(cast (number as string),2) as
string_fucntion_res from numbers("number" = "13"); """
- qt_stringfunction_21 """ select replace(cast (number as string),'1','a')
as string_fucntion_res from numbers("number" = "13"); """
- qt_stringfunction_22 """ select reverse(cast (number as string)) as
string_fucntion_res from numbers("number" = "20") where number>9; """
- qt_stringfunction_23 """ select right(cast (number as string),1) as
string_fucntion_res from numbers("number" = "20") where number>9; """
- qt_stringfunction_24 """ select number,rpad(cast (number as string),3,'0')
as string_fucntion_res from numbers("number" = "1000") where number>95 limit
15; """
- qt_stringfunction_25 """ select STARTS_WITH(cast (number as string),'1')
as string_fucntion_res from numbers("number" = "15"); """
- qt_stringfunction_26 """ select strleft(cast (number as string),'2') as
string_fucntion_res from numbers("number" = "200") where number>105 limit 10;
"""
- qt_stringfunction_27 """ select strright(cast (number as string),'2') as
string_fucntion_res from numbers("number" = "1000") where number>105 limit 10;
"""
- qt_stringfunction_28 """ select substring(cast (number as string),2) as
string_fucntion_res from numbers("number" = "1000") where number>105 limit 10;
"""
- qt_stringfunction_29 """ select substring(cast (number as string),-1) as
string_fucntion_res from numbers("number" = "1000") where number>105 limit 10;
"""
- qt_stringfunction_30 """ select number,unhex(cast (number as string)) as
string_fucntion_res from numbers("number" = "100") limit 30; """
+ order_qt_stringfunction_1 """ select cast (number as string) as string_num
from numbers("number" = "10"); """
+ order_qt_stringfunction_2 """ select append_trailing_char_if_absent(cast
(number as string),'a') as string_fucntion_res from numbers("number" = "10");
"""
+ order_qt_stringfunction_3 """ select concat(cast (number as
string),'abc','d') as string_fucntion_res from numbers("number" = "10"); """
+ order_qt_stringfunction_4 """ select concat(cast (number as string), cast
(number as string)) as string_fucntion_res from numbers("number" = "10"); """
+ order_qt_stringfunction_5 """ select ascii(cast (number as string)) as
string_fucntion_res from numbers("number" = "12"); """
+ order_qt_stringfunction_6 """ select bit_length(cast (number as string))
as string_fucntion_res from numbers("number" = "14") where number>5; """
+ order_qt_stringfunction_7 """ select char_length(cast (number as string))
as string_fucntion_res from numbers("number" = "14") where number>5; """
+ order_qt_stringfunction_8 """ select concat_ws('-',cast (number as
string),'a') as string_fucntion_res from numbers("number" = "14") where
number>5; """
+ order_qt_stringfunction_9 """ select number, ends_with(cast (number as
string),'1') as string_fucntion_res from numbers("number" = "12"); """
+ order_qt_stringfunction_10 """ select number,find_in_set(cast (number as
string),'0,1,2,3,4,5,6,7') as string_fucntion_res from numbers("number" =
"10"); """
+ order_qt_stringfunction_11 """ select number,hex(number) as
string_fucntion_res from numbers("number" = "13") where number>5; """
+ order_qt_stringfunction_12 """ select number,hex(cast (number as string))
as string_fucntion_res from numbers("number" = "13") where number>5; """
+ order_qt_stringfunction_13 """ select number,instr(cast (number as
string),'1') as string_fucntion_res from numbers("number" = "13") where
number>5; """
+ order_qt_stringfunction_14 """ select number,left(cast (number as
string),'2') as string_fucntion_res from numbers("number" = "1000") where
number>120 limit 10; """
+ order_qt_stringfunction_15 """ select number,length(cast (number as
string)) as string_fucntion_res from numbers("number" = "1000") where
number>120 limit 10; """
+ order_qt_stringfunction_16 """ select number,locate('2',cast (number as
string)) as string_fucntion_res from numbers("number" = "1000") where
number>120 limit 10; """
+ order_qt_stringfunction_17 """ select number,locate('2',cast (number as
string),3) as string_fucntion_res from numbers("number" = "1000") where
number>120 limit 10; """
+ order_qt_stringfunction_18 """ select number,lpad(cast (number as
string),3,'0') as string_fucntion_res from numbers("number" = "1000") where
number>95 limit 15; """
+ order_qt_stringfunction_19 """ select ltrim( concat(' a',cast (number as
string))) as string_fucntion_res from numbers("number" = "10"); """
+ order_qt_stringfunction_20 """ select repeat(cast (number as string),2) as
string_fucntion_res from numbers("number" = "13"); """
+ order_qt_stringfunction_21 """ select replace(cast (number as
string),'1','a') as string_fucntion_res from numbers("number" = "13"); """
+ order_qt_stringfunction_22 """ select reverse(cast (number as string)) as
string_fucntion_res from numbers("number" = "20") where number>9; """
+ order_qt_stringfunction_23 """ select right(cast (number as string),1) as
string_fucntion_res from numbers("number" = "20") where number>9; """
+ order_qt_stringfunction_24 """ select number,rpad(cast (number as
string),3,'0') as string_fucntion_res from numbers("number" = "1000") where
number>95 limit 15; """
+ order_qt_stringfunction_25 """ select STARTS_WITH(cast (number as
string),'1') as string_fucntion_res from numbers("number" = "15"); """
+ order_qt_stringfunction_26 """ select strleft(cast (number as string),'2')
as string_fucntion_res from numbers("number" = "200") where number>105 limit
10; """
+ order_qt_stringfunction_27 """ select strright(cast (number as
string),'2') as string_fucntion_res from numbers("number" = "1000") where
number>105 limit 10; """
+ order_qt_stringfunction_28 """ select substring(cast (number as string),2)
as string_fucntion_res from numbers("number" = "1000") where number>105 limit
10; """
+ order_qt_stringfunction_29 """ select substring(cast (number as
string),-1) as string_fucntion_res from numbers("number" = "1000") where
number>105 limit 10; """
+ order_qt_stringfunction_30 """ select number,unhex(cast (number as
string)) as string_fucntion_res from numbers("number" = "100") limit 30; """
// test subquery
order_qt_subquery_1 """ with a as (select number from
numbers("number"="3")) select * from a; """
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
