http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out 
b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
index e33101c..0a8a8a8 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
@@ -271,8 +271,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_8: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_7: 2100
-   RECORDS_OUT_OPERATOR_SEL_6: 2100
-   RECORDS_OUT_OPERATOR_TS_0: 2100
+   RECORDS_OUT_OPERATOR_SEL_6: 3
+   RECORDS_OUT_OPERATOR_TS_0: 3
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 262144
    ALLOCATED_USED_BYTES: 26
@@ -327,13 +327,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 8
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 8
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 8
-   RECORDS_OUT_OPERATOR_SEL_9: 8
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1048576
    ALLOCATED_USED_BYTES: 2731
@@ -367,13 +367,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 22
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 22
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 22
-   RECORDS_OUT_OPERATOR_SEL_9: 22
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -405,13 +405,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 16
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 16
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 16
-   RECORDS_OUT_OPERATOR_SEL_9: 16
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -443,13 +443,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 18
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 18
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 18
-   RECORDS_OUT_OPERATOR_SEL_9: 18
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -487,7 +487,7 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1
    RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -519,13 +519,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 32
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 32
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 32
-   RECORDS_OUT_OPERATOR_SEL_9: 32
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -557,13 +557,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 32
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 32
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 32
-   RECORDS_OUT_OPERATOR_SEL_9: 32
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -595,13 +595,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 1697
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1697
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1697
-   RECORDS_OUT_OPERATOR_SEL_9: 1697
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -633,13 +633,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 12
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 12
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 12
-   RECORDS_OUT_OPERATOR_SEL_9: 12
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -671,13 +671,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 1713
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1713
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1713
-   RECORDS_OUT_OPERATOR_SEL_9: 1713
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -709,13 +709,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 6
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 6
-   RECORDS_OUT_OPERATOR_TS_0: 100
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -747,13 +747,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 50
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 50
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 50
-   RECORDS_OUT_OPERATOR_SEL_9: 50
-   RECORDS_OUT_OPERATOR_TS_0: 1100
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -785,13 +785,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 318
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 318
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 318
-   RECORDS_OUT_OPERATOR_SEL_9: 318
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -959,13 +959,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1310720
    ALLOCATED_USED_BYTES: 13812
@@ -999,13 +999,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 6
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 6
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1037,13 +1037,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 6
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 6
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1097,13 +1097,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2100
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2100
+   RECORDS_OUT_OPERATOR_FIL_8: 3
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2100
-   RECORDS_OUT_OPERATOR_SEL_9: 2100
-   RECORDS_OUT_OPERATOR_TS_0: 2100
+   RECORDS_OUT_OPERATOR_SEL_9: 3
+   RECORDS_OUT_OPERATOR_TS_0: 3
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1170,13 +1170,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1208,13 +1208,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1246,13 +1246,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1284,13 +1284,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 81
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 81
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 81
-   RECORDS_OUT_OPERATOR_SEL_9: 81
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1322,13 +1322,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 74
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 74
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 74
-   RECORDS_OUT_OPERATOR_SEL_9: 74
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1360,13 +1360,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 12
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 12
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 12
-   RECORDS_OUT_OPERATOR_SEL_9: 12
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1398,13 +1398,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 13
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 13
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 13
-   RECORDS_OUT_OPERATOR_SEL_9: 13
-   RECORDS_OUT_OPERATOR_TS_0: 2000
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1442,7 +1442,7 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1
    RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 100
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1474,13 +1474,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 7
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 7
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 7
-   RECORDS_OUT_OPERATOR_SEL_9: 7
-   RECORDS_OUT_OPERATOR_TS_0: 1100
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1617,13 +1617,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 100
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1655,13 +1655,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 6
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 6
-   RECORDS_OUT_OPERATOR_TS_0: 1100
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 2
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1693,13 +1693,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 6982
    CACHE_MISS_BYTES: 0
@@ -1731,13 +1731,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 100
+   RECORDS_OUT_OPERATOR_SEL_9: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 6982
    CACHE_MISS_BYTES: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out 
b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
index 4c78e89..4d8400e 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
@@ -267,13 +267,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2094
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2094
+   RECORDS_OUT_OPERATOR_FIL_8: 3
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2094
-   RECORDS_OUT_OPERATOR_SEL_9: 2094
-   RECORDS_OUT_OPERATOR_TS_0: 2100
+   RECORDS_OUT_OPERATOR_SEL_9: 3
+   RECORDS_OUT_OPERATOR_TS_0: 3
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1310720
    ALLOCATED_USED_BYTES: 2757
@@ -307,13 +307,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2094
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2094
+   RECORDS_OUT_OPERATOR_FIL_8: 3
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2094
-   RECORDS_OUT_OPERATOR_SEL_9: 2094
-   RECORDS_OUT_OPERATOR_TS_0: 2100
+   RECORDS_OUT_OPERATOR_SEL_9: 3
+   RECORDS_OUT_OPERATOR_TS_0: 3
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/partialdhj.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partialdhj.q.out 
b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
index ec0044f..4546d85 100644
--- a/ql/src/test/results/clientpositive/llap/partialdhj.q.out
+++ b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
@@ -110,6 +110,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: 32 Data size: 2848 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   keys: _col0 (type: string)
@@ -147,6 +148,7 @@ STAGE PLANS:
                 input vertices:
                   0 Reducer 3
                 Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
@@ -343,6 +345,7 @@ STAGE PLANS:
                 input vertices:
                   1 Reducer 5
                 Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
@@ -364,6 +367,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 6
                 Statistics: Num rows: 32 Data size: 2848 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   keys: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
index 31726f6..e248575 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
@@ -244,7 +244,7 @@ Stage-0
                     Output:["_col0"]
                     Filter Operator [FIL_24] (runtime: rows=1 width=8)
                       predicate:((d_year = 2000) and d_date_sk is not null)
-                      TableScan [TS_3] (runtime: rows=2 width=8)
+                      TableScan [TS_3] (runtime: rows=1 width=8)
                         
default@x1_date_dim,d,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"]
                 Dynamic Partitioning Event Operator [EVENT_29] (runtime: 
rows=1 width=8)
                   Group By Operator [GBY_28] (runtime: rows=1 width=8)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
index 7518ae6..37143cb 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
@@ -336,7 +336,7 @@ STAGE PLANS:
                 TableScan
                   alias: d
                   filterExpr: ((d_moy = 3) and d_date_sk is not null) (type: 
boolean)
-                  Statistics: (RUNTIME) Num rows: 8 Data size: 64 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: (RUNTIME) Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((d_moy = 3) and d_date_sk is not null) (type: 
boolean)
                     Statistics: (RUNTIME) Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
index 6f8d52f..b17c58d 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
@@ -221,14 +221,14 @@ STAGE PLANS:
                 TableScan
                   alias: src
                   filterExpr: (UDFToDouble(key) < 10.0D) (type: boolean)
-                  Statistics: Num rows: 500/500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 500/1 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
-                    Statistics: Num rows: 166/10 Data size: 29548 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 166/1 Data size: 29548 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: sign(value) (type: double)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 166/10 Data size: 29548 Basic 
stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 166/1 Data size: 29548 Basic 
stats: COMPLETE Column stats: COMPLETE
                       Group By Operator
                         aggregations: count()
                         keys: _col0 (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out 
b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
index 76cee83..a94fb41 100644
--- a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
+++ b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
@@ -123,19 +123,19 @@ Stage-0
                 <-Map 1 [SIMPLE_EDGE] vectorized, llap
                   SHUFFLE [RS_33]
                     PartitionCols:_col0
-                    Select Operator [SEL_32] (runtime: rows=5 width=4)
+                    Select Operator [SEL_32] (runtime: rows=1 width=4)
                       Output:["_col0"]
-                      Filter Operator [FIL_31] (runtime: rows=5 width=4)
+                      Filter Operator [FIL_31] (runtime: rows=1 width=4)
                         predicate:((u < 10) and (u > 2))
-                        TableScan [TS_0] (runtime: rows=8 width=4)
+                        TableScan [TS_0] (runtime: rows=1 width=4)
                           
default@tx_n3,tx_n3,Tbl:COMPLETE,Col:COMPLETE,Output:["u"]
                 <-Map 4 [SIMPLE_EDGE] vectorized, llap
                   SHUFFLE [RS_36]
                     PartitionCols:_col0
-                    Select Operator [SEL_35] (runtime: rows=3 width=4)
+                    Select Operator [SEL_35] (runtime: rows=1 width=4)
                       Output:["_col0"]
-                      Filter Operator [FIL_34] (runtime: rows=3 width=4)
+                      Filter Operator [FIL_34] (runtime: rows=1 width=4)
                         predicate:((p < 10) and (p > 2))
-                        TableScan [TS_3] (runtime: rows=5 width=4)
+                        TableScan [TS_3] (runtime: rows=1 width=4)
                           
default@px_n0,px_n0,Tbl:COMPLETE,Col:COMPLETE,Output:["p"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/semijoin.q.out 
b/ql/src/test/results/clientpositive/llap/semijoin.q.out
index f343732..3ac562c 100644
--- a/ql/src/test/results/clientpositive/llap/semijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/semijoin.q.out
@@ -1996,7 +1996,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
+                     Full Outer Join 0 to 1
                      Left Semi Join 1 to 2
                 keys:
                   0 key (type: int)
@@ -2422,7 +2422,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Left Semi Join 0 to 1
-                     Outer Join 0 to 2
+                     Full Outer Join 0 to 2
                 keys:
                   0 key (type: int)
                   1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out 
b/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out
index bbaf94b..0c1ad42 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_4.q.out
@@ -464,7 +464,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Left Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -838,7 +838,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Right Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -1044,7 +1044,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
+                     Full Outer Join 0 to 1
                      Left Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
@@ -1161,7 +1161,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
+                     Full Outer Join 0 to 1
                      Right Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
@@ -1275,8 +1275,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 0 to 1
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out 
b/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out
index 6d273cd..6a63463 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_5.q.out
@@ -464,7 +464,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Left Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -838,7 +838,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Right Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -1044,7 +1044,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
+                     Full Outer Join 0 to 1
                      Left Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
@@ -1161,7 +1161,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
+                     Full Outer Join 0 to 1
                      Right Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
@@ -1275,8 +1275,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Outer Join 0 to 1
-                     Outer Join 1 to 2
+                     Full Outer Join 0 to 1
+                     Full Outer Join 1 to 2
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
index 86bc8bd..2bc1d3e 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
@@ -500,6 +500,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col2 (type: int)
@@ -639,6 +640,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col2 (type: int)
@@ -773,6 +775,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
@@ -908,6 +911,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 5
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
index 990e357..07f13bc 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
@@ -197,6 +197,115 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
+                HybridGraceHashJoin: true
+                Limit
+                  Number of rows: 1
+                  Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    table:
+                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: explain
+select a.*
+from alltypesorc a left outer join src b
+on a.cint = cast(b.key as int)
+limit 1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select a.*
+from alltypesorc a left outer join src b
+on a.cint = cast(b.key as int)
+limit 1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+        Reducer 3 <- Map 4 (CUSTOM_SIMPLE_EDGE), Reducer 2 (CUSTOM_SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: a
+                  Statistics: Num rows: 12288 Data size: 3093170 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Select Operator
+                    expressions: ctinyint (type: tinyint), csmallint (type: 
smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), 
cdouble (type: double), cstring1 (type: string), cstring2 (type: string), 
ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: 
boolean), cboolean2 (type: boolean)
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11
+                    Statistics: Num rows: 12288 Data size: 3093170 Basic 
stats: COMPLETE Column stats: COMPLETE
+                    Limit
+                      Number of rows: 1
+                      Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Reduce Output Operator
+                        sort order: 
+                        Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        TopN Hash Memory Usage: 0.1
+                        value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 
(type: double), _col6 (type: string), _col7 (type: string), _col8 (type: 
timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: 
boolean)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+        Map 4 
+            Map Operator Tree:
+                TableScan
+                  alias: b
+                  Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Select Operator
+                    expressions: key (type: string)
+                    outputColumnNames: _col0
+                    Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: UDFToInteger(_col0) (type: int)
+                      sort order: +
+                      Map-reduce partition columns: UDFToInteger(_col0) (type: 
int)
+                      Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: 
smallint), VALUE._col2 (type: int), VALUE._col3 (type: bigint), VALUE._col4 
(type: float), VALUE._col5 (type: double), VALUE._col6 (type: string), 
VALUE._col7 (type: string), VALUE._col8 (type: timestamp), VALUE._col9 (type: 
timestamp), VALUE._col10 (type: boolean), VALUE._col11 (type: boolean)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
+                Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Limit
+                  Number of rows: 1
+                  Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Reduce Output Operator
+                    key expressions: _col2 (type: int)
+                    sort order: +
+                    Map-reduce partition columns: _col2 (type: int)
+                    Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), 
_col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 
(type: timestamp), _col10 (type: boolean), _col11 (type: boolean)
+        Reducer 3 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Map Join Operator
+                condition map:
+                     Left Outer Join 0 to 1
+                keys:
+                  0 KEY.reducesinkkey0 (type: int)
+                  1 KEY.reducesinkkey0 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
+                input vertices:
+                  1 Map 4
+                Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Limit
                   Number of rows: 1

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out 
b/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
index f24906f..d346f04 100644
--- a/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
@@ -1581,8 +1581,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_9: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_8: 1000
-   RECORDS_OUT_OPERATOR_SEL_7: 1000
-   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_SEL_7: 618
+   RECORDS_OUT_OPERATOR_TS_0: 618
 Stage-1 LLAP IO COUNTERS:
    CACHE_MISS_BYTES: 3812
    NUM_DECODED_BATCHES: 618
@@ -1612,8 +1612,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 8
-   RECORDS_OUT_OPERATOR_SEL_9: 8
-   RECORDS_OUT_OPERATOR_TS_0: 8
+   RECORDS_OUT_OPERATOR_SEL_9: 4
+   RECORDS_OUT_OPERATOR_TS_0: 4
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 18
    NUM_DECODED_BATCHES: 4
@@ -1715,8 +1715,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 240
-   RECORDS_OUT_OPERATOR_SEL_9: 240
-   RECORDS_OUT_OPERATOR_TS_0: 240
+   RECORDS_OUT_OPERATOR_SEL_9: 148
+   RECORDS_OUT_OPERATOR_TS_0: 148
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 922
    NUM_DECODED_BATCHES: 148
@@ -1825,10 +1825,10 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_7: 74
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_14: 240
-   RECORDS_OUT_OPERATOR_SEL_11: 240
-   RECORDS_OUT_OPERATOR_SEL_13: 240
+   RECORDS_OUT_OPERATOR_SEL_11: 148
+   RECORDS_OUT_OPERATOR_SEL_13: 148
    RECORDS_OUT_OPERATOR_SEL_8: 74
-   RECORDS_OUT_OPERATOR_TS_0: 240
+   RECORDS_OUT_OPERATOR_TS_0: 148
    TOTAL_TABLE_ROWS_WRITTEN: 240
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 922
@@ -2346,21 +2346,21 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_INTERMEDIATE_Map_4: 240
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 952
    RECORDS_OUT_INTERMEDIATE_Reducer_3: 0
-   RECORDS_OUT_OPERATOR_EVENT_30: 309
+   RECORDS_OUT_OPERATOR_EVENT_30: 1
    RECORDS_OUT_OPERATOR_FS_34: 1
-   RECORDS_OUT_OPERATOR_GBY_29: 309
+   RECORDS_OUT_OPERATOR_GBY_29: 1
    RECORDS_OUT_OPERATOR_GBY_33: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_MERGEJOIN_25: 952
    RECORDS_OUT_OPERATOR_RS_11: 952
    RECORDS_OUT_OPERATOR_RS_27: 1000
    RECORDS_OUT_OPERATOR_RS_32: 240
-   RECORDS_OUT_OPERATOR_SEL_26: 1000
-   RECORDS_OUT_OPERATOR_SEL_28: 1000
-   RECORDS_OUT_OPERATOR_SEL_31: 240
+   RECORDS_OUT_OPERATOR_SEL_26: 618
+   RECORDS_OUT_OPERATOR_SEL_28: 618
+   RECORDS_OUT_OPERATOR_SEL_31: 74
    RECORDS_OUT_OPERATOR_SEL_9: 952
-   RECORDS_OUT_OPERATOR_TS_0: 1000
-   RECORDS_OUT_OPERATOR_TS_3: 240
+   RECORDS_OUT_OPERATOR_TS_0: 618
+   RECORDS_OUT_OPERATOR_TS_3: 74
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 3812
    CACHE_MISS_BYTES: 922

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index 3f4422c..db483d1 100644
--- 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
@@ -499,6 +499,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col2 (type: int)
@@ -633,6 +634,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
@@ -768,6 +770,7 @@ STAGE PLANS:
                 input vertices:
                   1 Map 5
                 Statistics: Num rows: ###Masked### Data size: ###Masked### 
Basic stats: COMPLETE Column stats: NONE
+                DynamicPartitionHashJoin: true
                 HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/union7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union7.q.out 
b/ql/src/test/results/clientpositive/llap/union7.q.out
index a157f36..612bf86 100644
--- a/ql/src/test/results/clientpositive/llap/union7.q.out
+++ b/ql/src/test/results/clientpositive/llap/union7.q.out
@@ -128,20 +128,20 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-128    1
-213    1
-278    1
-369    1
-tst1   1
        10
-150    1
-238    1
-66     1
+128    1
 146    1
+150    1
+213    1
 224    1
+238    1
 255    1
 273    1
+278    1
 311    1
+369    1
 401    1
 406    1
+66     1
 98     1
+tst1   1

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out 
b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
index b1fa6a7..a9971d4 100644
--- a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
@@ -155,10 +155,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0, 1, 2, 3]
+                            valueColumns: 0:decimal(38,18), 1:decimal(38,18), 
2:decimal(38,18), 3:bigint
                         Statistics: Num rows: 1 Data size: 456 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: decimal(38,18)), _col1 
(type: decimal(38,18)), _col2 (type: decimal(38,18)), _col3 (type: bigint)
             Execution mode: vectorized, llap
@@ -295,10 +294,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0, 1, 2, 3]
+                            valueColumns: 0:double, 1:double, 2:double, 
3:bigint
                         Statistics: Num rows: 1 Data size: 40 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: double), _col1 (type: 
double), _col2 (type: double), _col3 (type: bigint)
             Execution mode: vectorized, llap
@@ -435,10 +433,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0, 1, 2, 3]
+                            valueColumns: 0:timestamp, 1:timestamp, 2:double, 
3:bigint
                         Statistics: Num rows: 1 Data size: 136 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: timestamp), _col1 
(type: timestamp), _col2 (type: double), _col3 (type: bigint)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out 
b/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
index 46227d2..396afd3 100644
--- a/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
@@ -95,10 +95,9 @@ STAGE PLANS:
                           sort order: 
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkEmptyKeyOperator
-                              keyColumnNums: []
                               native: true
                               nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                              valueColumnNums: [0, 1]
+                              valueColumns: 0:int, 1:string
                           Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: COMPLETE
                           value expressions: _col0 (type: int), _col1 (type: 
string)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out 
b/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out
index ab37a4d..eb4b262 100644
--- a/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_auto_smb_mapjoin_14.q.out
@@ -106,6 +106,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -240,6 +243,9 @@ STAGE PLANS:
                             Map-reduce partition columns: _col0 (type: int)
                             Statistics: Num rows: 11 Data size: 44 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -448,6 +454,9 @@ STAGE PLANS:
                             Statistics: Num rows: 11 Data size: 44 Basic 
stats: COMPLETE Column stats: NONE
                             value expressions: _col1 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Map 5 
             Map Operator Tree:
                 TableScan
@@ -494,6 +503,9 @@ STAGE PLANS:
                             Statistics: Num rows: 11 Data size: 44 Basic 
stats: COMPLETE Column stats: NONE
                             value expressions: _col1 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -549,6 +561,9 @@ STAGE PLANS:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                         serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 6 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -705,6 +720,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -844,6 +862,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1007,6 +1028,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1158,6 +1182,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1353,6 +1380,9 @@ STAGE PLANS:
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     value expressions: _col0 (type: bigint)
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 3 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1478,6 +1508,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1623,6 +1656,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1770,6 +1806,9 @@ STAGE PLANS:
                             Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col0 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -1944,6 +1983,9 @@ STAGE PLANS:
                                 serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                                 name: default.dest2_n40
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
 
   Stage: Stage-3
     Dependency Collection
@@ -2169,6 +2211,9 @@ STAGE PLANS:
                               Statistics: Num rows: 11 Data size: 2068 Basic 
stats: COMPLETE Column stats: NONE
                               value expressions: _col1 (type: bigint)
             Execution mode: llap
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out 
b/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out
index 1824976..be0e5ca 100644
--- a/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_between_columns.q.out
@@ -196,6 +196,9 @@ STAGE PLANS:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                         serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
 
   Stage: Stage-0
     Fetch Operator
@@ -368,6 +371,9 @@ STAGE PLANS:
                           input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            MergeJoin Vectorization:
+                enabled: false
+                enableConditionsNotMet: Vectorizing MergeJoin Supported IS 
false
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out 
b/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out
index 6c461f0..cabc2b7 100644
--- a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out
@@ -157,6 +157,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerStringOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21
                         input vertices:
                           1 Map 4
@@ -571,6 +572,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerLongOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col3
                         input vertices:
                           1 Map 2

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
index 5c0ac9d..781f990 100644
--- a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
@@ -415,10 +415,10 @@ STAGE PLANS:
                       sort order: +++
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [1, 2, 3]
+                          keyColumns: 1:timestamp, 2:string, 3:timestamp
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [10, 12, 13, 14, 11, 7, 16, 23]
+                          valueColumns: 10:string, 12:string, 13:string, 
14:int, 11:string, 7:int, 16:int, 23:date
                       Statistics: Num rows: 51 Data size: 16000 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col2 (type: string), _col3 (type: 
string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 
(type: int), _col8 (type: int), _col9 (type: date)
             Execution mode: vectorized, llap
@@ -700,10 +700,10 @@ STAGE PLANS:
                       sort order: +++
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [1, 2, 3]
+                          keyColumns: 1:timestamp, 2:string, 3:timestamp
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [15, 26, 36, 40, 42, 44, 46, 53]
+                          valueColumns: 15:string, 26:string, 36:string, 
40:int, 42:string, 44:int, 46:int, 53:date
                       Statistics: Num rows: 51 Data size: 16000 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col2 (type: string), _col3 (type: 
string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 
(type: int), _col8 (type: int), _col9 (type: date)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out
index 4ae125b..c92eddf 100644
--- a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out
@@ -178,6 +178,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerStringOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2, _col3
                         input vertices:
                           1 Map 3
@@ -391,6 +392,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerStringOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2, _col3
                         input vertices:
                           0 Map 1
@@ -562,6 +564,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerStringOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2, _col3
                         input vertices:
                           0 Map 1

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out 
b/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
index 2fda570..1953826 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
@@ -99,14 +99,15 @@ STAGE PLANS:
                         0 _col0 (type: bigint)
                         1 _col0 (type: bigint)
                       Map Join Vectorization:
-                          bigTableKeyColumnNums: [0]
-                          bigTableRetainedColumnNums: [0]
-                          bigTableValueColumnNums: [0]
+                          bigTableKeyColumns: 0:bigint
+                          bigTableRetainColumnNums: [0]
+                          bigTableValueColumns: 0:bigint
                           className: VectorMapJoinOuterLongOperator
                           native: true
                           nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Outer Join has keys IS true, Optimized 
Table and Supports Key Types IS true
-                          projectedOutputColumnNums: [0, 2]
-                          smallTableMapping: [2]
+                          projectedOutput: 0:bigint, 2:bigint
+                          smallTableValueMapping: 2:bigint
+                          hashTableImplementationType: OPTIMIZED
                       outputColumnNames: _col0, _col2
                       input vertices:
                         1 Map 2
@@ -169,10 +170,10 @@ STAGE PLANS:
                       Map-reduce partition columns: _col0 (type: bigint)
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkLongOperator
-                          keyColumnNums: [0]
+                          keyColumns: 0:bigint
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [1]
+                          valueColumns: 1:bigint
                       Statistics: Num rows: 3 Data size: 48 Basic stats: 
COMPLETE Column stats: COMPLETE
                       value expressions: _col1 (type: bigint)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out 
b/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
index 28415c0..01b746d 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
@@ -70,10 +70,10 @@ STAGE PLANS:
                       sort order: ++
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [0, 1]
+                          keyColumns: 0:int, 1:int
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [3]
+                          valueColumns: 3:int
                       Statistics: Num rows: 2 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
                       value expressions: _col0 (type: int)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out 
b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
index 4e1698d..b6247ef 100644
--- a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
@@ -690,10 +690,9 @@ STAGE PLANS:
                       sort order: 
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkEmptyKeyOperator
-                          keyColumnNums: []
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [0, 1, 2, 3]
+                          valueColumns: 0:string, 1:map<string,string>, 
2:array<string>, 3:struct<a:string,b:string>
                       Statistics: Num rows: 1 Data size: 3440 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col0 (type: string), _col1 (type: 
map<string,string>), _col2 (type: array<string>), _col3 (type: 
struct<a:string,b:string>)
             Execution mode: vectorized, llap
@@ -730,10 +729,8 @@ STAGE PLANS:
                       sort order: 
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkEmptyKeyOperator
-                          keyColumnNums: []
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: []
                       Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             Map Vectorization:
@@ -769,10 +766,8 @@ STAGE PLANS:
                       sort order: 
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkEmptyKeyOperator
-                          keyColumnNums: []
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: []
                       Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: COMPLETE
             Execution mode: vectorized, llap
             Map Vectorization:
@@ -953,10 +948,9 @@ STAGE PLANS:
                         sort order: 
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkEmptyKeyOperator
-                            keyColumnNums: []
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [0]
+                            valueColumns: 0:bigint
                         Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col0 (type: bigint)
             Execution mode: vectorized, llap
@@ -1178,10 +1172,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkStringOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:string
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:bigint
                         Statistics: Num rows: 13503 Data size: 4721072 Basic 
stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
             Execution mode: vectorized, llap
@@ -1321,10 +1315,10 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkStringOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:string
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:bigint
                         Statistics: Num rows: 13503 Data size: 7697400 Basic 
stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
             Execution mode: vectorized, llap

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out 
b/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out
index b908894..d222460 100644
--- a/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_complex_join.q.out
@@ -73,6 +73,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerLongOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
                         input vertices:
                           1 Map 2
@@ -254,6 +255,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerLongOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2
                         input vertices:
                           1 Map 2
@@ -399,6 +401,7 @@ STAGE PLANS:
                             className: VectorMapJoinInnerLongOperator
                             native: true
                             nativeConditionsMet: 
hive.mapjoin.optimized.hashtable IS true, 
hive.vectorized.execution.mapjoin.native.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, One MapJoin Condition IS true, No nullsafe IS 
true, Small table vectorizes IS true, Optimized Table and Supports Key Types IS 
true
+                            hashTableImplementationType: OPTIMIZED
                         outputColumnNames: _col0, _col1, _col2
                         input vertices:
                           1 Map 2

http://git-wip-us.apache.org/repos/asf/hive/blob/a37827ec/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
index 32edfa6..1d16d65 100644
--- a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
@@ -128,10 +128,10 @@ STAGE PLANS:
                       sort order: +
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [0]
+                          keyColumns: 0:date
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [1, 3, 4, 5, 6, 7, 8, 9, 10]
+                          valueColumns: 1:date, 3:boolean, 4:boolean, 
5:boolean, 6:boolean, 7:boolean, 8:boolean, 9:boolean, 10:boolean
                       Statistics: Num rows: 3 Data size: 336 Basic stats: 
COMPLETE Column stats: NONE
                       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, llap
@@ -293,10 +293,10 @@ STAGE PLANS:
                       sort order: +
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [0]
+                          keyColumns: 0:date
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [1, 3, 4, 5, 6, 7, 8, 9, 10]
+                          valueColumns: 1:date, 3:boolean, 4:boolean, 
5:boolean, 6:boolean, 7:boolean, 8:boolean, 9:boolean, 10:boolean
                       Statistics: Num rows: 3 Data size: 336 Basic stats: 
COMPLETE Column stats: NONE
                       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, llap
@@ -458,10 +458,10 @@ STAGE PLANS:
                       sort order: +
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [0]
+                          keyColumns: 0:date
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [3, 4, 5, 6, 7]
+                          valueColumns: 3:boolean, 4:boolean, 5:boolean, 
6:boolean, 7:boolean
                       Statistics: Num rows: 3 Data size: 168 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: boolean), _col2 (type: 
boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean)
             Execution mode: vectorized, llap
@@ -623,10 +623,10 @@ STAGE PLANS:
                       sort order: +
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkObjectHashOperator
-                          keyColumnNums: [0]
+                          keyColumns: 0:date
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                          valueColumnNums: [3, 4, 5, 6, 7]
+                          valueColumns: 3:boolean, 4:boolean, 5:boolean, 
6:boolean, 7:boolean
                       Statistics: Num rows: 3 Data size: 168 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: boolean), _col2 (type: 
boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean)
             Execution mode: vectorized, llap
@@ -793,10 +793,10 @@ STAGE PLANS:
                         sort order: +
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkObjectHashOperator
-                            keyColumnNums: [0]
+                            keyColumns: 0:date
                             native: true
                             nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, 
BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                            valueColumnNums: [1]
+                            valueColumns: 1:date
                         Statistics: Num rows: 1 Data size: 112 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: date)
             Execution mode: vectorized, llap

Reply via email to