Skip to content

Commit

Permalink
revert test
Browse files Browse the repository at this point in the history
  • Loading branch information
@924060929
924060929 committed Jul 17, 2024
1 parent adee221 commit d20ee57
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 49 deletions.
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ public void setEnableLeftZigZag(boolean enableLeftZigZag) {
+ "right side to do bucket shuffle join"
}
)
private boolean enableNereidsDistributePlanner = true;
private boolean enableNereidsDistributePlanner = false;

@VariableMgr.VarAttr(name = REWRITE_OR_TO_IN_PREDICATE_THRESHOLD, fuzzy = true)
private int rewriteOrToInPredicateThreshold = 2;
Expand Down
4 changes: 2 additions & 2 deletions regression-test/data/nereids_rules_p0/eliminate_outer_join/eliminate_outer_join.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ PhysicalResultSink
-- !multiple_full_outer_2 --
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----hashJoin[LEFT_OUTER_JOIN shuffleBucket] hashCondition=((t1.id = t3.id)) otherCondition=()
----hashJoin[LEFT_OUTER_JOIN shuffle] hashCondition=((t1.id = t3.id)) otherCondition=()
------hashJoin[RIGHT_OUTER_JOIN colocated] hashCondition=((t1.id = t2.id)) otherCondition=()
--------PhysicalOlapScan[t]
--------filter((t2.score > 10))
Expand Down Expand Up @@ -227,7 +227,7 @@ PhysicalResultSink
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----filter(name IS NULL)
------hashJoin[FULL_OUTER_JOIN shuffleBucket] hashCondition=((t1.id = t3.id)) otherCondition=()
------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t3.id)) otherCondition=()
--------hashJoin[FULL_OUTER_JOIN colocated] hashCondition=((t1.id = t2.id)) otherCondition=()
----------PhysicalOlapScan[t]
----------PhysicalOlapScan[t]
Expand Down
2 changes: 1 addition & 1 deletion regression-test/data/nereids_rules_p0/filter_push_down/push_down_alias_through_join.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PhysicalResultSink
PhysicalResultSink
--PhysicalDistribute[DistributionSpecGather]
----hashJoin[LEFT_SEMI_JOIN bucketShuffle] hashCondition=((id3 = t4.id)) otherCondition=()
------hashJoin[RIGHT_OUTER_JOIN bucketShuffle] hashCondition=((id2 = id3)) otherCondition=()
------hashJoin[RIGHT_OUTER_JOIN shuffle] hashCondition=((id2 = id3)) otherCondition=()
--------hashJoin[INNER_JOIN bucketShuffle] hashCondition=((id1 = id2)) otherCondition=()
----------PhysicalProject
------------PhysicalOlapScan[t1]
Expand Down
16 changes: 9 additions & 7 deletions regression-test/data/nereids_rules_p0/filter_push_down/push_filter_through.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,19 @@ PhysicalResultSink
-- !filter_aggregation_group_set --
PhysicalResultSink
--filter((cast(msg as DOUBLE) = 1.0))
----hashAgg[LOCAL]
------PhysicalRepeat
--------filter((t1.id > 10))
----------PhysicalOlapScan[t1]
----hashAgg[GLOBAL]
------hashAgg[LOCAL]
--------PhysicalRepeat
----------filter((t1.id > 10))
------------PhysicalOlapScan[t1]

-- !filter_aggregation_group_set --
PhysicalResultSink
--filter(((t1.id > 10) OR (cast(msg as DOUBLE) = 1.0)))
----hashAgg[LOCAL]
------PhysicalRepeat
--------PhysicalOlapScan[t1]
----hashAgg[GLOBAL]
------hashAgg[LOCAL]
--------PhysicalRepeat
----------PhysicalOlapScan[t1]

-- !filter_aggregation_filtered_key --
PhysicalResultSink
Expand Down
45 changes: 21 additions & 24 deletions ...on-test/data/nereids_rules_p0/infer_set_operator_distinct/infer_set_operator_distinct.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ PhysicalResultSink
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[RIGHT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
----------------hashJoin[LEFT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand All @@ -220,12 +220,11 @@ PhysicalResultSink
------PhysicalDistribute[DistributionSpecHash]
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[FULL_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------PhysicalProject
--------------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------PhysicalOlapScan[t1]
----------------PhysicalProject
------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand Down Expand Up @@ -603,10 +602,10 @@ PhysicalResultSink
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[RIGHT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
----------------hashJoin[LEFT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand All @@ -622,12 +621,11 @@ PhysicalResultSink
------PhysicalDistribute[DistributionSpecHash]
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[FULL_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------PhysicalProject
--------------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------PhysicalOlapScan[t1]
----------------PhysicalProject
------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand Down Expand Up @@ -1045,10 +1043,10 @@ PhysicalResultSink
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[RIGHT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
----------------hashJoin[LEFT_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------------PhysicalOlapScan[t1]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand All @@ -1064,12 +1062,11 @@ PhysicalResultSink
------PhysicalDistribute[DistributionSpecHash]
--------hashAgg[LOCAL]
----------PhysicalUnion
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalProject
----------------hashJoin[FULL_OUTER_JOIN bucketShuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
------------------PhysicalOlapScan[t1]
------------------PhysicalProject
--------------------PhysicalOlapScan[t2]
------------PhysicalProject
--------------hashJoin[FULL_OUTER_JOIN shuffle] hashCondition=((t1.id = t2.id)) otherCondition=()
----------------PhysicalOlapScan[t1]
----------------PhysicalProject
------------------PhysicalOlapScan[t2]
------------PhysicalDistribute[DistributionSpecExecutionAny]
--------------PhysicalOlapScan[t3]

Expand Down
30 changes: 16 additions & 14 deletions regression-test/data/nereids_rules_p0/transposeJoin/transposeSemiJoinAgg.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ PhysicalResultSink

-- !grouping_positive_case --
PhysicalResultSink
--hashAgg[LOCAL]
----hashJoin[LEFT_SEMI_JOIN] hashCondition=((T3.a = T2.a)) otherCondition=()
------PhysicalRepeat
--------filter((T1.__DORIS_DELETE_SIGN__ = 0))
----------PhysicalOlapScan[T1]
------filter((T2.__DORIS_DELETE_SIGN__ = 0))
--------PhysicalOlapScan[T2]
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[LEFT_SEMI_JOIN] hashCondition=((T3.a = T2.a)) otherCondition=()
--------PhysicalRepeat
----------filter((T1.__DORIS_DELETE_SIGN__ = 0))
------------PhysicalOlapScan[T1]
--------filter((T2.__DORIS_DELETE_SIGN__ = 0))
----------PhysicalOlapScan[T2]

-- !grouping_negative_case --
PhysicalResultSink
Expand Down Expand Up @@ -58,13 +59,14 @@ PhysicalResultSink

-- !grouping_positive_case2 --
PhysicalResultSink
--hashAgg[LOCAL]
----hashJoin[LEFT_SEMI_JOIN] hashCondition=((T3.a = T2.a)) otherCondition=()
------PhysicalRepeat
--------filter((T1.__DORIS_DELETE_SIGN__ = 0))
----------PhysicalOlapScan[T1]
------filter((T2.__DORIS_DELETE_SIGN__ = 0))
--------PhysicalOlapScan[T2]
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[LEFT_SEMI_JOIN] hashCondition=((T3.a = T2.a)) otherCondition=()
--------PhysicalRepeat
----------filter((T1.__DORIS_DELETE_SIGN__ = 0))
------------PhysicalOlapScan[T1]
--------filter((T2.__DORIS_DELETE_SIGN__ = 0))
----------PhysicalOlapScan[T2]

-- !grouping_negative_case2 --
PhysicalResultSink
Expand Down

0 comments on commit d20ee57

Please sign in to comment.