http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out 
b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
index 0c48310..9eb1a2c 100644
--- a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
@@ -197,7 +197,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -213,7 +213,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -241,7 +241,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: _col2
                         raw input shape:
                         window functions:
@@ -512,7 +512,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -543,7 +543,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: _col2
                         raw input shape:
                         window functions:
@@ -701,7 +701,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -857,7 +857,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: abc
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -873,7 +873,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -901,7 +901,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: _col2
                         raw input shape:
                         window functions:
@@ -1106,7 +1106,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -1137,7 +1137,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: _col2
                         raw input shape:
                         window functions:
@@ -1324,7 +1324,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -1364,7 +1364,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: _col0
                         raw input shape:
                         window functions:
@@ -1587,7 +1587,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: abc
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col0: int, _col1: string, _col2: 
string, _col3: string, _col4: string, _col5: int, _col6: string, _col7: double, 
_col8: string
                         partition by: _col2
                         raw input shape:
@@ -1830,7 +1830,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: abc
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col0: int, _col1: string, _col2: 
string, _col3: string, _col4: string, _col5: int, _col6: string, _col7: double, 
_col8: string
                         partition by: _col2
                         raw input shape:
@@ -1939,7 +1939,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: p_name ASC NULLS FIRST, p_size DESC NULLS 
LAST
+                          order by: p_name ASC NULLS LAST, p_size DESC NULLS 
LAST
                           output shape: p_name: string, p_mfgr: string, 
p_size: int
                           partition by: p_mfgr
                           raw input shape:
@@ -1977,7 +1977,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col1 ASC NULLS FIRST, _col5 DESC NULLS LAST
+                        order by: _col1 ASC NULLS LAST, _col5 DESC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -1993,7 +1993,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aaz
+                reduceColumnNullOrder: azz
                 reduceColumnSortOrder: ++-
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2021,7 +2021,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col1 ASC NULLS FIRST, _col5 DESC NULLS LAST
+                        order by: _col1 ASC NULLS LAST, _col5 DESC NULLS LAST
                         partition by: _col2
                         raw input shape:
                         window functions:
@@ -2161,7 +2161,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: p_name ASC NULLS FIRST
+                          order by: p_name ASC NULLS LAST
                           output shape: p_name: string, p_mfgr: string, 
p_size: int, p_retailprice: double
                           partition by: p_mfgr
                           raw input shape:
@@ -2200,7 +2200,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -2217,7 +2217,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2245,7 +2245,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: _col2
                         raw input shape:
                         window functions:
@@ -2446,7 +2446,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -2462,7 +2462,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2490,7 +2490,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: _col2
                         raw input shape:
                         window functions:
@@ -2694,7 +2694,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -2708,7 +2708,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                           partition by: _col2
                           raw input shape:
@@ -2716,7 +2716,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_2
                           name: noop
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                           partition by: _col2
                           raw input shape:
@@ -2748,7 +2748,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -2756,7 +2756,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -2772,7 +2772,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -2800,7 +2800,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: _col2
                         raw input shape:
                         window functions:
@@ -3011,7 +3011,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: 
int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -3042,7 +3042,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: _col2
                         raw input shape:
                         window functions:
@@ -3272,7 +3272,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: abc
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col0: int, _col1: string, _col2: 
string, _col5: int, _col7: double
                         partition by: _col2
                         raw input shape:
@@ -3327,7 +3327,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: _col2
                         raw input shape:
                         window functions:
@@ -3522,7 +3522,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -3763,7 +3763,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noop
-                          order by: _col0 ASC NULLS FIRST
+                          order by: _col0 ASC NULLS LAST
                           output shape: _col0: string, _col1: string, _col2: 
double
                           partition by: _col0
                           raw input shape:
@@ -3794,7 +3794,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: _col0
                         raw input shape:
                         window functions:
@@ -3999,7 +3999,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -4027,7 +4027,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: _col2
                         raw input shape:
                         window functions:
@@ -4105,7 +4105,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col5 ASC NULLS FIRST
+                        order by: _col5 ASC NULLS LAST
                         partition by: _col2
                         raw input shape:
                         window functions:
@@ -4146,7 +4146,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col3 ASC NULLS FIRST, _col2 ASC NULLS FIRST
+                        order by: _col3 ASC NULLS LAST, _col2 ASC NULLS LAST
                         partition by: _col3
                         raw input shape:
                         window functions:
@@ -4209,7 +4209,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         partition by: _col2
                         raw input shape:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
@@ -4238,7 +4238,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col1 ASC NULLS FIRST
+                        order by: _col1 ASC NULLS LAST
                         partition by: _col2
                         raw input shape:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
@@ -4502,14 +4502,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -4523,7 +4523,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2, _col1
                           raw input shape:
@@ -4531,7 +4531,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_2
                           name: noop
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2, _col1
                           raw input shape:
@@ -4563,7 +4563,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -4571,7 +4571,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -4847,14 +4847,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -4885,7 +4885,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -4916,7 +4916,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -4932,7 +4932,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -4960,7 +4960,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: _col2
                         raw input shape:
                         window functions:
@@ -5188,14 +5188,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -5226,14 +5226,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -5249,7 +5249,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -5277,7 +5277,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: _col2
                         raw input shape:
                         window functions:
@@ -5506,14 +5506,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -5544,7 +5544,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -5558,7 +5558,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2, _col1
                           raw input shape:
@@ -5591,7 +5591,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -5865,7 +5865,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -5879,7 +5879,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: _col2 ASC NULLS FIRST
+                          order by: _col2 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2
                           raw input shape:
@@ -5887,7 +5887,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_2
                           name: noop
-                          order by: _col2 ASC NULLS FIRST
+                          order by: _col2 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2
                           raw input shape:
@@ -5919,7 +5919,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -5927,7 +5927,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2
                         raw input shape:
@@ -5943,7 +5943,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: zz
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -5971,7 +5971,7 @@ STAGE PLANS:
                       Windowing table definition
                         input alias: ptf_1
                         name: windowingtablefunction
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         partition by: _col2, _col1
                         raw input shape:
                         window functions:
@@ -6194,14 +6194,14 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
                       Partition table definition
                         input alias: ptf_2
                         name: noop
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -6215,7 +6215,7 @@ STAGE PLANS:
                         Partition table definition
                           input alias: ptf_1
                           name: noopwithmap
-                          order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS 
FIRST
+                          order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                           output shape: _col1: string, _col2: string, _col5: 
int
                           partition by: _col2, _col1
                           raw input shape:
@@ -6248,7 +6248,7 @@ STAGE PLANS:
                       Partition table definition
                         input alias: ptf_1
                         name: noopwithmap
-                        order by: _col2 ASC NULLS FIRST, _col1 ASC NULLS FIRST
+                        order by: _col2 ASC NULLS LAST, _col1 ASC NULLS LAST
                         output shape: _col1: string, _col2: string, _col5: int
                         partition by: _col2, _col1
                         raw input shape:
@@ -6265,7 +6265,7 @@ STAGE PLANS:
             Reduce Vectorization:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
-                reduceColumnNullOrder: aa
+                reduceColumnNullOrder: az
                 reduceColumnSortOrder: ++
                 allNative: false
                 usesVectorUDFAdaptor: false
@@ -6293,7 +6293,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: _col2
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out 
b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
index 3944542..a172ffc 100644
--- a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
@@ -258,7 +258,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -269,7 +269,7 @@ STAGE PLANS:
                         native: true
                         projectedOutputColumnNums: [5, 6, 7, 8, 9, 10, 11, 12, 
0, 1, 3, 13, 14, 15, 16, 17]
                         selectExpressions: VectorUDFUnixTimeStampTimestamp(col 
1:timestamp) -> 5:bigint, VectorUDFYearTimestamp(col 1:timestamp, field YEAR) 
-> 6:int, VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 7:int, 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 8:int, 
VectorUDFWeekOfYearTimestamp(col 1:timestamp, field WEEK_OF_YEAR) -> 9:int, 
VectorUDFHourTimestamp(col 1:timestamp, field HOUR_OF_DAY) -> 10:int, 
VectorUDFMinuteTimestamp(col 1:timestamp, field MINUTE) -> 11:int, 
VectorUDFSecondTimestamp(col 1:timestamp, field SECOND) -> 12:int, 
IfExprTimestampColumnScalar(col 0:boolean, col 1:timestamp, val 1319-01-25 
08:31:57.778) -> 13:timestamp, IfExprTimestampScalarColumn(col 0:boolean, val 
2000-12-18 00:42:30.0005, col 1:timestamp) -> 14:timestamp, 
IfExprTimestampColumnColumn(col 0:boolean, col 1:timestampcol 3:timestamp) -> 
15:timestamp, IfExprColumnNull(col 0:boolean, col 1:timestamp, null)(children: 
col 0:boolean, col 1:timestamp) -> 16:ti
 mestamp, IfExprNullColumn(col 0:boolean, null, col 3)(children: col 0:boolean, 
col 3:timestamp) -> 17:timestamp
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
                       sort order: +
@@ -277,7 +277,7 @@ STAGE PLANS:
                           className: VectorReduceSinkObjectHashOperator
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
spark IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS 
true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: int), _col2 (type: int), 
_col3 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), 
_col8 (type: int), _col9 (type: boolean), _col10 (type: timestamp), _col11 
(type: timestamp), _col12 (type: timestamp), _col13 (type: timestamp), _col14 
(type: timestamp), _col15 (type: timestamp), _col16 (type: timestamp)
             Execution mode: vectorized
             Map Vectorization:
@@ -305,13 +305,13 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 3, 4, 5, 6, 7, 8, 
9, 10, 11, 12, 13, 14, 15]
-                Statistics: Num rows: 52 Data size: 3219 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 52 Data size: 8979 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   File Sink Vectorization:
                       className: VectorFileSinkOperator
                       native: false
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -369,6 +369,46 @@ ORDER BY c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.628 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.628 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.637 1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.637 1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.64  1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.64  1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.661 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.661 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.676 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.676 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.705 1969-12-31 15:59:58.456 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.705 1969-12-31 15:59:58.456 NULL    1969-12-31 15:59:58.456
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.709 1969-12-31 15:59:58.456 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.709 1969-12-31 15:59:58.456 NULL    1969-12-31 15:59:58.456
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.72  1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.72  1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.721 1969-12-31 15:59:58.456 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.721 1969-12-31 15:59:58.456 NULL    1969-12-31 15:59:58.456
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.749 1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.749 1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.771 1969-12-31 15:59:58.456 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.771 1969-12-31 15:59:58.456 NULL    1969-12-31 15:59:58.456
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.773 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.773 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.782 1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.782 1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.783 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.783 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.807 1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.807 1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      NULL    
1969-12-31 23:59:43.82  1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:43.82  1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.619 1969-12-31 16:00:14.793 1969-12-31 23:59:43.619 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.619 1969-12-31 23:59:43.619 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.627 1969-12-31 16:00:03.679 1969-12-31 23:59:43.627 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.627 1969-12-31 23:59:43.627 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.631 1969-12-31 16:00:06.612 1969-12-31 23:59:43.631 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.631 1969-12-31 23:59:43.631 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.642 1969-12-31 16:00:04.424 1969-12-31 23:59:43.642 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.642 1969-12-31 23:59:43.642 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.643 1969-12-31 16:00:11.764 1969-12-31 23:59:43.643 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.643 1969-12-31 23:59:43.643 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.645 1969-12-31 16:00:00.077 1969-12-31 23:59:43.645 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.645 1969-12-31 23:59:43.645 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.661 1969-12-31 15:59:58.732 1969-12-31 23:59:43.661 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.661 1969-12-31 23:59:43.661 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.689 1969-12-31 15:59:46.848 1969-12-31 23:59:43.689 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.689 1969-12-31 23:59:43.689 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.695 1969-12-31 16:00:06.867 1969-12-31 23:59:43.695 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.695 1969-12-31 23:59:43.695 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.707 1969-12-31 15:59:56.965 1969-12-31 23:59:43.707 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.707 1969-12-31 23:59:43.707 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.71  1969-12-31 16:00:00.687 1969-12-31 23:59:43.71  
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.71  1969-12-31 23:59:43.71  
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.723 1969-12-31 16:00:03.375 1969-12-31 23:59:43.723 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.723 1969-12-31 23:59:43.723 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.745 1969-12-31 16:00:04.052 1969-12-31 23:59:43.745 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.745 1969-12-31 23:59:43.745 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.764 1969-12-31 16:00:10.52  1969-12-31 23:59:43.764 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.764 1969-12-31 23:59:43.764 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.775 1969-12-31 15:59:48.003 1969-12-31 23:59:43.775 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.775 1969-12-31 23:59:43.775 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.779 1969-12-31 15:59:53.274 1969-12-31 23:59:43.779 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.779 1969-12-31 23:59:43.779 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.785 1969-12-31 16:00:14.096 1969-12-31 23:59:43.785 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.785 1969-12-31 23:59:43.785 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.792 1969-12-31 15:59:52.041 1969-12-31 23:59:43.792 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.792 1969-12-31 23:59:43.792 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.793 1969-12-31 15:59:56.316 1969-12-31 23:59:43.793 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.793 1969-12-31 23:59:43.793 
NULL
+-16    1969    12      31      31      1       23      59      43      true    
1969-12-31 23:59:43.811 1969-12-31 16:00:00.479 1969-12-31 23:59:43.811 
2000-12-18 08:42:30.0005        1969-12-31 23:59:43.811 1969-12-31 23:59:43.811 
NULL
+-29    1969    12      31      31      1       23      59      30      NULL    
1969-12-31 23:59:30.929 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:30.929 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-29    1969    12      31      31      1       23      59      30      NULL    
1969-12-31 23:59:30.929 1969-12-31 15:59:55.451 1319-02-02 16:31:57.778 
1969-12-31 23:59:30.929 1969-12-31 15:59:55.451 NULL    1969-12-31 15:59:55.451
+-29    1969    12      31      31      1       23      59      30      NULL    
1969-12-31 23:59:30.929 1969-12-31 15:59:58.174 1319-02-02 16:31:57.778 
1969-12-31 23:59:30.929 1969-12-31 15:59:58.174 NULL    1969-12-31 15:59:58.174
+-29    1969    12      31      31      1       23      59      30      NULL    
1969-12-31 23:59:30.929 1969-12-31 15:59:58.456 1319-02-02 16:31:57.778 
1969-12-31 23:59:30.929 1969-12-31 15:59:58.456 NULL    1969-12-31 15:59:58.456
 -45479202281   528     10      25      25      43      8       15      18      
true    0528-10-27 08:15:18.941718273   NULL    0528-10-27 08:15:18.941718273   
2000-12-18 08:42:30.0005        0528-10-27 08:15:18.941718273   0528-10-27 
08:15:18.941718273   NULL
 1632453512     2021    9       24      24      38      3       18      32      
NULL    2021-09-24 03:18:32.4   1974-10-04 17:21:03.989 1319-02-02 16:31:57.778 
2021-09-24 03:18:32.4   1974-10-04 17:21:03.989 NULL    1974-10-04 17:21:03.989
 1632453512     2021    9       24      24      38      3       18      32      
false   2021-09-24 03:18:32.4   1999-10-03 16:59:10.396903939   1319-02-02 
16:31:57.778 2021-09-24 03:18:32.4   1999-10-03 16:59:10.396903939   NULL    
1999-10-03 16:59:10.396903939
@@ -378,47 +418,7 @@ POSTHOOK: Input: default@alltypesorc_string
 163809583224   7160    12      2       2       48      6       0       24      
NULL    7160-12-02 06:00:24.81200852    NULL    1319-02-02 16:31:57.778 
7160-12-02 06:00:24.81200852    NULL    NULL    NULL
 490699811      1985    7       20      20      29      9       30      11      
true    1985-07-20 09:30:11     1319-02-02 16:31:57.778 1985-07-20 09:30:11     
2000-12-18 08:42:30.0005        1985-07-20 09:30:11     1985-07-20 09:30:11     
NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    1319-02-02 16:31:57.778 NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:47.183 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:47.183 NULL    1969-12-31 15:59:47.183
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:52.843 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:52.843 NULL    1969-12-31 15:59:52.843
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:53.087 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:53.087 NULL    1969-12-31 15:59:53.087
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:53.55  1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:53.55  NULL    1969-12-31 15:59:53.55
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:54.042 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:54.042 NULL    1969-12-31 15:59:54.042
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:54.686 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:54.686 NULL    1969-12-31 15:59:54.686
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 15:59:58.459 1319-02-02 16:31:57.778 NULL    1969-12-31 
15:59:58.459 NULL    1969-12-31 15:59:58.459
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:00.889 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:00.889 NULL    1969-12-31 16:00:00.889
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:01.258 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:01.258 NULL    1969-12-31 16:00:01.258
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:05.698 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:05.698 NULL    1969-12-31 16:00:05.698
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:08.602 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:08.602 NULL    1969-12-31 16:00:08.602
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:14.214 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:14.214 NULL    1969-12-31 16:00:14.214
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    1969-12-31 16:00:15.466 1319-02-02 16:31:57.778 NULL    1969-12-31 
16:00:15.466 NULL    1969-12-31 16:00:15.466
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    false   
NULL    NULL    1319-02-02 16:31:57.778 NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:46.123 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:49.989 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:51.119 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:52.961 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:52.967 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:53.593 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:53.641 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:55.407 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:55.439 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:56.031 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:57.719 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 15:59:58.636 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:00.176 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:00.423 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:00.477 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:00.93  NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:01.839 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:02.13  NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:03.151 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:03.756 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:06.134 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:07.209 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:10.361 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:11.525 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:13.589 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:13.839 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    1969-12-31 16:00:15.601 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    2024-11-11 16:42:41.101 NULL    2000-12-18 08:42:30.0005        NULL    
NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    true    
NULL    NULL    NULL    2000-12-18 08:42:30.0005        NULL    NULL    NULL
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
@@ -466,7 +466,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -477,7 +477,7 @@ STAGE PLANS:
                         native: true
                         projectedOutputColumnNums: [5, 7, 8, 9, 6, 11, 10, 13, 
14]
                         selectExpressions: VectorUDFUnixTimeStampString(col 
2:string) -> 5:bigint, VectorUDFYearDate(col 6, field YEAR)(children: 
CastStringToDate(col 2:string) -> 6:date) -> 7:int, VectorUDFMonthDate(col 6, 
field MONTH)(children: CastStringToDate(col 2:string) -> 6:date) -> 8:int, 
VectorUDFDayOfMonthDate(col 6, field DAY_OF_MONTH)(children: 
CastStringToDate(col 2:string) -> 6:date) -> 9:int, 
VectorUDFDayOfMonthString(col 2:string, fieldStart 8, fieldLength 2) -> 6:int, 
VectorUDFWeekOfYearDate(col 10, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 2:string) -> 10:date) -> 11:int, 
VectorUDFHourTimestamp(col 12:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 10:int, 
VectorUDFMinuteTimestamp(col 12:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 13:int, 
VectorUDFSecondTimestamp(col 12:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 14
 :int
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
                       sort order: +
@@ -485,7 +485,7 @@ STAGE PLANS:
                           className: VectorReduceSinkObjectHashOperator
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
spark IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS 
true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: int), _col2 (type: int), 
_col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), 
_col7 (type: int), _col8 (type: int)
             Execution mode: vectorized
             Map Vectorization:
@@ -513,13 +513,13 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-                Statistics: Num rows: 52 Data size: 3219 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 52 Data size: 8979 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   File Sink Vectorization:
                       className: VectorFileSinkOperator
                       native: false
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -561,7 +561,47 @@ ORDER BY c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
+-17    1969    12      31      31      1       23      59      43
 -2736272726    1883    4       17      17      16      4       14      34
+-30    1969    12      31      31      1       23      59      30
+-30    1969    12      31      31      1       23      59      30
+-30    1969    12      31      31      1       23      59      30
+-30    1969    12      31      31      1       23      59      30
 -62018199211   4       9       24      22      39      18      26      29
 1365554626     2013    4       10      10      15      0       43      46
 206730996125   8521    1       16      16      3       20      42      5
@@ -573,46 +613,6 @@ NULL       NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
   to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1,
   year(ctimestamp1) = year(stimestamp1),
@@ -658,7 +658,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -669,7 +669,7 @@ STAGE PLANS:
                         native: true
                         projectedOutputColumnNums: [7, 6, 8, 9, 11, 10, 14, 
15, 16]
                         selectExpressions: LongColEqualLongColumn(col 
5:bigint, col 6:bigint)(children: VectorUDFUnixTimeStampTimestamp(col 
1:timestamp) -> 5:bigint, VectorUDFUnixTimeStampString(col 2:string) -> 
6:bigint) -> 7:boolean, LongColEqualLongColumn(col 5:int, col 8:int)(children: 
VectorUDFYearTimestamp(col 1:timestamp, field YEAR) -> 5:int, 
VectorUDFYearDate(col 6, field YEAR)(children: CastStringToDate(col 2:string) 
-> 6:date) -> 8:int) -> 6:boolean, LongColEqualLongColumn(col 5:int, col 
9:int)(children: VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 
5:int, VectorUDFMonthDate(col 8, field MONTH)(children: CastStringToDate(col 
2:string) -> 8:date) -> 9:int) -> 8:boolean, LongColEqualLongColumn(col 5:int, 
col 10:int)(children: VectorUDFDayOfMonthTimestamp(col 1:timestamp, field 
DAY_OF_MONTH) -> 5:int, VectorUDFDayOfMonthDate(col 9, field 
DAY_OF_MONTH)(children: CastStringToDate(col 2:string) -> 9:date) -> 10:int) -> 
9:boolean, LongColEqualLongColumn(col 5:int, col
  10:int)(children: VectorUDFDayOfMonthTimestamp(col 1:timestamp, field 
DAY_OF_MONTH) -> 5:int, VectorUDFDayOfMonthString(col 2:string, fieldStart 8, 
fieldLength 2) -> 10:int) -> 11:boolean, LongColEqualLongColumn(col 5:int, col 
12:int)(children: VectorUDFWeekOfYearTimestamp(col 1:timestamp, field 
WEEK_OF_YEAR) -> 5:int, VectorUDFWeekOfYearDate(col 10, field 
WEEK_OF_YEAR)(children: CastStringToDate(col 2:string) -> 10:date) -> 12:int) 
-> 10:boolean, LongColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFHourTimestamp(col 1:timestamp, field HOUR_OF_DAY) -> 5:int, 
VectorUDFHourTimestamp(col 13:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 14:boolean, 
LongColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFMinuteTimestamp(col 1:timestamp, field MINUTE) -> 5:int, 
VectorUDFMinuteTimestamp(col 13:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 15:boolean, 
Lo
 ngColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFSecondTimestamp(col 1:timestamp, field SECOND) -> 5:int, 
VectorUDFSecondTimestamp(col 13:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 16:boolean
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: boolean)
                       sort order: +
@@ -677,7 +677,7 @@ STAGE PLANS:
                           className: VectorReduceSinkObjectHashOperator
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
spark IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS 
true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
-                      Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: boolean), _col2 (type: 
boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), 
_col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean)
             Execution mode: vectorized
             Map Vectorization:
@@ -705,13 +705,13 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8]
-                Statistics: Num rows: 52 Data size: 3219 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 52 Data size: 8979 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   File Sink Vectorization:
                       className: VectorFileSinkOperator
                       native: false
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -761,50 +761,50 @@ NULL      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 false  false   false   false   false   false   false   false   false
 false  false   false   false   false   false   false   false   false
 false  false   false   false   false   false   false   false   false
 false  false   false   false   false   false   false   false   false
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
+false  true    true    true    true    true    true    true    true
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
   to_unix_timestamp(stimestamp1) AS c1,
   year(stimestamp1),
@@ -981,7 +981,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -991,7 +991,7 @@ STAGE PLANS:
                         className: VectorSelectOperator
                         native: true
                         projectedOutputColumnNums: [1]
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: min(ctimestamp1), max(ctimestamp1), 
count(ctimestamp1), count()
                       Group By Vectorization:
@@ -1078,7 +1078,7 @@ FROM alltypesorc_string
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-0528-10-27 08:15:18.941718273  7160-12-02 06:00:24.81200852    8       52
+0528-10-27 08:15:18.941718273  7160-12-02 06:00:24.81200852    48      52
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
   round(sum(ctimestamp1), 3)
 FROM alltypesorc_string
@@ -1106,7 +1106,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -1116,7 +1116,7 @@ STAGE PLANS:
                         className: VectorSelectOperator
                         native: true
                         projectedOutputColumnNums: [1]
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(ctimestamp1)
                       Group By Vectorization:
@@ -1206,7 +1206,7 @@ FROM alltypesorc_string
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-2.89160478029166E11
+2.891604773267E11
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
   round(avg(ctimestamp1), 0),
   variance(ctimestamp1) between 8.97077295279421E19 and 8.97077295279422E19,
@@ -1248,7 +1248,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_string
-                  Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
                   Select Operator
@@ -1259,7 +1259,7 @@ STAGE PLANS:
                         native: true
                         projectedOutputColumnNums: [1, 5, 8]
                         selectExpressions: CastTimestampToDouble(col 
1:timestamp) -> 5:double, DoubleColMultiplyDoubleColumn(col 6:double, col 
7:double)(children: CastTimestampToDouble(col 1:timestamp) -> 6:double, 
CastTimestampToDouble(col 1:timestamp) -> 7:double) -> 8:double
-                    Statistics: Num rows: 52 Data size: 3219 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 52 Data size: 8979 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(_col0), count(_col0), sum(_col2), 
sum(_col1)
                       Group By Vectorization:
@@ -1363,4 +1363,4 @@ FROM alltypesorc_string
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-3.6145059754E10        false   false   false   7.5245178084814E10      
7.5245178084814E10      7.5245178084814E10      8.0440478971476E10
+6.024176611E9  false   false   false   3.3542405863247E10      
3.3542405863247E10      3.3542405863247E10      3.3897361841912E10

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/spark/windowing.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/windowing.q.out 
b/ql/src/test/results/clientpositive/spark/windowing.q.out
index 7967d05..e2295c1 100644
--- a/ql/src/test/results/clientpositive/spark/windowing.q.out
+++ b/ql/src/test/results/clientpositive/spark/windowing.q.out
@@ -1856,7 +1856,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: _col2
                         raw input shape:
                         window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out 
b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
index c65b04c..dbc6f5d 100644
--- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
+++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
@@ -324,7 +324,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col5 ASC NULLS FIRST
+                  order by: _col5 ASC NULLS LAST
                   partition by: _col2
                   raw input shape:
                   window functions:
@@ -493,7 +493,7 @@ STAGE PLANS:
                 Windowing table definition
                   input alias: ptf_1
                   name: windowingtablefunction
-                  order by: _col5 ASC NULLS FIRST
+                  order by: _col5 ASC NULLS LAST
                   partition by: _col2
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out 
b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
index 634b4ea..192f577 100644
--- 
a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
+++ 
b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
@@ -97,7 +97,6 @@ POSTHOOK: query: select distinct si, si%4 from over10k_n9 
order by si
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_n9
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-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_n0 select * from over10k_n9
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_n9

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udtf_json_tuple.q.out 
b/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
index d500c14..45a8f46 100644
--- a/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
+++ b/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
@@ -189,12 +189,12 @@ POSTHOOK: query: select json_tuple(a.jstring, 'f1', 'f2', 
'f3', 'f4', 'f5') as (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@json_t
 #### A masked pattern was here ####
-NULL   NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL
        NULL    NULL    NULL    NULL
 value1 value2  3       NULL    5.23
 value12        2       value3  4.01    NULL
 value13        2       value33 value44 5.01
+NULL   NULL    NULL    NULL    NULL
+NULL   NULL    NULL    NULL    NULL
 PREHOOK: query: explain 
 select a.key, b.f2, b.f5 from json_t a lateral view json_tuple(a.jstring, 
'f1', 'f2', 'f3', 'f4', 'f5') b as f1, f2, f3, f4, f5 order by a.key
 PREHOOK: type: QUERY
@@ -403,9 +403,9 @@ POSTHOOK: query: select f2, count(*) from json_t a lateral 
view json_tuple(a.jst
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@json_t
 #### A masked pattern was here ####
-NULL   1
 2      2
 value2 1
+NULL   1
 PREHOOK: query: CREATE TABLE dest1_n65(c1 STRING) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out 
b/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
index 51e23e5..c122bf6 100644
--- a/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
+++ b/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
@@ -208,12 +208,12 @@ POSTHOOK: query: select parse_url_tuple(a.fullurl, 
'HOST', 'PATH', 'QUERY', 'REF
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@url_t
 #### A masked pattern was here ####
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 facebook.com   /path1/p.php    k1=v1&k2=v2     Ref1    http    
/path1/p.php?k1=v1&k2=v2        facebook.com    NULL    v1
 sites.google.com       /a/example.com/site/page        NULL    NULL    ftp     
/a/example.com/site/page        sites.google.com        NULL    NULL
 www.socs.uts.edu.au    /MosaicDocs-old/url-primer.html k1=tps  chapter1        
https   /MosaicDocs-old/url-primer.html?k1=tps  www.socs.uts.edu.au:80  NULL    
tps
+NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
+NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
+NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 PREHOOK: query: explain
 select a.key, b.ho, b.qu, b.qk1, b.err1, b.err2, b.err3 from url_t a lateral 
view parse_url_tuple(a.fullurl, 'HOST', 'PATH', 'QUERY', 'REF', 'PROTOCOL', 
'FILE', 'AUTHORITY', 'USERINFO', 'QUERY:k1', 'host', 'query', 
'QUERY:nonExistCol') b as ho, pa, qu, re, pr, fi, au, us, qk1, err1, err2, err3 
order by a.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out 
b/ql/src/test/results/clientpositive/union_ppr.q.out
index 2d24bc9..b6c4642 100644
--- a/ql/src/test/results/clientpositive/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/union_ppr.q.out
@@ -45,7 +45,7 @@ STAGE PLANS:
                     Statistics: Num rows: 666 Data size: 7074 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: string), _col1 (type: 
string), '2008-04-08' (type: string), _col3 (type: string)
-                      null sort order: aaaa
+                      null sort order: zzzz
                       sort order: ++++
                       Statistics: Num rows: 666 Data size: 7074 Basic stats: 
COMPLETE Column stats: NONE
                       tag: -1
@@ -71,7 +71,7 @@ STAGE PLANS:
                     Statistics: Num rows: 666 Data size: 7074 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: string), _col1 (type: 
string), '2008-04-08' (type: string), _col3 (type: string)
-                      null sort order: aaaa
+                      null sort order: zzzz
                       sort order: ++++
                       Statistics: Num rows: 666 Data size: 7074 Basic stats: 
COMPLETE Column stats: NONE
                       tag: -1

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_6_subq.q.out 
b/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
index daf05f2..80b8bbf 100644
--- a/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_6_subq.q.out
@@ -525,7 +525,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: _col0
                   raw input shape:
                   window functions:

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/update_all_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/update_all_partitioned.q.out 
b/ql/src/test/results/clientpositive/update_all_partitioned.q.out
index 4ee1e2e..78c02ce 100644
--- a/ql/src/test/results/clientpositive/update_all_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/update_all_partitioned.q.out
@@ -53,11 +53,11 @@ POSTHOOK: Input: default@acid_uap@ds=tomorrow
 762    BLoMwUJ51ns6pd  tomorrow
 762    a10E76jX35YwquKCTA      tomorrow
 762    q5y2Vy1 tomorrow
-6981   NULL    tomorrow
 6981   1FNNhmiFLGw425NA13g     tomorrow
 6981   4KhrrQ0nJ7bMNTvhSCA     tomorrow
 6981   K630vaVf        tomorrow
 6981   Y5x3JuI3M8jngv5N        tomorrow
+6981   YdG61y00526u5   tomorrow
 PREHOOK: query: update acid_uap set b = 'fred'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uap

http://git-wip-us.apache.org/repos/asf/hive/blob/499d01a3/ql/src/test/results/clientpositive/update_tmp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/update_tmp_table.q.out 
b/ql/src/test/results/clientpositive/update_tmp_table.q.out
index 446a379..746fb9f 100644
--- a/ql/src/test/results/clientpositive/update_tmp_table.q.out
+++ b/ql/src/test/results/clientpositive/update_tmp_table.q.out
@@ -50,7 +50,6 @@ POSTHOOK: query: select * from acid_utt order by a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_utt
 #### A masked pattern was here ####
-NULL   0ruyd6Y50JpdGRf6HqD
 -1073279343    oj1YrV5Wa
 -1073051226    A34p7oRr2WvUJNf
 -1072910839    0iqrc5
@@ -60,3 +59,4 @@ NULL  0ruyd6Y50JpdGRf6HqD
 -1071363017    Anj0oF
 -1070551679    iUR3Q
 -1069736047    k17Am8uPHWk02cEf1jet
+NULL   0ruyd6Y50JpdGRf6HqD

Reply via email to