Skip to content

Commit 235d8d9

Browse files
feiniaofeiafeifeiniaofeiafei
authored
[fix](test) fix case salt_join make it disable join reorder (#59035)
fix case salt_join make it disable join reorder.
1 parent f3bd871 commit 235d8d9

File tree

2 files changed

+195
-189
lines changed

2 files changed

+195
-189
lines changed

‎regression-test/data/nereids_rules_p0/salt_join/salt_join.out‎

Lines changed: 150 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -88,46 +88,6 @@
8888
2 def 2 2 def 2
8989
3 abc 4 3 abc 4
9090

91-
-- !leading --
92-
\N def 2 1 def 2
93-
\N def 2 2 def 2
94-
\N def 2 2 def 2
95-
1 abc 9 1 abc 9
96-
1 def 2 1 def 2
97-
1 def 2 2 def 2
98-
1 def 2 2 def 2
99-
2 abc 2 1 def 2
100-
2 abc 2 2 def 2
101-
2 abc 2 2 def 2
102-
2 def 2 1 def 2
103-
2 def 2 2 def 2
104-
2 def 2 2 def 2
105-
3 abc 4 3 abc 4
106-
107-
-- !has_other_equal_condition --
108-
1 abc 9 1 abc 9
109-
1 def 2 1 def 2
110-
2 abc 2 2 def 2
111-
2 abc 2 2 def 2
112-
2 def 2 2 def 2
113-
2 def 2 2 def 2
114-
3 abc 4 3 abc 4
115-
116-
-- !has_other_unequal_condition --
117-
1 def 2 2 def 2
118-
1 def 2 2 def 2
119-
120-
-- !test_varchar_skew_value --
121-
1 abc 1 1 abc 9
122-
1 abc 9 1 abc 9
123-
1 def 2 1 def 2
124-
2 def 2 2 def 2
125-
2 def 2 2 def 2
126-
3 abc \N 3 abc \N
127-
3 abc \N 3 abc 4
128-
3 abc 4 3 abc \N
129-
3 abc 4 3 abc 4
130-
13191
-- !test_multi_join --
13292
\N def 2 1 def 2 1 def 2
13393
\N def 2 1 def 2 2 def 2
@@ -258,76 +218,6 @@
258218
2 def 2 2 def 2 2 def 2
259219
3 abc 4 3 abc 4 3 abc 4
260220

261-
-- !leading_multi_join --
262-
1 abc 1 1 abc 9 1 abc 9
263-
1 abc 1 1 abc 9 3 abc \N
264-
1 abc 1 1 abc 9 3 abc 4
265-
1 abc 9 1 abc 9 1 abc 9
266-
1 abc 9 1 abc 9 3 abc \N
267-
1 abc 9 1 abc 9 3 abc 4
268-
1 def 2 1 def 2 1 def 2
269-
1 def 2 1 def 2 2 def 2
270-
1 def 2 1 def 2 2 def 2
271-
1 def 2 1 def 2 5 def \N
272-
1 def 2 1 def 2 5 def 8
273-
2 def 2 2 def 2 1 def 2
274-
2 def 2 2 def 2 1 def 2
275-
2 def 2 2 def 2 2 def 2
276-
2 def 2 2 def 2 2 def 2
277-
2 def 2 2 def 2 2 def 2
278-
2 def 2 2 def 2 2 def 2
279-
2 def 2 2 def 2 5 def \N
280-
2 def 2 2 def 2 5 def \N
281-
2 def 2 2 def 2 5 def 8
282-
2 def 2 2 def 2 5 def 8
283-
3 abc \N 3 abc \N 1 abc 9
284-
3 abc \N 3 abc \N 3 abc \N
285-
3 abc \N 3 abc \N 3 abc 4
286-
3 abc \N 3 abc 4 1 abc 9
287-
3 abc \N 3 abc 4 3 abc \N
288-
3 abc \N 3 abc 4 3 abc 4
289-
3 abc 4 3 abc \N 1 abc 9
290-
3 abc 4 3 abc \N 3 abc \N
291-
3 abc 4 3 abc \N 3 abc 4
292-
3 abc 4 3 abc 4 1 abc 9
293-
3 abc 4 3 abc 4 3 abc \N
294-
3 abc 4 3 abc 4 3 abc 4
295-
296-
-- !leading_multi_join_bracket --
297-
1 abc 1 1 abc 9 1 abc 9
298-
1 abc 1 1 abc 9 3 abc \N
299-
1 abc 1 1 abc 9 3 abc 4
300-
1 abc 9 1 abc 9 1 abc 9
301-
1 abc 9 1 abc 9 3 abc \N
302-
1 abc 9 1 abc 9 3 abc 4
303-
1 def 2 1 def 2 1 def 2
304-
1 def 2 1 def 2 2 def 2
305-
1 def 2 1 def 2 2 def 2
306-
1 def 2 1 def 2 5 def \N
307-
1 def 2 1 def 2 5 def 8
308-
2 def 2 2 def 2 1 def 2
309-
2 def 2 2 def 2 1 def 2
310-
2 def 2 2 def 2 2 def 2
311-
2 def 2 2 def 2 2 def 2
312-
2 def 2 2 def 2 2 def 2
313-
2 def 2 2 def 2 2 def 2
314-
2 def 2 2 def 2 5 def \N
315-
2 def 2 2 def 2 5 def \N
316-
2 def 2 2 def 2 5 def 8
317-
2 def 2 2 def 2 5 def 8
318-
3 abc \N 3 abc \N 1 abc 9
319-
3 abc \N 3 abc \N 3 abc \N
320-
3 abc \N 3 abc \N 3 abc 4
321-
3 abc \N 3 abc 4 1 abc 9
322-
3 abc \N 3 abc 4 3 abc \N
323-
3 abc \N 3 abc 4 3 abc 4
324-
3 abc 4 3 abc \N 1 abc 9
325-
3 abc 4 3 abc \N 3 abc \N
326-
3 abc 4 3 abc \N 3 abc 4
327-
3 abc 4 3 abc 4 1 abc 9
328-
3 abc 4 3 abc 4 3 abc \N
329-
3 abc 4 3 abc 4 3 abc 4
330-
331221
-- !agg --
332222
\N 3
333223
1 4
@@ -405,46 +295,6 @@
405295
2 def 2 2 def 2
406296
3 abc 4 3 abc 4
407297

408-
-- !shape_leading_inner_subquery --
409-
PhysicalResultSink
410-
--hashAgg[GLOBAL]
411-
----hashAgg[LOCAL]
412-
------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = t3.c3)) otherCondition=()
413-
--------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = alias2.c2) and (r1$c$1 = r2$c$2)) otherCondition=()
414-
----------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4)) otherCondition=()
415-
------------PhysicalOlapScan[t2]
416-
------------PhysicalOlapScan[t4]
417-
----------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((skewValue$c$5 = alias1.c1)) otherCondition=()
418-
------------PhysicalGenerate
419-
--------------PhysicalUnion
420-
------------PhysicalOlapScan[t1]
421-
--------PhysicalOlapScan[t3]
422-
423-
Hint log:
424-
Used: leading(alias2 shuffle_skew t1 )
425-
UnUsed:
426-
SyntaxError:
427-
428-
-- !shape_leading_inner_subquery_switch --
429-
PhysicalResultSink
430-
--hashAgg[GLOBAL]
431-
----hashAgg[LOCAL]
432-
------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = t3.c3)) otherCondition=()
433-
--------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = alias2.c2) and (r1$c$1 = r2$c$2)) otherCondition=()
434-
----------PhysicalOlapScan[t1]
435-
----------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((skewValue$c$5 = alias2.c2)) otherCondition=()
436-
------------PhysicalGenerate
437-
--------------PhysicalUnion
438-
------------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4)) otherCondition=()
439-
--------------PhysicalOlapScan[t2]
440-
--------------PhysicalOlapScan[t4]
441-
--------PhysicalOlapScan[t3]
442-
443-
Hint log:
444-
Used: leading(t1 shuffle_skew alias2 )
445-
UnUsed:
446-
SyntaxError:
447-
448298
-- !inner_skew_value --
449299
1 \N 1 \N
450300

@@ -970,3 +820,153 @@ Used: [shuffle_skew]_1
970820
UnUsed:
971821
SyntaxError:
972822

823+
-- !leading_multi_join --
824+
1 abc 1 1 abc 9 1 abc 9
825+
1 abc 1 1 abc 9 3 abc \N
826+
1 abc 1 1 abc 9 3 abc 4
827+
1 abc 9 1 abc 9 1 abc 9
828+
1 abc 9 1 abc 9 3 abc \N
829+
1 abc 9 1 abc 9 3 abc 4
830+
1 def 2 1 def 2 1 def 2
831+
1 def 2 1 def 2 2 def 2
832+
1 def 2 1 def 2 2 def 2
833+
1 def 2 1 def 2 5 def \N
834+
1 def 2 1 def 2 5 def 8
835+
2 def 2 2 def 2 1 def 2
836+
2 def 2 2 def 2 1 def 2
837+
2 def 2 2 def 2 2 def 2
838+
2 def 2 2 def 2 2 def 2
839+
2 def 2 2 def 2 2 def 2
840+
2 def 2 2 def 2 2 def 2
841+
2 def 2 2 def 2 5 def \N
842+
2 def 2 2 def 2 5 def \N
843+
2 def 2 2 def 2 5 def 8
844+
2 def 2 2 def 2 5 def 8
845+
3 abc \N 3 abc \N 1 abc 9
846+
3 abc \N 3 abc \N 3 abc \N
847+
3 abc \N 3 abc \N 3 abc 4
848+
3 abc \N 3 abc 4 1 abc 9
849+
3 abc \N 3 abc 4 3 abc \N
850+
3 abc \N 3 abc 4 3 abc 4
851+
3 abc 4 3 abc \N 1 abc 9
852+
3 abc 4 3 abc \N 3 abc \N
853+
3 abc 4 3 abc \N 3 abc 4
854+
3 abc 4 3 abc 4 1 abc 9
855+
3 abc 4 3 abc 4 3 abc \N
856+
3 abc 4 3 abc 4 3 abc 4
857+
858+
-- !leading_multi_join_bracket --
859+
1 abc 1 1 abc 9 1 abc 9
860+
1 abc 1 1 abc 9 3 abc \N
861+
1 abc 1 1 abc 9 3 abc 4
862+
1 abc 9 1 abc 9 1 abc 9
863+
1 abc 9 1 abc 9 3 abc \N
864+
1 abc 9 1 abc 9 3 abc 4
865+
1 def 2 1 def 2 1 def 2
866+
1 def 2 1 def 2 2 def 2
867+
1 def 2 1 def 2 2 def 2
868+
1 def 2 1 def 2 5 def \N
869+
1 def 2 1 def 2 5 def 8
870+
2 def 2 2 def 2 1 def 2
871+
2 def 2 2 def 2 1 def 2
872+
2 def 2 2 def 2 2 def 2
873+
2 def 2 2 def 2 2 def 2
874+
2 def 2 2 def 2 2 def 2
875+
2 def 2 2 def 2 2 def 2
876+
2 def 2 2 def 2 5 def \N
877+
2 def 2 2 def 2 5 def \N
878+
2 def 2 2 def 2 5 def 8
879+
2 def 2 2 def 2 5 def 8
880+
3 abc \N 3 abc \N 1 abc 9
881+
3 abc \N 3 abc \N 3 abc \N
882+
3 abc \N 3 abc \N 3 abc 4
883+
3 abc \N 3 abc 4 1 abc 9
884+
3 abc \N 3 abc 4 3 abc \N
885+
3 abc \N 3 abc 4 3 abc 4
886+
3 abc 4 3 abc \N 1 abc 9
887+
3 abc 4 3 abc \N 3 abc \N
888+
3 abc 4 3 abc \N 3 abc 4
889+
3 abc 4 3 abc 4 1 abc 9
890+
3 abc 4 3 abc 4 3 abc \N
891+
3 abc 4 3 abc 4 3 abc 4
892+
893+
-- !leading --
894+
\N def 2 1 def 2
895+
\N def 2 2 def 2
896+
\N def 2 2 def 2
897+
1 abc 9 1 abc 9
898+
1 def 2 1 def 2
899+
1 def 2 2 def 2
900+
1 def 2 2 def 2
901+
2 abc 2 1 def 2
902+
2 abc 2 2 def 2
903+
2 abc 2 2 def 2
904+
2 def 2 1 def 2
905+
2 def 2 2 def 2
906+
2 def 2 2 def 2
907+
3 abc 4 3 abc 4
908+
909+
-- !has_other_equal_condition --
910+
1 abc 9 1 abc 9
911+
1 def 2 1 def 2
912+
2 abc 2 2 def 2
913+
2 abc 2 2 def 2
914+
2 def 2 2 def 2
915+
2 def 2 2 def 2
916+
3 abc 4 3 abc 4
917+
918+
-- !has_other_unequal_condition --
919+
1 def 2 2 def 2
920+
1 def 2 2 def 2
921+
922+
-- !test_varchar_skew_value --
923+
1 abc 1 1 abc 9
924+
1 abc 9 1 abc 9
925+
1 def 2 1 def 2
926+
2 def 2 2 def 2
927+
2 def 2 2 def 2
928+
3 abc \N 3 abc \N
929+
3 abc \N 3 abc 4
930+
3 abc 4 3 abc \N
931+
3 abc 4 3 abc 4
932+
933+
-- !shape_leading_inner_subquery --
934+
PhysicalResultSink
935+
--hashAgg[GLOBAL]
936+
----hashAgg[LOCAL]
937+
------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = t3.c3)) otherCondition=()
938+
--------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = alias2.c2) and (r1$c$1 = r2$c$2)) otherCondition=()
939+
----------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4)) otherCondition=()
940+
------------PhysicalOlapScan[t2]
941+
------------PhysicalOlapScan[t4]
942+
----------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((skewValue$c$5 = alias1.c1)) otherCondition=()
943+
------------PhysicalGenerate
944+
--------------PhysicalUnion
945+
------------PhysicalOlapScan[t1]
946+
--------PhysicalOlapScan[t3]
947+
948+
Hint log:
949+
Used: leading(alias2 shuffle_skew t1 )
950+
UnUsed:
951+
SyntaxError:
952+
953+
-- !shape_leading_inner_subquery_switch --
954+
PhysicalResultSink
955+
--hashAgg[GLOBAL]
956+
----hashAgg[LOCAL]
957+
------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = t3.c3)) otherCondition=()
958+
--------hashJoin[INNER_JOIN] hashCondition=((alias1.c1 = alias2.c2) and (r1$c$1 = r2$c$2)) otherCondition=()
959+
----------PhysicalOlapScan[t1]
960+
----------hashJoin[RIGHT_OUTER_JOIN] hashCondition=((skewValue$c$5 = alias2.c2)) otherCondition=()
961+
------------PhysicalGenerate
962+
--------------PhysicalUnion
963+
------------hashJoin[INNER_JOIN] hashCondition=((t2.c2 = t4.c4)) otherCondition=()
964+
--------------PhysicalOlapScan[t2]
965+
--------------PhysicalOlapScan[t4]
966+
--------PhysicalOlapScan[t3]
967+
968+
Hint log:
969+
Used: leading(t1 shuffle_skew alias2 )
970+
UnUsed:
971+
SyntaxError:
972+

0 commit comments

Comments
 (0)