Skip to content

Commit 03cbe9d

Browse files
leiyskyleiysky
committed
fix tests
1 parent cdf3bc2 commit 03cbe9d

File tree

7 files changed

+84
-103
lines changed

7 files changed

+84
-103
lines changed

‎tests/logictest/suites/mode/cluster/exchange.test

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ explain select * from numbers(1) t, numbers(2) t1 where t.number = t1.number;
55
Exchange(Merge)
66
└── HashJoin: INNER, build keys: [t1.number (#1)], probe keys: [t.number (#0)], join filters: []
77
├── Exchange(Hash): keys: [t.number (#0)]
8-
│ └── Scan: default.system.numbers, filters: []
8+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
99
└── Exchange(Hash): keys: [t1.number (#1)]
10-
└── Scan: default.system.numbers, filters: []
10+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
1111

1212
statement query T
1313
explain select * from numbers(1) t, numbers(2) t1, numbers(3) t2 where t.number = t1.number and t.number = t2.number;
@@ -17,11 +17,11 @@ Exchange(Merge)
1717
└── HashJoin: INNER, build keys: [t2.number (#2)], probe keys: [t.number (#0)], join filters: []
1818
├── HashJoin: INNER, build keys: [t1.number (#1)], probe keys: [t.number (#0)], join filters: []
1919
│ ├── Exchange(Hash): keys: [t.number (#0)]
20-
│ │ └── Scan: default.system.numbers, filters: []
20+
│ │ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
2121
│ └── Exchange(Hash): keys: [t1.number (#1)]
22-
│ └── Scan: default.system.numbers, filters: []
22+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
2323
└── Exchange(Hash): keys: [t2.number (#2)]
24-
└── Scan: default.system.numbers, filters: []
24+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
2525

2626
statement query T
2727
explain select * from (select number as a, number+1 as b from numbers(1)) t, numbers(2) t1, numbers(3) t2 where a = t1.number and b = t2.number;
@@ -33,11 +33,11 @@ Exchange(Merge)
3333
│ └── HashJoin: INNER, build keys: [t1.number (#3)], probe keys: [t.a (#0)], join filters: []
3434
│ ├── Exchange(Hash): keys: [t.a (#0)]
3535
│ │ └── EvalScalar: [+(numbers.number (#0), 1)]
36-
│ │ └── Scan: default.system.numbers, filters: []
36+
│ │ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
3737
│ └── Exchange(Hash): keys: [t1.number (#3)]
38-
│ └── Scan: default.system.numbers, filters: []
38+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
3939
└── Exchange(Hash): keys: [t2.number (#4)]
40-
└── Scan: default.system.numbers, filters: []
40+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
4141

4242
statement query T
4343
explain select * from (select sum(number) as number from numbers(1) group by number) t, numbers(2) t1 where t.number = t1.number;
@@ -51,7 +51,7 @@ Exchange(Merge)
5151
│ └── Aggregate(Final): group items: [numbers.number (#0)], aggregate functions: [sum(number)]
5252
│ └── Aggregate(Partial): group items: [numbers.number (#0)], aggregate functions: [sum(number)]
5353
│ └── Exchange(Hash): keys: [numbers.number (#0)]
54-
│ └── Scan: default.system.numbers, filters: []
54+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
5555
└── Exchange(Hash): keys: [t1.number (#4)]
56-
└── Scan: default.system.numbers, filters: []
56+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
5757

‎tests/logictest/suites/mode/standalone/explain/explain.test

+1-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
-- TODO(need fix)
2-
3-
onlyif mysql
41
statement ok
52
drop table if exists t1 all;
63

7-
onlyif mysql
84
statement ok
95
drop table if exists t2 all;
106

11-
onlyif mysql
127
statement ok
138
create table t1(a int, b int);
149

15-
onlyif mysql
1610
statement ok
1711
create table t2(a int, b int);
1812

19-
onlyif mysql
2013
statement query T
2114
explain select t1.a from t1 where a > 0;
2215

@@ -25,7 +18,6 @@ Project: [a (#0)]
2518
└── Filter: [t1.a (#0) > 0]
2619
└── Scan: default.default.t1, filters: [t1.a (#0) > 0], Sort: [none], limit: [none]
2720

28-
onlyif mysql
2921
statement query T
3022
explain select * from t1, t2 where (t1.a = t2.a and t1.a > 3) or (t1.a = t2.a and t2.a > 5 and t1.a > 1);
3123

@@ -35,7 +27,6 @@ Filter: [(t1.a (#0) > 3) OR ((t2.a (#2) > 5) AND (t1.a (#0) > 1))]
3527
├── Scan: default.default.t1, filters: [], Sort: [none], limit: [none]
3628
└── Scan: default.default.t2, filters: [], Sort: [none], limit: [none]
3729

38-
onlyif mysql
3930
statement query T
4031
explain select * from t1, t2 where (t1.a = t2.a and t1.a > 3) or (t1.a = t2.a);
4132

@@ -44,7 +35,6 @@ HashJoin: INNER, build keys: [t2.a (#2)], probe keys: [t1.a (#0)], join filters:
4435
├── Scan: default.default.t1, filters: [], Sort: [none], limit: [none]
4536
└── Scan: default.default.t2, filters: [], Sort: [none], limit: [none]
4637

47-
onlyif mysql
4838
statement query T
4939
explain raw select * from t1, t2 where (t1.a = t2.a and t1.a > 3) or (t1.a = t2.a);
5040

@@ -56,7 +46,6 @@ Project: [a (#0),b (#1),a (#2),b (#3)]
5646
├── LogicalGet: default.default.t1, Sort: [none], limit: [none]
5747
└── LogicalGet: default.default.t2, Sort: [none], limit: [none]
5848

59-
onlyif mysql
6049
statement query T
6150
explain raw select * from t1 inner join t2 on t1.a = t2.a and t1.b = t2.b and t1.a > 2;
6251

@@ -67,7 +56,6 @@ Project: [a (#0),b (#1),a (#2),b (#3)]
6756
├── LogicalGet: default.default.t1, Sort: [none], limit: [none]
6857
└── LogicalGet: default.default.t2, Sort: [none], limit: [none]
6958

70-
onlyif mysql
7159
statement query T
7260
explain syntax select 1, 'ab', [1,2,3], (1, 'a');
7361

@@ -78,7 +66,6 @@ SELECT
7866
[1, 2, 3],
7967
(1, 'a')
8068

81-
onlyif mysql
8269
statement query T
8370
explain syntax select a, sum(b) as sum from t1 where a in (1, 2) and b > 0 and b < 100 group by a order by a;
8471

@@ -95,7 +82,6 @@ WHERE
9582
GROUP BY a
9683
ORDER BY a
9784

98-
onlyif mysql
9985
statement query T
10086
explain syntax select * from t1 inner join t2 on t1.a = t2.a and t1.b = t2.b and t1.a > 2;
10187

@@ -107,7 +93,6 @@ FROM
10793
AND t1.b = t2.b
10894
AND t1.a > 2
10995

110-
onlyif mysql
11196
statement query T
11297
explain syntax delete from t1 where a > 100 and b > 1 and b < 10;
11398

@@ -119,7 +104,6 @@ WHERE
119104
AND b > 1
120105
AND b < 10
121106

122-
onlyif mysql
123107
statement query T
124108
explain syntax copy into t1 from 's3://mybucket/data.csv' file_format = ( type = 'CSV' field_delimiter = ',' record_delimiter = '\n' skip_header = 1) size_limit=10;
125109

@@ -135,7 +119,6 @@ FILE_FORMAT = (
135119
)
136120
SIZE_LIMIT = 10
137121

138-
onlyif mysql
139122
statement query T
140123
explain syntax copy into 's3://mybucket/data.csv' from t1 file_format = ( type = 'CSV' field_delimiter = ',' record_delimiter = '\n' skip_header = 1) size_limit=10;
141124

@@ -151,7 +134,6 @@ FILE_FORMAT = (
151134
)
152135
SIZE_LIMIT = 10
153136

154-
onlyif mysql
155137
statement query T
156138
explain syntax create table t3(a int64, b uint64, c float64, d string, e array(int32), f tuple(f1 bool, f2 string)) engine=fuse cluster by (a, b, c) comment='test' compression='LZ4';
157139

@@ -172,7 +154,6 @@ CLUSTER BY (
172154
comment = 'test',
173155
compression = 'LZ4'
174156

175-
onlyif mysql
176157
statement query T
177158
explain syntax create view v as select number % 3 as a from numbers(100) where number > 10;
178159

@@ -185,10 +166,9 @@ AS
185166
WHERE
186167
number > 10
187168

188-
onlyif mysql
189169
statement ok
190170
drop table t1;
191171

192-
onlyif mysql
193172
statement ok
194173
drop table t2;
174+

‎tests/logictest/suites/mode/standalone/explain/join.test

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number =
44
----
55
Project: [number (#0)]
66
└── HashJoin: INNER, build keys: [t1.number (#1)], probe keys: [t.number (#0)], join filters: []
7-
├── Scan: default.system.numbers, filters: []
8-
└── Scan: default.system.numbers, filters: []
7+
├── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
8+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
99

1010
statement query T
1111
explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number = t1.number and t.number = t1.number + 1;
1212

1313
----
1414
Project: [number (#0)]
1515
└── HashJoin: INNER, build keys: [t1.number (#1), +(t1.number (#1), 1)], probe keys: [t.number (#0), t.number (#0)], join filters: []
16-
├── Scan: default.system.numbers, filters: []
17-
└── Scan: default.system.numbers, filters: []
16+
├── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
17+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
1818

1919
statement query T
2020
explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number > 1 and 1 < t1.number;
@@ -23,9 +23,9 @@ explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number >
2323
Project: [number (#0)]
2424
└── CrossJoin
2525
├── Filter: [t.number (#0) > 1]
26-
│ └── Scan: default.system.numbers, filters: [t.number (#0) > 1]
26+
│ └── Scan: default.system.numbers, filters: [t.number (#0) > 1], Sort: [none], limit: [none]
2727
└── Filter: [1 < t1.number (#1)]
28-
└── Scan: default.system.numbers, filters: [1 < t1.number (#1)]
28+
└── Scan: default.system.numbers, filters: [1 < t1.number (#1)], Sort: [none], limit: [none]
2929

3030
statement query T
3131
explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number + t1.number = 1;
@@ -34,17 +34,17 @@ explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number +
3434
Project: [number (#0)]
3535
└── Filter: [+(t.number (#0), t1.number (#1)) = 1]
3636
└── CrossJoin
37-
├── Scan: default.system.numbers, filters: []
38-
└── Scan: default.system.numbers, filters: []
37+
├── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
38+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
3939

4040
statement query T
4141
explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number = cast(t1.number as string);
4242

4343
----
4444
Project: [number (#0)]
4545
└── HashJoin: INNER, build keys: [CAST(CAST(t1.number (#1) AS VARCHAR) AS DOUBLE)], probe keys: [CAST(t.number (#0) AS DOUBLE)], join filters: []
46-
├── Scan: default.system.numbers, filters: []
47-
└── Scan: default.system.numbers, filters: []
46+
├── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
47+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
4848

4949
statement query T
5050
explain select t.number from numbers(1) as t, numbers(1) as t1, numbers(1) as t2 where t1.number = t2.number and t.number = 1;
@@ -54,7 +54,7 @@ Project: [number (#0)]
5454
└── HashJoin: INNER, build keys: [t2.number (#2)], probe keys: [t1.number (#1)], join filters: []
5555
├── CrossJoin
5656
│ ├── Filter: [t.number (#0) = 1]
57-
│ │ └── Scan: default.system.numbers, filters: [t.number (#0) = 1]
58-
│ └── Scan: default.system.numbers, filters: []
59-
└── Scan: default.system.numbers, filters: []
57+
│ │ └── Scan: default.system.numbers, filters: [t.number (#0) = 1], Sort: [none], limit: [none]
58+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
59+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
6060

‎tests/logictest/suites/mode/standalone/explain/limit.test

+1
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ Limit: [1], Offset: [0]
6464
└── Aggregate(Final): group items: [t.number (#4)], aggregate functions: [count(t.number)]
6565
└── Aggregate(Partial): group items: [t.number (#4)], aggregate functions: [count(t.number)]
6666
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
67+

‎tests/logictest/suites/mode/standalone/explain/prune_column.test

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ explain select * from (select a from (select number as a, number + 1 as b from n
33

44
----
55
Project: [number (#0)]
6-
└── Scan: default.system.numbers, filters: []
6+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
77

88
statement query T
99
explain select a from (select number as a, count(*) as b from numbers(1) group by a);
@@ -12,20 +12,20 @@ explain select a from (select number as a, count(*) as b from numbers(1) group b
1212
Project: [number (#0)]
1313
└── Aggregate(Final): group items: [numbers.number (#0)], aggregate functions: []
1414
└── Aggregate(Partial): group items: [numbers.number (#0)], aggregate functions: []
15-
└── Scan: default.system.numbers, filters: []
15+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
1616

1717
statement query T
1818
explain select a from (select number as a, number b, sum(number) as c, number as d, number as e from numbers(1) group by a, b, d, e) where b > 1 order by d limit 1;
1919

2020
----
21-
Limit: [1], Offset: [0]
22-
└── Project: [number (#0)]
23-
└── Sort: [number (#0) ASC]
21+
Project: [number (#0)]
22+
└── Limit: [1], Offset: [0]
23+
└── Sort: [number (#0) ASC], limit: [1]
2424
└── Project: [number (#0)]
2525
└── Filter: [numbers.b (#0) > 1]
2626
└── Aggregate(Final): group items: [numbers.number (#0), numbers.number (#0), numbers.number (#0), numbers.number (#0)], aggregate functions: []
2727
└── Aggregate(Partial): group items: [numbers.number (#0), numbers.number (#0), numbers.number (#0), numbers.number (#0)], aggregate functions: []
28-
└── Scan: default.system.numbers, filters: []
28+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
2929

3030
statement query T
3131
explain select * from (select t1.a from (select number + 1 as a, number + 1 as b, number + 1 as c, number + 1 as d from numbers(1)) as t1, (select number + 1 as a, number + 1 as b, number + 1 as c from numbers(1)) as t2 where t1.b = t2.b and t1.c = 1);
@@ -36,10 +36,10 @@ Project: [a (#1)]
3636
├── Project: [a (#1),b (#2)]
3737
│ └── Filter: [t1.c (#3) = 1]
3838
│ └── EvalScalar: [+(numbers.number (#0), 1), +(numbers.number (#0), 1), +(numbers.number (#0), 1)]
39-
│ └── Scan: default.system.numbers, filters: []
39+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
4040
└── Project: [b (#11)]
4141
└── EvalScalar: [+(numbers.number (#9), 1)]
42-
└── Scan: default.system.numbers, filters: []
42+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
4343

4444
statement query T
4545
explain select t1.a from (select number + 1 as a, number + 1 as b from numbers(1)) as t1 where t1.a = (select count(*) from (select t2.a, t3.a from (select number + 1 as a, number + 1 as b, number + 1 as c, number + 1 as d from numbers(1)) as t2, (select number + 1 as a, number + 1 as b, number + 1 as c from numbers(1)) as t3 where t2.b = t3.b and t2.c = 1));
@@ -50,7 +50,7 @@ Project: [a (#1)]
5050
└── HashJoin: SINGLE, build keys: [], probe keys: [], join filters: []
5151
├── Project: [a (#1)]
5252
│ └── EvalScalar: [+(numbers.number (#0), 1)]
53-
│ └── Scan: default.system.numbers, filters: []
53+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
5454
└── Project: [COUNT(*) (#21)]
5555
└── EvalScalar: [COUNT(*) (#22)]
5656
└── Aggregate(Final): group items: [], aggregate functions: [COUNT(*)]
@@ -60,18 +60,18 @@ Project: [a (#1)]
6060
├── Project: [a (#6),b (#7)]
6161
│ └── Filter: [t2.c (#8) = 1]
6262
│ └── EvalScalar: [+(numbers.number (#5), 1), +(numbers.number (#5), 1), +(numbers.number (#5), 1)]
63-
│ └── Scan: default.system.numbers, filters: []
63+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
6464
└── Project: [b (#16)]
6565
└── EvalScalar: [+(numbers.number (#14), 1)]
66-
└── Scan: default.system.numbers, filters: []
66+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
6767

6868
statement query T
6969
explain select name from system.functions order by example;
7070

7171
----
7272
Project: [name (#0)]
73-
└── Sort: [example (#7) ASC]
74-
└── Scan: default.system.functions, filters: []
73+
└── Sort: [example (#7) ASC], limit: [none]
74+
└── Scan: default.system.functions, filters: [], Sort: [example (#7) ASC], limit: [none]
7575

7676
statement query T
7777
explain select t.number from numbers(10) t where exists(select * from numbers(10));
@@ -85,6 +85,6 @@ Project: [number (#0)]
8585
│ └── Aggregate(Final): group items: [], aggregate functions: [count(*)]
8686
│ └── Aggregate(Partial): group items: [], aggregate functions: [count(*)]
8787
│ └── Limit: [1], Offset: [0]
88-
│ └── Scan: default.system.numbers, filters: []
89-
└── Scan: default.system.numbers, filters: []
88+
│ └── Scan: default.system.numbers, filters: [], Sort: [none], limit: [1]
89+
└── Scan: default.system.numbers, filters: [], Sort: [none], limit: [none]
9090

0 commit comments

Comments
 (0)