From 14f5054ee733fcf943732331198eac6415a013e2 Mon Sep 17 00:00:00 2001 From: Oleg Danilov Date: Wed, 21 Jun 2017 01:50:14 +0300 Subject: [PATCH] HIVE-16925: Add isSlowStart as parameter for the setAutoReduce method --- .../org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java | 6 +++--- ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java index ae05bd52fe2..92404f2e83c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java @@ -159,7 +159,7 @@ private void handleWork(TezWork tezWork, BaseWork work) throws SemanticException graceMapJoinOp.getConf().setHybridHashJoin(false); } adjustAutoParallelism(work); - + convertWork(tezWork, work); } mapJoinOpList.clear(); @@ -187,13 +187,13 @@ private void adjustAutoParallelism(BaseWork work) { Math.max(reduceWork.getMinReduceTasks(), targetCount)); if (newMin < reduceWork.getMaxReduceTasks()) { reduceWork.setMinReduceTasks(newMin); - reduceWork.getEdgePropRef().setAutoReduce(conf, true, newMin, + reduceWork.getEdgePropRef().setAutoReduce(conf, true, reduceWork.isSlowStart(), newMin, reduceWork.getMaxReduceTasks(), conf.getLongVar(HiveConf.ConfVars.BYTESPERREDUCER)); } else { reduceWork.setAutoReduceParallelism(false); reduceWork.setNumReduceTasks(newMin); // TODO: is this correct? based on the same logic as HIVE-14200 - reduceWork.getEdgePropRef().setAutoReduce(null, false, 0, 0, 0); + reduceWork.getEdgePropRef().setAutoReduce(null, false, reduceWork.isSlowStart(), 0, 0, 0); } } else { // UNIFORM || AUTOPARALLEL (maxed out) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java index b695f0f8094..60abd83e639 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java @@ -51,12 +51,12 @@ public TezEdgeProperty(HiveConf hiveConf, EdgeType edgeType, public TezEdgeProperty(HiveConf hiveConf, EdgeType edgeType, boolean isAutoReduce, boolean isSlowStart, int minReducer, int maxReducer, long bytesPerReducer) { this(hiveConf, edgeType, -1); - setAutoReduce(hiveConf, isAutoReduce, minReducer, maxReducer, bytesPerReducer); + setAutoReduce(hiveConf, isAutoReduce, isSlowStart, minReducer, maxReducer, bytesPerReducer); this.isSlowStart = isSlowStart; } - public void setAutoReduce(HiveConf hiveConf, boolean isAutoReduce, int minReducer, - int maxReducer, long bytesPerReducer) { + public void setAutoReduce(HiveConf hiveConf, boolean isAutoReduce, boolean isSlowStart, int minReducer, int maxReducer, + long bytesPerReducer) { this.hiveConf = hiveConf; this.minReducer = minReducer; this.maxReducer = maxReducer;