fix conflicts

databendlabs · May 9, 2022 · 236d1fa · 236d1fa
1 parent 3a14885
commit 236d1fa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.result
@@ -63,9 +63,7 @@
 2	3
 1	2
 2	3
-<<<<<<< HEAD
 1000
-=======
 2	0
 2	0
 2	1
@@ -90,4 +88,3 @@
 2	1
 2	0
 
->>>>>>> 098ef7427 (feat(planner): support  in new planner)
diff --git a/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql b/tests/suites/0_stateless/20+_others/20_0001_planner_v2.sql
@@ -60,6 +60,7 @@ select * from t1 inner join t on t.a = t1.b;
 select * from t2 inner join t on t.a = t2.c;
 select * from t2 inner join t on t.a = t2.c + 1;
 select * from t2 inner join t on t.a = t2.c + 1 and t.a - 1 = t2.c;
+select count(*) from numbers(1000) as t inner join numbers(1000) as t1 on t.number = t1.number;
 
 -- order by
 SELECT number%3 as c1, number%2 as c2 FROM numbers_mt (10) order by c1 desc, c2 asc;
@@ -69,6 +70,5 @@ drop table t;
 drop table t1;
 drop table t2;
 
-select count(*) from numbers(1000) as t inner join numbers(1000) as t1 on t.number = t1.number;
 
 set enable_planner_v2 = 0;