hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [6/6] hive git commit: HIVE-10872 : LLAP: make sure tests pass #1 (Sergey Shelukhin)
Date Sat, 13 Jun 2015 01:12:43 GMT
HIVE-10872 : LLAP: make sure tests pass #1 (Sergey Shelukhin)


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

Branch: refs/heads/llap
Commit: f8efa6ff09a9f2b83e8a654223da045e9c59e52e
Parents: b321c55
Author: Sergey Shelukhin <sershe@apache.org>
Authored: Fri Jun 12 18:11:49 2015 -0700
Committer: Sergey Shelukhin <sershe@apache.org>
Committed: Fri Jun 12 18:11:49 2015 -0700

----------------------------------------------------------------------
 .../llap/IncrementalObjectSizeEstimator.java    |  12 +-
 .../hive/llap/cache/LowLevelCacheImpl.java      |  12 +-
 .../llap/io/encoded/OrcEncodedDataReader.java   |   6 +-
 .../TestIncrementalObjectSizeEstimator.java     |  11 +-
 .../app/rm/TestLlapTaskSchedulerService.java    |   2 +-
 .../hadoop/hive/ql/exec/MapJoinOperator.java    |  11 --
 .../hive/ql/plan/ExprNodeGenericFuncDesc.java   |  10 +-
 ql/src/test/queries/clientcompare/llap_0.q      |   3 +-
 ql/src/test/queries/clientcompare/llap_0_00.qv  |   1 +
 ql/src/test/queries/clientcompare/llap_0_01.qv  |   1 +
 .../clientpositive/autogen_colalias.q.out       |   4 +-
 .../clientpositive/tez/cbo_windowing.q.out      |  32 ++--
 .../tez/dynpart_sort_opt_vectorization.q.out    |  48 +++---
 .../tez/dynpart_sort_optimization2.q.out        |   8 +-
 .../clientpositive/tez/llapdecider.q.out        |  32 ++--
 .../clientpositive/tez/vector_between_in.q.out  |  16 +-
 .../tez/vector_binary_join_groupby.q.out        |  50 +++---
 .../clientpositive/tez/vector_bucket.q.out      |   2 +-
 .../clientpositive/tez/vector_char_2.q.out      |   8 +-
 .../tez/vector_char_mapjoin1.q.out              |   6 +-
 .../clientpositive/tez/vector_char_simple.q.out |   6 +-
 .../clientpositive/tez/vector_coalesce_2.q.out  |   2 +-
 .../tez/vector_count_distinct.q.out             |   2 +-
 .../clientpositive/tez/vector_data_types.q.out  |   2 +-
 .../clientpositive/tez/vector_date_1.q.out      |  12 +-
 .../clientpositive/tez/vector_decimal_1.q.out   |  18 +--
 .../tez/vector_decimal_10_0.q.out               |   2 +-
 .../clientpositive/tez/vector_decimal_2.q.out   |  54 +++----
 .../tez/vector_decimal_aggregate.q.out          |   2 +-
 .../tez/vector_decimal_round.q.out              |  12 +-
 .../tez/vector_decimal_round_2.q.out            |   8 +-
 .../clientpositive/tez/vector_decimal_udf.q.out |   8 +-
 .../clientpositive/tez/vector_distinct_2.q.out  |   2 +-
 .../clientpositive/tez/vector_groupby_3.q.out   |   2 +-
 .../tez/vector_groupby_reduce.q.out             |   2 +-
 .../tez/vector_grouping_sets.q.out              |   2 +-
 .../clientpositive/tez/vector_if_expr.q.out     |   2 +-
 .../clientpositive/tez/vector_interval_1.q.out  |  16 +-
 .../clientpositive/tez/vector_interval_2.q.out  |  20 +--
 .../clientpositive/tez/vector_join30.q.out      |  50 +++---
 .../tez/vector_left_outer_join.q.out            |   2 +-
 .../tez/vector_leftsemi_mapjoin.q.out           | 152 +++++++++----------
 .../tez/vector_mapjoin_reduce.q.out             |   4 +-
 .../tez/vector_mr_diff_schema_alias.q.out       |   4 +-
 .../tez/vector_non_string_partition.q.out       |   4 +-
 .../clientpositive/tez/vector_orderby_5.q.out   |   4 +-
 .../clientpositive/tez/vector_outer_join1.q.out |  60 ++++----
 .../clientpositive/tez/vector_outer_join2.q.out |  26 ++--
 .../clientpositive/tez/vector_outer_join3.q.out |  66 ++++----
 .../clientpositive/tez/vector_outer_join4.q.out |   2 +-
 .../clientpositive/tez/vector_outer_join5.q.out |  20 +--
 .../tez/vector_partition_diff_num_cols.q.out    |  10 +-
 .../tez/vector_partitioned_date_time.q.out      |  18 +--
 .../tez/vector_reduce_groupby_decimal.q.out     |   4 +-
 .../tez/vector_string_concat.q.out              |   4 +-
 .../tez/vector_varchar_mapjoin1.q.out           |   6 +-
 .../tez/vector_varchar_simple.q.out             |   6 +-
 .../clientpositive/tez/vectorization_0.q.out    |  30 ++--
 .../clientpositive/tez/vectorization_13.q.out   |   4 +-
 .../clientpositive/tez/vectorization_14.q.out   |   2 +-
 .../clientpositive/tez/vectorization_15.q.out   |   2 +-
 .../clientpositive/tez/vectorization_div0.q.out |   4 +-
 .../tez/vectorization_limit.q.out               |   8 +-
 .../tez/vectorization_part_project.q.out        |   2 +-
 .../tez/vectorization_short_regress.q.out       |  32 ++--
 .../tez/vectorized_date_funcs.q.out             |   4 +-
 .../tez/vectorized_distinct_gby.q.out           |   2 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  82 +++++-----
 .../tez/vectorized_nested_mapjoin.q.out         |   2 +-
 .../clientpositive/tez/vectorized_ptf.q.out     |  54 +++----
 .../tez/vectorized_shufflejoin.q.out            |   2 +-
 .../tez/vectorized_timestamp_funcs.q.out        |  12 +-
 .../clientpositive/udf_nondeterministic.q.out   |   2 +-
 .../clientpositive/vector_char_mapjoin1.q.out   |   4 +-
 .../clientpositive/vector_decimal_mapjoin.q.out |   2 +-
 .../clientpositive/vector_inner_join.q.out      |  18 +--
 .../vector_interval_mapjoin.q.out               |   2 +-
 .../clientpositive/vector_left_outer_join.q.out |   2 +-
 .../vector_left_outer_join2.q.out               |   8 +-
 .../vector_leftsemi_mapjoin.q.out               | 144 +++++++++---------
 .../clientpositive/vector_nullsafe_join.q.out   |  20 +--
 .../clientpositive/vector_outer_join0.q.out     |   4 +-
 .../clientpositive/vector_outer_join1.q.out     |   6 +-
 .../clientpositive/vector_outer_join2.q.out     |   2 +-
 .../clientpositive/vector_outer_join3.q.out     |   6 +-
 .../clientpositive/vector_outer_join4.q.out     |   6 +-
 .../clientpositive/vector_outer_join5.q.out     |  20 +--
 .../vector_varchar_mapjoin1.q.out               |   4 +-
 .../clientpositive/vectorized_context.q.out     |   2 +-
 .../clientpositive/vectorized_mapjoin.q.out     |   2 +-
 .../vectorized_nested_mapjoin.q.out             |   2 +-
 .../results/clientpositive/vectorized_ptf.q.out |  40 ++---
 92 files changed, 715 insertions(+), 714 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/llap-server/src/java/org/apache/hadoop/hive/llap/IncrementalObjectSizeEstimator.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/IncrementalObjectSizeEstimator.java b/llap-server/src/java/org/apache/hadoop/hive/llap/IncrementalObjectSizeEstimator.java
index 21387e4..d33f724 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/IncrementalObjectSizeEstimator.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/IncrementalObjectSizeEstimator.java
@@ -295,13 +295,11 @@ public class IncrementalObjectSizeEstimator {
   private static void addArrayEstimator(
       HashMap<Class<?>, ObjectEstimator> byType, Deque<Object> stack,
       Field field, Object fieldObj) {
-    int arrayLen = 0;
-    if (fieldObj != null) {
-      arrayLen = Array.getLength(fieldObj);
-      if (arrayLen == 0) {
-        if (DebugUtils.isTraceEnabled()) {
-          LlapIoImpl.LOG.info("Empty array " + field);
-        }
+    if (fieldObj == null) return;
+    int arrayLen = Array.getLength(fieldObj);
+    if (arrayLen == 0) {
+      if (DebugUtils.isTraceEnabled()) {
+        LlapIoImpl.LOG.info("Empty array " + field);
       }
     }
     for (int i = 0; i < arrayLen; ++i) {

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
index 8c65844..3798aaa 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cache/LowLevelCacheImpl.java
@@ -161,7 +161,9 @@ public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
       if (!lockBuffer(buffer, true)) {
         // If we cannot lock, remove this from cache and continue.
         matches.remove();
-        resultObj.didGetAllData = false;
+        if (resultObj != null) {
+          resultObj.didGetAllData = false;
+        }
         continue;
       }
       long cacheOffset = e.getKey();
@@ -177,7 +179,9 @@ public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
     }
     if (currentNotCached != null) {
       assert !currentNotCached.hasData();
-      resultObj.didGetAllData = false;
+      if (resultObj != null) {
+        resultObj.didGetAllData = false;
+      }
     }
   }
 
@@ -202,7 +206,9 @@ public class LowLevelCacheImpl implements LowLevelCache, LlapOomDebugDump {
       }
     } else {
       // There's some part of current buffer that is not cached.
-      resultObj.didGetAllData = false;
+      if (resultObj != null) {
+        resultObj.didGetAllData = false;
+      }
       assert currentNotCached.getOffset() < currentCached.getOffset()
         || currentNotCached.prev == null
         || currentNotCached.prev.getEnd() <= currentCached.getOffset();

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
index d6022b5..5743f87 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
@@ -413,9 +413,9 @@ public class OrcEncodedDataReader extends CallableWithNdc<Void>
     int bufferSize = fileMetadata.getCompressionBufferSize();
     int minAllocSize = HiveConf.getIntVar(conf, HiveConf.ConfVars.LLAP_ORC_CACHE_MIN_ALLOC);
     if (bufferSize < minAllocSize) {
-      throw new IOException("ORC compression buffer size (" + bufferSize + ") is smaller than"
-          + " LLAP low-level cache minimum allocation size (" + minAllocSize + "). Decrease"
-          + " the value for " + HiveConf.ConfVars.LLAP_ORC_CACHE_MIN_ALLOC.toString());
+      LOG.warn("ORC compression buffer size (" + bufferSize + ") is smaller than LLAP low-level "
+            + "cache minimum allocation size (" + minAllocSize + "). Decrease the value for "
+            + HiveConf.ConfVars.LLAP_ORC_CACHE_MIN_ALLOC.toString() + " to avoid wasting memory");
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestIncrementalObjectSizeEstimator.java
----------------------------------------------------------------------
diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestIncrementalObjectSizeEstimator.java b/llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestIncrementalObjectSizeEstimator.java
index 369b2f6..4697445 100644
--- a/llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestIncrementalObjectSizeEstimator.java
+++ b/llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestIncrementalObjectSizeEstimator.java
@@ -56,6 +56,7 @@ import org.apache.hadoop.hive.ql.io.orc.RecordReaderImpl.Index;
 import org.apache.hadoop.hive.ql.io.orc.StripeInformation;
 import org.apache.hadoop.hive.ql.util.JavaDataModel;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import com.google.protobuf.CodedOutputStream;
 
@@ -151,20 +152,22 @@ public class TestIncrementalObjectSizeEstimator {
     DummyMetadataReader mr = new DummyMetadataReader();
     mr.doStreamStep = false;
     mr.isEmpty = true;
-    osm = new OrcStripeMetadata(stripeKey, mr, null, null, null);
+    StripeInformation si = Mockito.mock(StripeInformation.class);
+    Mockito.when(si.getNumberOfRows()).thenReturn(0L);
+    osm = new OrcStripeMetadata(stripeKey, mr, si, null, null);
     LOG.info("Estimated " + root.estimate(osm, map) + " for an empty OSM");
     mr.doStreamStep = true;
-    osm = new OrcStripeMetadata(stripeKey, mr, null, null, null);
+    osm = new OrcStripeMetadata(stripeKey, mr, si, null, null);
     LOG.info("Estimated " + root.estimate(osm, map) + " for an empty OSM after serde");
 
     mr.isEmpty = false;
     stripeKey = new OrcBatchKey(0, 0, 0);
-    osm = new OrcStripeMetadata(stripeKey, mr, null, null, null);
+    osm = new OrcStripeMetadata(stripeKey, mr, si, null, null);
     LOG.info("Estimated " + root.estimate(osm, map) + " for a test OSM");
     osm.resetRowIndex();
     LOG.info("Estimated " + root.estimate(osm, map) + " for a test OSM w/o row index");
     mr.doStreamStep = true;
-    osm = new OrcStripeMetadata(stripeKey, mr, null, null, null);
+    osm = new OrcStripeMetadata(stripeKey, mr, si, null, null);
     LOG.info("Estimated " + root.estimate(osm, map) + " for a test OSM after serde");
     osm.resetRowIndex();
     LOG.info("Estimated " + root.estimate(osm, map) + " for a test OSM w/o row index after serde");

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java
----------------------------------------------------------------------
diff --git a/llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java b/llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java
index b9b89e3..d0bfd19 100644
--- a/llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java
+++ b/llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java
@@ -285,7 +285,7 @@ public class TestLlapTaskSchedulerService {
     }
 
     TestTaskSchedulerServiceWrapper(long disableTimeoutMillis) {
-      this(2000l, new String[]{HOST1, HOST2, HOST3}, 4,
+      this(disableTimeoutMillis, new String[]{HOST1, HOST2, HOST3}, 4,
           LlapConfiguration.LLAP_DAEMON_TASK_SCHEDULER_WAIT_QUEUE_SIZE_DEFAULT);
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
index 2405d41..6ddc258 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
@@ -205,17 +205,6 @@ public class MapJoinOperator extends AbstractMapJoinOperator<MapJoinDesc> implem
       hashTblInitedOnce = true;
     }
 
-    alias = (byte) conf.getPosBigTable();
-    if (hashMapRowGetters == null) {
-      hashMapRowGetters = new ReusableGetAdaptor[mapJoinTables.length];
-      MapJoinKey refKey = getRefKey(alias);
-      for (byte pos = 0; pos < order.length; pos++) {
-        if (pos != alias) {
-          hashMapRowGetters[pos] = mapJoinTables[pos].createGetter(refKey);
-        }
-      }
-    }
-
     if (this.getExecContext() != null) {
       // reset exec context so that initialization of the map operator happens
       // properly

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
index 4b2c1ad..655cfb3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
@@ -136,11 +136,13 @@ public class ExprNodeGenericFuncDesc extends ExprNodeDesc implements
     StringBuilder sb = new StringBuilder();
     sb.append(genericUDF.getClass().getSimpleName());
     sb.append("(");
-    for (int i = 0; i < chidren.size(); i++) {
-      if (i > 0) {
-        sb.append(", ");
+    if (chidren != null) {
+      for (int i = 0; i < chidren.size(); i++) {
+        if (i > 0) {
+          sb.append(", ");
+        }
+        sb.append(chidren.get(i).toString());
       }
-      sb.append(chidren.get(i).toString());
     }
     sb.append(")");
     return sb.toString();

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/queries/clientcompare/llap_0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientcompare/llap_0.q b/ql/src/test/queries/clientcompare/llap_0.q
index 51ca78c..0a95282 100644
--- a/ql/src/test/queries/clientcompare/llap_0.q
+++ b/ql/src/test/queries/clientcompare/llap_0.q
@@ -3,7 +3,8 @@ SET hive.vectorized.execution.enabled=true;
 SELECT   cfloat,
          cint,
          cdouble,
-         cbigint
+         cbigint,
+         cstring1
 FROM     alltypesorc
 WHERE    (cbigint > -23)
            AND ((cdouble != 988888)

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/queries/clientcompare/llap_0_00.qv
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientcompare/llap_0_00.qv b/ql/src/test/queries/clientcompare/llap_0_00.qv
new file mode 100644
index 0000000..0be510e
--- /dev/null
+++ b/ql/src/test/queries/clientcompare/llap_0_00.qv
@@ -0,0 +1 @@
+SET hive.llap.io.enabled = false;

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/queries/clientcompare/llap_0_01.qv
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientcompare/llap_0_01.qv b/ql/src/test/queries/clientcompare/llap_0_01.qv
new file mode 100644
index 0000000..aded710
--- /dev/null
+++ b/ql/src/test/queries/clientcompare/llap_0_01.qv
@@ -0,0 +1 @@
+SET hive.llap.io.enabled = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/autogen_colalias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/autogen_colalias.q.out b/ql/src/test/results/clientpositive/autogen_colalias.q.out
index 5569b46..896a468 100644
--- a/ql/src/test/results/clientpositive/autogen_colalias.q.out
+++ b/ql/src/test/results/clientpositive/autogen_colalias.q.out
@@ -33,7 +33,7 @@ c3                  	int
 c4                  	bigint              	                    
 c5                  	double              	                    
 c6                  	bigint              	                    
-c7                  	timestamp
+c7                  	timestamp           	                    
 c8                  	int                 	                    
 c9                  	int                 	                    
 PREHOOK: query: create table dest_grouped_old2 as select distinct src.key from src
@@ -82,7 +82,7 @@ test_max_length_src__3	int
 count_src_value_4   	bigint              	                    
 sin_count_src_value_5	double              	                    
 count_sin_src_value_6	bigint              	                    
-current_timestamp_7 	timestamp
+current_timestamp_7 	timestamp           	                    
 sum_if_value_10_valu_8	int                 	                    
 if_src_key_10_src_ke_9	double              	                    
 PREHOOK: query: create table dest_grouped_new2 as select distinct src.key from src

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out
index 57201b5..dce87f5 100644
--- a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out
+++ b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out
@@ -44,7 +44,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-18	18.0	1	1	1	1	1	0.0	1	NULL
+18	18.0	1	1	1	1	1	0.0	1	1.0
 18	18.0	1	1	10	1	1	0.0	1	1.0
 18	18.0	1	1	11	1	1	0.0	1	1.0
 18	18.0	1	1	12	1	1	0.0	1	1.0
@@ -52,13 +52,13 @@ POSTHOOK: Input: default@cbo_t1@dt=2014
 18	18.0	1	1	14	1	1	0.0	1	1.0
 18	18.0	1	1	15	1	1	0.0	1	1.0
 18	18.0	1	1	16	1	1	0.0	1	1.0
-18	18.0	1	1	17	1	1	0.0	1	1.0
-18	18.0	1	1	18	1	1	0.0	1	1.0
-18	18.0	1	1	19	1	1	0.0	1	1.0
-18	18.0	1	1	2	1	1	0.0	1	NULL
-18	18.0	1	1	20	1	1	0.0	1	1.0
-18	18.0	1	1	3	1	1	0.0	1	NULL
-18	18.0	1	1	4	1	1	0.0	1	NULL
+18	18.0	1	1	17	1	1	0.0	NULL	1.0
+18	18.0	1	1	18	1	1	0.0	NULL	1.0
+18	18.0	1	1	19	1	1	0.0	NULL	1.0
+18	18.0	1	1	2	1	1	0.0	1	1.0
+18	18.0	1	1	20	1	1	0.0	NULL	1.0
+18	18.0	1	1	3	1	1	0.0	1	1.0
+18	18.0	1	1	4	1	1	0.0	1	1.0
 18	18.0	1	1	5	1	1	0.0	1	1.0
 18	18.0	1	1	6	1	1	0.0	1	1.0
 18	18.0	1	1	7	1	1	0.0	1	1.0
@@ -74,7 +74,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-18	18.0	1	1	1	1	1	0.0	1	NULL
+18	18.0	1	1	1	1	1	0.0	1	1.0
 18	18.0	1	1	10	1	1	0.0	1	1.0
 18	18.0	1	1	11	1	1	0.0	1	1.0
 18	18.0	1	1	12	1	1	0.0	1	1.0
@@ -82,13 +82,13 @@ POSTHOOK: Input: default@cbo_t1@dt=2014
 18	18.0	1	1	14	1	1	0.0	1	1.0
 18	18.0	1	1	15	1	1	0.0	1	1.0
 18	18.0	1	1	16	1	1	0.0	1	1.0
-18	18.0	1	1	17	1	1	0.0	1	1.0
-18	18.0	1	1	18	1	1	0.0	1	1.0
-18	18.0	1	1	19	1	1	0.0	1	1.0
-18	18.0	1	1	2	1	1	0.0	1	NULL
-18	18.0	1	1	20	1	1	0.0	1	1.0
-18	18.0	1	1	3	1	1	0.0	1	NULL
-18	18.0	1	1	4	1	1	0.0	1	NULL
+18	18.0	1	1	17	1	1	0.0	NULL	1.0
+18	18.0	1	1	18	1	1	0.0	NULL	1.0
+18	18.0	1	1	19	1	1	0.0	NULL	1.0
+18	18.0	1	1	2	1	1	0.0	1	1.0
+18	18.0	1	1	20	1	1	0.0	NULL	1.0
+18	18.0	1	1	3	1	1	0.0	1	1.0
+18	18.0	1	1	4	1	1	0.0	1	1.0
 18	18.0	1	1	5	1	1	0.0	1	1.0
 18	18.0	1	1	6	1	1	0.0	1	1.0
 18	18.0	1	1	7	1	1	0.0	1	1.0

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
index 04927b8..2b97959 100644
--- a/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
@@ -190,6 +190,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
@@ -201,8 +202,8 @@ STAGE PLANS:
                   Map-reduce partition columns: _col4 (type: tinyint)
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -216,7 +217,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -276,6 +276,7 @@ STAGE PLANS:
                           value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -290,8 +291,8 @@ STAGE PLANS:
                     Map-reduce partition columns: _col4 (type: tinyint)
                     Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -305,7 +306,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_limit_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -363,6 +363,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint), '_bucket_number' (type: string)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint), VALUE._bucket_number (type: string)
@@ -376,7 +377,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_buck_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -433,6 +433,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint), '_bucket_number' (type: string)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint), VALUE._bucket_number (type: string)
@@ -446,7 +447,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_buck_sort_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -573,6 +573,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
@@ -584,8 +585,8 @@ STAGE PLANS:
                   Map-reduce partition columns: _col4 (type: tinyint)
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -599,7 +600,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -659,6 +659,7 @@ STAGE PLANS:
                           value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -673,8 +674,8 @@ STAGE PLANS:
                     Map-reduce partition columns: _col4 (type: tinyint)
                     Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -688,7 +689,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_limit_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -746,6 +746,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint), '_bucket_number' (type: string)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint), VALUE._bucket_number (type: string)
@@ -759,7 +760,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_buck_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -816,6 +816,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint), '_bucket_number' (type: string)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint), VALUE._bucket_number (type: string)
@@ -829,7 +830,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.over1k_part_buck_sort_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1373,6 +1373,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
@@ -1386,7 +1387,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1444,6 +1444,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
@@ -1455,8 +1456,8 @@ STAGE PLANS:
                   Map-reduce partition columns: _col4 (type: tinyint)
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -1470,7 +1471,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1525,6 +1525,7 @@ STAGE PLANS:
                       value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float)
@@ -1546,8 +1547,8 @@ STAGE PLANS:
                         Map-reduce partition columns: _col4 (type: tinyint)
                         Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -1561,7 +1562,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1623,6 +1623,7 @@ STAGE PLANS:
                           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: smallint), KEY._col1 (type: int), KEY._col2 (type: bigint), KEY._col3 (type: float), KEY._col4 (type: tinyint)
@@ -1637,7 +1638,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1702,6 +1702,7 @@ STAGE PLANS:
                           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: smallint), KEY._col1 (type: int), KEY._col2 (type: bigint), KEY._col3 (type: float), KEY._col4 (type: tinyint)
@@ -1714,8 +1715,8 @@ STAGE PLANS:
                   Map-reduce partition columns: _col4 (type: tinyint)
                   Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
@@ -1729,7 +1730,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -2113,6 +2113,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col4 (type: tinyint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), KEY.reducesinkkey0 (type: float), VALUE._col3 (type: tinyint)
@@ -2126,7 +2127,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part_buck_sort2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -2183,6 +2183,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint), '_bucket_number' (type: string)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint), VALUE._bucket_number (type: string)
@@ -2196,7 +2197,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.over1k_part_buck_sort2_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -2401,6 +2401,7 @@ STAGE PLANS:
                         Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: bigint)
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -2414,7 +2415,6 @@ STAGE PLANS:
                       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
@@ -2620,6 +2620,7 @@ STAGE PLANS:
                         Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col0 (type: bigint)
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -2633,7 +2634,6 @@ STAGE PLANS:
                       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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
index 6b6d912..5abad85 100644
--- a/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
+++ b/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out
@@ -1129,6 +1129,7 @@ STAGE PLANS:
                         Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: int), KEY._col1 (type: float), KEY._col2 (type: float)
@@ -1147,7 +1148,6 @@ STAGE PLANS:
                         output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                         serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                         name: default.ss_part_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1372,6 +1372,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: float), _col1 (type: float), _col2 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: float), VALUE._col1 (type: float), VALUE._col2 (type: int)
@@ -1385,7 +1386,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                       serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                       name: default.ss_part_orc
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1645,6 +1645,7 @@ STAGE PLANS:
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col2 (type: bigint)
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -1664,7 +1665,6 @@ STAGE PLANS:
                         output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                         serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                         name: default.hive13_dp1
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection
@@ -1772,6 +1772,7 @@ STAGE PLANS:
                         Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col2 (type: bigint)
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -1791,7 +1792,6 @@ STAGE PLANS:
                         output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                         serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                         name: default.hive13_dp1
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/llapdecider.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/llapdecider.q.out b/ql/src/test/results/clientpositive/tez/llapdecider.q.out
index 60b2fed..6aa5513 100644
--- a/ql/src/test/results/clientpositive/tez/llapdecider.q.out
+++ b/ql/src/test/results/clientpositive/tez/llapdecider.q.out
@@ -377,10 +377,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -468,10 +468,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -558,10 +558,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -645,10 +645,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -732,10 +732,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -821,10 +821,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -908,10 +908,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -999,10 +999,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1219 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE
+                  Statistics: Num rows: 1219 Data size: 433964 Basic stats: COMPLETE Column stats: COMPLETE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_between_in.q.out b/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
index 61e215e..1d720c0 100644
--- a/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
@@ -41,6 +41,7 @@ STAGE PLANS:
                         Statistics: Num rows: 6144 Data size: 1233808 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date)
@@ -53,7 +54,6 @@ STAGE PLANS:
                       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
@@ -97,6 +97,7 @@ STAGE PLANS:
                           value expressions: _col0 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -110,7 +111,6 @@ STAGE PLANS:
                       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
@@ -151,6 +151,7 @@ STAGE PLANS:
                         Statistics: Num rows: 6144 Data size: 1233808 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: decimal(20,10))
@@ -163,7 +164,6 @@ STAGE PLANS:
                       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
@@ -207,6 +207,7 @@ STAGE PLANS:
                           value expressions: _col0 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -220,7 +221,6 @@ STAGE PLANS:
                       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
@@ -261,6 +261,7 @@ STAGE PLANS:
                         Statistics: Num rows: 6144 Data size: 1233808 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date)
@@ -273,7 +274,6 @@ STAGE PLANS:
                       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
@@ -314,6 +314,7 @@ STAGE PLANS:
                         Statistics: Num rows: 6144 Data size: 1233808 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date)
@@ -326,7 +327,6 @@ STAGE PLANS:
                       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
@@ -367,6 +367,7 @@ STAGE PLANS:
                         Statistics: Num rows: 6144 Data size: 1233808 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: decimal(20,10))
@@ -379,7 +380,6 @@ STAGE PLANS:
                       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
@@ -423,6 +423,7 @@ STAGE PLANS:
                           value expressions: _col0 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
@@ -436,7 +437,6 @@ STAGE PLANS:
                       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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
index 8dcd40d..8ee68df 100644
--- a/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_binary_join_groupby.q.out
@@ -121,10 +121,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t1
-                  Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: bin is not null (type: boolean)
-                    Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -134,7 +134,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24
                       input vertices:
                         1 Map 3
-                      Statistics: Num rows: 55 Data size: 16300 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 55 Data size: 16294 Basic stats: COMPLETE Column stats: NONE
                       HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: sum(hash(_col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8,_col9,_col10,_col14,_col15,_col16,_col17,_col18,_col19,_col20,_col21,_col22,_col23,_col24))
@@ -149,17 +149,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t2
-                  Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: bin is not null (type: boolean)
-                    Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: bin (type: binary)
                       sort order: +
                       Map-reduce partition columns: bin (type: binary)
-                      Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                       value expressions: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float), d (type: double), bo (type: boolean), s (type: string), ts (type: timestamp), dec (type: decimal(4,2))
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
@@ -173,7 +174,6 @@ STAGE PLANS:
                       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
@@ -192,7 +192,7 @@ FROM hundredorc t1 JOIN hundredorc t2 ON t2.bin = t2.bin
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@hundredorc
 #### A masked pattern was here ####
--107801098240
+-83389294336
 PREHOOK: query: EXPLAIN 
 SELECT count(*), bin
 FROM hundredorc
@@ -218,44 +218,44 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: hundredorc
-                  Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: bin (type: binary)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: _col0 (type: binary)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: binary)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: binary)
-                        Statistics: Num rows: 100 Data size: 29638 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 100 Data size: 29627 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
                 keys: KEY._col0 (type: binary)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col1 (type: bigint), _col0 (type: binary)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 50 Data size: 14819 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 50 Data size: 14813 Basic stats: COMPLETE Column stats: NONE
                     table:
                         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
@@ -275,29 +275,29 @@ GROUP BY bin
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@hundredorc
 #### A masked pattern was here ####
-5	american history
-5	biology
+4	american history
+4	biology
 2	chemistry
-2	debate
+4	debate
 4	education
 5	forestry
-4	geology
+3	geology
 5	history
 6	industrial engineering
-3	joggying
+2	joggying
 5	kindergarten
 1	linguistics
 9	mathematics
 8	nap time
-1	opthamology
-2	philosophy
+2	opthamology
+3	philosophy
 5	quiet hour
 4	religion
 3	study skills
-7	topology
+8	topology
 1	undecided
 2	values clariffication
 3	wind surfing
-3	xylophone band
+2	xylophone band
 2	yard duty
 3	zync studies

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_bucket.q.out b/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
index eab698c..0679b49 100644
--- a/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_bucket.q.out
@@ -40,6 +40,7 @@ STAGE PLANS:
                       Statistics: Num rows: 1 Data size: 26 Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col0 (type: string), _col1 (type: string)
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: UDFToInteger(VALUE._col0) (type: int), VALUE._col1 (type: string)
@@ -53,7 +54,6 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: default.non_orc_table
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_char_2.q.out b/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
index 4a2b795..8545608 100644
--- a/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_char_2.q.out
@@ -94,6 +94,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: bigint), _col2 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), count(VALUE._col1)
@@ -106,8 +107,8 @@ STAGE PLANS:
                   sort order: +
                   Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint), _col2 (type: bigint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: char(20)), VALUE._col0 (type: bigint), VALUE._col1 (type: bigint)
@@ -123,7 +124,6 @@ STAGE PLANS:
                         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
@@ -222,6 +222,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: bigint), _col2 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), count(VALUE._col1)
@@ -234,8 +235,8 @@ STAGE PLANS:
                   sort order: -
                   Statistics: Num rows: 250 Data size: 49500 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint), _col2 (type: bigint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: char(20)), VALUE._col0 (type: bigint), VALUE._col1 (type: bigint)
@@ -251,7 +252,6 @@ STAGE PLANS:
                         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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
index f495f95..b728b25 100644
--- a/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_char_mapjoin1.q.out
@@ -181,6 +181,7 @@ STAGE PLANS:
                       value expressions: c1 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: char(10)), VALUE._col1 (type: int), VALUE._col2 (type: char(10))
@@ -193,7 +194,6 @@ STAGE PLANS:
                       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
@@ -281,6 +281,7 @@ STAGE PLANS:
                           value expressions: _col1 (type: char(10)), _col2 (type: int), _col3 (type: char(20))
             Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: char(10)), VALUE._col1 (type: int), VALUE._col2 (type: char(20))
@@ -293,7 +294,6 @@ STAGE PLANS:
                       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
@@ -382,6 +382,7 @@ STAGE PLANS:
                       value expressions: c1 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: char(10)), VALUE._col1 (type: int), VALUE._col2 (type: string)
@@ -394,7 +395,6 @@ STAGE PLANS:
                       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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out b/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
index 9c72edb..be38775 100644
--- a/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
@@ -82,6 +82,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: char(20))
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: char(10)), VALUE._col0 (type: char(20))
@@ -97,7 +98,6 @@ STAGE PLANS:
                         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
@@ -182,6 +182,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: char(20))
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: char(10)), VALUE._col0 (type: char(20))
@@ -197,7 +198,6 @@ STAGE PLANS:
                         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
@@ -285,6 +285,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: VALUE._col0 (type: int)
@@ -305,7 +306,6 @@ STAGE PLANS:
                           output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                           serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                           name: default.char_3
-            Execution mode: vectorized
 
   Stage: Stage-2
     Dependency Collection

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_coalesce_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_coalesce_2.q.out b/ql/src/test/results/clientpositive/tez/vector_coalesce_2.q.out
index a43303f..2889273 100644
--- a/ql/src/test/results/clientpositive/tez/vector_coalesce_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_coalesce_2.q.out
@@ -202,6 +202,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: bigint)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
@@ -220,7 +221,6 @@ STAGE PLANS:
                         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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_count_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_count_distinct.q.out b/ql/src/test/results/clientpositive/tez/vector_count_distinct.q.out
index e6d34ff..f0e0d14 100644
--- a/ql/src/test/results/clientpositive/tez/vector_count_distinct.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_count_distinct.q.out
@@ -1288,6 +1288,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)
@@ -1301,7 +1302,6 @@ STAGE PLANS:
                       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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
index 972404b..9474c2c 100644
--- a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out
@@ -219,6 +219,7 @@ STAGE PLANS:
                       value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary)
@@ -234,7 +235,6 @@ STAGE PLANS:
                         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

http://git-wip-us.apache.org/repos/asf/hive/blob/f8efa6ff/ql/src/test/results/clientpositive/tez/vector_date_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_date_1.q.out b/ql/src/test/results/clientpositive/tez/vector_date_1.q.out
index aac10c0..27e10c0 100644
--- a/ql/src/test/results/clientpositive/tez/vector_date_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_date_1.q.out
@@ -103,6 +103,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: date), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: boolean)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date), VALUE._col0 (type: date), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean), VALUE._col8 (type: boolean)
@@ -115,7 +116,6 @@ STAGE PLANS:
                       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
@@ -211,6 +211,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: date), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: boolean)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date), VALUE._col0 (type: date), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean), VALUE._col8 (type: boolean)
@@ -223,7 +224,6 @@ STAGE PLANS:
                       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
@@ -321,6 +321,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: boolean), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date), VALUE._col0 (type: boolean), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean)
@@ -333,7 +334,6 @@ STAGE PLANS:
                       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
@@ -429,6 +429,7 @@ STAGE PLANS:
                       value expressions: _col1 (type: boolean), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date), VALUE._col0 (type: boolean), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean)
@@ -441,7 +442,6 @@ STAGE PLANS:
                       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
@@ -542,6 +542,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: date)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: date), VALUE._col0 (type: date)
@@ -554,7 +555,6 @@ STAGE PLANS:
                       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
@@ -656,6 +656,7 @@ STAGE PLANS:
                         value expressions: _col1 (type: date)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: 2001-01-01 (type: date), VALUE._col0 (type: date)
@@ -668,7 +669,6 @@ STAGE PLANS:
                       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


Mime
View raw message