diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java index 65e2a22..b5a9291 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java @@ -81,6 +81,10 @@ LOG = LogFactory.getLog("org.apache.hadoop.hive.ql.optimizer.GenMapRedUtils"); } + private static boolean needsTagging(Operator reducer) { + return (reducer.getClass() == JoinOperator.class || + reducer.getClass() == DemuxOperator.class); + } /** * Initialize the current plan by adding it to root tasks. * @@ -107,8 +111,7 @@ public static void initPlan(ReduceSinkOperator op, GenMRProcContext opProcCtx) plan.setNumReduceTasks(desc.getNumReducers()); - if (reducer.getClass() == JoinOperator.class || - reducer.getClass() == DemuxOperator.class) { + if (needsTagging(reducer)) { plan.setNeedsTagging(true); } @@ -151,8 +154,7 @@ public static void initUnionPlan(ReduceSinkOperator op, UnionOperator currUnionO plan.setNumReduceTasks(desc.getNumReducers()); - if (reducer.getClass() == JoinOperator.class || - reducer.getClass() == DemuxOperator.class) { + if (needsTagging(reducer)) { plan.setNeedsTagging(true); } @@ -926,7 +928,7 @@ private static void splitTasks(ReduceSinkOperator op, Operator reducer = op.getChildOperators().get(0); - if (reducer.getClass() == JoinOperator.class) { + if (needsTagging(reducer)) { String origStreamDesc; streamDesc = "$INTNAME"; origStreamDesc = streamDesc; diff --git ql/src/test/results/clientpositive/correlationoptimizer3.q.out ql/src/test/results/clientpositive/correlationoptimizer3.q.out index cebddff..cfa7eff 100644 --- ql/src/test/results/clientpositive/correlationoptimizer3.q.out +++ ql/src/test/results/clientpositive/correlationoptimizer3.q.out @@ -670,7 +670,7 @@ STAGE PLANS: Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -683,7 +683,7 @@ STAGE PLANS: value expressions: expr: _col1 type: bigint -#### A masked pattern was here #### + $INTNAME1 Reduce Output Operator key expressions: expr: _col0 @@ -1547,7 +1547,7 @@ STAGE PLANS: Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -1560,7 +1560,7 @@ STAGE PLANS: value expressions: expr: _col1 type: string -#### A masked pattern was here #### + $INTNAME1 Reduce Output Operator key expressions: expr: _col0 diff --git ql/src/test/results/clientpositive/correlationoptimizer6.q.out ql/src/test/results/clientpositive/correlationoptimizer6.q.out index c40a786..b0438e6 100644 --- ql/src/test/results/clientpositive/correlationoptimizer6.q.out +++ ql/src/test/results/clientpositive/correlationoptimizer6.q.out @@ -733,7 +733,7 @@ STAGE PLANS: Stage: Stage-2 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -746,7 +746,7 @@ STAGE PLANS: value expressions: expr: _col1 type: bigint -#### A masked pattern was here #### + $INTNAME1 Reduce Output Operator key expressions: expr: _col0 @@ -4891,7 +4891,7 @@ STAGE PLANS: Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -5236,7 +5236,7 @@ STAGE PLANS: Stage: Stage-3 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -5253,7 +5253,7 @@ STAGE PLANS: type: string expr: _col2 type: bigint -#### A masked pattern was here #### + $INTNAME1 Reduce Output Operator key expressions: expr: _col0 diff --git ql/src/test/results/clientpositive/correlationoptimizer7.q.out ql/src/test/results/clientpositive/correlationoptimizer7.q.out index ea54431..f8db2bf 100644 --- ql/src/test/results/clientpositive/correlationoptimizer7.q.out +++ ql/src/test/results/clientpositive/correlationoptimizer7.q.out @@ -349,7 +349,7 @@ STAGE PLANS: Stage: Stage-1 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0 @@ -871,7 +871,7 @@ STAGE PLANS: Stage: Stage-1 Map Reduce Alias -> Map Operator Tree: -#### A masked pattern was here #### + $INTNAME Reduce Output Operator key expressions: expr: _col0