http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out 
b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
index f9a17a5..1379ba7 100644
--- a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
@@ -1166,7 +1166,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -1365,7 +1365,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -1623,7 +1623,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -1646,7 +1646,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -1952,7 +1952,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2151,7 +2151,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2410,7 +2410,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2433,7 +2433,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out 
b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
index 57ff575..44b7a77 100644
--- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
@@ -97,7 +97,6 @@ POSTHOOK: query: select distinct si, si%4 from over10k_n2 
order by si
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_n2
 #### A masked pattern was here ####
-NULL   NULL
 256    0
 257    1
 258    2
@@ -350,6 +349,7 @@ NULL        NULL
 509    1
 510    2
 511    3
+NULL   NULL
 PREHOOK: query: insert into over10k_orc_bucketed select * from over10k_n2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_n2

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
index 08fe291..ef84475 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
@@ -2214,7 +2214,6 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: my_fact
-                  filterExpr: ((fiscal_year = '2015') and 
(UDFToDouble(accounting_period) = 10.0D) and join_col is not null) (type: 
boolean)
                   Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE 
Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -2240,7 +2239,6 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: my_dim
-                  filterExpr: ((filter_col) IN ('VAL1', 'VAL2') and join_col 
is not null) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1472 Basic stats: 
COMPLETE Column stats: NONE
                   GatherStats: false
                   Filter Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
index df844ee..a9e5ca1 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
@@ -247,7 +247,7 @@ STAGE PLANS:
                   Statistics: Num rows: 72 Data size: 29216 Basic stats: 
PARTIAL Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int), _col1 (type: string)
-                    null sort order: aa
+                    null sort order: zz
                     sort order: ++
                     Statistics: Num rows: 72 Data size: 29216 Basic stats: 
PARTIAL Column stats: NONE
                     tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out 
b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
index c582578..0d5c8f0 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out
@@ -8,7 +8,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    NULL
+1      4       12
 PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as 
x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by 
y, x order by x,y limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -19,7 +19,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    1
+5.0    2       2
 PREHOOK: query: select key from(select key from (select key from cbo_t1 limit 
5)cbo_t2  limit 5)cbo_t3  limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -45,8 +45,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL
-NULL   NULL
+1      1
+1      1
 1      1
 1      1
 1      1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out 
b/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
index c582578..0d5c8f0 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_limit.q.out
@@ -8,7 +8,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    NULL
+1      4       12
 PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as 
x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by 
y, x order by x,y limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -19,7 +19,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL    1
+5.0    2       2
 PREHOOK: query: select key from(select key from (select key from cbo_t1 limit 
5)cbo_t2  limit 5)cbo_t3  limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1
@@ -45,8 +45,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 #### A masked pattern was here ####
-NULL   NULL
-NULL   NULL
+1      1
+1      1
 1      1
 1      1
 1      1

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
 
b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
index e83a370..a9206f7 100644
--- 
a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
@@ -119,5 +119,5 @@ POSTHOOK: query: select * from space order by ` left`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@space
 #### A masked pattern was here ####
-NULL   2       NULL
 1      2       3
+NULL   2       NULL

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/delete_all_partitioned.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/delete_all_partitioned.q.out 
b/ql/src/test/results/clientpositive/llap/delete_all_partitioned.q.out
index 90f8753..4c1a024 100644
--- a/ql/src/test/results/clientpositive/llap/delete_all_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/delete_all_partitioned.q.out
@@ -48,7 +48,6 @@ POSTHOOK: Input: default@acid_dap@ds=tomorrow
 -1070883071    0ruyd6Y50JpdGRf6HqD     today
 -1070551679    iUR3Q   today
 -1069736047    k17Am8uPHWk02cEf1jet    today
-6981   NULL    tomorrow
 6981   1FNNhmiFLGw425NA13g     tomorrow
 6981   4KhrrQ0nJ7bMNTvhSCA     tomorrow
 6981   K630vaVf        tomorrow
@@ -58,6 +57,7 @@ POSTHOOK: Input: default@acid_dap@ds=tomorrow
 6981   o4lvY20511w0EOX3P3I82p63        tomorrow
 6981   o5mb0QP5Y48Qd4vdB0      tomorrow
 6981   sF2CRfgt2K      tomorrow
+6981   NULL    tomorrow
 PREHOOK: query: delete from acid_dap
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dap

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/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 fea49d5..2b69d01 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -2168,7 +2168,7 @@ Stage-0
                 Filter Operator [FIL_25] (rows=26 width=491)
                   predicate:first_value_window_0 is not null
                   PTF Operator [PTF_10] (rows=26 width=491)
-                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col5 ASC NULLS 
FIRST","partition by:":"_col2"}]
+                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col5 ASC NULLS 
LAST","partition by:":"_col2"}]
                     Select Operator [SEL_9] (rows=26 width=491)
                       Output:["_col1","_col2","_col5"]
                     <-Map 4 [SIMPLE_EDGE] llap
@@ -2586,7 +2586,7 @@ Stage-0
         Select Operator [SEL_4] (rows=20 width=64)
           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
           PTF Operator [PTF_3] (rows=20 width=621)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col0"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col0"}]
             Select Operator [SEL_2] (rows=20 width=621)
               Output:["_col0","_col1","_col2","_col3"]
             <-Map 1 [SIMPLE_EDGE] llap
@@ -2613,7 +2613,7 @@ Stage-0
         Select Operator [SEL_4] (rows=25 width=179)
           Output:["_col0","_col1","_col2"]
           PTF Operator [PTF_3] (rows=25 width=443)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col0"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col0"}]
             Select Operator [SEL_2] (rows=25 width=443)
               Output:["_col0","_col1"]
             <-Map 1 [SIMPLE_EDGE] llap
@@ -4099,14 +4099,14 @@ Stage-0
         Select Operator [SEL_7] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_6] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_5] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_4]
                 PartitionCols:_col2
                 PTF Operator [PTF_3] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_2] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4145,14 +4145,14 @@ Stage-0
         Select Operator [SEL_14] (rows=27 width=227)
           Output:["_col0","_col1","_col2","_col3"]
           PTF Operator [PTF_13] (rows=27 width=223)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             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=27 width=223)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_9] (rows=27 width=223)
                     Output:["_col1","_col2","_col5"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4207,14 +4207,14 @@ Stage-0
         Select Operator [SEL_7] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_6] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_5] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_4]
                 PartitionCols:_col2
                 PTF Operator [PTF_3] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_2] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4258,14 +4258,14 @@ Stage-0
         Select Operator [SEL_7] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
           PTF Operator [PTF_6] (rows=26 width=491)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_5] (rows=26 width=491)
               Output:["_col1","_col2","_col5"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_4]
                 PartitionCols:_col2
                 PTF Operator [PTF_3] (rows=26 width=491)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_2] (rows=26 width=491)
                     Output:["_col1","_col2","_col5"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4312,7 +4312,7 @@ Stage-0
         Select Operator [SEL_12] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
           PTF Operator [PTF_11] (rows=26 width=223)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col0"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col0"}]
             Group By Operator [GBY_8] (rows=26 width=223)
               Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, 
KEY._col2
             <-Reducer 3 [SIMPLE_EDGE] llap
@@ -4326,7 +4326,7 @@ Stage-0
                     Select Operator [SEL_4] (rows=26 width=491)
                       Output:["_col1","_col2","_col5"]
                       PTF Operator [PTF_3] (rows=26 width=491)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                         Select Operator [SEL_2] (rows=26 width=491)
                           Output:["_col1","_col2","_col5"]
                         <-Map 1 [SIMPLE_EDGE] llap
@@ -4372,7 +4372,7 @@ Stage-0
         <-Filter Operator [FIL_14] (rows=26 width=887)
             predicate:_col0 is not null
             PTF Operator [PTF_4] (rows=26 width=887)
-              Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+              Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
               Select Operator [SEL_3] (rows=26 width=887)
                 
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
               <-Map 1 [SIMPLE_EDGE] llap
@@ -4410,21 +4410,21 @@ Stage-0
         Select Operator [SEL_8] (rows=26 width=227)
           Output:["_col0","_col1","_col2","_col3"]
           PTF Operator [PTF_7] (rows=26 width=491)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST, _col5 DESC NULLS LAST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST, _col5 DESC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_6] (rows=26 width=491)
               Output:["_col1","_col2","_col5"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_5]
                 PartitionCols:_col2
                 PTF Operator [PTF_4] (rows=26 width=491)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col1 ASC NULLS FIRST, _col5 
DESC NULLS LAST","partition by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col1 ASC NULLS LAST, _col5 
DESC NULLS LAST","partition by:":"_col2"}}]
                   Select Operator [SEL_3] (rows=26 width=491)
                     Output:["_col1","_col2","_col5"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_2]
                       PartitionCols:p_mfgr
                       PTF Operator [PTF_1] (rows=26 width=223)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"p_name ASC NULLS FIRST, p_size 
DESC NULLS LAST","partition by:":"p_mfgr"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"p_name ASC NULLS LAST, p_size 
DESC NULLS LAST","partition by:":"p_mfgr"}}]
                         TableScan [TS_0] (rows=26 width=223)
                           
default@part,part,Tbl:COMPLETE,Col:COMPLETE,Output:["p_name","p_mfgr","p_size"]
 
@@ -4461,21 +4461,21 @@ Stage-0
         Select Operator [SEL_8] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_7] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_6] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_5]
                 PartitionCols:_col2
                 PTF Operator [PTF_4] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col1 ASC NULLS 
FIRST","partition by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col1 ASC NULLS 
LAST","partition by:":"_col2"}}]
                   Select Operator [SEL_3] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_2]
                       PartitionCols:p_mfgr
                       PTF Operator [PTF_1] (rows=26 width=231)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"p_name ASC NULLS 
FIRST","partition by:":"p_mfgr"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"p_name ASC NULLS 
LAST","partition by:":"p_mfgr"}}]
                         TableScan [TS_0] (rows=26 width=231)
                           
default@part,part,Tbl:COMPLETE,Col:COMPLETE,Output:["p_name","p_mfgr","p_size","p_retailprice"]
 
@@ -4512,14 +4512,14 @@ Stage-0
         Select Operator [SEL_7] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_6] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_5] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_4]
                 PartitionCols:_col2
                 PTF Operator [PTF_3] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_2] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4564,23 +4564,23 @@ Stage-0
         Select Operator [SEL_11] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_10] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_9] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 3 [SIMPLE_EDGE] llap
               SHUFFLE [RS_8]
                 PartitionCols:_col2
                 PTF Operator [PTF_7] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 DESC NULLS LAST, _col1 
ASC NULLS FIRST","partition by:":"_col2"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
FIRST","partition by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 DESC NULLS LAST, _col1 
ASC NULLS LAST","partition by:":"_col2"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2"}}]
                   Select Operator [SEL_6] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Reducer 2 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_5]
                       PartitionCols:_col2
                       PTF Operator [PTF_4] (rows=26 width=499)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 DESC NULLS LAST, _col1 
ASC NULLS FIRST","partition by:":"_col2"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
FIRST","partition by:":"_col2"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 DESC NULLS LAST, _col1 
ASC NULLS LAST","partition by:":"_col2"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2"}}]
                         PTF Operator [PTF_3] (rows=26 width=499)
-                          Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
FIRST","partition by:":"_col2"}}]
+                          Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 DESC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2"}}]
                           Select Operator [SEL_2] (rows=26 width=499)
                             Output:["_col1","_col2","_col5","_col7"]
                           <-Map 1 [SIMPLE_EDGE] llap
@@ -4630,14 +4630,14 @@ Stage-0
         Select Operator [SEL_7] (rows=26 width=235)
           Output:["_col0","_col1","_col2","_col3"]
           PTF Operator [PTF_6] (rows=26 width=499)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_5] (rows=26 width=499)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
               SHUFFLE [RS_4]
                 PartitionCols:_col2
                 PTF Operator [PTF_3] (rows=26 width=499)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_2] (rows=26 width=499)
                     Output:["_col1","_col2","_col5","_col7"]
                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4685,7 +4685,7 @@ Stage-0
         Select Operator [SEL_13] (rows=27 width=259)
           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
           PTF Operator [PTF_12] (rows=27 width=767)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_11] (rows=27 width=767)
               Output:["_col1","_col2","_col5","_col7"]
             <-Reducer 2 [SIMPLE_EDGE] llap
@@ -4703,7 +4703,7 @@ Stage-0
                 <-Filter Operator [FIL_18] (rows=26 width=503)
                     predicate:_col0 is not null
                     PTF Operator [PTF_4] (rows=26 width=503)
-                      Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                      Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                       Select Operator [SEL_3] (rows=26 width=503)
                         Output:["_col0","_col1","_col2","_col5","_col7"]
                       <-Map 1 [SIMPLE_EDGE] llap
@@ -4843,14 +4843,14 @@ Stage-4
                         Select Operator [SEL_7] (rows=26 width=239)
                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                           PTF Operator [PTF_6] (rows=26 width=499)
-                            Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
FIRST","partition by:":"_col2"}]
+                            Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS 
LAST","partition by:":"_col2"}]
                             Select Operator [SEL_5] (rows=26 width=499)
                               Output:["_col1","_col2","_col5","_col7"]
                             <-Reducer 2 [SIMPLE_EDGE] llap
                               SHUFFLE [RS_4]
                                 PartitionCols:_col2
                                 PTF Operator [PTF_3] (rows=26 width=499)
-                                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col1 ASC NULLS LAST","partition 
by:":"_col2"}}]
                                   Select Operator [SEL_2] (rows=26 width=499)
                                     Output:["_col1","_col2","_col5","_col7"]
                                   <-Map 1 [SIMPLE_EDGE] llap
@@ -4877,7 +4877,7 @@ Stage-4
                         Select Operator [SEL_25] (rows=26 width=247)
                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                           PTF Operator [PTF_24] (rows=26 width=499)
-                            Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS 
FIRST, _col2 ASC NULLS FIRST","partition by:":"_col3"}]
+                            Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS 
LAST, _col2 ASC NULLS LAST","partition by:":"_col3"}]
                             Select Operator [SEL_23] (rows=26 width=499)
                               Output:["_col0","_col2","_col3","_col6"]
                             <-Reducer 6 [SIMPLE_EDGE] llap
@@ -4886,7 +4886,7 @@ Stage-4
                                 Select Operator [SEL_21] (rows=26 width=491)
                                   
Output:["sum_window_0","_col1","_col2","_col5"]
                                   PTF Operator [PTF_20] (rows=26 width=491)
-                                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col5 ASC NULLS 
FIRST","partition by:":"_col2"}]
+                                    Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col5 ASC NULLS 
LAST","partition by:":"_col2"}]
                                     Select Operator [SEL_19] (rows=26 
width=491)
                                       Output:["_col1","_col2","_col5"]
                                     <-Reducer 2 [SIMPLE_EDGE] llap
@@ -4962,16 +4962,16 @@ Stage-0
               SHUFFLE [RS_8]
                 PartitionCols:_col2, _col1
                 PTF Operator [PTF_7] (rows=26 width=491)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 ASC NULLS FIRST, _col1 
ASC NULLS FIRST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST","partition by:":"_col2, _col1"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 ASC NULLS LAST, _col1 ASC 
NULLS LAST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2, _col1"}}]
                   Select Operator [SEL_6] (rows=26 width=491)
                     Output:["_col1","_col2","_col5"]
                   <-Reducer 2 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_5]
                       PartitionCols:_col2, _col1
                       PTF Operator [PTF_4] (rows=26 width=491)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 ASC NULLS FIRST, _col1 
ASC NULLS FIRST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST","partition by:":"_col2, _col1"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noopwithmap","order by:":"_col2 ASC NULLS LAST, _col1 ASC 
NULLS LAST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2, _col1"}}]
                         PTF Operator [PTF_3] (rows=26 width=491)
-                          Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS FIRST","partition by:":"_col2"}}]
+                          Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS LAST","partition by:":"_col2"}}]
                           Select Operator [SEL_2] (rows=26 width=491)
                             Output:["_col1","_col2","_col5"]
                           <-Map 1 [SIMPLE_EDGE] llap
@@ -5031,28 +5031,28 @@ Stage-0
         Select Operator [SEL_13] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_12] (rows=26 width=491)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_11] (rows=26 width=491)
               Output:["_col1","_col2","_col5"]
             <-Reducer 4 [SIMPLE_EDGE] llap
               SHUFFLE [RS_10]
                 PartitionCols:_col2
                 PTF Operator [PTF_9] (rows=26 width=491)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST","partition 
by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST","partition 
by:":"_col2"}}]
                   Select Operator [SEL_8] (rows=26 width=491)
                     Output:["_col1","_col2","_col5"]
                   <-Reducer 3 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_7]
                       PartitionCols:_col2
                       PTF Operator [PTF_6] (rows=26 width=491)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST","partition by:":"_col2, _col1"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2, _col1"}}]
                         Select Operator [SEL_5] (rows=26 width=491)
                           Output:["_col1","_col2","_col5"]
                         <-Reducer 2 [SIMPLE_EDGE] llap
                           SHUFFLE [RS_4]
                             PartitionCols:_col2, _col1
                             PTF Operator [PTF_3] (rows=26 width=491)
-                              Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS FIRST","partition by:":"_col2"}}]
+                              Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS LAST","partition by:":"_col2"}}]
                               Select Operator [SEL_2] (rows=26 width=491)
                                 Output:["_col1","_col2","_col5"]
                               <-Map 1 [SIMPLE_EDGE] llap
@@ -5107,21 +5107,21 @@ Stage-0
         Select Operator [SEL_10] (rows=26 width=239)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
           PTF Operator [PTF_9] (rows=26 width=491)
-            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}]
+            Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS LAST","partition by:":"_col2"}]
             Select Operator [SEL_8] (rows=26 width=491)
               Output:["_col1","_col2","_col5"]
             <-Reducer 3 [SIMPLE_EDGE] llap
               SHUFFLE [RS_7]
                 PartitionCols:_col2
                 PTF Operator [PTF_6] (rows=26 width=491)
-                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS FIRST","partition by:":"_col2"}}]
+                  Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST","partition 
by:":"_col2"}},{"Partition table definition":{"name:":"noop","order by:":"_col2 
ASC NULLS LAST","partition by:":"_col2"}}]
                   Select Operator [SEL_5] (rows=26 width=491)
                     Output:["_col1","_col2","_col5"]
                   <-Reducer 2 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_4]
                       PartitionCols:_col2
                       PTF Operator [PTF_3] (rows=26 width=491)
-                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST","partition by:":"_col2, _col1"}}]
+                        Function definitions:[{},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2, _col1"}},{"Partition table 
definition":{"name:":"noop","order by:":"_col2 ASC NULLS LAST, _col1 ASC NULLS 
LAST","partition by:":"_col2, _col1"}}]
                         Select Operator [SEL_2] (rows=26 width=491)
                           Output:["_col1","_col2","_col5"]
                         <-Map 1 [SIMPLE_EDGE] llap

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out 
b/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
index 4a1d874..cbfb1a8 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
@@ -426,7 +426,6 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: simple_hive_table1
-                  filterExpr: ikey is not null (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
                     predicate: ikey is not null (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/groupby_resolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/groupby_resolution.q.out 
b/ql/src/test/results/clientpositive/llap/groupby_resolution.q.out
index 39dd4d5..099825a 100644
--- a/ql/src/test/results/clientpositive/llap/groupby_resolution.q.out
+++ b/ql/src/test/results/clientpositive/llap/groupby_resolution.q.out
@@ -711,7 +711,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         partition by: 0
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/insert_into_with_schema.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/insert_into_with_schema.q.out 
b/ql/src/test/results/clientpositive/llap/insert_into_with_schema.q.out
index 95de940..13545d8 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into_with_schema.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into_with_schema.q.out
@@ -144,9 +144,9 @@ POSTHOOK: query: select * from target1 order by x,y,z
 POSTHOOK: type: QUERY
 POSTHOOK: Input: x314@target1
 #### A masked pattern was here ####
-NULL   1       2
 1      2       NULL
 2      NULL    1
+NULL   1       2
 PREHOOK: query: select * from target2 order by x,y,z
 PREHOOK: type: QUERY
 PREHOOK: Input: x314@target2
@@ -155,8 +155,8 @@ POSTHOOK: query: select * from target2 order by x,y,z
 POSTHOOK: type: QUERY
 POSTHOOK: Input: x314@target2
 #### A masked pattern was here ####
-NULL   1       2
 2      NULL    1
+NULL   1       2
 PREHOOK: query: create table source2(s1 int, s2 int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:x314

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/insert_values_non_partitioned.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/insert_values_non_partitioned.q.out 
b/ql/src/test/results/clientpositive/llap/insert_values_non_partitioned.q.out
index 3819351..513f7e5 100644
--- 
a/ql/src/test/results/clientpositive/llap/insert_values_non_partitioned.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/insert_values_non_partitioned.q.out
@@ -65,6 +65,6 @@ POSTHOOK: query: select * from acid_ivnp order by ti
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_ivnp
 #### A masked pattern was here ####
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL
 1      257     65537   4294967297      3.14    3.141592654     109.23  
2014-08-25 17:21:30     2014-08-25      true    mary had a little lamb  ring 
around the rosie   red         
 3      25      6553    NULL    0.14    1923.141592654  1.23    2014-08-24 
17:21:30     2014-08-26      false   its fleece was white as snow    a pocket 
full of posies blue        
+NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
index 1f14580..3d6300d 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
@@ -456,6 +456,7 @@ POSTHOOK: query: select distinct(cdouble) as dis from 
alltypesorc order by dis l
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-16243.0
 -16269.0
 -16274.0
 -16277.0
@@ -475,7 +476,6 @@ POSTHOOK: Input: default@alltypesorc
 -16372.0
 -16373.0
 -16379.0
-NULL
 PREHOOK: query: explain
 select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint 
order by ctinyint limit 20
 PREHOOK: type: QUERY
@@ -554,6 +554,7 @@ POSTHOOK: query: select ctinyint, count(distinct(cdouble)) 
from alltypesorc grou
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-45    24
 -46    24
 -47    22
 -48    29
@@ -573,7 +574,6 @@ POSTHOOK: Input: default@alltypesorc
 -62    27
 -63    19
 -64    24
-NULL   2932
 PREHOOK: query: explain 
 select ctinyint, count(cdouble) from (select ctinyint, cdouble from 
alltypesorc group by ctinyint, cdouble) t1 group by ctinyint order by ctinyint 
limit 20
 PREHOOK: type: QUERY
@@ -652,6 +652,7 @@ POSTHOOK: query: select ctinyint, count(cdouble) from 
(select ctinyint, cdouble
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-45    24
 -46    24
 -47    22
 -48    29
@@ -671,7 +672,6 @@ POSTHOOK: Input: default@alltypesorc
 -62    27
 -63    19
 -64    24
-NULL   2932
 PREHOOK: query: explain
 select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from 
alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
@@ -747,6 +747,7 @@ POSTHOOK: query: select ctinyint, 
count(distinct(cstring1)), count(distinct(cstr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-45    3       24
 -46    3       19
 -47    3       23
 -48    3       27
@@ -766,7 +767,6 @@ POSTHOOK: Input: default@alltypesorc
 -62    3       23
 -63    3       16
 -64    3       13
-NULL   3065    3
 PREHOOK: query: explain
 select key,value from src order by key limit 0
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out 
b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
index 1027bfe..1f9d692 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
@@ -497,7 +497,6 @@ POSTHOOK: query: select distinct(cdouble) as dis from 
alltypesorc order by dis l
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-NULL
 -16379.0
 -16373.0
 -16372.0
@@ -517,6 +516,7 @@ NULL
 -16277.0
 -16274.0
 -16269.0
+-16243.0
 PREHOOK: query: explain
 select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint 
order by ctinyint limit 20
 PREHOOK: type: QUERY
@@ -609,7 +609,6 @@ POSTHOOK: query: select ctinyint, count(distinct(cdouble)) 
from alltypesorc grou
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-NULL   2932
 -64    24
 -63    19
 -62    27
@@ -629,6 +628,7 @@ NULL        2932
 -48    29
 -47    22
 -46    24
+-45    24
 PREHOOK: query: explain 
 select ctinyint, count(cdouble) from (select ctinyint, cdouble from 
alltypesorc group by ctinyint, cdouble) t1 group by ctinyint order by ctinyint 
limit 20
 PREHOOK: type: QUERY
@@ -721,7 +721,6 @@ POSTHOOK: query: select ctinyint, count(cdouble) from 
(select ctinyint, cdouble
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-NULL   2932
 -64    24
 -63    19
 -62    27
@@ -741,6 +740,7 @@ NULL        2932
 -48    29
 -47    22
 -46    24
+-45    24
 PREHOOK: query: explain
 select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from 
alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
@@ -830,7 +830,6 @@ POSTHOOK: query: select ctinyint, 
count(distinct(cstring1)), count(distinct(cstr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-NULL   3065    3
 -64    3       13
 -63    3       16
 -62    3       23
@@ -850,6 +849,7 @@ NULL        3065    3
 -48    3       27
 -47    3       23
 -46    3       19
+-45    3       24
 PREHOOK: query: explain
 select key,value from src order by key limit 0
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/lineage2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage2.q.out 
b/ql/src/test/results/clientpositive/llap/lineage2.q.out
index 76f0c9d..f56b100 100644
--- a/ql/src/test/results/clientpositive/llap/lineage2.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage2.q.out
@@ -634,7 +634,7 @@ having count(a.c2) > 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_l2
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"4e60ca1e72d985639b2027021a199297","queryText":"select
 sum(a.c1) over (partition by a.c1 order by a.id)\nfrom dest_l2 a\nwhere a.c2 
!= 10\ngroup by a.c1, a.c2, a.id\nhaving count(a.c2) > 
0","edges":[{"sources":[1,2,3],"targets":[0],"expression":"(tok_function sum (. 
(tok_table_or_col $hdt$_0) c1) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col $hdt$_0) c1)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col $hdt$_0) id))))) 
(tok_windowvalues (preceding 2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0],"expression":"(a.c2
 <> 
10)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"(count(default.dest_l2.c2)
 > 
0L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"sum_window_0"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{
 "id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"4e60ca1e72d985639b2027021a199297","queryText":"select
 sum(a.c1) over (partition by a.c1 order by a.id)\nfrom dest_l2 a\nwhere a.c2 
!= 10\ngroup by a.c1, a.c2, a.id\nhaving count(a.c2) > 
0","edges":[{"sources":[1,2,3],"targets":[0],"expression":"(tok_function sum (. 
(tok_table_or_col $hdt$_0) c1) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col $hdt$_0) c1)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_last (. (tok_table_or_col $hdt$_0) id))))) 
(tok_windowvalues (preceding 2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0],"expression":"(a.c2
 <> 
10)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"(count(default.dest_l2.c2)
 > 
0L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"sum_window_0"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"
 id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"}]}
 1
 PREHOOK: query: select sum(a.c1), count(b.c1), b.c2, b.c3
 from dest_l2 a join dest_l3 b on (a.id = b.id)

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/lineage3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage3.q.out 
b/ql/src/test/results/clientpositive/llap/lineage3.q.out
index 27dd874..7a9302c 100644
--- a/ql/src/test/results/clientpositive/llap/lineage3.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage3.q.out
@@ -67,7 +67,7 @@ where cint > 10 and cint < 10000 limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"af879e003bd60eb1f8ff064bd3f362ac","queryText":"select
 cint, rank() over(order by cint) from alltypesorc\nwhere cint > 10 and cint < 
10000 limit 
10","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3,4,2,5,6,7,8,9,10,11,12,13],"targets":[1],"expression":"(tok_function
 rank (tok_windowspec (tok_partitioningspec (tok_distributeby 0) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col alltypesorc) 
cint))))) (tok_windowrange (preceding 2147483647) (following 
2147483647))))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"((alltypesorc.cint
 > 10) and (alltypesorc.cint < 
10000))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"cint"},{"id":1,"vertexType":"COLUMN","vertexId":"rank_window_0"},{"id":2,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},
 
{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cdouble"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring2"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctimestamp1"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctimestamp2"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"af879e003bd60eb1f8ff064bd3f362ac","queryText":"select
 cint, rank() over(order by cint) from alltypesorc\nwhere cint > 10 and cint < 
10000 limit 
10","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3,4,2,5,6,7,8,9,10,11,12,13],"targets":[1],"expression":"(tok_function
 rank (tok_windowspec (tok_partitioningspec (tok_distributeby 0) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_last (. (tok_table_or_col alltypesorc) 
cint))))) (tok_windowrange (preceding 2147483647) (following 
2147483647))))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"((alltypesorc.cint
 > 10) and (alltypesorc.cint < 
10000))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"cint"},{"id":1,"vertexType":"COLUMN","vertexId":"rank_window_0"},{"id":2,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{
 
"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cdouble"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring2"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctimestamp1"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctimestamp2"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"}]}
 762    1
 762    1
 762    1
@@ -237,8 +237,8 @@ PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@dest_v1
 #### A masked pattern was here ####
 
{"version":"1.0","engine":"tez","database":"default","hash":"3d35b5bc2418de2cc033311606ac03cf","queryText":"select
 * from dest_v1 order by ctinyint, cint limit 
2","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"alltypesorc.ctinyint
 is not 
null","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"dest_v1.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"dest_v1.cint"},{"id":2,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"}]}
--64    NULL
--64    NULL
+-64    253665376
+-64    253665376
 PREHOOK: query: alter view dest_v1 as select ctinyint from alltypesorc
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@alltypesorc
@@ -311,13 +311,13 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_v3
-{"version":"1.0","engine":"tez","database":"default","hash":"81bb549360513aeae39a3bd971405be3","queryText":"alter
 view dest_v3 as\n  select * from (\n    select sum(a.ctinyint) over (partition 
by a.csmallint order by a.csmallint) a,\n      count(b.cstring1) x, 
b.cboolean1\n    from alltypesorc a join alltypesorc b on (a.cint = b.cint)\n   
 where a.cboolean2 = true and b.cfloat > 0\n    group by a.ctinyint, 
a.csmallint, b.cboolean1\n    having count(a.cint) > 10\n    order by a, x, 
b.cboolean1 limit 10) 
t_n20","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function
 sum (. (tok_table_or_col a) ctinyint) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col a) csmallint)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col a) 
csmallint)))))))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"}
 ,{"sources":[7],"targets":[0,1,2],"expression":"(a.cint = 
b.cint)","edgeType":"PREDICATE"},{"sources":[8,9],"targets":[0,1,2],"expression":"((a.cboolean2
 = true) and (b.cfloat > 
0.0))","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","v
 ertexId":"default.alltypesorc.cfloat"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"81bb549360513aeae39a3bd971405be3","queryText":"alter
 view dest_v3 as\n  select * from (\n    select sum(a.ctinyint) over (partition 
by a.csmallint order by a.csmallint) a,\n      count(b.cstring1) x, 
b.cboolean1\n    from alltypesorc a join alltypesorc b on (a.cint = b.cint)\n   
 where a.cboolean2 = true and b.cfloat > 0\n    group by a.ctinyint, 
a.csmallint, b.cboolean1\n    having count(a.cint) > 10\n    order by a, x, 
b.cboolean1 limit 10) 
t_n20","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function
 sum (. (tok_table_or_col a) ctinyint) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col a) csmallint)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_last (. (tok_table_or_col a) 
csmallint)))))))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},
 {"sources":[7],"targets":[0,1,2],"expression":"(a.cint = 
b.cint)","edgeType":"PREDICATE"},{"sources":[8,9],"targets":[0,1,2],"expression":"((a.cboolean2
 = true) and (b.cfloat > 
0.0))","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","ve
 rtexId":"default.alltypesorc.cfloat"}]}
 PREHOOK: query: select * from dest_v3 limit 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@dest_v3
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"fd4e0dd59f42b53fc07125817451df49","queryText":"select
 * from dest_v3 limit 
2","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col $hdt$_0) ctinyint) (tok_windowspec 
(tok_partitioningspec (tok_distributeby (. (tok_table_or_col $hdt$_0) 
csmallint)) (tok_orderby (tok_tabsortcolnameasc (tok_nulls_first (. 
(tok_table_or_col $hdt$_0) csmallint))))) (tok_windowvalues (preceding 
2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"sources":[8,7],"targets":[0,1,2],"expression":"(a.cboolean2
 and a.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(a.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[9,7],"targets":[0,1,2],"expression":"((b.cfloat
 > 0) and b.cint is not null)","edgeType":"PRED
 
ICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"fd4e0dd59f42b53fc07125817451df49","queryText":"select
 * from dest_v3 limit 
2","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col $hdt$_0) ctinyint) (tok_windowspec 
(tok_partitioningspec (tok_distributeby (. (tok_table_or_col $hdt$_0) 
csmallint)) (tok_orderby (tok_tabsortcolnameasc (tok_nulls_last (. 
(tok_table_or_col $hdt$_0) csmallint))))) (tok_windowvalues (preceding 
2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"sources":[8,7],"targets":[0,1,2],"expression":"(a.cboolean2
 and a.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(a.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[9,7],"targets":[0,1,2],"expression":"((b.cfloat
 > 0) and b.cint is not null)","edgeType":"PREDI
 
CATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"}]}
 38     216     false
 38     229     true
 PREHOOK: query: drop table if exists src_dp

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/llap_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid.q.out 
b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
index 635f928..0d1a331 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
@@ -142,7 +142,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: zz
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -288,7 +288,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -396,7 +396,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: zz
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out 
b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
index c4dc6f7..18a2ae9 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
@@ -136,7 +136,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: zz
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -282,7 +282,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: a
+                reduceColumnNullOrder: z
                 reduceColumnSortOrder: +
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -390,7 +390,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: zz
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/llap_smb_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_smb_ptf.q.out 
b/ql/src/test/results/clientpositive/llap/llap_smb_ptf.q.out
index 6d2b01c..127cef8 100644
--- a/ql/src/test/results/clientpositive/llap/llap_smb_ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_smb_ptf.q.out
@@ -587,7 +587,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col4 ASC NULLS FIRST
+                        order by: _col4 ASC NULLS LAST
                         partition by: _col0, _col4
                         raw input shape:
                         window functions:
@@ -707,7 +707,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         partition by: _col3, _col2
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out
index ab03522..c683098 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out
@@ -348,7 +348,6 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.partition_mv_1
-          filterExpr: ((UDFToDouble(key) > 210.0D) and (UDFToDouble(key) < 
230.0D)) (type: boolean)
           Filter Operator
             predicate: ((UDFToDouble(key) < 230.0D) and (UDFToDouble(key) > 
210.0D)) (type: boolean)
             Select Operator
@@ -429,7 +428,6 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.partition_mv_2
-          filterExpr: ((value < 'val_230') and (value > 'val_220')) (type: 
boolean)
           Select Operator
             expressions: key (type: string), value (type: string)
             outputColumnNames: _col0, _col1
@@ -486,7 +484,6 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.partition_mv_4
-          filterExpr: ((UDFToDouble(key) > 224.0D) and (UDFToDouble(key) < 
226.0D)) (type: boolean)
           Filter Operator
             predicate: ((UDFToDouble(key) < 226.0D) and (UDFToDouble(key) > 
224.0D)) (type: boolean)
             Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out
index 3751ff1..e25ef64 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out
@@ -40,7 +40,6 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: src_txn
-                  filterExpr: ((UDFToDouble(key) > 200.0D) and 
(UDFToDouble(key) < 250.0D)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 175168 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((UDFToDouble(key) < 250.0D) and 
(UDFToDouble(key) > 200.0D)) (type: boolean)

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out
 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out
index 8b8e9e6..6d1452c 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out
@@ -227,12 +227,10 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.mv1_part_n0
-          Filter Operator
-            predicate: (deptno >= 20) (type: boolean)
-            Select Operator
-              expressions: empid (type: int)
-              outputColumnNames: _col0
-              ListSink
+          Select Operator
+            expressions: empid (type: int)
+            outputColumnNames: _col0
+            ListSink
 
 PREHOOK: query: select empid from emps_n00
 join depts_n00 using (deptno) where depts_n00.deptno >= 20
@@ -316,12 +314,10 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.mv1_part_n0
-          Filter Operator
-            predicate: (empid >= 20) (type: boolean)
-            Select Operator
-              expressions: deptno (type: int)
-              outputColumnNames: _col0
-              ListSink
+          Select Operator
+            expressions: empid (type: int)
+            outputColumnNames: _col0
+            ListSink
 
 PREHOOK: query: select empid from emps_n00
 join depts_n00 using (deptno) where depts_n00.deptno >= 20
@@ -405,12 +401,10 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: default.mv1_part_n0
-          Filter Operator
-            predicate: (deptno >= 20) (type: boolean)
-            Select Operator
-              expressions: empid (type: int)
-              outputColumnNames: _col0
-              ListSink
+          Select Operator
+            expressions: empid (type: int)
+            outputColumnNames: _col0
+            ListSink
 
 PREHOOK: query: select empid from emps_n00
 join depts_n00 using (deptno) where depts_n00.deptno >= 20

http://git-wip-us.apache.org/repos/asf/hive/blob/0427ffa5/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out 
b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
index d95025c..7d432f1 100644
--- a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
+++ b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
@@ -461,7 +461,6 @@ POSTHOOK: query: select distinct(cdouble) as dis from 
alltypesorc order by dis l
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
--16309.0
 -16307.0
 -16306.0
 -16305.0
@@ -481,6 +480,7 @@ POSTHOOK: Input: default@alltypesorc
 -16211.0
 -16208.0
 -16207.0
+-16201.0
 PREHOOK: query: explain
 select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint 
order by ctinyint limit 10,20
 PREHOOK: type: QUERY
@@ -560,7 +560,6 @@ POSTHOOK: query: select ctinyint, count(distinct(cdouble)) 
from alltypesorc grou
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
--55    29
 -54    26
 -53    22
 -52    33
@@ -580,6 +579,7 @@ POSTHOOK: Input: default@alltypesorc
 -38    31
 -37    20
 -36    26
+-35    26
 PREHOOK: query: explain
 select ctinyint, count(cdouble) from (select ctinyint, cdouble from 
alltypesorc group by ctinyint, cdouble) t1 group by ctinyint order by ctinyint 
limit 10,20
 PREHOOK: type: QUERY
@@ -659,7 +659,6 @@ POSTHOOK: query: select ctinyint, count(cdouble) from 
(select ctinyint, cdouble
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
--55    29
 -54    26
 -53    22
 -52    33
@@ -679,6 +678,7 @@ POSTHOOK: Input: default@alltypesorc
 -38    31
 -37    20
 -36    26
+-35    26
 PREHOOK: query: explain
 select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from 
alltypesorc group by ctinyint order by ctinyint limit 10,20
 PREHOOK: type: QUERY
@@ -755,7 +755,6 @@ POSTHOOK: query: select ctinyint, 
count(distinct(cstring1)), count(distinct(cstr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
--55    3       21
 -54    3       21
 -53    3       17
 -52    3       21
@@ -775,6 +774,7 @@ POSTHOOK: Input: default@alltypesorc
 -38    3       19
 -37    3       27
 -36    3       18
+-35    3       21
 PREHOOK: query: explain
 select key,value from src order by key limit 0,0
 PREHOOK: type: QUERY

Reply via email to