You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/07/08 03:57:24 UTC

[31/31] hive git commit: HIVE-11199 : LLAP: merge master into branch (Sergey Shelukhin)

HIVE-11199 : LLAP: merge master into branch (Sergey Shelukhin)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1e0eace4
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1e0eace4
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1e0eace4

Branch: refs/heads/llap
Commit: 1e0eace43f869dfd1cc62a67585e698a4f5b9c5e
Parents: 533ca49 10dc20f
Author: Sergey Shelukhin <se...@apache.org>
Authored: Tue Jul 7 18:56:48 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Tue Jul 7 18:56:48 2015 -0700

----------------------------------------------------------------------
 pom.xml                                         |    1 +
 ql/pom.xml                                      |    5 +
 .../java/org/apache/hadoop/hive/ql/Driver.java  |    2 +-
 .../org/apache/hadoop/hive/ql/QueryPlan.java    |    9 +-
 .../hive/ql/exec/CommonMergeJoinOperator.java   |   76 +-
 .../ql/exec/vector/VectorizedRowBatchCtx.java   |    2 +-
 .../hadoop/hive/ql/hooks/HookContext.java       |   12 +
 .../hadoop/hive/ql/hooks/LineageInfo.java       |   96 +
 .../hadoop/hive/ql/hooks/LineageLogger.java     |  441 +++
 .../hadoop/hive/ql/io/orc/MemoryManager.java    |   39 +-
 .../apache/hadoop/hive/ql/io/orc/OrcFile.java   |   15 +-
 .../hadoop/hive/ql/io/orc/WriterImpl.java       |   67 +-
 .../ql/log/NoDeleteRollingFileAppender.java     |  176 ++
 .../apache/hadoop/hive/ql/metadata/Hive.java    |    7 +-
 .../calcite/rules/HiveJoinCommuteRule.java      |   96 +
 .../ql/optimizer/lineage/ExprProcFactory.java   |   98 +
 .../hive/ql/optimizer/lineage/Generator.java    |   16 +-
 .../hive/ql/optimizer/lineage/LineageCtx.java   |   79 +-
 .../ql/optimizer/lineage/OpProcFactory.java     |  228 +-
 .../ql/optimizer/physical/SerializeFilter.java  |  178 ++
 .../hadoop/hive/ql/parse/CalcitePlanner.java    |   19 +-
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |   51 +-
 .../hadoop/hive/ql/parse/TezCompiler.java       |    9 +
 .../apache/hadoop/hive/ql/plan/BaseWork.java    |    7 +
 .../apache/hadoop/hive/ql/plan/FilterDesc.java  |   14 +
 .../apache/hadoop/hive/ql/plan/JoinDesc.java    |    4 +
 .../hadoop/hive/ql/plan/MergeJoinWork.java      |    8 +-
 .../hadoop/hive/ql/plan/TableScanDesc.java      |   15 +-
 .../hadoop/hive/ql/session/LineageState.java    |    9 +-
 .../hive/ql/io/orc/TestInputOutputFormat.java   |   12 +-
 .../parse/TestUpdateDeleteSemanticAnalyzer.java |    2 +-
 ql/src/test/queries/clientpositive/lineage2.q   |  116 +
 ql/src/test/queries/clientpositive/lineage3.q   |  162 +
 .../clientpositive/vectorization_part_varchar.q |    7 +
 .../resources/orc-file-dump-bloomfilter.out     |   92 +-
 .../resources/orc-file-dump-bloomfilter2.out    |   92 +-
 .../orc-file-dump-dictionary-threshold.out      |   76 +-
 ql/src/test/resources/orc-file-dump.json        |  108 +-
 ql/src/test/resources/orc-file-dump.out         |   84 +-
 ql/src/test/resources/orc-file-has-null.out     |   62 +-
 .../clientpositive/alter_merge_orc.q.out        |   24 +-
 .../clientpositive/alter_merge_stats_orc.q.out  |   22 +-
 .../alter_partition_change_col.q.out            |    8 +-
 .../clientpositive/alter_table_cascade.q.out    |    8 +-
 .../clientpositive/annotate_stats_part.q.out    |    6 +-
 .../clientpositive/annotate_stats_table.q.out   |    4 +-
 .../results/clientpositive/auto_join12.q.out    |   54 +-
 .../results/clientpositive/auto_join5.q.out     |    8 +-
 .../test/results/clientpositive/combine2.q.out  |   16 +-
 .../constantPropagateForSubQuery.q.out          |   38 +-
 .../clientpositive/correlationoptimizer15.q.out |  120 +-
 .../clientpositive/correlationoptimizer6.q.out  |  818 +++--
 .../dynpart_sort_opt_vectorization.q.out        |   16 +-
 .../dynpart_sort_optimization2.q.out            |    8 +-
 .../encryption_insert_partition_dynamic.q.out   |   18 +-
 .../encryption_insert_partition_static.q.out    |   24 +-
 .../extrapolate_part_stats_full.q.out           |   24 +-
 .../extrapolate_part_stats_partial.q.out        |   76 +-
 .../extrapolate_part_stats_partial_ndv.q.out    |   38 +-
 .../clientpositive/groupby_sort_1_23.q.out      |   10 +-
 .../clientpositive/groupby_sort_skew_1_23.q.out |   10 +-
 .../clientpositive/index_auto_mult_tables.q.out |   12 +
 .../index_auto_mult_tables_compact.q.out        |    9 +
 .../clientpositive/index_auto_partitioned.q.out |    9 +
 .../clientpositive/index_auto_update.q.out      |    2 +
 .../results/clientpositive/index_bitmap.q.out   |   24 +
 .../index_bitmap_auto_partitioned.q.out         |   12 +
 .../clientpositive/index_bitmap_rc.q.out        |   24 +
 .../results/clientpositive/index_compact.q.out  |   18 +
 .../clientpositive/index_compact_2.q.out        |   18 +
 ql/src/test/results/clientpositive/join12.q.out |   28 +-
 ql/src/test/results/clientpositive/join34.q.out |    2 +-
 ql/src/test/results/clientpositive/join35.q.out |    2 +-
 ql/src/test/results/clientpositive/join5.q.out  |   20 +-
 .../join_merge_multi_expressions.q.out          |   46 +-
 .../results/clientpositive/join_merging.q.out   |  117 +-
 .../results/clientpositive/join_nulls.q.out     |    2 +-
 .../results/clientpositive/limit_pushdown.q.out |   98 +-
 .../test/results/clientpositive/lineage1.q.out  |    4 +-
 .../test/results/clientpositive/lineage2.q.out  | 2905 ++++++++++++++++++
 .../test/results/clientpositive/lineage3.q.out  | 2482 +++++++++++++++
 .../clientpositive/load_dyn_part13.q.out        |    8 +-
 .../clientpositive/louter_join_ppr.q.out        |   74 +-
 .../results/clientpositive/multiMapJoin1.q.out  |   10 +-
 .../results/clientpositive/multi_insert.q.out   |   32 +-
 ...i_insert_move_tasks_share_dependencies.q.out |   32 +-
 .../results/clientpositive/optional_outer.q.out |   36 +-
 .../orc_dictionary_threshold.q.out              |    2 +-
 .../clientpositive/outer_join_ppr.q.java1.7.out |  168 +-
 .../results/clientpositive/ppd_gby_join.q.out   |  104 +-
 .../test/results/clientpositive/ppd_join.q.out  |  106 +-
 .../test/results/clientpositive/ppd_join2.q.out |   88 +-
 .../test/results/clientpositive/ppd_join3.q.out |  114 +-
 .../clientpositive/ppd_outer_join4.q.out        |   88 +-
 .../results/clientpositive/ppd_random.q.out     |   80 +-
 ql/src/test/results/clientpositive/ptf.q.out    |   28 +-
 .../clientpositive/rcfile_null_value.q.out      |   20 +-
 .../clientpositive/router_join_ppr.q.out        |  170 +-
 .../test/results/clientpositive/skewjoin.q.out  |   46 +-
 .../clientpositive/spark/alter_merge_orc.q.out  |   24 +-
 .../spark/alter_merge_stats_orc.q.out           |   22 +-
 .../clientpositive/spark/auto_join12.q.out      |   54 +-
 .../clientpositive/spark/auto_join5.q.out       |   10 +-
 .../spark/groupby_sort_1_23.q.out               |   10 +-
 .../spark/groupby_sort_skew_1_23.q.out          |   10 +-
 .../results/clientpositive/spark/join12.q.out   |   26 +-
 .../results/clientpositive/spark/join34.q.out   |    2 +-
 .../results/clientpositive/spark/join35.q.out   |    2 +-
 .../results/clientpositive/spark/join5.q.out    |   20 +-
 .../spark/join_merge_multi_expressions.q.out    |   46 +-
 .../clientpositive/spark/join_merging.q.out     |  115 +-
 .../clientpositive/spark/limit_pushdown.q.out   |   80 +-
 .../clientpositive/spark/load_dyn_part13.q.out  |    8 +-
 .../clientpositive/spark/louter_join_ppr.q.out  |  432 +--
 .../clientpositive/spark/multi_insert.q.out     |   32 +-
 ...i_insert_move_tasks_share_dependencies.q.out |   32 +-
 .../spark/outer_join_ppr.q.java1.7.out          |  328 +-
 .../clientpositive/spark/ppd_gby_join.q.out     |  106 +-
 .../results/clientpositive/spark/ppd_join.q.out |  110 +-
 .../clientpositive/spark/ppd_join2.q.out        |   86 +-
 .../clientpositive/spark/ppd_join3.q.out        |  116 +-
 .../clientpositive/spark/ppd_outer_join4.q.out  |  124 +-
 .../test/results/clientpositive/spark/ptf.q.out |   28 +-
 .../clientpositive/spark/router_join_ppr.q.out  |  370 ++-
 .../results/clientpositive/spark/skewjoin.q.out |   46 +-
 .../results/clientpositive/spark/union22.q.out  |    4 +-
 .../results/clientpositive/spark/union28.q.out  |    4 +-
 .../results/clientpositive/spark/union29.q.out  |    4 +-
 .../results/clientpositive/spark/union30.q.out  |    4 +-
 .../results/clientpositive/spark/union33.q.out  |    4 +-
 .../clientpositive/spark/union_date_trim.q.out  |    4 +-
 .../clientpositive/spark/union_remove_1.q.out   |    4 +-
 .../clientpositive/spark/union_remove_10.q.out  |    2 +-
 .../clientpositive/spark/union_remove_11.q.out  |    2 +-
 .../clientpositive/spark/union_remove_15.q.out  |    8 +-
 .../clientpositive/spark/union_remove_16.q.out  |    8 +-
 .../clientpositive/spark/union_remove_17.q.out  |    4 +-
 .../clientpositive/spark/union_remove_18.q.out  |   24 +-
 .../clientpositive/spark/union_remove_19.q.out  |   12 +-
 .../clientpositive/spark/union_remove_2.q.out   |    2 +-
 .../clientpositive/spark/union_remove_20.q.out  |    4 +-
 .../clientpositive/spark/union_remove_21.q.out  |    2 +-
 .../clientpositive/spark/union_remove_22.q.out  |   12 +-
 .../clientpositive/spark/union_remove_23.q.out  |    2 +-
 .../clientpositive/spark/union_remove_24.q.out  |    4 +-
 .../clientpositive/spark/union_remove_25.q.out  |   16 +-
 .../clientpositive/spark/union_remove_3.q.out   |    2 +-
 .../clientpositive/spark/union_remove_4.q.out   |    4 +-
 .../clientpositive/spark/union_remove_5.q.out   |    2 +-
 .../clientpositive/spark/union_remove_6.q.out   |    8 +-
 .../spark/union_remove_6_subq.q.out             |    8 +-
 .../clientpositive/spark/union_remove_7.q.out   |    4 +-
 .../clientpositive/spark/union_remove_8.q.out   |    2 +-
 .../clientpositive/spark/union_remove_9.q.out   |    2 +-
 .../clientpositive/spark/union_top_level.q.out  |    4 +-
 .../clientpositive/spark/vectorized_ptf.q.out   |  136 +-
 .../clientpositive/spark/windowing.q.out        |   40 +-
 .../temp_table_windowing_expressions.q.out      |    8 +-
 .../clientpositive/tez/alter_merge_orc.q.out    |   24 +-
 .../tez/alter_merge_stats_orc.q.out             |   22 +-
 .../tez/dynpart_sort_opt_vectorization.q.out    |   16 +-
 .../tez/dynpart_sort_optimization2.q.out        |    8 +-
 .../clientpositive/tez/explainuser_1.q.out      | 1118 ++++---
 .../clientpositive/tez/limit_pushdown.q.out     |   78 +-
 .../results/clientpositive/tez/mergejoin.q.out  |   26 +-
 .../test/results/clientpositive/tez/mrr.q.out   |   82 +-
 .../test/results/clientpositive/tez/ptf.q.out   |   28 +-
 .../results/clientpositive/tez/skewjoin.q.out   |   26 +-
 .../clientpositive/tez/tez_join_hash.q.out      |    4 +-
 .../results/clientpositive/tez/tez_union.q.out  |   88 +-
 .../clientpositive/tez/unionDistinct_1.q.out    |   20 +-
 .../clientpositive/tez/vectorized_ptf.q.out     |  136 +-
 .../test/results/clientpositive/union22.q.out   |    4 +-
 .../test/results/clientpositive/union28.q.out   |    4 +-
 .../test/results/clientpositive/union29.q.out   |    4 +-
 .../test/results/clientpositive/union30.q.out   |    4 +-
 .../test/results/clientpositive/union33.q.out   |    4 +-
 .../clientpositive/unionDistinct_1.q.out        |   20 +-
 .../clientpositive/union_date_trim.q.out        |    4 +-
 .../results/clientpositive/union_remove_1.q.out |    4 +-
 .../clientpositive/union_remove_10.q.out        |    2 +-
 .../clientpositive/union_remove_11.q.out        |    2 +-
 .../clientpositive/union_remove_15.q.out        |    8 +-
 .../clientpositive/union_remove_16.q.out        |    8 +-
 .../clientpositive/union_remove_17.q.out        |    4 +-
 .../clientpositive/union_remove_18.q.out        |   24 +-
 .../clientpositive/union_remove_19.q.out        |   12 +-
 .../results/clientpositive/union_remove_2.q.out |    2 +-
 .../clientpositive/union_remove_20.q.out        |    4 +-
 .../clientpositive/union_remove_21.q.out        |    2 +-
 .../clientpositive/union_remove_22.q.out        |   12 +-
 .../clientpositive/union_remove_23.q.out        |    2 +-
 .../clientpositive/union_remove_24.q.out        |    4 +-
 .../clientpositive/union_remove_25.q.out        |   16 +-
 .../results/clientpositive/union_remove_3.q.out |    2 +-
 .../results/clientpositive/union_remove_4.q.out |    4 +-
 .../results/clientpositive/union_remove_5.q.out |    2 +-
 .../results/clientpositive/union_remove_6.q.out |    8 +-
 .../clientpositive/union_remove_6_subq.q.out    |    8 +-
 .../results/clientpositive/union_remove_7.q.out |    4 +-
 .../results/clientpositive/union_remove_8.q.out |    2 +-
 .../results/clientpositive/union_remove_9.q.out |    2 +-
 .../clientpositive/union_top_level.q.out        |    4 +-
 .../vectorization_part_varchar.q.out            |   72 +
 .../results/clientpositive/vectorized_ptf.q.out |  132 +-
 .../test/results/clientpositive/windowing.q.out |   40 +-
 .../clientpositive/windowing_expressions.q.out  |    8 +-
 .../apache/hadoop/hive/shims/Hadoop23Shims.java |    5 +-
 208 files changed, 11379 insertions(+), 4311 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
index 105effe,f20393a..a60527b
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
@@@ -483,10 -483,12 +484,18 @@@ public class TezCompiler extends TaskCo
        physicalCtx = new MemoryDecider().resolve(physicalCtx);
      }
  
 +    if ("llap".equalsIgnoreCase(conf.getVar(HiveConf.ConfVars.HIVE_EXECUTION_MODE))) {
 +      physicalCtx = new LlapDecider().resolve(physicalCtx);
 +    } else {
 +      LOG.debug("Skipping llap decider");
 +    }
++
+     //  This optimizer will serialize all filters that made it to the
+     //  table scan operator to avoid having to do it multiple times on
+     //  the backend. If you have a physical optimization that changes
+     //  table scans or filters, you have to invoke it before this one.
+     physicalCtx = new SerializeFilter().resolve(physicalCtx);
+ 
+     return;
    }
  }

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
----------------------------------------------------------------------
diff --cc ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
index e804659,f09138d..b088326
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
@@@ -136,32 -141,7 +136,36 @@@ public class MergeJoinWork extends Base
    }
  
    @Override
 +  public void setVectorMode(boolean vectorMode) {
 +    getMainWork().setVectorMode(vectorMode);
 +  }
 +
 +  @Override
 +  public boolean getVectorMode() {
 +    return getMainWork().getVectorMode();
 +  }
 +
 +  @Override
 +  public void setUberMode(boolean uberMode) {
 +    getMainWork().setUberMode(uberMode);
 +  }
 +
 +  @Override
 +  public boolean getUberMode() {
 +    return getMainWork().getUberMode();
 +  }
 +
 +  @Override
 +  public void setLlapMode(boolean llapMode) {
 +    getMainWork().setLlapMode(llapMode);
 +  }
 +
 +  @Override
 +  public boolean getLlapMode() {
 +    return getMainWork().getLlapMode();
 +  }
++  
+   public void addDummyOp(HashTableDummyOperator dummyOp) {
+     getMainWork().addDummyOp(dummyOp);
+   }
  }

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/mergejoin.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/tez/mergejoin.q.out
index c4be404,c4be404..de38ac3
--- a/ql/src/test/results/clientpositive/tez/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mergejoin.q.out
@@@ -307,6 -307,6 +307,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -320,7 -320,7 +321,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1377,6 -1377,6 +1377,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1390,7 -1390,7 +1391,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1476,6 -1476,6 +1476,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1489,7 -1489,7 +1490,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1575,6 -1575,6 +1575,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1588,7 -1588,7 +1589,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1709,6 -1709,6 +1709,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 4 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1722,7 -1722,7 +1723,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1812,6 -1812,6 +1812,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1825,7 -1825,7 +1826,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -1972,6 -1972,6 +1972,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 5 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -1985,7 -1985,7 +1986,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
          Union 3 
              Vertex: Union 3
  
@@@ -2060,6 -2060,6 +2060,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -2073,7 -2073,7 +2074,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -2192,6 -2192,6 +2192,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 4 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -2205,7 -2205,7 +2206,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -2354,6 -2354,6 +2354,7 @@@ STAGE PLANS
                      Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                      value expressions: _col0 (type: bigint)
          Reducer 5 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -2367,7 -2367,7 +2368,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
          Union 3 
              Vertex: Union 3
  
@@@ -2446,6 -2446,6 +2446,7 @@@ STAGE PLANS
                          Statistics: Num rows: 250 Data size: 23500 Basic stats: COMPLETE Column stats: NONE
              Execution mode: vectorized
          Reducer 2 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Select Operator
                  expressions: KEY.reducesinkkey0 (type: int)
@@@ -2456,7 -2456,7 +2457,6 @@@
                    sort order: +
                    Map-reduce partition columns: _col0 (type: int)
                    Statistics: Num rows: 121 Data size: 11374 Basic stats: COMPLETE Column stats: NONE
--            Execution mode: vectorized
          Reducer 3 
              Reduce Operator Tree:
                Merge Join Operator
@@@ -2482,6 -2482,6 +2482,7 @@@
                          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                          value expressions: _col0 (type: bigint)
          Reducer 4 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -2495,8 -2495,8 +2496,8 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
          Reducer 6 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Select Operator
                  expressions: KEY.reducesinkkey0 (type: int)
@@@ -2507,7 -2507,7 +2508,6 @@@
                    sort order: +
                    Map-reduce partition columns: _col0 (type: int)
                    Statistics: Num rows: 250 Data size: 23500 Basic stats: COMPLETE Column stats: NONE
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/mrr.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
----------------------------------------------------------------------
diff --cc ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
index 59c8df4,59c8df4..7e54e29
--- a/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
@@@ -90,6 -90,6 +90,7 @@@ STAGE PLANS
                          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                          value expressions: _col0 (type: bigint)
          Reducer 3 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -103,7 -103,7 +104,6 @@@
                        input format: org.apache.hadoop.mapred.TextInputFormat
                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
  
    Stage: Stage-0
      Fetch Operator
@@@ -277,6 -277,6 +277,7 @@@ STAGE PLANS
                          Statistics: Num rows: 2310 Data size: 24541 Basic stats: COMPLETE Column stats: NONE
                          value expressions: _col2 (type: bigint)
          Reducer 4 
++            Execution mode: vectorized
              Reduce Operator Tree:
                Group By Operator
                  aggregations: count(VALUE._col0)
@@@ -295,7 -295,7 +296,6 @@@
                          input format: org.apache.hadoop.mapred.TextInputFormat
                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
--            Execution mode: vectorized
          Union 3 
              Vertex: Union 3
  

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/ql/src/test/results/clientpositive/vectorized_ptf.q.out
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hive/blob/1e0eace4/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
----------------------------------------------------------------------