You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2018/04/23 14:15:50 UTC
[4/8] drill git commit: DRILL-6339: Add a new option to disable TopN
(for testing)
DRILL-6339: Add a new option to disable TopN (for testing)
This closes #1219
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/69ec019c
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/69ec019c
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/69ec019c
Branch: refs/heads/master
Commit: 69ec019c85f2fffb2b6f2087e9fd59b0a7cf80e0
Parents: c79dbe9
Author: Ben-Zvi <bb...@mapr.com>
Authored: Tue Apr 17 17:05:50 2018 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Fri Apr 20 16:53:37 2018 -0700
----------------------------------------------------------------------
.../apache/drill/exec/planner/physical/PlannerSettings.java | 1 +
.../apache/drill/exec/planner/physical/PushLimitToTopN.java | 6 ++++++
.../apache/drill/exec/server/options/SystemOptionManager.java | 1 +
exec/java-exec/src/main/resources/drill-module.conf | 1 +
4 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/69ec019c/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PlannerSettings.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PlannerSettings.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PlannerSettings.java
index 1271ff9..8b5c878 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PlannerSettings.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PlannerSettings.java
@@ -55,6 +55,7 @@ public class PlannerSettings implements Context{
public static final OptionValidator EXCHANGE = new BooleanValidator("planner.disable_exchanges");
public static final OptionValidator HASHAGG = new BooleanValidator("planner.enable_hashagg");
public static final OptionValidator STREAMAGG = new BooleanValidator("planner.enable_streamagg");
+ public static final OptionValidator TOPN = new BooleanValidator("planner.enable_topn");
public static final OptionValidator HASHJOIN = new BooleanValidator("planner.enable_hashjoin");
public static final OptionValidator MERGEJOIN = new BooleanValidator("planner.enable_mergejoin");
public static final OptionValidator NESTEDLOOPJOIN = new BooleanValidator("planner.enable_nestedloopjoin");
http://git-wip-us.apache.org/repos/asf/drill/blob/69ec019c/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java
index 12f7c3e..66126ec 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java
@@ -31,6 +31,12 @@ public class PushLimitToTopN extends Prule{
}
@Override
+ public boolean matches(RelOptRuleCall call) {
+ return PrelUtil.getPlannerSettings(call.getPlanner()).getOptions()
+ .getOption(PlannerSettings.TOPN.getOptionName()).bool_val;
+ }
+
+ @Override
public void onMatch(RelOptRuleCall call) {
final LimitPrel limit = (LimitPrel) call.rel(0);
final SingleMergeExchangePrel smex = (SingleMergeExchangePrel) call.rel(1);
http://git-wip-us.apache.org/repos/asf/drill/blob/69ec019c/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
index d18acb7..63f1dc2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
@@ -80,6 +80,7 @@ public class SystemOptionManager extends BaseOptionManager implements AutoClosea
new OptionDefinition(PlannerSettings.EXCHANGE),
new OptionDefinition(PlannerSettings.HASHAGG),
new OptionDefinition(PlannerSettings.STREAMAGG),
+ new OptionDefinition(PlannerSettings.TOPN, new OptionMetaData(OptionValue.AccessibleScopes.ALL, false, true)),
new OptionDefinition(PlannerSettings.HASHJOIN),
new OptionDefinition(PlannerSettings.MERGEJOIN),
new OptionDefinition(PlannerSettings.NESTEDLOOPJOIN),
http://git-wip-us.apache.org/repos/asf/drill/blob/69ec019c/exec/java-exec/src/main/resources/drill-module.conf
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf
index 9af09bc..60fd639 100644
--- a/exec/java-exec/src/main/resources/drill-module.conf
+++ b/exec/java-exec/src/main/resources/drill-module.conf
@@ -483,6 +483,7 @@ drill.exec.options: {
planner.enable_nestedloopjoin: true,
planner.enable_nljoin_for_scalar_only: true,
planner.enable_streamagg: true,
+ planner.enable_topn: true,
planner.enable_type_inference: true,
planner.enable_unionall_distribute: false,
planner.filter.max_selectivity_estimate_factor: 1.0,