You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/06/28 15:45:00 UTC

[16/34] hive git commit: HIVE-20007: Hive should carry out timestamp computations in UTC (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
index 654dab9..cc7699b 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
@@ -263,13 +263,13 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: to_unix_timestamp(ctimestamp1) (type: bigint), year(ctimestamp1) (type: int), month(ctimestamp1) (type: int), day(ctimestamp1) (type: int), dayofmonth(ctimestamp1) (type: int), weekofyear(ctimestamp1) (type: int), hour(ctimestamp1) (type: int), minute(ctimestamp1) (type: int), second(ctimestamp1) (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), if(cboolean1, ctimestamp1, TIMESTAMP'1319-02-02 16:31:57.778') (type: timestamp), if(cboolean1, TIMESTAMP'2000-12-18 08:42:30.0005', ctimestamp1) (type: timestamp), if(cboolean1, ctimestamp1, ctimestamp2) (type: timestamp), if(cboolean1, ctimestamp1, null) (type: timestamp), if(cboolean1, null, ctimestamp2) (type: timestamp)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16
+                    expressions: to_unix_timestamp(ctimestamp1) (type: bigint), year(ctimestamp1) (type: int), month(ctimestamp1) (type: int), day(ctimestamp1) (type: int), weekofyear(ctimestamp1) (type: int), hour(ctimestamp1) (type: int), minute(ctimestamp1) (type: int), second(ctimestamp1) (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), if(cboolean1, ctimestamp1, TIMESTAMP'1319-02-02 16:31:57.778') (type: timestamp), if(cboolean1, TIMESTAMP'2000-12-18 08:42:30.0005', ctimestamp1) (type: timestamp), if(cboolean1, ctimestamp1, ctimestamp2) (type: timestamp), if(cboolean1, ctimestamp1, null) (type: timestamp), if(cboolean1, null, ctimestamp2) (type: timestamp)
+                    outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1, 3, 14, 15, 16, 17, 18]
-                        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, VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 9:int, VectorUDFWeekOfYearTimestamp(col 1:timestamp, field WEEK_OF_YEAR) -> 10:int, VectorUDFHourTimestamp(col 1:timestamp, field HOUR_OF_DAY) -> 11:int, VectorUDFMinuteTimestamp(col 1:timestamp, field MINUTE) -> 12:int, VectorUDFSecondTimestamp(col 1:timestamp, field SECOND) -> 13:int, IfExprTimestampColumnScalar(col 0:boolean, col 1:timestamp, val 1319-02-02 16:31:57.778) -> 14:timestamp, IfExprTimestampScalarColumn(col 0:boolean, val 2000-12-18 08:42:30.0005, col 1:timestamp) -> 15:timestamp, IfExprTimestampColumnColumn(col 0:boolean, col 1:timestampcol 3:timestamp) -> 16:timestamp, IfExprColumnNull(col 0:boole
 an, col 1:timestamp, null)(children: col 0:boolean, col 1:timestamp) -> 17:timestamp, IfExprNullColumn(col 0:boolean, null, col 3)(children: col 0:boolean, col 3:timestamp) -> 18:timestamp
+                        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: 16836 Basic stats: COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
@@ -279,7 +279,7 @@ STAGE PLANS:
                           native: true
                           nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                       Statistics: Num rows: 52 Data size: 16836 Basic stats: COMPLETE Column stats: COMPLETE
-                      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), _col9 (type: boolean), _col10 (type: timestamp), _col11 (type: timestamp), _col12 (type: timestamp), _col13 (type: timestamp), _col14 (type: timestamp), _col15 (type: timestamp), _col16 (type: timestamp)
+                      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, llap
             LLAP IO: all inputs
             Map Vectorization:
@@ -301,12 +301,12 @@ STAGE PLANS:
                 vectorized: true
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int), VALUE._col8 (type: boolean), VALUE._col9 (type: timestamp), VALUE._col10 (type: timestamp), VALUE._col11 (type: timestamp), VALUE._col12 (type: timestamp), VALUE._col13 (type: timestamp), VALUE._col14 (type: timestamp), VALUE._col15 (type: timestamp)
+                expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: boolean), VALUE._col8 (type: timestamp), VALUE._col9 (type: timestamp), VALUE._col10 (type: timestamp), VALUE._col11 (type: timestamp), VALUE._col12 (type: timestamp), VALUE._col13 (type: timestamp), VALUE._col14 (type: timestamp)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+                    projectedOutputColumnNums: [0, 1, 2, 3, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
                 Statistics: Num rows: 52 Data size: 16836 Basic stats: COMPLETE Column stats: COMPLETE
                 File Output Operator
                   compressed: false
@@ -371,14 +371,14 @@ ORDER BY c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
--45479000681	528	10	27	27	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
-1632478712	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
-1632478712	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
-1632478712	2021	9	24	24	38	3	18	32	false	2021-09-24 03:18:32.4	2010-04-08 02:43:35.861742727	1319-02-02 16:31:57.778	2021-09-24 03:18:32.4	2010-04-08 02:43:35.861742727	NULL	2010-04-08 02:43:35.861742727
-1632478712	2021	9	24	24	38	3	18	32	false	2021-09-24 03:18:32.4	NULL	1319-02-02 16:31:57.778	2021-09-24 03:18:32.4	NULL	NULL	NULL
-163809612024	7160	12	2	2	48	6	0	24	NULL	7160-12-02 06:00:24.81200852	1966-08-16 13:36:50.183	1319-02-02 16:31:57.778	7160-12-02 06:00:24.81200852	1966-08-16 13:36:50.183	NULL	1966-08-16 13:36:50.183
-163809612024	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
-490725011	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
+-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
+1632453512	2021	9	24	24	38	3	18	32	false	2021-09-24 03:18:32.4	2010-04-08 02:43:35.861742727	1319-02-02 16:31:57.778	2021-09-24 03:18:32.4	2010-04-08 02:43:35.861742727	NULL	2010-04-08 02:43:35.861742727
+1632453512	2021	9	24	24	38	3	18	32	false	2021-09-24 03:18:32.4	NULL	1319-02-02 16:31:57.778	2021-09-24 03:18:32.4	NULL	NULL	NULL
+163809583224	7160	12	2	2	48	6	0	24	NULL	7160-12-02 06:00:24.81200852	1966-08-16 13:36:50.183	1319-02-02 16:31:57.778	7160-12-02 06:00:24.81200852	1966-08-16 13:36:50.183	NULL	1966-08-16 13:36:50.183
+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:44.028	1319-02-02 16:31:57.778	NULL	1969-12-31 15:59:44.028	NULL	1969-12-31 15:59:44.028
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	false	NULL	1969-12-31 15:59:44.809	1319-02-02 16:31:57.778	NULL	1969-12-31 15:59:44.809	NULL	1969-12-31 15:59:44.809
@@ -473,7 +473,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(CAST( stimestamp1 AS DATE)) (type: int), month(CAST( stimestamp1 AS DATE)) (type: int), day(CAST( stimestamp1 AS DATE)) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(CAST( stimestamp1 AS DATE)) (type: int), hour(CAST( stimestamp1 AS TIMESTAMP)) (type: int), minute(CAST( stimestamp1 AS TIMESTAMP)) (type: int), second(CAST( stimestamp1 AS TIMESTAMP)) (type: int)
+                    expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(CAST( stimestamp1 AS DATE)) (type: int), month(CAST( stimestamp1 AS DATE)) (type: int), day(CAST( stimestamp1 AS DATE)) (type: int), day(stimestamp1) (type: int), weekofyear(CAST( stimestamp1 AS DATE)) (type: int), hour(CAST( stimestamp1 AS TIMESTAMP)) (type: int), minute(CAST( stimestamp1 AS TIMESTAMP)) (type: int), second(CAST( stimestamp1 AS TIMESTAMP)) (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -565,14 +565,14 @@ ORDER BY c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
--2736243926	1883	4	17	17	16	4	14	34
--62018170411	4	9	22	22	39	18	26	29
-1365579826	2013	4	10	10	15	0	43	46
-206731024925	8521	1	16	16	3	20	42	5
-271201265	1978	8	5	5	31	14	41	5
-501208674	1985	11	18	18	47	16	37	54
-501208674	1985	11	18	18	47	16	37	54
-94573848655	4966	12	4	4	49	9	30	55
+-2736272726	1883	4	17	17	16	4	14	34
+-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
+271176065	1978	8	5	5	31	14	41	5
+501179874	1985	11	18	18	47	16	37	54
+501179874	1985	11	18	18	47	16	37	54
+94573819855	4966	12	4	4	49	9	30	55
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -667,7 +667,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: (to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1)) (type: boolean), (year(ctimestamp1) = year(CAST( stimestamp1 AS DATE))) (type: boolean), (month(ctimestamp1) = month(CAST( stimestamp1 AS DATE))) (type: boolean), (day(ctimestamp1) = day(CAST( stimestamp1 AS DATE))) (type: boolean), (dayofmonth(ctimestamp1) = dayofmonth(stimestamp1)) (type: boolean), (weekofyear(ctimestamp1) = weekofyear(CAST( stimestamp1 AS DATE))) (type: boolean), (hour(ctimestamp1) = hour(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean), (minute(ctimestamp1) = minute(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean), (second(ctimestamp1) = second(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean)
+                    expressions: (to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1)) (type: boolean), (year(ctimestamp1) = year(CAST( stimestamp1 AS DATE))) (type: boolean), (month(ctimestamp1) = month(CAST( stimestamp1 AS DATE))) (type: boolean), (day(ctimestamp1) = day(CAST( stimestamp1 AS DATE))) (type: boolean), (day(ctimestamp1) = day(stimestamp1)) (type: boolean), (weekofyear(ctimestamp1) = weekofyear(CAST( stimestamp1 AS DATE))) (type: boolean), (hour(ctimestamp1) = hour(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean), (minute(ctimestamp1) = minute(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean), (second(ctimestamp1) = second(CAST( stimestamp1 AS TIMESTAMP))) (type: boolean)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -861,7 +861,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(CAST( stimestamp1 AS DATE)) (type: int), month(CAST( stimestamp1 AS DATE)) (type: int), day(CAST( stimestamp1 AS DATE)) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(CAST( stimestamp1 AS DATE)) (type: int), hour(CAST( stimestamp1 AS TIMESTAMP)) (type: int), minute(CAST( stimestamp1 AS TIMESTAMP)) (type: int), second(CAST( stimestamp1 AS TIMESTAMP)) (type: int)
+                    expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(CAST( stimestamp1 AS DATE)) (type: int), month(CAST( stimestamp1 AS DATE)) (type: int), day(CAST( stimestamp1 AS DATE)) (type: int), day(stimestamp1) (type: int), weekofyear(CAST( stimestamp1 AS DATE)) (type: int), hour(CAST( stimestamp1 AS TIMESTAMP)) (type: int), minute(CAST( stimestamp1 AS TIMESTAMP)) (type: int), second(CAST( stimestamp1 AS TIMESTAMP)) (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -953,7 +953,7 @@ ORDER BY c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_wrong
 #### A masked pattern was here ####
-NULL	2	11	30	NULL	48	NULL	NULL	NULL
+NULL	2	12	2	NULL	49	4	40	39
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
@@ -1218,7 +1218,7 @@ FROM alltypesorc_string
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-2.89160863229166E11
+2.89160478029166E11
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION  SELECT
   round(avg(ctimestamp1), 0),
   variance(ctimestamp1) between 8.97077295279421E19 and 8.97077295279422E19,
@@ -1377,4 +1377,4 @@ FROM alltypesorc_string
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-3.6145107904E10	false	false	false	7.5245155692476E10	7.5245155692476E10	7.5245155692476E10	8.0440455033059E10
+3.6145059754E10	false	false	false	7.5245178084814E10	7.5245178084814E10	7.5245178084814E10	8.0440478971476E10

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
index 14ca738..bbf07a8 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
@@ -137,32 +137,32 @@ where cbigint % 250 = 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-1969-12-31 15:59:59.964	1969-12-31 15:59:59.8	NULL	1969-12-08 10:43:03.25	1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 15:59:45.748	NULL	NULL
-1969-12-31 15:59:59.964	1969-12-31 15:59:59.8	NULL	1970-01-19 04:24:39	1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 15:59:53.817	NULL	NULL
-1969-12-31 15:59:59.97	1969-12-31 15:59:59.8	NULL	1970-01-17 05:10:52.25	1969-12-31 15:59:30	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 16:00:12.935	NULL	NULL
-1969-12-31 15:59:59.949	NULL	1970-01-09 14:53:20.971	1970-01-12 20:45:23.25	1969-12-31 15:59:09	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:08.451	NULL	NULL
-1969-12-31 15:59:59.949	NULL	1970-01-09 07:39:13.882	1969-12-09 07:45:32.75	1969-12-31 15:59:09	NULL	1969-12-31 16:00:00.001	1969-12-31 16:00:00	1969-12-31 16:00:08.451	NULL	NULL
-1969-12-31 16:00:00.02	1969-12-31 16:00:15.601	NULL	1969-12-27 11:19:26.75	1969-12-31 16:00:20	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:45.129	NULL	NULL
-1969-12-31 15:59:59.962	1969-12-31 16:00:15.601	NULL	1969-12-10 03:41:51	1969-12-31 15:59:22	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:58.614	NULL	NULL
-1969-12-31 15:59:59.995	1969-12-31 16:00:15.601	NULL	1970-01-07 18:06:56	1969-12-31 15:59:55	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 16:00:04.679	NULL	NULL
-1969-12-31 16:00:00.048	1969-12-31 16:00:15.601	NULL	1969-12-22 11:03:59	1969-12-31 16:00:48	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:50.235	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1969-12-24 00:12:58.862	1969-12-20 21:16:47.25	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1969-12-30 11:24:23.566	1969-12-16 11:20:17.25	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1970-01-09 23:39:39.664	1970-01-10 17:09:21.5	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1969-12-23 21:59:27.689	1970-01-19 01:16:31.25	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1970-01-10 23:29:48.972	1969-12-10 02:41:39	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00.001	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:00.008	NULL	1970-01-11 10:34:27.246	1970-01-14 14:49:59.25	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00.001	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 15:59:59.941	1969-12-31 15:59:52.804	NULL	1969-12-13 02:11:50	1969-12-31 15:59:01	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:13.15	NULL	NULL
-1969-12-31 15:59:59.979	1969-12-31 15:59:52.804	NULL	1970-01-18 12:27:09	1969-12-31 15:59:39	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:55.9	NULL	NULL
-1969-12-31 15:59:59.94	1969-12-31 15:59:52.804	NULL	1970-01-18 05:11:54.75	1969-12-31 15:59:00	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:52.408	NULL	NULL
-1969-12-31 15:59:59.986	1969-12-31 15:59:52.804	NULL	1969-12-13 16:50:00.5	1969-12-31 15:59:46	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:11.065	NULL	NULL
-1969-12-31 16:00:00.059	1969-12-31 15:59:52.804	NULL	1969-12-18 11:57:25.5	1969-12-31 16:00:59	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:10.956	NULL	NULL
-1969-12-31 15:59:59.992	1969-12-31 15:59:52.804	NULL	1969-12-10 06:06:48.5	1969-12-31 15:59:52	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:03.136	NULL	NULL
-1969-12-31 16:00:00.005	1969-12-31 15:59:52.804	NULL	1969-12-19 21:53:12.5	1969-12-31 16:00:05	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:10.973	NULL	NULL
-1969-12-31 15:59:59.976	1969-12-31 15:59:52.804	NULL	1970-01-10 06:18:31	1969-12-31 15:59:36	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:53.145	NULL	NULL
-1969-12-31 15:59:59.95	1969-12-31 15:59:52.804	NULL	1969-12-19 17:33:32.75	1969-12-31 15:59:10	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:54.733	NULL	NULL
-1969-12-31 16:00:00.011	NULL	1969-12-30 22:03:04.018	1970-01-21 12:50:53.75	1969-12-31 16:00:11	NULL	1969-12-31 16:00:00.001	1969-12-31 16:00:00	1969-12-31 16:00:02.351	NULL	NULL
-1969-12-31 16:00:00.011	NULL	1969-12-27 18:49:09.583	1970-01-14 22:35:27	1969-12-31 16:00:11	NULL	1969-12-31 16:00:00.001	1969-12-31 16:00:00	1969-12-31 16:00:02.351	NULL	NULL
+1969-12-31 23:59:59.964	1969-12-31 23:59:59.8	NULL	1969-12-08 18:43:03.25	1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 15:59:45.748	NULL	NULL
+1969-12-31 23:59:59.964	1969-12-31 23:59:59.8	NULL	1970-01-19 12:24:39	1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 15:59:53.817	NULL	NULL
+1969-12-31 23:59:59.97	1969-12-31 23:59:59.8	NULL	1970-01-17 13:10:52.25	1969-12-31 23:59:30	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 16:00:12.935	NULL	NULL
+1969-12-31 23:59:59.949	NULL	1970-01-09 22:53:20.971	1970-01-13 04:45:23.25	1969-12-31 23:59:09	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:08.451	NULL	NULL
+1969-12-31 23:59:59.949	NULL	1970-01-09 15:39:13.882	1969-12-09 15:45:32.75	1969-12-31 23:59:09	NULL	1970-01-01 00:00:00.001	1970-01-01 00:00:00	1969-12-31 16:00:08.451	NULL	NULL
+1970-01-01 00:00:00.02	1970-01-01 00:00:15.601	NULL	1969-12-27 19:19:26.75	1970-01-01 00:00:20	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:45.129	NULL	NULL
+1969-12-31 23:59:59.962	1970-01-01 00:00:15.601	NULL	1969-12-10 11:41:51	1969-12-31 23:59:22	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:58.614	NULL	NULL
+1969-12-31 23:59:59.995	1970-01-01 00:00:15.601	NULL	1970-01-08 02:06:56	1969-12-31 23:59:55	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 16:00:04.679	NULL	NULL
+1970-01-01 00:00:00.048	1970-01-01 00:00:15.601	NULL	1969-12-22 19:03:59	1970-01-01 00:00:48	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:50.235	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1969-12-24 08:12:58.862	1969-12-21 05:16:47.25	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1969-12-30 19:24:23.566	1969-12-16 19:20:17.25	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1970-01-10 07:39:39.664	1970-01-11 01:09:21.5	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1969-12-24 05:59:27.689	1970-01-19 09:16:31.25	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1970-01-11 07:29:48.972	1969-12-10 10:41:39	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00.001	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:00.008	NULL	1970-01-11 18:34:27.246	1970-01-14 22:49:59.25	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00.001	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1969-12-31 23:59:59.941	1969-12-31 23:59:52.804	NULL	1969-12-13 10:11:50	1969-12-31 23:59:01	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:13.15	NULL	NULL
+1969-12-31 23:59:59.979	1969-12-31 23:59:52.804	NULL	1970-01-18 20:27:09	1969-12-31 23:59:39	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:55.9	NULL	NULL
+1969-12-31 23:59:59.94	1969-12-31 23:59:52.804	NULL	1970-01-18 13:11:54.75	1969-12-31 23:59:00	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:52.408	NULL	NULL
+1969-12-31 23:59:59.986	1969-12-31 23:59:52.804	NULL	1969-12-14 00:50:00.5	1969-12-31 23:59:46	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:11.065	NULL	NULL
+1970-01-01 00:00:00.059	1969-12-31 23:59:52.804	NULL	1969-12-18 19:57:25.5	1970-01-01 00:00:59	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:10.956	NULL	NULL
+1969-12-31 23:59:59.992	1969-12-31 23:59:52.804	NULL	1969-12-10 14:06:48.5	1969-12-31 23:59:52	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:03.136	NULL	NULL
+1970-01-01 00:00:00.005	1969-12-31 23:59:52.804	NULL	1969-12-20 05:53:12.5	1970-01-01 00:00:05	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:10.973	NULL	NULL
+1969-12-31 23:59:59.976	1969-12-31 23:59:52.804	NULL	1970-01-10 14:18:31	1969-12-31 23:59:36	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:53.145	NULL	NULL
+1969-12-31 23:59:59.95	1969-12-31 23:59:52.804	NULL	1969-12-20 01:33:32.75	1969-12-31 23:59:10	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:54.733	NULL	NULL
+1970-01-01 00:00:00.011	NULL	1969-12-31 06:03:04.018	1970-01-21 20:50:53.75	1970-01-01 00:00:11	NULL	1970-01-01 00:00:00.001	1970-01-01 00:00:00	1969-12-31 16:00:02.351	NULL	NULL
+1970-01-01 00:00:00.011	NULL	1969-12-28 02:49:09.583	1970-01-15 06:35:27	1970-01-01 00:00:11	NULL	1970-01-01 00:00:00.001	1970-01-01 00:00:00	1969-12-31 16:00:02.351	NULL	NULL
 PREHOOK: query: explain vectorization expression
 select
 
@@ -302,29 +302,29 @@ where cbigint % 250 = 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	1906-06-05 13:34:10	1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 15:59:45.748	NULL	NULL
-1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	2020-09-11 19:50:00	1969-12-31 15:59:24	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 15:59:53.817	NULL	NULL
-1969-12-31 15:59:30	1969-12-31 15:56:40	NULL	2015-04-23 22:10:50	1969-12-31 15:59:30	1969-12-31 15:56:40	NULL	1969-12-31 16:00:00	1969-12-31 16:00:12.935	NULL	NULL
-1969-12-31 15:59:09	NULL	1994-07-07 10:09:31	2003-05-25 21:27:30	1969-12-31 15:59:09	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:08.451	NULL	NULL
-1969-12-31 15:59:09	NULL	1993-09-08 22:51:22	1908-10-29 07:05:50	1969-12-31 15:59:09	NULL	1969-12-31 16:00:01	1969-12-31 16:00:00	1969-12-31 16:00:08.451	NULL	NULL
-1969-12-31 16:00:20	1969-12-31 20:20:01	NULL	1958-07-07 21:05:50	1969-12-31 16:00:20	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:45.129	NULL	NULL
-1969-12-31 15:59:22	1969-12-31 20:20:01	NULL	1911-02-07 01:30:00	1969-12-31 15:59:22	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:58.614	NULL	NULL
-1969-12-31 15:59:55	1969-12-31 20:20:01	NULL	1989-05-28 20:33:20	1969-12-31 15:59:55	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 16:00:04.679	NULL	NULL
-1969-12-31 16:00:48	1969-12-31 20:20:01	NULL	1944-10-18 03:23:20	1969-12-31 16:00:48	1969-12-31 20:20:01	NULL	1969-12-31 16:00:00	1969-12-31 15:59:50.235	NULL	NULL
-1969-12-31 16:00:08	NULL	1949-01-13 00:21:02	1940-06-26 15:47:30	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:08	NULL	1966-09-27 07:32:46	1928-05-26 10:07:30	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:08	NULL	1995-07-07 22:01:04	1997-07-05 20:58:20	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:08	NULL	1948-10-12 08:01:29	2020-05-04 04:20:50	1969-12-31 16:00:08	NULL	1969-12-31 16:00:00	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:08	NULL	1998-03-27 00:56:12	1910-12-27 06:10:00	1969-12-31 16:00:08	NULL	1969-12-31 16:00:01	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 16:00:08	NULL	1999-07-01 15:14:06	2008-03-13 02:07:30	1969-12-31 16:00:08	NULL	1969-12-31 16:00:01	1969-12-31 16:00:00	1969-12-31 16:00:15.892	NULL	NULL
-1969-12-31 15:59:01	1969-12-31 14:00:04	NULL	1919-02-22 13:13:20	1969-12-31 15:59:01	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:13.15	NULL	NULL
-1969-12-31 15:59:39	1969-12-31 14:00:04	NULL	2018-11-16 20:30:00	1969-12-31 15:59:39	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:55.9	NULL	NULL
-1969-12-31 15:59:00	1969-12-31 14:00:04	NULL	2018-01-18 14:32:30	1969-12-31 15:59:00	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:52.408	NULL	NULL
-1969-12-31 15:59:46	1969-12-31 14:00:04	NULL	1920-10-24 09:28:20	1969-12-31 15:59:46	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:11.065	NULL	NULL
-1969-12-31 16:00:59	1969-12-31 14:00:04	NULL	1933-12-12 05:05:00	1969-12-31 16:00:59	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:10.956	NULL	NULL
-1969-12-31 15:59:52	1969-12-31 14:00:04	NULL	1911-05-18 17:28:20	1969-12-31 15:59:52	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:03.136	NULL	NULL
-1969-12-31 16:00:05	1969-12-31 14:00:04	NULL	1937-10-25 22:48:20	1969-12-31 16:00:05	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 16:00:10.973	NULL	NULL
-1969-12-31 15:59:36	1969-12-31 14:00:04	NULL	1996-04-09 21:36:40	1969-12-31 15:59:36	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:53.145	NULL	NULL
-1969-12-31 15:59:10	1969-12-31 14:00:04	NULL	1937-04-28 15:05:50	1969-12-31 15:59:10	1969-12-31 14:00:04	NULL	1969-12-31 16:00:00	1969-12-31 15:59:54.733	NULL	NULL
-1969-12-31 16:00:11	NULL	1967-12-14 19:06:58	2027-02-19 08:15:50	1969-12-31 16:00:11	NULL	1969-12-31 16:00:01	1969-12-31 16:00:00	1969-12-31 16:00:02.351	NULL	NULL
-1969-12-31 16:00:11	NULL	1959-05-16 04:19:43	2009-01-30 06:50:00	1969-12-31 16:00:11	NULL	1969-12-31 16:00:01	1969-12-31 16:00:00	1969-12-31 16:00:02.351	NULL	NULL
+1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	1906-06-05 21:34:10	1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 15:59:45.748	NULL	NULL
+1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	2020-09-12 02:50:00	1969-12-31 23:59:24	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 15:59:53.817	NULL	NULL
+1969-12-31 23:59:30	1969-12-31 23:56:40	NULL	2015-04-24 05:10:50	1969-12-31 23:59:30	1969-12-31 23:56:40	NULL	1970-01-01 00:00:00	1969-12-31 16:00:12.935	NULL	NULL
+1969-12-31 23:59:09	NULL	1994-07-07 17:09:31	2003-05-26 04:27:30	1969-12-31 23:59:09	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:08.451	NULL	NULL
+1969-12-31 23:59:09	NULL	1993-09-09 05:51:22	1908-10-29 15:05:50	1969-12-31 23:59:09	NULL	1970-01-01 00:00:01	1970-01-01 00:00:00	1969-12-31 16:00:08.451	NULL	NULL
+1970-01-01 00:00:20	1970-01-01 04:20:01	NULL	1958-07-08 04:05:50	1970-01-01 00:00:20	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:45.129	NULL	NULL
+1969-12-31 23:59:22	1970-01-01 04:20:01	NULL	1911-02-07 09:30:00	1969-12-31 23:59:22	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:58.614	NULL	NULL
+1969-12-31 23:59:55	1970-01-01 04:20:01	NULL	1989-05-29 03:33:20	1969-12-31 23:59:55	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 16:00:04.679	NULL	NULL
+1970-01-01 00:00:48	1970-01-01 04:20:01	NULL	1944-10-18 10:23:20	1970-01-01 00:00:48	1970-01-01 04:20:01	NULL	1970-01-01 00:00:00	1969-12-31 15:59:50.235	NULL	NULL
+1970-01-01 00:00:08	NULL	1949-01-13 08:21:02	1940-06-26 23:47:30	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:08	NULL	1966-09-27 14:32:46	1928-05-26 18:07:30	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:08	NULL	1995-07-08 05:01:04	1997-07-06 03:58:20	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:08	NULL	1948-10-12 15:01:29	2020-05-04 11:20:50	1970-01-01 00:00:08	NULL	1970-01-01 00:00:00	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:08	NULL	1998-03-27 08:56:12	1910-12-27 14:10:00	1970-01-01 00:00:08	NULL	1970-01-01 00:00:01	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1970-01-01 00:00:08	NULL	1999-07-01 22:14:06	2008-03-13 09:07:30	1970-01-01 00:00:08	NULL	1970-01-01 00:00:01	1970-01-01 00:00:00	1969-12-31 16:00:15.892	NULL	NULL
+1969-12-31 23:59:01	1969-12-31 22:00:04	NULL	1919-02-22 21:13:20	1969-12-31 23:59:01	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:13.15	NULL	NULL
+1969-12-31 23:59:39	1969-12-31 22:00:04	NULL	2018-11-17 04:30:00	1969-12-31 23:59:39	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:55.9	NULL	NULL
+1969-12-31 23:59:00	1969-12-31 22:00:04	NULL	2018-01-18 22:32:30	1969-12-31 23:59:00	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:52.408	NULL	NULL
+1969-12-31 23:59:46	1969-12-31 22:00:04	NULL	1920-10-24 17:28:20	1969-12-31 23:59:46	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:11.065	NULL	NULL
+1970-01-01 00:00:59	1969-12-31 22:00:04	NULL	1933-12-12 13:05:00	1970-01-01 00:00:59	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:10.956	NULL	NULL
+1969-12-31 23:59:52	1969-12-31 22:00:04	NULL	1911-05-19 01:28:20	1969-12-31 23:59:52	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:03.136	NULL	NULL
+1970-01-01 00:00:05	1969-12-31 22:00:04	NULL	1937-10-26 06:48:20	1970-01-01 00:00:05	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 16:00:10.973	NULL	NULL
+1969-12-31 23:59:36	1969-12-31 22:00:04	NULL	1996-04-10 04:36:40	1969-12-31 23:59:36	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:53.145	NULL	NULL
+1969-12-31 23:59:10	1969-12-31 22:00:04	NULL	1937-04-28 23:05:50	1969-12-31 23:59:10	1969-12-31 22:00:04	NULL	1970-01-01 00:00:00	1969-12-31 15:59:54.733	NULL	NULL
+1970-01-01 00:00:11	NULL	1967-12-15 03:06:58	2027-02-19 16:15:50	1970-01-01 00:00:11	NULL	1970-01-01 00:00:01	1970-01-01 00:00:00	1969-12-31 16:00:02.351	NULL	NULL
+1970-01-01 00:00:11	NULL	1959-05-16 11:19:43	2009-01-30 14:50:00	1970-01-01 00:00:11	NULL	1970-01-01 00:00:01	1970-01-01 00:00:00	1969-12-31 16:00:02.351	NULL	NULL

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/llap_uncompressed.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap_uncompressed.q.out b/ql/src/test/results/clientpositive/llap_uncompressed.q.out
index a11a30c..fd3ed1d 100644
--- a/ql/src/test/results/clientpositive/llap_uncompressed.q.out
+++ b/ql/src/test/results/clientpositive/llap_uncompressed.q.out
@@ -137,7 +137,7 @@ POSTHOOK: query: select sum(hash(*)) from llap_temp_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@llap_temp_table
 #### A masked pattern was here ####
--42787391908
+-107598224420
 PREHOOK: query: explain
 select * from orc_llap_n0 where cint > 10 and cint < 5000000
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/localtimezone.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/localtimezone.q.out b/ql/src/test/results/clientpositive/localtimezone.q.out
index a76e4a3..b4c6d86 100644
--- a/ql/src/test/results/clientpositive/localtimezone.q.out
+++ b/ql/src/test/results/clientpositive/localtimezone.q.out
@@ -19,24 +19,24 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@date_test
 PREHOOK: query: insert into `date_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@date_test
 POSTHOOK: query: insert into `date_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@date_test
@@ -50,24 +50,24 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@timestamp_test
 PREHOOK: query: insert into `timestamp_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@timestamp_test
 POSTHOOK: query: insert into `timestamp_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@timestamp_test
@@ -81,24 +81,24 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@timestamptz_test
 PREHOOK: query: insert into `timestamptz_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@timestamptz_test
 POSTHOOK: query: insert into `timestamptz_test` VALUES
-  ('2011-01-01 01:01:01.123'),
-  ('2011-01-01 01:01:01.123 Europe/Rome'),
-  ('2011-01-01 01:01:01.123 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912'),
-  ('2011-01-01 01:01:01.12345678912 Europe/Rome'),
-  ('2011-01-01 01:01:01.12345678912 GMT-05:00'),
-  ('2011-01-01 01:01:01.12345678912 xyz')
+  (cast('2011-01-01 01:01:01.123' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.123 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 Europe/Rome' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 GMT-05:00' as timestamp with local time zone)),
+  (cast('2011-01-01 01:01:01.12345678912 xyz' as timestamp with local time zone))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@timestamptz_test

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/localtimezone2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/localtimezone2.q.out b/ql/src/test/results/clientpositive/localtimezone2.q.out
new file mode 100644
index 0000000..fb4bd17
--- /dev/null
+++ b/ql/src/test/results/clientpositive/localtimezone2.q.out
@@ -0,0 +1,148 @@
+PREHOOK: query: drop table `table_tsltz`
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table `table_tsltz`
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE table_tsltz (tz VARCHAR(200),
+                         c_ts1 TIMESTAMP,
+                         c_ts2 TIMESTAMP,
+                         c_tsltz1 TIMESTAMP WITH LOCAL TIME ZONE,
+                         c_tsltz2 TIMESTAMP WITH LOCAL TIME ZONE)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@table_tsltz
+POSTHOOK: query: CREATE TABLE table_tsltz (tz VARCHAR(200),
+                         c_ts1 TIMESTAMP,
+                         c_ts2 TIMESTAMP,
+                         c_tsltz1 TIMESTAMP WITH LOCAL TIME ZONE,
+                         c_tsltz2 TIMESTAMP WITH LOCAL TIME ZONE)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@table_tsltz
+PREHOOK: query: insert into table_tsltz values (
+  '-08:00',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table_tsltz
+POSTHOOK: query: insert into table_tsltz values (
+  '-08:00',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table_tsltz
+POSTHOOK: Lineage: table_tsltz.c_ts1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_ts2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.tz SCRIPT []
+PREHOOK: query: insert into table_tsltz values (
+  'UTC',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table_tsltz
+POSTHOOK: query: insert into table_tsltz values (
+  'UTC',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table_tsltz
+POSTHOOK: Lineage: table_tsltz.c_ts1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_ts2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.tz SCRIPT []
+PREHOOK: query: insert into table_tsltz values (
+  '+02:00',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table_tsltz
+POSTHOOK: query: insert into table_tsltz values (
+  '+02:00',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table_tsltz
+POSTHOOK: Lineage: table_tsltz.c_ts1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_ts2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.tz SCRIPT []
+PREHOOK: query: insert into table_tsltz values (
+  'US/Pacific',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table_tsltz
+POSTHOOK: query: insert into table_tsltz values (
+  'US/Pacific',
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone),
+  cast('2016-01-01 00:00:00' as timestamp),
+  cast('2016-01-01 00:00:00 -05:00' as timestamp with local time zone))
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table_tsltz
+POSTHOOK: Lineage: table_tsltz.c_ts1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_ts2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz1 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.c_tsltz2 SCRIPT []
+POSTHOOK: Lineage: table_tsltz.tz SCRIPT []
+PREHOOK: query: select tz,
+    c_ts1, c_ts2,
+    cast(c_tsltz1 as VARCHAR(200)) as c_tsltz1, cast(c_tsltz2 as VARCHAR(200)) as c_tsltz2
+from table_tsltz
+PREHOOK: type: QUERY
+PREHOOK: Input: default@table_tsltz
+#### A masked pattern was here ####
+POSTHOOK: query: select tz,
+    c_ts1, c_ts2,
+    cast(c_tsltz1 as VARCHAR(200)) as c_tsltz1, cast(c_tsltz2 as VARCHAR(200)) as c_tsltz2
+from table_tsltz
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_tsltz
+#### A masked pattern was here ####
+-08:00	2016-01-01 00:00:00	2015-12-31 21:00:00	2016-01-01 00:00:00.0 US/Pacific	2015-12-31 21:00:00.0 US/Pacific
+UTC	2016-01-01 00:00:00	2016-01-01 05:00:00	2015-12-31 16:00:00.0 US/Pacific	2015-12-31 21:00:00.0 US/Pacific
++02:00	2016-01-01 00:00:00	2016-01-01 07:00:00	2015-12-31 14:00:00.0 US/Pacific	2015-12-31 21:00:00.0 US/Pacific
+US/Pacific	2016-01-01 00:00:00	2015-12-31 21:00:00	2016-01-01 00:00:00.0 US/Pacific	2015-12-31 21:00:00.0 US/Pacific
+PREHOOK: query: select tz,
+    c_ts1, c_ts2,
+    cast(c_tsltz1 as VARCHAR(200)) as c_tsltz1, cast(c_tsltz2 as VARCHAR(200)) as c_tsltz2
+from table_tsltz
+PREHOOK: type: QUERY
+PREHOOK: Input: default@table_tsltz
+#### A masked pattern was here ####
+POSTHOOK: query: select tz,
+    c_ts1, c_ts2,
+    cast(c_tsltz1 as VARCHAR(200)) as c_tsltz1, cast(c_tsltz2 as VARCHAR(200)) as c_tsltz2
+from table_tsltz
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_tsltz
+#### A masked pattern was here ####
+-08:00	2016-01-01 00:00:00	2015-12-31 21:00:00	2016-01-01 08:00:00.0 UTC	2016-01-01 05:00:00.0 UTC
+UTC	2016-01-01 00:00:00	2016-01-01 05:00:00	2016-01-01 00:00:00.0 UTC	2016-01-01 05:00:00.0 UTC
++02:00	2016-01-01 00:00:00	2016-01-01 07:00:00	2015-12-31 22:00:00.0 UTC	2016-01-01 05:00:00.0 UTC
+US/Pacific	2016-01-01 00:00:00	2015-12-31 21:00:00	2016-01-01 08:00:00.0 UTC	2016-01-01 05:00:00.0 UTC

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/orc_file_dump.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_file_dump.q.out b/ql/src/test/results/clientpositive/orc_file_dump.q.out
index 5101312..77be7a5 100644
--- a/ql/src/test/results/clientpositive/orc_file_dump.q.out
+++ b/ql/src/test/results/clientpositive/orc_file_dump.q.out
@@ -129,7 +129,7 @@ File Statistics:
   Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22405 rows: 1049 tail: 253 index: 8956
+  Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8956
     Stream: column 0 section ROW_INDEX start: 3 length 20
     Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34
     Stream: column 1 section ROW_INDEX start: 57 length 58
@@ -269,7 +269,7 @@ Stripes:
       Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 98 loadFactor: 0.0156 expectedFpp: 5.9604645E-8
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 102 loadFactor: 0.0163 expectedFpp: 6.9948186E-8
 
-File length: 32309 bytes
+File length: 32298 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________
@@ -326,7 +326,7 @@ File Statistics:
   Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22405 rows: 1049 tail: 248 index: 13603
+  Stripe: offset: 3 data: 22405 rows: 1049 tail: 240 index: 13603
     Stream: column 0 section ROW_INDEX start: 3 length 20
     Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 43
     Stream: column 1 section ROW_INDEX start: 66 length 58
@@ -466,7 +466,7 @@ Stripes:
       Entry 1: numHashFunctions: 7 bitCount: 9600 popCount: 174 loadFactor: 0.0181 expectedFpp: 6.426078E-13
       Stripe level merge: numHashFunctions: 7 bitCount: 9600 popCount: 181 loadFactor: 0.0189 expectedFpp: 8.4693775E-13
 
-File length: 36950 bytes
+File length: 36943 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________
@@ -535,7 +535,7 @@ File Statistics:
   Column 11: count: 1049 hasNull: false bytesOnDisk: 2468 sum: 13278
 
 Stripes:
-  Stripe: offset: 3 data: 22405 rows: 1049 tail: 253 index: 8956
+  Stripe: offset: 3 data: 22405 rows: 1049 tail: 242 index: 8956
     Stream: column 0 section ROW_INDEX start: 3 length 20
     Stream: column 0 section BLOOM_FILTER_UTF8 start: 23 length 34
     Stream: column 1 section ROW_INDEX start: 57 length 58
@@ -675,7 +675,7 @@ Stripes:
       Entry 1: numHashFunctions: 4 bitCount: 6272 popCount: 98 loadFactor: 0.0156 expectedFpp: 5.9604645E-8
       Stripe level merge: numHashFunctions: 4 bitCount: 6272 popCount: 102 loadFactor: 0.0163 expectedFpp: 6.9948186E-8
 
-File length: 32309 bytes
+File length: 32298 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________

http://git-wip-us.apache.org/repos/asf/hive/blob/ae008b79/ql/src/test/results/clientpositive/orc_merge11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_merge11.q.out b/ql/src/test/results/clientpositive/orc_merge11.q.out
index 8e7840c..5327299 100644
--- a/ql/src/test/results/clientpositive/orc_merge11.q.out
+++ b/ql/src/test/results/clientpositive/orc_merge11.q.out
@@ -96,7 +96,7 @@ File Statistics:
   Column 5: count: 50000 hasNull: false bytesOnDisk: 64 min: 1969-12-31 16:00:00.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:00:00.0 max UTC: 1969-12-31 08:04:10.0
 
 Stripes:
-  Stripe: offset: 3 data: 5761 rows: 50000 tail: 112 index: 433
+  Stripe: offset: 3 data: 5761 rows: 50000 tail: 99 index: 433
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 73
     Stream: column 2 section ROW_INDEX start: 93 length 79
@@ -155,7 +155,7 @@ Stripes:
       Entry 3: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,506,294,0,232,304
       Entry 4: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,666,54,0,312,64
 
-File length: 6685 bytes
+File length: 6672 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________
@@ -187,7 +187,7 @@ File Statistics:
   Column 5: count: 50000 hasNull: false bytesOnDisk: 64 min: 1969-12-31 16:00:00.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:00:00.0 max UTC: 1969-12-31 08:04:10.0
 
 Stripes:
-  Stripe: offset: 3 data: 5761 rows: 50000 tail: 112 index: 433
+  Stripe: offset: 3 data: 5761 rows: 50000 tail: 99 index: 433
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 73
     Stream: column 2 section ROW_INDEX start: 93 length 79
@@ -246,7 +246,7 @@ Stripes:
       Entry 3: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,506,294,0,232,304
       Entry 4: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,666,54,0,312,64
 
-File length: 6685 bytes
+File length: 6672 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________
@@ -306,7 +306,7 @@ File Statistics:
   Column 5: count: 100000 hasNull: false bytesOnDisk: 128 min: 1969-12-31 16:00:00.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:00:00.0 max UTC: 1969-12-31 08:04:10.0
 
 Stripes:
-  Stripe: offset: 3 data: 5761 rows: 50000 tail: 112 index: 433
+  Stripe: offset: 3 data: 5761 rows: 50000 tail: 99 index: 433
     Stream: column 0 section ROW_INDEX start: 3 length 17
     Stream: column 1 section ROW_INDEX start: 20 length 73
     Stream: column 2 section ROW_INDEX start: 93 length 79
@@ -364,22 +364,22 @@ Stripes:
       Entry 2: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,354,22,0,156,32
       Entry 3: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,506,294,0,232,304
       Entry 4: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,666,54,0,312,64
-  Stripe: offset: 6309 data: 5761 rows: 50000 tail: 112 index: 433
-    Stream: column 0 section ROW_INDEX start: 6309 length 17
-    Stream: column 1 section ROW_INDEX start: 6326 length 73
-    Stream: column 2 section ROW_INDEX start: 6399 length 79
-    Stream: column 3 section ROW_INDEX start: 6478 length 85
-    Stream: column 4 section ROW_INDEX start: 6563 length 92
-    Stream: column 5 section ROW_INDEX start: 6655 length 87
-    Stream: column 1 section DATA start: 6742 length 30
-    Stream: column 2 section DATA start: 6772 length 24
-    Stream: column 2 section LENGTH start: 6796 length 8
-    Stream: column 2 section DICTIONARY_DATA start: 6804 length 23
-    Stream: column 3 section DATA start: 6827 length 5114
-    Stream: column 4 section DATA start: 11941 length 480
-    Stream: column 4 section SECONDARY start: 12421 length 18
-    Stream: column 5 section DATA start: 12439 length 46
-    Stream: column 5 section SECONDARY start: 12485 length 18
+  Stripe: offset: 6296 data: 5761 rows: 50000 tail: 99 index: 433
+    Stream: column 0 section ROW_INDEX start: 6296 length 17
+    Stream: column 1 section ROW_INDEX start: 6313 length 73
+    Stream: column 2 section ROW_INDEX start: 6386 length 79
+    Stream: column 3 section ROW_INDEX start: 6465 length 85
+    Stream: column 4 section ROW_INDEX start: 6550 length 92
+    Stream: column 5 section ROW_INDEX start: 6642 length 87
+    Stream: column 1 section DATA start: 6729 length 30
+    Stream: column 2 section DATA start: 6759 length 24
+    Stream: column 2 section LENGTH start: 6783 length 8
+    Stream: column 2 section DICTIONARY_DATA start: 6791 length 23
+    Stream: column 3 section DATA start: 6814 length 5114
+    Stream: column 4 section DATA start: 11928 length 480
+    Stream: column 4 section SECONDARY start: 12408 length 18
+    Stream: column 5 section DATA start: 12426 length 46
+    Stream: column 5 section SECONDARY start: 12472 length 18
     Encoding column 0: DIRECT
     Encoding column 1: DIRECT_V2
     Encoding column 2: DICTIONARY_V2[6]
@@ -423,7 +423,7 @@ Stripes:
       Entry 3: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,506,294,0,232,304
       Entry 4: count: 10000 hasNull: false min: 1969-12-31 16:04:10.0 max: 1969-12-31 16:04:10.0 min UTC: 1969-12-31 08:04:10.0 max UTC: 1969-12-31 08:04:10.0 positions: 0,666,54,0,312,64
 
-File length: 13004 bytes
+File length: 12978 bytes
 Padding length: 0 bytes
 Padding ratio: 0%
 ________________________________________________________________________________________________________________________