enable multi-phase aggregate by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/4b0d060a Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/4b0d060a Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/4b0d060a Branch: refs/heads/master Commit: 4b0d060a913e8ccb25131c805a8dc0c170ddf191 Parents: 78ae265 Author: Jacques Nadeau <[email protected]> Authored: Mon May 19 17:31:23 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Mon May 19 17:46:55 2014 -0700 ---------------------------------------------------------------------- .../exec/planner/physical/PlannerSettings.java | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4b0d060a/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 e65ef17..18a32af 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 @@ -32,10 +32,10 @@ public class PlannerSettings implements FrameworkContext{ public static final OptionValidator EXCHANGE = new BooleanValidator("planner.disable_exchanges", false); public static final OptionValidator HASHAGG = new BooleanValidator("planner.enable_hashagg", true); - public static final OptionValidator STREAMAGG = new BooleanValidator("planner.enable_streamagg", true); - public static final OptionValidator HASHJOIN = new BooleanValidator("planner.enable_hashjoin", true); - public static final OptionValidator MERGEJOIN = new BooleanValidator("planner.enable_mergejoin", true); - public static final OptionValidator MULTIPHASE = new BooleanValidator("planner.enable_multiphase_agg", false); + public static final OptionValidator STREAMAGG = new BooleanValidator("planner.enable_streamagg", true); + public static final OptionValidator HASHJOIN = new BooleanValidator("planner.enable_hashjoin", true); + public static final OptionValidator MERGEJOIN = new BooleanValidator("planner.enable_mergejoin", true); + public static final OptionValidator MULTIPHASE = new BooleanValidator("planner.enable_multiphase_agg", true); public static final OptionValidator BROADCAST = new BooleanValidator("planner.enable_broadcast_join", false); public OptionManager options = null; @@ -49,13 +49,13 @@ public class PlannerSettings implements FrameworkContext{ } public int numEndPoints() { - return numEndPoints; + return numEndPoints; } - + public boolean useDefaultCosting() { return useDefaultCosting; } - + public void setNumEndPoints(int numEndPoints) { this.numEndPoints = numEndPoints; } @@ -63,35 +63,35 @@ public class PlannerSettings implements FrameworkContext{ public void setUseDefaultCosting(boolean defcost) { this.useDefaultCosting = defcost; } - + public boolean isHashAggEnabled() { - return options.getOption(HASHAGG.getOptionName()).bool_val; + return options.getOption(HASHAGG.getOptionName()).bool_val; } - + public boolean isStreamAggEnabled() { - return options.getOption(STREAMAGG.getOptionName()).bool_val; + return options.getOption(STREAMAGG.getOptionName()).bool_val; } - + public boolean isHashJoinEnabled() { return options.getOption(HASHJOIN.getOptionName()).bool_val; } - + public boolean isMergeJoinEnabled() { - return options.getOption(MERGEJOIN.getOptionName()).bool_val; + return options.getOption(MERGEJOIN.getOptionName()).bool_val; } - + public boolean isMultiPhaseAggEnabled() { return options.getOption(MULTIPHASE.getOptionName()).bool_val; } - + public boolean isBroadcastJoinEnabled() { - return options.getOption(BROADCAST.getOptionName()).bool_val; + return options.getOption(BROADCAST.getOptionName()).bool_val; } public int getBroadcastThreshold() { - return broadcastThreshold; + return broadcastThreshold; } - + @Override public <T> T unwrap(Class<T> clazz) { if(clazz == PlannerSettings.class){
