Skip to content

[opt](nereids) remove enable nereids rules usage #44769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 2 commits into from
Dec 2, 2024
Merged

[opt](nereids) remove enable nereids rules usage #44769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d00b730
[fix](nereids) remove enable nereids rules usage
Nov 29, 2024
f29cfac
[fix](nereids) remove enable nereids rules usage
Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/PushDownAggThroughJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ public List<Rule> buildRules() {
);
})
.thenApply(ctx -> {
Set<Integer> enableNereidsRules = ctx.cascadesContext.getConnectContext()
.getSessionVariable().getEnableNereidsRules();
if (!enableNereidsRules.contains(RuleType.PUSH_DOWN_AGG_THROUGH_JOIN.type())) {
return null;
}
LogicalAggregate<LogicalJoin<Plan, Plan>> agg = ctx.root;
return pushAgg(agg, agg.child(), ImmutableList.of());
})
Expand All @@ -109,11 +104,6 @@ public List<Rule> buildRules() {
);
})
.thenApply(ctx -> {
Set<Integer> enableNereidsRules = ctx.cascadesContext.getConnectContext()
.getSessionVariable().getEnableNereidsRules();
if (!enableNereidsRules.contains(RuleType.PUSH_DOWN_AGG_THROUGH_JOIN.type())) {
return null;
}
LogicalAggregate<LogicalProject<LogicalJoin<Plan, Plan>>> agg = ctx.root;
return pushAgg(agg, agg.child().child(), agg.child().getProjects());
})
Expand Down
10 changes: 0 additions & 10 deletions ...e/src/main/java/org/apache/doris/nereids/rules/rewrite/PushDownAggThroughJoinOneSide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ public List<Rule> buildRules() {
&& (f.children().isEmpty() || f.child(0) instanceof Slot)));
})
.thenApply(ctx -> {
Set<Integer> enableNereidsRules = ctx.cascadesContext.getConnectContext()
.getSessionVariable().getEnableNereidsRules();
if (!enableNereidsRules.contains(RuleType.PUSH_DOWN_AGG_THROUGH_JOIN_ONE_SIDE.type())) {
return null;
}
LogicalAggregate<LogicalJoin<Plan, Plan>> agg = ctx.root;
return pushMinMaxSumCount(agg, agg.child(), ImmutableList.of());
})
Expand All @@ -101,11 +96,6 @@ public List<Rule> buildRules() {
&& (f.children().isEmpty() || f.child(0) instanceof Slot));
})
.thenApply(ctx -> {
Set<Integer> enableNereidsRules = ctx.cascadesContext.getConnectContext()
.getSessionVariable().getEnableNereidsRules();
if (!enableNereidsRules.contains(RuleType.PUSH_DOWN_AGG_THROUGH_JOIN_ONE_SIDE.type())) {
return null;
}
LogicalAggregate<LogicalProject<LogicalJoin<Plan, Plan>>> agg = ctx.root;
return pushMinMaxSumCount(agg, agg.child().child(), agg.child().getProjects());
})
Expand Down
7 changes: 0 additions & 7 deletions ...ore/src/main/java/org/apache/doris/nereids/rules/rewrite/PushDownDistinctThroughJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.doris.nereids.rules.rewrite;

import org.apache.doris.nereids.jobs.JobContext;
import org.apache.doris.nereids.rules.RuleType;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.algebra.Relation;
import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate;
Expand All @@ -30,7 +29,6 @@

import com.google.common.collect.ImmutableList;

import java.util.Set;
import java.util.function.Function;

/**
Expand All @@ -39,11 +37,6 @@
public class PushDownDistinctThroughJoin extends DefaultPlanRewriter<JobContext> implements CustomRewriter {
@Override
public Plan rewriteRoot(Plan plan, JobContext context) {
Set<Integer> enableNereidsRules = context.getCascadesContext().getConnectContext()
.getSessionVariable().getEnableNereidsRules();
if (!enableNereidsRules.contains(RuleType.PUSH_DOWN_DISTINCT_THROUGH_JOIN.type())) {
return null;
}
return plan.accept(this, context);
}

Expand Down
46 changes: 28 additions & 18 deletions regression-test/data/nereids_rules_p0/eager_aggregate/basic.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,54 +40,64 @@ PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------filter((a.event_id = 'ad_click'))
----------PhysicalOlapScan[com_dd_library]
--------filter((cast(experiment_id as DOUBLE) = 37.0))
----------PhysicalOlapScan[shunt_log_com_dd_library]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------filter((a.event_id = 'ad_click'))
--------------PhysicalOlapScan[com_dd_library]
--------hashAgg[LOCAL]
----------filter((cast(experiment_id as DOUBLE) = 37.0))
------------PhysicalOlapScan[shunt_log_com_dd_library]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed: use_push_down_agg_through_join
SyntaxError:

-- !with_hint_2 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library]
--------filter((cast(experiment_id as DOUBLE) = 73.0))
----------PhysicalOlapScan[shunt_log_com_dd_library]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------PhysicalOlapScan[com_dd_library]
--------hashAgg[LOCAL]
----------filter((cast(experiment_id as DOUBLE) = 73.0))
------------PhysicalOlapScan[shunt_log_com_dd_library]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed: use_push_down_agg_through_join
SyntaxError:

-- !with_hint_3 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[com_dd_library]
--------filter((cast(experiment_id as DOUBLE) = 73.0))
----------PhysicalOlapScan[shunt_log_com_dd_library]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed: use_push_down_agg_through_join
SyntaxError:

-- !with_hint_4 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library]
--------PhysicalOlapScan[shunt_log_com_dd_library]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------PhysicalOlapScan[com_dd_library]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[shunt_log_com_dd_library]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed: use_push_down_agg_through_join
SyntaxError:

46 changes: 28 additions & 18 deletions regression-test/data/nereids_rules_p0/eager_aggregate/basic_one_side.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,54 +40,64 @@ PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------filter((a.event_id = 'ad_click'))
----------PhysicalOlapScan[com_dd_library_one_side]
--------filter((cast(experiment_id as DOUBLE) = 37.0))
----------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------filter((a.event_id = 'ad_click'))
--------------PhysicalOlapScan[com_dd_library_one_side]
--------hashAgg[LOCAL]
----------filter((cast(experiment_id as DOUBLE) = 37.0))
------------PhysicalOlapScan[shunt_log_com_dd_library_one_side]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed:
SyntaxError:

-- !with_hint_2 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library_one_side]
--------filter((cast(experiment_id as DOUBLE) = 73.0))
----------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------PhysicalOlapScan[com_dd_library_one_side]
--------hashAgg[LOCAL]
----------filter((cast(experiment_id as DOUBLE) = 73.0))
------------PhysicalOlapScan[shunt_log_com_dd_library_one_side]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed:
SyntaxError:

-- !with_hint_3 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library_one_side]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[com_dd_library_one_side]
--------filter((cast(experiment_id as DOUBLE) = 73.0))
----------PhysicalOlapScan[shunt_log_com_dd_library_one_side]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed:
SyntaxError:

-- !with_hint_4 --
PhysicalResultSink
--hashAgg[GLOBAL]
----hashAgg[LOCAL]
------hashJoin[INNER_JOIN] hashCondition=((a.device_id = b.device_id)) otherCondition=()
--------PhysicalOlapScan[com_dd_library_one_side]
--------PhysicalOlapScan[shunt_log_com_dd_library_one_side]
--------hashAgg[LOCAL]
----------hashAgg[LOCAL]
------------PhysicalOlapScan[com_dd_library_one_side]
--------hashAgg[LOCAL]
----------PhysicalOlapScan[shunt_log_com_dd_library_one_side]

Hint log:
Used:
UnUsed: use_push_down_agg_through_join_one_side
Used: use_push_down_agg_through_join_one_side
UnUsed:
SyntaxError:

Loading