You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2017/07/15 08:06:50 UTC

[11/24] hive git commit: HIVE-16996: Add HLL as an alternative to FM sketch to compute stats (Pengcheng Xiong, reviewed by Ashutosh Chauhan, Prasanth Jayachandran)

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
index 87b8cae..eb1268c 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -397,9 +397,9 @@ Stage-0
                       <-Reducer 8 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_21]
                           PartitionCols:_col0
-                          Select Operator [SEL_17] (rows=1 width=89)
+                          Select Operator [SEL_17] (rows=2 width=89)
                             Output:["_col0","_col1"]
-                            Group By Operator [GBY_16] (rows=1 width=93)
+                            Group By Operator [GBY_16] (rows=2 width=93)
                               Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
                             <-Map 7 [SIMPLE_EDGE] llap
                               SHUFFLE [RS_15]
@@ -926,9 +926,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=100 width=7)
+        Select Operator [SEL_7] (rows=80 width=7)
           Output:["_col0","_col1"]
-          Merge Join Operator [MERGEJOIN_11] (rows=100 width=7)
+          Merge Join Operator [MERGEJOIN_11] (rows=80 width=7)
             Conds:RS_4._col0=RS_5._col0(Left Outer),Output:["_col1","_col3"]
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_4]
@@ -960,9 +960,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_8]
-        Select Operator [SEL_7] (rows=100 width=7)
+        Select Operator [SEL_7] (rows=80 width=7)
           Output:["_col0","_col1"]
-          Merge Join Operator [MERGEJOIN_9] (rows=100 width=7)
+          Merge Join Operator [MERGEJOIN_9] (rows=80 width=7)
             Conds:RS_4._col0=RS_5._col0(Outer),Output:["_col1","_col3"]
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_4]
@@ -994,9 +994,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=291 width=100)
+        Select Operator [SEL_13] (rows=194 width=100)
           Output:["_col0","_col1","_col2","_col3","_col4"]
-          Merge Join Operator [MERGEJOIN_24] (rows=291 width=100)
+          Merge Join Operator [MERGEJOIN_24] (rows=194 width=100)
             Conds:RS_9._col0=RS_10._col0(Inner),RS_9._col0=RS_11._col0(Inner),Output:["_col1","_col2","_col4","_col5","_col6"]
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_9]
@@ -1041,9 +1041,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=291 width=177)
+        Select Operator [SEL_13] (rows=194 width=177)
           Output:["_col0","_col1","_col2","_col3"]
-          Merge Join Operator [MERGEJOIN_24] (rows=291 width=177)
+          Merge Join Operator [MERGEJOIN_24] (rows=194 width=177)
             Conds:RS_9._col0=RS_10._col0(Inner),RS_9._col0=RS_11._col0(Inner),Output:["_col0","_col1","_col3","_col4"]
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_9]
@@ -1088,9 +1088,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=72 width=101)
+        Select Operator [SEL_13] (rows=40 width=101)
           Output:["_col0","_col1","_col2","_col3","_col4"]
-          Merge Join Operator [MERGEJOIN_24] (rows=72 width=101)
+          Merge Join Operator [MERGEJOIN_24] (rows=40 width=101)
             Conds:RS_9._col0=RS_10._col0(Inner),RS_9._col0=RS_11._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col6"],residual filter predicates:{((_col1 + _col4) = 2)} {((_col1 > 0) or (_col6 >= 0))}
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_9]
@@ -1135,9 +1135,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=72 width=101)
+        Select Operator [SEL_13] (rows=40 width=101)
           Output:["_col0","_col1","_col2","_col3","_col4"]
-          Merge Join Operator [MERGEJOIN_24] (rows=72 width=101)
+          Merge Join Operator [MERGEJOIN_24] (rows=40 width=101)
             Conds:RS_9._col0=RS_10._col0(Inner),RS_9._col0=RS_11._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col6"],residual filter predicates:{((_col1 + _col4) = 2)} {((_col1 > 0) or (_col6 >= 0))}
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_9]
@@ -1432,7 +1432,7 @@ Stage-0
           <-Map 3 [SIMPLE_EDGE] llap
             SHUFFLE [RS_9]
               PartitionCols:_col0
-              Group By Operator [GBY_7] (rows=5 width=85)
+              Group By Operator [GBY_7] (rows=6 width=85)
                 Output:["_col0"],keys:_col0
                 Select Operator [SEL_5] (rows=18 width=80)
                   Output:["_col0"]
@@ -1456,9 +1456,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_18]
-        Select Operator [SEL_17] (rows=16 width=93)
+        Select Operator [SEL_17] (rows=14 width=93)
           Output:["_col0","_col1","_col2"]
-          Merge Join Operator [MERGEJOIN_28] (rows=16 width=93)
+          Merge Join Operator [MERGEJOIN_28] (rows=14 width=93)
             Conds:RS_13._col0=RS_14._col0(Left Semi),RS_13._col0=RS_15._col0(Left Semi),Output:["_col0","_col1","_col2"]
           <-Map 1 [SIMPLE_EDGE] llap
             SHUFFLE [RS_13]
@@ -1472,7 +1472,7 @@ Stage-0
           <-Map 3 [SIMPLE_EDGE] llap
             SHUFFLE [RS_14]
               PartitionCols:_col0
-              Group By Operator [GBY_10] (rows=3 width=85)
+              Group By Operator [GBY_10] (rows=4 width=85)
                 Output:["_col0"],keys:_col0
                 Select Operator [SEL_5] (rows=9 width=85)
                   Output:["_col0"]
@@ -1483,7 +1483,7 @@ Stage-0
           <-Map 4 [SIMPLE_EDGE] llap
             SHUFFLE [RS_15]
               PartitionCols:_col0
-              Group By Operator [GBY_12] (rows=6 width=85)
+              Group By Operator [GBY_12] (rows=7 width=85)
                 Output:["_col0"],keys:_col0
                 Select Operator [SEL_8] (rows=18 width=80)
                   Output:["_col0"]
@@ -1682,9 +1682,9 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_19]
-        Select Operator [SEL_18] (rows=332 width=178)
+        Select Operator [SEL_18] (rows=366 width=178)
           Output:["_col0","_col1"]
-          Filter Operator [FIL_17] (rows=332 width=179)
+          Filter Operator [FIL_17] (rows=366 width=179)
             predicate:_col3 is null
             Merge Join Operator [MERGEJOIN_22] (rows=500 width=179)
               Conds:RS_14._col1=RS_15._col0(Left Outer),Output:["_col0","_col1","_col3"]
@@ -1698,9 +1698,9 @@ Stage-0
             <-Reducer 3 [SIMPLE_EDGE] llap
               SHUFFLE [RS_15]
                 PartitionCols:_col0
-                Select Operator [SEL_13] (rows=72 width=95)
+                Select Operator [SEL_13] (rows=83 width=95)
                   Output:["_col0","_col1"]
-                  Group By Operator [GBY_12] (rows=72 width=91)
+                  Group By Operator [GBY_12] (rows=83 width=91)
                     Output:["_col0"],keys:_col1
                     Select Operator [SEL_8] (rows=83 width=178)
                       Output:["_col1"]
@@ -1911,7 +1911,7 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_12]
-        Merge Join Operator [MERGEJOIN_17] (rows=166 width=178)
+        Merge Join Operator [MERGEJOIN_17] (rows=133 width=178)
           Conds:RS_8._col0=RS_9._col0(Left Semi),Output:["_col0","_col1"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_8]
@@ -1925,7 +1925,7 @@ Stage-0
         <-Map 3 [SIMPLE_EDGE] llap
           SHUFFLE [RS_9]
             PartitionCols:_col0
-            Group By Operator [GBY_7] (rows=69 width=87)
+            Group By Operator [GBY_7] (rows=83 width=87)
               Output:["_col0"],keys:_col0
               Select Operator [SEL_5] (rows=166 width=87)
                 Output:["_col0"]
@@ -1957,9 +1957,9 @@ Stage-0
     Stage-1
       Reducer 4 llap
       File Output Operator [FS_22]
-        Select Operator [SEL_21] (rows=5 width=8)
+        Select Operator [SEL_21] (rows=7 width=8)
           Output:["_col0","_col1"]
-          Merge Join Operator [MERGEJOIN_32] (rows=5 width=8)
+          Merge Join Operator [MERGEJOIN_32] (rows=7 width=8)
             Conds:RS_18._col1, _col4=RS_19._col0, _col1(Left Semi),Output:["_col0","_col3"]
           <-Map 6 [SIMPLE_EDGE] llap
             SHUFFLE [RS_19]
@@ -1975,14 +1975,14 @@ Stage-0
           <-Reducer 3 [SIMPLE_EDGE] llap
             SHUFFLE [RS_18]
               PartitionCols:_col1, _col4
-              Merge Join Operator [MERGEJOIN_31] (rows=5 width=16)
+              Merge Join Operator [MERGEJOIN_31] (rows=7 width=16)
                 Conds:RS_13._col0=RS_14._col1(Inner),Output:["_col0","_col1","_col3","_col4"]
               <-Map 5 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_14]
                   PartitionCols:_col1
-                  Select Operator [SEL_9] (rows=17 width=16)
+                  Select Operator [SEL_9] (rows=14 width=16)
                     Output:["_col0","_col1","_col2","_col3"]
-                    Filter Operator [FIL_29] (rows=17 width=16)
+                    Filter Operator [FIL_29] (rows=14 width=16)
                       predicate:((l_linenumber = 1) and l_partkey is not null)
                       TableScan [TS_7] (rows=100 width=16)
                         default@lineitem,li,Tbl:COMPLETE,Col:COMPLETE,Output:["l_orderkey","l_partkey","l_suppkey","l_linenumber"]
@@ -2027,26 +2027,26 @@ Stage-0
     Stage-1
       Reducer 4 llap
       File Output Operator [FS_31]
-        Merge Join Operator [MERGEJOIN_44] (rows=34 width=186)
+        Merge Join Operator [MERGEJOIN_44] (rows=32 width=186)
           Conds:RS_27._col2=RS_28._col0(Left Semi),Output:["_col0","_col1","_col2"]
         <-Reducer 3 [SIMPLE_EDGE] llap
           SHUFFLE [RS_27]
             PartitionCols:_col2
-            Filter Operator [FIL_37] (rows=83 width=186)
+            Filter Operator [FIL_37] (rows=66 width=186)
               predicate:_col2 is not null
-              Group By Operator [GBY_14] (rows=83 width=186)
+              Group By Operator [GBY_14] (rows=66 width=186)
                 Output:["_col0","_col1","_col2"],aggregations:["count(VALUE._col0)"],keys:KEY._col0, KEY._col1
               <-Reducer 2 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_13]
                   PartitionCols:_col0, _col1
-                  Group By Operator [GBY_12] (rows=83 width=186)
+                  Group By Operator [GBY_12] (rows=66 width=186)
                     Output:["_col0","_col1","_col2"],aggregations:["count()"],keys:_col0, _col1
-                    Merge Join Operator [MERGEJOIN_43] (rows=166 width=178)
+                    Merge Join Operator [MERGEJOIN_43] (rows=133 width=178)
                       Conds:RS_8._col0=RS_9._col0(Left Semi),Output:["_col0","_col1"]
                     <-Map 5 [SIMPLE_EDGE] llap
                       SHUFFLE [RS_9]
                         PartitionCols:_col0
-                        Group By Operator [GBY_7] (rows=69 width=87)
+                        Group By Operator [GBY_7] (rows=83 width=87)
                           Output:["_col0"],keys:_col0
                           Select Operator [SEL_5] (rows=166 width=87)
                             Output:["_col0"]
@@ -2066,20 +2066,20 @@ Stage-0
         <-Reducer 6 [SIMPLE_EDGE] llap
           SHUFFLE [RS_28]
             PartitionCols:_col0
-            Group By Operator [GBY_26] (rows=34 width=8)
+            Group By Operator [GBY_26] (rows=41 width=8)
               Output:["_col0"],keys:_col0
-              Select Operator [SEL_24] (rows=69 width=8)
+              Select Operator [SEL_24] (rows=83 width=8)
                 Output:["_col0"]
-                Filter Operator [FIL_40] (rows=69 width=8)
+                Filter Operator [FIL_40] (rows=83 width=8)
                   predicate:_col1 is not null
-                  Select Operator [SEL_42] (rows=69 width=8)
+                  Select Operator [SEL_42] (rows=83 width=8)
                     Output:["_col1"]
-                    Group By Operator [GBY_22] (rows=69 width=95)
+                    Group By Operator [GBY_22] (rows=83 width=95)
                       Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                     <-Map 5 [SIMPLE_EDGE] llap
                       SHUFFLE [RS_21]
                         PartitionCols:_col0
-                        Group By Operator [GBY_20] (rows=69 width=95)
+                        Group By Operator [GBY_20] (rows=83 width=95)
                           Output:["_col0","_col1"],aggregations:["count()"],keys:key
                           Filter Operator [FIL_41] (rows=166 width=87)
                             predicate:(key > '9')
@@ -2212,14 +2212,14 @@ Stage-0
                 <-Reducer 7 [SIMPLE_EDGE] llap
                   SHUFFLE [RS_20]
                     PartitionCols:_col0
-                    Select Operator [SEL_15] (rows=69 width=91)
+                    Select Operator [SEL_15] (rows=83 width=91)
                       Output:["_col0","_col1"]
-                      Group By Operator [GBY_14] (rows=69 width=87)
+                      Group By Operator [GBY_14] (rows=83 width=87)
                         Output:["_col0"],keys:KEY._col0
                       <-Map 5 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_13]
                           PartitionCols:_col0
-                          Group By Operator [GBY_12] (rows=69 width=87)
+                          Group By Operator [GBY_12] (rows=83 width=87)
                             Output:["_col0"],keys:key
                             Filter Operator [FIL_29] (rows=166 width=87)
                               predicate:(key > '2')
@@ -2632,16 +2632,16 @@ Stage-0
           PARTITION_ONLY_SHUFFLE [RS_16]
             Group By Operator [GBY_15] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(_col0)","sum(_col1)"]
-              Select Operator [SEL_13] (rows=14 width=94)
+              Select Operator [SEL_13] (rows=16 width=94)
                 Output:["_col0","_col1"]
-                Group By Operator [GBY_12] (rows=14 width=94)
+                Group By Operator [GBY_12] (rows=16 width=94)
                   Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                 <-Reducer 2 [SIMPLE_EDGE] llap
                   SHUFFLE [RS_11]
                     PartitionCols:_col0
-                    Group By Operator [GBY_10] (rows=14 width=94)
+                    Group By Operator [GBY_10] (rows=16 width=94)
                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                      Merge Join Operator [MERGEJOIN_24] (rows=60 width=86)
+                      Merge Join Operator [MERGEJOIN_24] (rows=40 width=86)
                         Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col0"]
                       <-Map 1 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_6]
@@ -2693,16 +2693,16 @@ Stage-0
           PARTITION_ONLY_SHUFFLE [RS_16]
             Group By Operator [GBY_15] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(_col0)","sum(_col1)"]
-              Select Operator [SEL_13] (rows=14 width=94)
+              Select Operator [SEL_13] (rows=16 width=94)
                 Output:["_col0","_col1"]
-                Group By Operator [GBY_12] (rows=14 width=94)
+                Group By Operator [GBY_12] (rows=16 width=94)
                   Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                 <-Reducer 2 [SIMPLE_EDGE] llap
                   SHUFFLE [RS_11]
                     PartitionCols:_col0
-                    Group By Operator [GBY_10] (rows=14 width=94)
+                    Group By Operator [GBY_10] (rows=16 width=94)
                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                      Merge Join Operator [MERGEJOIN_24] (rows=60 width=86)
+                      Merge Join Operator [MERGEJOIN_24] (rows=40 width=86)
                         Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col0"]
                       <-Map 1 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_6]
@@ -2754,16 +2754,16 @@ Stage-0
           PARTITION_ONLY_SHUFFLE [RS_16]
             Group By Operator [GBY_15] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(_col0)","sum(_col1)"]
-              Select Operator [SEL_13] (rows=14 width=94)
+              Select Operator [SEL_13] (rows=16 width=94)
                 Output:["_col0","_col1"]
-                Group By Operator [GBY_12] (rows=14 width=94)
+                Group By Operator [GBY_12] (rows=16 width=94)
                   Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                 <-Map 2 [SIMPLE_EDGE] llap
                   SHUFFLE [RS_11]
                     PartitionCols:_col0
-                    Group By Operator [GBY_10] (rows=14 width=94)
+                    Group By Operator [GBY_10] (rows=16 width=94)
                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                      Map Join Operator [MAPJOIN_24] (rows=60 width=86)
+                      Map Join Operator [MAPJOIN_24] (rows=40 width=86)
                         Conds:RS_6._col0=SEL_5._col0(Inner),Output:["_col0"]
                       <-Map 1 [BROADCAST_EDGE] llap
                         BROADCAST [RS_6]
@@ -2812,16 +2812,16 @@ Stage-0
           PARTITION_ONLY_SHUFFLE [RS_18]
             Group By Operator [GBY_17] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(_col0)","sum(_col1)"]
-              Select Operator [SEL_15] (rows=12 width=94)
+              Select Operator [SEL_15] (rows=10 width=94)
                 Output:["_col0","_col1"]
-                Group By Operator [GBY_14] (rows=12 width=94)
+                Group By Operator [GBY_14] (rows=10 width=94)
                   Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                 <-Reducer 2 [SIMPLE_EDGE] llap
                   SHUFFLE [RS_13]
                     PartitionCols:_col0
-                    Group By Operator [GBY_12] (rows=12 width=94)
+                    Group By Operator [GBY_12] (rows=10 width=94)
                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                      Merge Join Operator [MERGEJOIN_26] (rows=25 width=86)
+                      Merge Join Operator [MERGEJOIN_26] (rows=20 width=86)
                         Conds:RS_8._col0=RS_9._col0(Left Semi),Output:["_col0"]
                       <-Map 1 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_8]
@@ -2835,7 +2835,7 @@ Stage-0
                       <-Map 5 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_9]
                           PartitionCols:_col0
-                          Group By Operator [GBY_7] (rows=205 width=87)
+                          Group By Operator [GBY_7] (rows=250 width=87)
                             Output:["_col0"],keys:_col0
                             Select Operator [SEL_5] (rows=500 width=87)
                               Output:["_col0"]
@@ -4157,23 +4157,23 @@ Stage-0
     Stage-1
       Reducer 3 llap
       File Output Operator [FS_16]
-        Select Operator [SEL_14] (rows=29 width=227)
+        Select Operator [SEL_14] (rows=27 width=227)
           Output:["_col0","_col1","_col2","_col3"]
-          PTF Operator [PTF_13] (rows=29 width=223)
+          PTF Operator [PTF_13] (rows=27 width=223)
             Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
-            Select Operator [SEL_12] (rows=29 width=223)
+            Select Operator [SEL_12] (rows=27 width=223)
               Output:["_col1","_col2","_col5"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_11]
                 PartitionCols:_col2
-                PTF Operator [PTF_10] (rows=29 width=223)
+                PTF Operator [PTF_10] (rows=27 width=223)
                   Function definitions:[{},{"Partition table definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}}]
-                  Select Operator [SEL_9] (rows=29 width=223)
+                  Select Operator [SEL_9] (rows=27 width=223)
                     Output:["_col1","_col2","_col5"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_8]
                       PartitionCols:_col2
-                      Map Join Operator [MAPJOIN_21] (rows=29 width=223)
+                      Map Join Operator [MAPJOIN_21] (rows=27 width=223)
                         Conds:FIL_19.p_partkey=RS_5.p_partkey(Inner),Output:["_col1","_col2","_col5"]
                       <-Map 4 [BROADCAST_EDGE] llap
                         BROADCAST [RS_5]
@@ -4375,7 +4375,7 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_11]
-        Map Join Operator [MAPJOIN_16] (rows=29 width=619)
+        Map Join Operator [MAPJOIN_16] (rows=27 width=619)
           Conds:FIL_14._col0=RS_8.p_partkey(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
         <-Map 3 [BROADCAST_EDGE] llap
           BROADCAST [RS_8]
@@ -4697,16 +4697,16 @@ Stage-0
     Stage-1
       Reducer 3 llap
       File Output Operator [FS_15]
-        Select Operator [SEL_13] (rows=29 width=259)
+        Select Operator [SEL_13] (rows=27 width=259)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
-          PTF Operator [PTF_12] (rows=29 width=767)
+          PTF Operator [PTF_12] (rows=27 width=767)
             Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
-            Select Operator [SEL_11] (rows=29 width=767)
+            Select Operator [SEL_11] (rows=27 width=767)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_10]
                 PartitionCols:_col2
-                Map Join Operator [MAPJOIN_20] (rows=29 width=231)
+                Map Join Operator [MAPJOIN_20] (rows=27 width=231)
                   Conds:FIL_18._col0=RS_8.p_partkey(Inner),Output:["_col1","_col2","_col5","_col7"]
                 <-Map 4 [BROADCAST_EDGE] llap
                   BROADCAST [RS_8]
@@ -5257,9 +5257,9 @@ Stage-3
               Reducer 2 llap
               File Output Operator [FS_11]
                 table:{"name:":"default.dest_j1"}
-                Select Operator [SEL_9] (rows=1219 width=95)
+                Select Operator [SEL_9] (rows=809 width=95)
                   Output:["_col0","_col1"]
-                  Merge Join Operator [MERGEJOIN_16] (rows=1219 width=178)
+                  Merge Join Operator [MERGEJOIN_16] (rows=809 width=178)
                     Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col0","_col2"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_6]
@@ -5492,7 +5492,7 @@ Stage-0
     Stage-1
       Reducer 2 llap
       File Output Operator [FS_10]
-        Merge Join Operator [MERGEJOIN_15] (rows=1219 width=356)
+        Merge Join Operator [MERGEJOIN_15] (rows=809 width=356)
           Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col0","_col1","_col2","_col3"]
         <-Map 1 [SIMPLE_EDGE] llap
           SHUFFLE [RS_6]

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
index f8a6526..4f1a4a1 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
@@ -192,36 +192,36 @@ Stage-0
     Stage-1
       Reducer 3 llap
       File Output Operator [FS_16]
-        Select Operator [SEL_15] (rows=141 width=268)
+        Select Operator [SEL_15] (rows=64 width=268)
           Output:["_col0","_col1","_col2"]
-          Merge Join Operator [MERGEJOIN_26] (rows=141 width=268)
-            Conds:RS_12._col3=RS_13._col0(Inner),Output:["_col0","_col3","_col6"]
+          Merge Join Operator [MERGEJOIN_26] (rows=64 width=268)
+            Conds:RS_12._col3=RS_13._col0(Inner),Output:["_col1","_col2","_col4"]
           <-Map 5 [SIMPLE_EDGE] llap
             SHUFFLE [RS_13]
               PartitionCols:_col0
-              Select Operator [SEL_8] (rows=500 width=178)
-                Output:["_col0","_col1"]
-                Filter Operator [FIL_24] (rows=500 width=178)
-                  predicate:key is not null
-                  TableScan [TS_6] (rows=500 width=178)
-                    default@src,y,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
+              Select Operator [SEL_8] (rows=500 width=369)
+                Output:["_col0"]
+                Filter Operator [FIL_24] (rows=500 width=91)
+                  predicate:value is not null
+                  TableScan [TS_6] (rows=500 width=91)
+                    default@srcpart,z,Tbl:COMPLETE,Col:COMPLETE,Output:["value"]
           <-Reducer 2 [SIMPLE_EDGE] llap
             SHUFFLE [RS_12]
               PartitionCols:_col3
-              Merge Join Operator [MERGEJOIN_25] (rows=58 width=177)
-                Conds:RS_9._col0=RS_10._col1(Inner),Output:["_col0","_col3"]
+              Merge Join Operator [MERGEJOIN_25] (rows=40 width=266)
+                Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2","_col3"]
               <-Map 1 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_9]
                   PartitionCols:_col0
-                  Select Operator [SEL_2] (rows=500 width=369)
-                    Output:["_col0"]
-                    Filter Operator [FIL_22] (rows=500 width=91)
-                      predicate:value is not null
-                      TableScan [TS_0] (rows=500 width=91)
-                        default@srcpart,z,Tbl:COMPLETE,Col:COMPLETE,Output:["value"]
+                  Select Operator [SEL_2] (rows=500 width=178)
+                    Output:["_col0","_col1"]
+                    Filter Operator [FIL_22] (rows=500 width=178)
+                      predicate:key is not null
+                      TableScan [TS_0] (rows=500 width=178)
+                        default@src,y,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
               <-Map 4 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_10]
-                  PartitionCols:_col1
+                  PartitionCols:_col0
                   Select Operator [SEL_5] (rows=25 width=175)
                     Output:["_col0","_col1"]
                     Filter Operator [FIL_23] (rows=25 width=175)
@@ -288,15 +288,15 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 10 <- Map 15 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
-Reducer 12 <- Map 11 (SIMPLE_EDGE), Map 13 (SIMPLE_EDGE)
+Reducer 10 <- Reducer 11 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
+Reducer 11 <- Map 15 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
-Reducer 3 <- Reducer 2 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
+Reducer 3 <- Reducer 10 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
-Reducer 7 <- Map 6 (SIMPLE_EDGE), Reducer 12 (SIMPLE_EDGE)
-Reducer 8 <- Map 14 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 10 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
+Reducer 7 <- Map 12 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
+Reducer 8 <- Map 13 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
+Reducer 9 <- Map 14 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
@@ -304,78 +304,56 @@ Stage-0
     Stage-1
       Reducer 5 llap
       File Output Operator [FS_55]
-        Limit [LIM_54] (rows=14 width=285)
+        Limit [LIM_54] (rows=5 width=285)
           Number of rows:100
-          Select Operator [SEL_53] (rows=14 width=285)
+          Select Operator [SEL_53] (rows=5 width=285)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           <-Reducer 4 [SIMPLE_EDGE] llap
             SHUFFLE [RS_52]
-              Group By Operator [GBY_50] (rows=14 width=285)
+              Group By Operator [GBY_50] (rows=5 width=285)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(VALUE._col0)","count(VALUE._col1)","count(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2
               <-Reducer 3 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_49]
                   PartitionCols:_col0, _col1, _col2
-                  Group By Operator [GBY_48] (rows=14 width=285)
-                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(_col13)","count(_col21)","count(_col3)"],keys:_col12, _col20, _col2
-                    Merge Join Operator [MERGEJOIN_97] (rows=363 width=534)
-                      Conds:RS_44._col1, _col3=RS_45._col15, _col17(Inner),Output:["_col2","_col3","_col12","_col13","_col20","_col21"]
-                    <-Reducer 2 [SIMPLE_EDGE] llap
-                      SHUFFLE [RS_44]
-                        PartitionCols:_col1, _col3
-                        Merge Join Operator [MERGEJOIN_91] (rows=99 width=269)
-                          Conds:RS_41._col0=RS_42._col0(Inner),Output:["_col1","_col2","_col3"]
-                        <-Map 6 [SIMPLE_EDGE] llap
-                          SHUFFLE [RS_42]
-                            PartitionCols:_col0
-                            Select Operator [SEL_5] (rows=7 width=178)
-                              Output:["_col0"]
-                              Filter Operator [FIL_84] (rows=7 width=178)
-                                predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null)
-                                TableScan [TS_3] (rows=500 width=178)
-                                  default@src,d3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
-                        <-Map 1 [SIMPLE_EDGE] llap
-                          SHUFFLE [RS_41]
-                            PartitionCols:_col0
-                            Select Operator [SEL_2] (rows=170 width=356)
-                              Output:["_col0","_col1","_col2","_col3"]
-                              Filter Operator [FIL_83] (rows=170 width=356)
-                                predicate:(v2 is not null and v3 is not null and k1 is not null)
-                                TableScan [TS_0] (rows=170 width=356)
-                                  default@cs,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v2","k3","v3"]
-                    <-Reducer 9 [SIMPLE_EDGE] llap
+                  Group By Operator [GBY_48] (rows=5 width=285)
+                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(_col11)","count(_col21)","count(_col3)"],keys:_col10, _col20, _col2
+                    Merge Join Operator [MERGEJOIN_97] (rows=940 width=534)
+                      Conds:RS_44._col1, _col3=RS_45._col15, _col17(Inner),Output:["_col2","_col3","_col10","_col11","_col20","_col21"]
+                    <-Reducer 10 [SIMPLE_EDGE] llap
                       SHUFFLE [RS_45]
                         PartitionCols:_col15, _col17
-                        Select Operator [SEL_40] (rows=180 width=447)
-                          Output:["_col6","_col7","_col14","_col15","_col17"]
-                          Merge Join Operator [MERGEJOIN_96] (rows=180 width=447)
-                            Conds:RS_37._col6, _col4=RS_38._col4, _col2(Inner),Output:["_col2","_col3","_col14","_col15","_col17"]
-                          <-Reducer 10 [SIMPLE_EDGE] llap
+                        Select Operator [SEL_40] (rows=336 width=447)
+                          Output:["_col4","_col5","_col14","_col15","_col17"]
+                          Merge Join Operator [MERGEJOIN_96] (rows=336 width=447)
+                            Conds:RS_37._col4, _col2=RS_38._col4, _col2(Inner),Output:["_col0","_col1","_col14","_col15","_col17"]
+                          <-Reducer 11 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_38]
                               PartitionCols:_col4, _col2
-                              Merge Join Operator [MERGEJOIN_95] (rows=18 width=356)
+                              Merge Join Operator [MERGEJOIN_95] (rows=8 width=356)
                                 Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col2","_col3","_col4","_col5"]
                               <-Map 6 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_25]
                                   PartitionCols:_col0
-                                  Select Operator [SEL_23] (rows=7 width=178)
+                                  Select Operator [SEL_23] (rows=5 width=178)
                                     Output:["_col0"]
-                                    Filter Operator [FIL_90] (rows=7 width=178)
+                                    Filter Operator [FIL_90] (rows=5 width=178)
                                       predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null)
-                                       Please refer to the previous TableScan [TS_3]
+                                      TableScan [TS_3] (rows=500 width=178)
+                                        default@src,d3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
                               <-Map 15 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_24]
                                   PartitionCols:_col0
-                                  Select Operator [SEL_20] (rows=8 width=531)
+                                  Select Operator [SEL_20] (rows=7 width=531)
                                     Output:["_col0","_col2","_col3","_col4","_col5"]
-                                    Filter Operator [FIL_89] (rows=8 width=534)
+                                    Filter Operator [FIL_89] (rows=7 width=534)
                                       predicate:((v1 = 'srv1') and k2 is not null and k3 is not null and v2 is not null and v3 is not null and k1 is not null)
                                       TableScan [TS_18] (rows=85 width=534)
                                         default@sr,sr,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"]
-                          <-Reducer 8 [SIMPLE_EDGE] llap
+                          <-Reducer 9 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_37]
-                              PartitionCols:_col6, _col4
-                              Merge Join Operator [MERGEJOIN_94] (rows=40 width=352)
-                                Conds:RS_34._col3=RS_35._col1(Inner),Output:["_col2","_col3","_col4","_col6"]
+                              PartitionCols:_col4, _col2
+                              Merge Join Operator [MERGEJOIN_94] (rows=42 width=352)
+                                Conds:RS_34._col1=RS_35._col1(Inner),Output:["_col0","_col1","_col2","_col4"]
                               <-Map 14 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_35]
                                   PartitionCols:_col1
@@ -385,42 +363,64 @@ Stage-0
                                       predicate:((key = 'src1key') and value is not null)
                                       TableScan [TS_15] (rows=25 width=175)
                                         default@src1,src1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
-                              <-Reducer 7 [SIMPLE_EDGE] llap
+                              <-Reducer 8 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_34]
-                                  PartitionCols:_col3
-                                  Merge Join Operator [MERGEJOIN_93] (rows=40 width=352)
-                                    Conds:RS_31._col2=RS_32._col0(Inner),Output:["_col2","_col3","_col4","_col6"]
-                                  <-Map 6 [SIMPLE_EDGE] llap
+                                  PartitionCols:_col1
+                                  Merge Join Operator [MERGEJOIN_93] (rows=42 width=352)
+                                    Conds:RS_31._col3=RS_32._col1(Inner),Output:["_col0","_col1","_col2","_col4"]
+                                  <-Map 13 [SIMPLE_EDGE] llap
                                     SHUFFLE [RS_32]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_14] (rows=2 width=178)
-                                        Output:["_col0"]
-                                        Filter Operator [FIL_87] (rows=2 width=178)
-                                          predicate:((value = 'd1value') and key is not null)
-                                           Please refer to the previous TableScan [TS_3]
-                                  <-Reducer 12 [SIMPLE_EDGE] llap
+                                      PartitionCols:_col1
+                                      Select Operator [SEL_14] (rows=6 width=185)
+                                        Output:["_col1"]
+                                        Filter Operator [FIL_87] (rows=6 width=178)
+                                          predicate:((key = 'srcpartkey') and value is not null)
+                                          TableScan [TS_12] (rows=2000 width=178)
+                                            default@srcpart,srcpart,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
+                                  <-Reducer 7 [SIMPLE_EDGE] llap
                                     SHUFFLE [RS_31]
-                                      PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_92] (rows=40 width=352)
-                                        Conds:RS_28._col1=RS_29._col3(Inner),Output:["_col2","_col3","_col4","_col6"]
-                                      <-Map 11 [SIMPLE_EDGE] llap
-                                        SHUFFLE [RS_28]
-                                          PartitionCols:_col1
-                                          Select Operator [SEL_8] (rows=10 width=185)
-                                            Output:["_col1"]
-                                            Filter Operator [FIL_85] (rows=10 width=178)
-                                              predicate:((key = 'srcpartkey') and value is not null)
-                                              TableScan [TS_6] (rows=2000 width=178)
-                                                default@srcpart,srcpart,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
-                                      <-Map 13 [SIMPLE_EDGE] llap
+                                      PartitionCols:_col3
+                                      Merge Join Operator [MERGEJOIN_92] (rows=7 width=443)
+                                        Conds:RS_28._col0=RS_29._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4"]
+                                      <-Map 6 [SIMPLE_EDGE] llap
                                         SHUFFLE [RS_29]
-                                          PartitionCols:_col3
-                                          Select Operator [SEL_11] (rows=8 width=531)
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_11] (rows=2 width=178)
+                                            Output:["_col0"]
+                                            Filter Operator [FIL_86] (rows=2 width=178)
+                                              predicate:((value = 'd1value') and key is not null)
+                                               Please refer to the previous TableScan [TS_3]
+                                      <-Map 12 [SIMPLE_EDGE] llap
+                                        SHUFFLE [RS_28]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_8] (rows=7 width=531)
                                             Output:["_col0","_col1","_col2","_col3","_col4"]
-                                            Filter Operator [FIL_86] (rows=8 width=534)
+                                            Filter Operator [FIL_85] (rows=7 width=534)
                                               predicate:((v3 = 'ssv3') and k2 is not null and k3 is not null and k1 is not null and v1 is not null and v2 is not null)
-                                              TableScan [TS_9] (rows=85 width=534)
+                                              TableScan [TS_6] (rows=85 width=534)
                                                 default@ss,ss,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"]
+                    <-Reducer 2 [SIMPLE_EDGE] llap
+                      SHUFFLE [RS_44]
+                        PartitionCols:_col1, _col3
+                        Merge Join Operator [MERGEJOIN_91] (rows=70 width=269)
+                          Conds:RS_41._col0=RS_42._col0(Inner),Output:["_col1","_col2","_col3"]
+                        <-Map 6 [SIMPLE_EDGE] llap
+                          SHUFFLE [RS_42]
+                            PartitionCols:_col0
+                            Select Operator [SEL_5] (rows=5 width=178)
+                              Output:["_col0"]
+                              Filter Operator [FIL_84] (rows=5 width=178)
+                                predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null)
+                                 Please refer to the previous TableScan [TS_3]
+                        <-Map 1 [SIMPLE_EDGE] llap
+                          SHUFFLE [RS_41]
+                            PartitionCols:_col0
+                            Select Operator [SEL_2] (rows=170 width=356)
+                              Output:["_col0","_col1","_col2","_col3"]
+                              Filter Operator [FIL_83] (rows=170 width=356)
+                                predicate:(v2 is not null and v3 is not null and k1 is not null)
+                                TableScan [TS_0] (rows=170 width=356)
+                                  default@cs,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v2","k3","v3"]
 
 PREHOOK: query: explain
 SELECT x.key, z.value, y.value
@@ -469,9 +469,9 @@ Stage-0
               PartitionCols:_col0, _col1
               Group By Operator [GBY_55] (rows=28 width=177)
                 Output:["_col0","_col1"],keys:_col0, _col1
-                Select Operator [SEL_51] (rows=73 width=177)
+                Select Operator [SEL_51] (rows=33 width=177)
                   Output:["_col0","_col1"]
-                  Merge Join Operator [MERGEJOIN_85] (rows=73 width=177)
+                  Merge Join Operator [MERGEJOIN_85] (rows=33 width=177)
                     Conds:RS_48._col2=RS_49._col0(Inner),Output:["_col1","_col2"]
                   <-Map 17 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_49]
@@ -485,7 +485,7 @@ Stage-0
                   <-Reducer 10 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_48]
                       PartitionCols:_col2
-                      Merge Join Operator [MERGEJOIN_84] (rows=30 width=177)
+                      Merge Join Operator [MERGEJOIN_84] (rows=21 width=177)
                         Conds:RS_45._col1=RS_46._col1(Inner),Output:["_col1","_col2"]
                       <-Map 9 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_46]
@@ -531,9 +531,9 @@ Stage-0
               PartitionCols:_col0, _col1
               Group By Operator [GBY_55] (rows=28 width=177)
                 Output:["_col0","_col1"],keys:_col0, _col1
-                Select Operator [SEL_25] (rows=73 width=177)
+                Select Operator [SEL_25] (rows=33 width=177)
                   Output:["_col0","_col1"]
-                  Merge Join Operator [MERGEJOIN_83] (rows=73 width=177)
+                  Merge Join Operator [MERGEJOIN_83] (rows=33 width=177)
                     Conds:RS_22._col2=RS_23._col0(Inner),Output:["_col1","_col2"]
                   <-Map 12 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_23]
@@ -547,7 +547,7 @@ Stage-0
                   <-Reducer 4 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_22]
                       PartitionCols:_col2
-                      Merge Join Operator [MERGEJOIN_82] (rows=30 width=177)
+                      Merge Join Operator [MERGEJOIN_82] (rows=21 width=177)
                         Conds:RS_19._col1=RS_20._col1(Inner),Output:["_col1","_col2"]
                       <-Map 9 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_20]
@@ -643,17 +643,17 @@ Stage-0
     Stage-1
       Reducer 9 llap
       File Output Operator [FS_122]
-        Group By Operator [GBY_120] (rows=107 width=177)
+        Group By Operator [GBY_120] (rows=48 width=177)
           Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
         <-Union 8 [SIMPLE_EDGE]
           <-Reducer 15 [CONTAINS] llap
             Reduce Output Operator [RS_119]
               PartitionCols:_col0, _col1
-              Group By Operator [GBY_118] (rows=107 width=177)
+              Group By Operator [GBY_118] (rows=48 width=177)
                 Output:["_col0","_col1"],keys:_col0, _col1
-                Select Operator [SEL_114] (rows=124 width=177)
+                Select Operator [SEL_114] (rows=56 width=177)
                   Output:["_col0","_col1"]
-                  Merge Join Operator [MERGEJOIN_170] (rows=124 width=177)
+                  Merge Join Operator [MERGEJOIN_170] (rows=56 width=177)
                     Conds:RS_111._col2=RS_112._col0(Inner),Output:["_col2","_col5"]
                   <-Map 16 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_112]
@@ -667,7 +667,7 @@ Stage-0
                   <-Reducer 14 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_111]
                       PartitionCols:_col2
-                      Merge Join Operator [MERGEJOIN_169] (rows=51 width=86)
+                      Merge Join Operator [MERGEJOIN_169] (rows=35 width=86)
                         Conds:RS_108._col1=RS_109._col1(Inner),Output:["_col2"]
                       <-Map 11 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_109]
@@ -753,19 +753,19 @@ Stage-0
           <-Reducer 7 [CONTAINS] llap
             Reduce Output Operator [RS_119]
               PartitionCols:_col0, _col1
-              Group By Operator [GBY_118] (rows=107 width=177)
+              Group By Operator [GBY_118] (rows=48 width=177)
                 Output:["_col0","_col1"],keys:_col0, _col1
-                Group By Operator [GBY_67] (rows=90 width=177)
+                Group By Operator [GBY_67] (rows=40 width=177)
                   Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
                 <-Union 6 [SIMPLE_EDGE]
                   <-Reducer 13 [CONTAINS] llap
                     Reduce Output Operator [RS_66]
                       PartitionCols:_col0, _col1
-                      Group By Operator [GBY_65] (rows=90 width=177)
+                      Group By Operator [GBY_65] (rows=40 width=177)
                         Output:["_col0","_col1"],keys:_col0, _col1
-                        Select Operator [SEL_61] (rows=107 width=177)
+                        Select Operator [SEL_61] (rows=48 width=177)
                           Output:["_col0","_col1"]
-                          Merge Join Operator [MERGEJOIN_168] (rows=107 width=177)
+                          Merge Join Operator [MERGEJOIN_168] (rows=48 width=177)
                             Conds:RS_58._col2=RS_59._col0(Inner),Output:["_col2","_col5"]
                           <-Map 24 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_59]
@@ -779,7 +779,7 @@ Stage-0
                           <-Reducer 12 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_58]
                               PartitionCols:_col2
-                              Merge Join Operator [MERGEJOIN_167] (rows=44 width=86)
+                              Merge Join Operator [MERGEJOIN_167] (rows=30 width=86)
                                 Conds:RS_55._col1=RS_56._col1(Inner),Output:["_col2"]
                               <-Map 11 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_56]
@@ -839,11 +839,11 @@ Stage-0
                   <-Reducer 5 [CONTAINS] llap
                     Reduce Output Operator [RS_66]
                       PartitionCols:_col0, _col1
-                      Group By Operator [GBY_65] (rows=90 width=177)
+                      Group By Operator [GBY_65] (rows=40 width=177)
                         Output:["_col0","_col1"],keys:_col0, _col1
-                        Select Operator [SEL_25] (rows=73 width=177)
+                        Select Operator [SEL_25] (rows=33 width=177)
                           Output:["_col0","_col1"]
-                          Merge Join Operator [MERGEJOIN_166] (rows=73 width=177)
+                          Merge Join Operator [MERGEJOIN_166] (rows=33 width=177)
                             Conds:RS_22._col2=RS_23._col0(Inner),Output:["_col2","_col5"]
                           <-Map 16 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_23]
@@ -852,7 +852,7 @@ Stage-0
                           <-Reducer 4 [SIMPLE_EDGE] llap
                             SHUFFLE [RS_22]
                               PartitionCols:_col2
-                              Merge Join Operator [MERGEJOIN_165] (rows=30 width=86)
+                              Merge Join Operator [MERGEJOIN_165] (rows=21 width=86)
                                 Conds:RS_19._col1=RS_20._col1(Inner),Output:["_col2"]
                               <-Map 11 [SIMPLE_EDGE] llap
                                 SHUFFLE [RS_20]
@@ -913,21 +913,21 @@ Stage-0
         Select Operator [SEL_15] (rows=605 width=10)
           Output:["_col0","_col1","_col2"]
           Map Join Operator [MAPJOIN_26] (rows=605 width=10)
-            Conds:MAPJOIN_25._col3=RS_13._col0(Inner),Output:["_col0","_col3","_col6"]
+            Conds:MAPJOIN_25._col3=RS_13._col0(Inner),Output:["_col1","_col2","_col4"]
           <-Map 3 [BROADCAST_EDGE] llap
             BROADCAST [RS_13]
               PartitionCols:_col0
               Select Operator [SEL_8] (rows=500 width=10)
-                Output:["_col0","_col1"]
+                Output:["_col0"]
                 Filter Operator [FIL_24] (rows=500 width=10)
-                  predicate:key is not null
+                  predicate:value is not null
                   TableScan [TS_6] (rows=500 width=10)
-                    default@src,y,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
+                    default@srcpart,z,Tbl:COMPLETE,Col:NONE,Output:["value"]
           <-Map Join Operator [MAPJOIN_25] (rows=550 width=10)
-              Conds:SEL_2._col0=RS_10._col1(Inner),Output:["_col0","_col3"]
+              Conds:SEL_2._col0=RS_10._col0(Inner),Output:["_col1","_col2","_col3"]
             <-Map 2 [BROADCAST_EDGE] llap
               BROADCAST [RS_10]
-                PartitionCols:_col1
+                PartitionCols:_col0
                 Select Operator [SEL_5] (rows=25 width=7)
                   Output:["_col0","_col1"]
                   Filter Operator [FIL_23] (rows=25 width=7)
@@ -935,11 +935,11 @@ Stage-0
                     TableScan [TS_3] (rows=25 width=7)
                       default@src1,x,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
             <-Select Operator [SEL_2] (rows=500 width=10)
-                Output:["_col0"]
+                Output:["_col0","_col1"]
                 Filter Operator [FIL_22] (rows=500 width=10)
-                  predicate:value is not null
+                  predicate:key is not null
                   TableScan [TS_0] (rows=500 width=10)
-                    default@srcpart,z,Tbl:COMPLETE,Col:NONE,Output:["value"]
+                    default@src,y,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
 
 PREHOOK: query: EXPLAIN
 select 
@@ -1002,31 +1002,32 @@ Plan optimized by CBO.
 Vertex dependency in root stage
 Map 10 <- Map 9 (BROADCAST_EDGE)
 Map 2 <- Map 1 (BROADCAST_EDGE)
-Map 3 <- Map 10 (BROADCAST_EDGE), Map 2 (BROADCAST_EDGE), Map 6 (BROADCAST_EDGE), Map 7 (BROADCAST_EDGE), Map 8 (BROADCAST_EDGE)
-Reducer 4 <- Map 3 (SIMPLE_EDGE)
-Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
+Map 4 <- Map 3 (BROADCAST_EDGE)
+Map 5 <- Map 10 (BROADCAST_EDGE), Map 2 (BROADCAST_EDGE), Map 4 (BROADCAST_EDGE), Map 8 (BROADCAST_EDGE)
+Reducer 6 <- Map 5 (SIMPLE_EDGE)
+Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
-      Reducer 5 llap
+      Reducer 7 llap
       File Output Operator [FS_55]
         Limit [LIM_54] (rows=100 width=10)
           Number of rows:100
-          Select Operator [SEL_53] (rows=805 width=10)
+          Select Operator [SEL_53] (rows=732 width=10)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-          <-Reducer 4 [SIMPLE_EDGE] llap
+          <-Reducer 6 [SIMPLE_EDGE] llap
             SHUFFLE [RS_52]
-              Group By Operator [GBY_50] (rows=805 width=10)
+              Group By Operator [GBY_50] (rows=732 width=10)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(VALUE._col0)","count(VALUE._col1)","count(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2
-              <-Map 3 [SIMPLE_EDGE] llap
+              <-Map 5 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_49]
                   PartitionCols:_col0, _col1, _col2
-                  Group By Operator [GBY_48] (rows=1610 width=10)
-                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(_col13)","count(_col21)","count(_col3)"],keys:_col12, _col20, _col2
-                    Map Join Operator [MAPJOIN_97] (rows=1610 width=10)
-                      Conds:RS_44._col1, _col3=SEL_40._col15, _col17(Inner),Output:["_col2","_col3","_col12","_col13","_col20","_col21"]
+                  Group By Operator [GBY_48] (rows=1464 width=10)
+                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["count(_col11)","count(_col21)","count(_col3)"],keys:_col10, _col20, _col2
+                    Map Join Operator [MAPJOIN_97] (rows=1464 width=10)
+                      Conds:RS_44._col1, _col3=SEL_40._col15, _col17(Inner),Output:["_col2","_col3","_col10","_col11","_col20","_col21"]
                     <-Map 2 [BROADCAST_EDGE] llap
                       BROADCAST [RS_44]
                         PartitionCols:_col1, _col3
@@ -1047,10 +1048,10 @@ Stage-0
                               predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null)
                               TableScan [TS_3] (rows=500 width=10)
                                 default@src,d3,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
-                    <-Select Operator [SEL_40] (rows=1464 width=10)
-                        Output:["_col6","_col7","_col14","_col15","_col17"]
-                        Map Join Operator [MAPJOIN_96] (rows=1464 width=10)
-                          Conds:MAPJOIN_94._col6, _col4=RS_38._col4, _col2(Inner),Output:["_col2","_col3","_col14","_col15","_col17"]
+                    <-Select Operator [SEL_40] (rows=1331 width=10)
+                        Output:["_col4","_col5","_col14","_col15","_col17"]
+                        Map Join Operator [MAPJOIN_96] (rows=1331 width=10)
+                          Conds:MAPJOIN_94._col4, _col2=RS_38._col4, _col2(Inner),Output:["_col0","_col1","_col14","_col15","_col17"]
                         <-Map 10 [BROADCAST_EDGE] llap
                           BROADCAST [RS_38]
                             PartitionCols:_col4, _col2
@@ -1071,8 +1072,8 @@ Stage-0
                                   predicate:((value) IN ('2000Q1', '2000Q2', '2000Q3') and key is not null)
                                   TableScan [TS_21] (rows=500 width=10)
                                     default@src,d2,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
-                        <-Map Join Operator [MAPJOIN_94] (rows=1331 width=10)
-                            Conds:MAPJOIN_93._col3=RS_35._col1(Inner),Output:["_col2","_col3","_col4","_col6"]
+                        <-Map Join Operator [MAPJOIN_94] (rows=1210 width=10)
+                            Conds:MAPJOIN_93._col1=RS_35._col1(Inner),Output:["_col0","_col1","_col2","_col4"]
                           <-Map 8 [BROADCAST_EDGE] llap
                             BROADCAST [RS_35]
                               PartitionCols:_col1
@@ -1082,34 +1083,34 @@ Stage-0
                                   predicate:((key = 'src1key') and value is not null)
                                   TableScan [TS_15] (rows=25 width=7)
                                     default@src1,src1,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
-                          <-Map Join Operator [MAPJOIN_93] (rows=1210 width=10)
-                              Conds:MAPJOIN_92._col2=RS_32._col0(Inner),Output:["_col2","_col3","_col4","_col6"]
-                            <-Map 7 [BROADCAST_EDGE] llap
-                              BROADCAST [RS_32]
-                                PartitionCols:_col0
-                                Select Operator [SEL_14] (rows=250 width=10)
-                                  Output:["_col0"]
-                                  Filter Operator [FIL_87] (rows=250 width=10)
-                                    predicate:((value = 'd1value') and key is not null)
-                                    TableScan [TS_12] (rows=500 width=10)
-                                      default@src,d1,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
-                            <-Map Join Operator [MAPJOIN_92] (rows=1100 width=10)
-                                Conds:SEL_8._col1=RS_29._col3(Inner),Output:["_col2","_col3","_col4","_col6"]
-                              <-Map 6 [BROADCAST_EDGE] llap
-                                BROADCAST [RS_29]
-                                  PartitionCols:_col3
-                                  Select Operator [SEL_11] (rows=42 width=34)
-                                    Output:["_col0","_col1","_col2","_col3","_col4"]
-                                    Filter Operator [FIL_86] (rows=42 width=34)
-                                      predicate:((v3 = 'ssv3') and k2 is not null and k3 is not null and k1 is not null and v1 is not null and v2 is not null)
-                                      TableScan [TS_9] (rows=85 width=34)
-                                        default@ss,ss,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"]
-                              <-Select Operator [SEL_8] (rows=1000 width=10)
-                                  Output:["_col1"]
-                                  Filter Operator [FIL_85] (rows=1000 width=10)
-                                    predicate:((key = 'srcpartkey') and value is not null)
-                                    TableScan [TS_6] (rows=2000 width=10)
-                                      default@srcpart,srcpart,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
+                          <-Map Join Operator [MAPJOIN_93] (rows=1100 width=10)
+                              Conds:RS_31._col3=SEL_14._col1(Inner),Output:["_col0","_col1","_col2","_col4"]
+                            <-Map 4 [BROADCAST_EDGE] llap
+                              BROADCAST [RS_31]
+                                PartitionCols:_col3
+                                Map Join Operator [MAPJOIN_92] (rows=275 width=10)
+                                  Conds:RS_28._col0=SEL_11._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4"]
+                                <-Map 3 [BROADCAST_EDGE] llap
+                                  BROADCAST [RS_28]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_8] (rows=42 width=34)
+                                      Output:["_col0","_col1","_col2","_col3","_col4"]
+                                      Filter Operator [FIL_85] (rows=42 width=34)
+                                        predicate:((v3 = 'ssv3') and k2 is not null and k3 is not null and k1 is not null and v1 is not null and v2 is not null)
+                                        TableScan [TS_6] (rows=85 width=34)
+                                          default@ss,ss,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"]
+                                <-Select Operator [SEL_11] (rows=250 width=10)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_86] (rows=250 width=10)
+                                      predicate:((value = 'd1value') and key is not null)
+                                      TableScan [TS_9] (rows=500 width=10)
+                                        default@src,d1,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
+                            <-Select Operator [SEL_14] (rows=1000 width=10)
+                                Output:["_col1"]
+                                Filter Operator [FIL_87] (rows=1000 width=10)
+                                  predicate:((key = 'srcpartkey') and value is not null)
+                                  TableScan [TS_12] (rows=2000 width=10)
+                                    default@srcpart,srcpart,Tbl:COMPLETE,Col:NONE,Output:["key","value"]
 
 PREHOOK: query: explain
 SELECT x.key, z.value, y.value

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index 95d1321..a4c251e 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -26,11 +26,11 @@ Stage-0
     Stage-1
       Reducer 3 llap
       File Output Operator [FS_12]
-        Select Operator [SEL_11] (rows=2166 width=556)
+        Select Operator [SEL_11] (rows=2076 width=553)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
         <-Reducer 2 [SIMPLE_EDGE] llap
           SHUFFLE [RS_10]
-            Merge Join Operator [MERGEJOIN_17] (rows=2166 width=556)
+            Merge Join Operator [MERGEJOIN_17] (rows=2076 width=553)
               Conds:RS_6._col2=RS_7._col2(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
             <-Map 1 [SIMPLE_EDGE] llap
               SHUFFLE [RS_6]
@@ -111,7 +111,7 @@ Stage-0
           PARTITION_ONLY_SHUFFLE [RS_11]
             Group By Operator [GBY_10] (rows=1 width=8)
               Output:["_col0"],aggregations:["count()"]
-              Merge Join Operator [MERGEJOIN_19] (rows=2166 width=8)
+              Merge Join Operator [MERGEJOIN_19] (rows=2076 width=8)
                 Conds:RS_6._col0=RS_7._col0(Inner)
               <-Map 1 [SIMPLE_EDGE] llap
                 SHUFFLE [RS_6]
@@ -180,18 +180,18 @@ Stage-0
     Stage-1
       Reducer 4 llap
       File Output Operator [FS_16]
-        Select Operator [SEL_15] (rows=616 width=11)
+        Select Operator [SEL_15] (rows=623 width=11)
           Output:["_col0","_col1"]
         <-Reducer 3 [SIMPLE_EDGE] llap
           SHUFFLE [RS_14]
-            Group By Operator [GBY_12] (rows=616 width=11)
+            Group By Operator [GBY_12] (rows=623 width=11)
               Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_11]
                 PartitionCols:_col0
-                Group By Operator [GBY_10] (rows=616 width=11)
+                Group By Operator [GBY_10] (rows=623 width=11)
                   Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                  Merge Join Operator [MERGEJOIN_21] (rows=2166 width=3)
+                  Merge Join Operator [MERGEJOIN_21] (rows=2076 width=3)
                     Conds:RS_6._col1=RS_7._col0(Inner),Output:["_col0"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_6]

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
index d97223c..6bc1970 100644
--- a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
+++ b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
@@ -133,7 +133,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-locid               	double              	1.0                 	4.0                 	0                   	5                   	                    	                    	                    	                    	from deserializer   
+locid               	double              	1.0                 	4.0                 	0                   	4                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') locid
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -142,7 +142,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-locid               	double              	1.0                 	5.0                 	0                   	6                   	                    	                    	                    	                    	from deserializer   
+locid               	double              	1.0                 	5.0                 	0                   	5                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2001') cnt
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -151,7 +151,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-cnt                 	decimal(10,0)       	10                  	2000                	0                   	5                   	                    	                    	                    	                    	from deserializer   
+cnt                 	decimal(10,0)       	10                  	2000                	0                   	4                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') cnt
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -169,7 +169,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-zip                 	int                 	43201               	94087               	0                   	4                   	                    	                    	                    	                    	from deserializer   
+zip                 	int                 	43201               	94087               	0                   	3                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2002') zip
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -178,7 +178,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-zip                 	int                 	43201               	94087               	0                   	4                   	                    	                    	                    	                    	from deserializer   
+zip                 	int                 	43201               	94087               	0                   	3                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
@@ -425,7 +425,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-state               	string              	                    	                    	0                   	4                   	1.25                	4                   	                    	                    	from deserializer   
+state               	string              	                    	                    	0                   	3                   	1.25                	4                   	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') locid
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -443,7 +443,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-locid               	double              	1.0                 	31.0                	0                   	6                   	                    	                    	                    	                    	from deserializer   
+locid               	double              	1.0                 	31.0                	0                   	5                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2000') cnt
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -452,7 +452,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-cnt                 	decimal(10,0)       	1000                	1010                	0                   	3                   	                    	                    	                    	                    	from deserializer   
+cnt                 	decimal(10,0)       	1000                	1010                	0                   	2                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_1d PARTITION(year='2003') cnt
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_1d
@@ -479,7 +479,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_1d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-zip                 	int                 	43201               	94087               	0                   	4                   	                    	                    	                    	                    	from deserializer   
+zip                 	int                 	43201               	94087               	0                   	3                   	                    	                    	                    	                    	from deserializer   
 PREHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended select state,locid,cnt,zip from loc_orc_1d
@@ -797,7 +797,7 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@loc_orc_2d
 # col_name            	data_type           	min                 	max                 	num_nulls           	distinct_count      	avg_col_len         	max_col_len         	num_trues           	num_falses          	comment             
 	 	 	 	 	 	 	 	 	 	 
-state               	string              	                    	                    	0                   	4                   	3.0                 	3                   	                    	                    	from deserializer   
+state               	string              	                    	                    	0                   	3                   	3.0                 	3                   	                    	                    	from deserializer   
 PREHOOK: query: describe formatted loc_orc_2d partition(zip=94086, year='2001') locid
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@loc_orc_2d

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/filter_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/filter_union.q.out b/ql/src/test/results/clientpositive/llap/filter_union.q.out
index c4af317..0aab9e0 100644
--- a/ql/src/test/results/clientpositive/llap/filter_union.q.out
+++ b/ql/src/test/results/clientpositive/llap/filter_union.q.out
@@ -52,13 +52,13 @@ STAGE PLANS:
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         null sort order: a
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                         tag: -1
                         value expressions: _col1 (type: bigint)
                         auto parallelism: true
@@ -130,13 +130,13 @@ STAGE PLANS:
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         null sort order: a
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                         tag: -1
                         value expressions: _col1 (type: bigint)
                         auto parallelism: true
@@ -202,17 +202,17 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: bigint), 3 (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 0
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 410 Data size: 40590 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 500 Data size: 49500 Basic stats: COMPLETE Column stats: COMPLETE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -238,17 +238,17 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: bigint), 4 (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 0
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 410 Data size: 40590 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 500 Data size: 49500 Basic stats: COMPLETE Column stats: COMPLETE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -326,12 +326,12 @@ STAGE PLANS:
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
@@ -343,14 +343,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: bigint), 1 (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -414,12 +414,12 @@ STAGE PLANS:
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                        Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
@@ -431,14 +431,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 250 Data size: 23750 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: bigint), 4 (type: int)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 205 Data size: 20295 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 250 Data size: 24750 Basic stats: COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/b883d313/ql/src/test/results/clientpositive/llap/groupby1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/groupby1.q.out b/ql/src/test/results/clientpositive/llap/groupby1.q.out
index 0eecbb6..5917013 100644
--- a/ql/src/test/results/clientpositive/llap/groupby1.q.out
+++ b/ql/src/test/results/clientpositive/llap/groupby1.q.out
@@ -67,14 +67,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: final
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 205 Data size: 19475 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 309 Data size: 29355 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: UDFToInteger(_col0) (type: int), _col1 (type: double)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 205 Data size: 2460 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 309 Data size: 3708 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 205 Data size: 2460 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 309 Data size: 3708 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/b883d313/ql/src/test/results/clientpositive/llap/groupby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/groupby2.q.out b/ql/src/test/results/clientpositive/llap/groupby2.q.out
index 29b85d1..f94db4e 100644
--- a/ql/src/test/results/clientpositive/llap/groupby2.q.out
+++ b/ql/src/test/results/clientpositive/llap/groupby2.q.out
@@ -68,14 +68,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: final
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 205 Data size: 41000 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 309 Data size: 61800 Basic stats: COMPLETE Column stats: COMPLETE
                 Select Operator
                   expressions: _col0 (type: string), UDFToInteger(_col1) (type: int), concat(_col0, _col2) (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 205 Data size: 76260 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 309 Data size: 114948 Basic stats: COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 205 Data size: 76260 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 309 Data size: 114948 Basic stats: COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat