You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2015/09/30 21:06:18 UTC
hive git commit: HIVE-10178: DateWritable incorrectly calculates
daysSinceEpoch for negative Unix time (Alex Pivovarov via Jason Dere)
Repository: hive
Updated Branches:
refs/heads/branch-1.0 d00a5a26e -> 5000b2f76
HIVE-10178: DateWritable incorrectly calculates daysSinceEpoch for negative Unix time (Alex Pivovarov via Jason Dere)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5000b2f7
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5000b2f7
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5000b2f7
Branch: refs/heads/branch-1.0
Commit: 5000b2f7667bc526c0ab12c6389d927a2ccf8e21
Parents: d00a5a2
Author: Jason Dere <jd...@hortonworks.com>
Authored: Wed Sep 30 12:05:00 2015 -0700
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Wed Sep 30 12:05:00 2015 -0700
----------------------------------------------------------------------
.../clientpositive/tez/update_all_types.q.out | 26 ++--
.../clientpositive/tez/vector_between_in.q.out | 145 +++++++------------
.../clientpositive/update_all_types.q.out | 26 ++--
.../clientpositive/vector_between_in.q.out | 145 +++++++------------
.../hadoop/hive/serde2/io/DateWritable.java | 19 ++-
5 files changed, 146 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5000b2f7/ql/src/test/results/clientpositive/tez/update_all_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/update_all_types.q.out b/ql/src/test/results/clientpositive/tez/update_all_types.q.out
index eba4dde..0e268b9 100644
--- a/ql/src/test/results/clientpositive/tez/update_all_types.q.out
+++ b/ql/src/test/results/clientpositive/tez/update_all_types.q.out
@@ -88,14 +88,14 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-51 NULL -1071480828 -1401575336 -51.0 NULL -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -741 -1070883071 -1645852809 NULL -741.0 NULL NULL 1970-01-01 0ruyd6Y50JpdGRf6HqD 0ruyd6Y50JpdGRf6HqD xH7445Rals48VOulSyR5F false
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -741 -1070883071 -1645852809 NULL -741.0 NULL NULL 1969-12-31 0ruyd6Y50JpdGRf6HqD 0ruyd6Y50JpdGRf6HqD xH7445Rals48VOulSyR5F false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
PREHOOK: query: update acid_uat set
ti = 1,
@@ -142,13 +142,13 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-51 NULL -1071480828 -1401575336 -51.0 NULL -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
1 2 3 4 3.14 6.28 5.99 NULL 2014-09-01 its a beautiful day in the neighbhorhood a beautiful day for a neighbor wont you be mine true
PREHOOK: query: update acid_uat set
@@ -176,12 +176,12 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-102 -51 -1071480828 -1401575336 -51.0 -51.0 -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
1 2 3 4 3.14 6.28 5.99 NULL 2014-09-01 its a beautiful day in the neighbhorhood a beautiful day for a neighbor wont you be mine true
http://git-wip-us.apache.org/repos/asf/hive/blob/5000b2f7/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_between_in.q.out b/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
index bf97900..0f7aa94 100644
--- a/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_between_in.q.out
@@ -467,36 +467,6 @@ POSTHOOK: Input: default@decimal_date_test
1969-07-14
1969-07-14
1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
1969-10-26
1969-10-26
1969-10-26
@@ -519,7 +489,7 @@ POSTHOOK: query: SELECT COUNT(*) FROM decimal_date_test WHERE cdate NOT IN (CAST
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal_date_test
#### A masked pattern was here ####
-5996
+6026
PREHOOK: query: SELECT cdecimal1 FROM decimal_date_test WHERE cdecimal1 IN (2365.8945945946, 881.0135135135, -3367.6517567568) ORDER BY cdecimal1
PREHOOK: type: QUERY
PREHOOK: Input: default@decimal_date_test
@@ -562,6 +532,45 @@ POSTHOOK: Input: default@decimal_date_test
1969-12-30
1969-12-30
1969-12-30
+1969-12-30
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
1969-12-31
1969-12-31
1969-12-31
@@ -571,53 +580,6 @@ POSTHOOK: Input: default@decimal_date_test
1969-12-31
1969-12-31
1969-12-31
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
1970-01-01
1970-01-01
1970-01-01
@@ -654,22 +616,23 @@ POSTHOOK: query: SELECT cdate FROM decimal_date_test WHERE cdate NOT BETWEEN CAS
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal_date_test
#### A masked pattern was here ####
-1968-04-07
+1968-04-06
+1968-04-08
1968-04-09
-1968-04-10
-1968-04-14
-1968-04-16
-1968-04-16
-1968-04-19
-1968-04-23
+1968-04-13
+1968-04-15
+1968-04-15
+1968-04-18
+1968-04-22
+1968-04-24
1968-04-25
1968-04-26
-1968-04-27
-1968-04-27
-1968-04-27
-1968-04-29
-1968-04-29
-1968-04-29
+1968-04-26
+1968-04-26
+1968-04-28
+1968-04-28
+1968-04-28
+1968-04-28
1968-04-29
1968-04-30
1971-09-02
http://git-wip-us.apache.org/repos/asf/hive/blob/5000b2f7/ql/src/test/results/clientpositive/update_all_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/update_all_types.q.out b/ql/src/test/results/clientpositive/update_all_types.q.out
index eba4dde..0e268b9 100644
--- a/ql/src/test/results/clientpositive/update_all_types.q.out
+++ b/ql/src/test/results/clientpositive/update_all_types.q.out
@@ -88,14 +88,14 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-51 NULL -1071480828 -1401575336 -51.0 NULL -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -741 -1070883071 -1645852809 NULL -741.0 NULL NULL 1970-01-01 0ruyd6Y50JpdGRf6HqD 0ruyd6Y50JpdGRf6HqD xH7445Rals48VOulSyR5F false
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -741 -1070883071 -1645852809 NULL -741.0 NULL NULL 1969-12-31 0ruyd6Y50JpdGRf6HqD 0ruyd6Y50JpdGRf6HqD xH7445Rals48VOulSyR5F false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
PREHOOK: query: update acid_uat set
ti = 1,
@@ -142,13 +142,13 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-51 NULL -1071480828 -1401575336 -51.0 NULL -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
1 2 3 4 3.14 6.28 5.99 NULL 2014-09-01 its a beautiful day in the neighbhorhood a beautiful day for a neighbor wont you be mine true
PREHOOK: query: update acid_uat set
@@ -176,12 +176,12 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uat
#### A masked pattern was here ####
11 NULL -1073279343 -1595604468 11.0 NULL 11 1969-12-31 16:00:02.351 NULL oj1YrV5Wa oj1YrV5Wa P76636jJ6qM17d7DIy true
-NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1970-01-01 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
+NULL -7382 -1073051226 -1887561756 NULL -7382.0 NULL NULL 1969-12-31 A34p7oRr2WvUJNf A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d false
11 NULL -1072910839 2048385991 11.0 NULL 11 1969-12-31 16:00:02.351 NULL 0iqrc5 0iqrc5 KbaDXiN85adbHRx58v false
-NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1970-01-01 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
-NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1970-01-01 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
+NULL 8373 -1072081801 1864027286 NULL 8373.0 NULL NULL 1969-12-31 dPkN74F7 dPkN74F7 4KWs6gw7lv2WYd66P true
+NULL -5470 -1072076362 1864027286 NULL -5470.0 NULL NULL 1969-12-31 2uLyD28144vklju213J1mr 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P true
-102 -51 -1071480828 -1401575336 -51.0 -51.0 -51 1969-12-31 16:00:08.451 NULL aw724t8c5558x2xneC624 aw724t8c5558x2xneC624 4uE7l74tESBiKfu7c8wM7GA true
8 NULL -1071363017 1349676361 8.0 NULL 8 1969-12-31 16:00:15.892 NULL Anj0oF Anj0oF IwE1G7Qb0B1NEfV030g true
-NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1970-01-01 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
+NULL -947 -1070551679 1864027286 NULL -947.0 NULL NULL 1969-12-31 iUR3Q iUR3Q 4KWs6gw7lv2WYd66P false
11 NULL -1069736047 -453772520 11.0 NULL 11 1969-12-31 16:00:02.351 NULL k17Am8uPHWk02cEf1jet k17Am8uPHWk02cEf1jet qrXLLNX1 true
1 2 3 4 3.14 6.28 5.99 NULL 2014-09-01 its a beautiful day in the neighbhorhood a beautiful day for a neighbor wont you be mine true
http://git-wip-us.apache.org/repos/asf/hive/blob/5000b2f7/ql/src/test/results/clientpositive/vector_between_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_between_in.q.out b/ql/src/test/results/clientpositive/vector_between_in.q.out
index 22c40fe..22fc9c9 100644
--- a/ql/src/test/results/clientpositive/vector_between_in.q.out
+++ b/ql/src/test/results/clientpositive/vector_between_in.q.out
@@ -411,36 +411,6 @@ POSTHOOK: Input: default@decimal_date_test
1969-07-14
1969-07-14
1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-07-14
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
-1969-10-26
1969-10-26
1969-10-26
1969-10-26
@@ -463,7 +433,7 @@ POSTHOOK: query: SELECT COUNT(*) FROM decimal_date_test WHERE cdate NOT IN (CAST
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal_date_test
#### A masked pattern was here ####
-5996
+6026
PREHOOK: query: SELECT cdecimal1 FROM decimal_date_test WHERE cdecimal1 IN (2365.8945945946, 881.0135135135, -3367.6517567568) ORDER BY cdecimal1
PREHOOK: type: QUERY
PREHOOK: Input: default@decimal_date_test
@@ -506,6 +476,45 @@ POSTHOOK: Input: default@decimal_date_test
1969-12-30
1969-12-30
1969-12-30
+1969-12-30
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
+1969-12-31
1969-12-31
1969-12-31
1969-12-31
@@ -515,53 +524,6 @@ POSTHOOK: Input: default@decimal_date_test
1969-12-31
1969-12-31
1969-12-31
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
-1970-01-01
1970-01-01
1970-01-01
1970-01-01
@@ -598,22 +560,23 @@ POSTHOOK: query: SELECT cdate FROM decimal_date_test WHERE cdate NOT BETWEEN CAS
POSTHOOK: type: QUERY
POSTHOOK: Input: default@decimal_date_test
#### A masked pattern was here ####
-1968-04-07
+1968-04-06
+1968-04-08
1968-04-09
-1968-04-10
-1968-04-14
-1968-04-16
-1968-04-16
-1968-04-19
-1968-04-23
+1968-04-13
+1968-04-15
+1968-04-15
+1968-04-18
+1968-04-22
+1968-04-24
1968-04-25
1968-04-26
-1968-04-27
-1968-04-27
-1968-04-27
-1968-04-29
-1968-04-29
-1968-04-29
+1968-04-26
+1968-04-26
+1968-04-28
+1968-04-28
+1968-04-28
+1968-04-28
1968-04-29
1968-04-30
1971-09-02
http://git-wip-us.apache.org/repos/asf/hive/blob/5000b2f7/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java b/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java
index 2b0b550..6cedf4c 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java
@@ -25,9 +25,6 @@ import java.util.Calendar;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hadoop.hive.serde2.ByteStream.RandomAccessOutput;
import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils;
import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt;
@@ -44,8 +41,6 @@ import org.apache.hadoop.io.WritableUtils;
*
*/
public class DateWritable implements WritableComparable<DateWritable> {
- private static final Log LOG = LogFactory.getLog(DateWritable.class);
-
private static final long MILLIS_PER_DAY = TimeUnit.DAYS.toMillis(1);
// Local time zone.
@@ -134,11 +129,21 @@ public class DateWritable implements WritableComparable<DateWritable> {
return millisUtc - LOCAL_TIMEZONE.get().getOffset(tmp);
}
+ public static int millisToDays(long millisLocal) {
+ long millisUtc = millisLocal + LOCAL_TIMEZONE.get().getOffset(millisLocal);
+ int days;
+ if (millisUtc >= 0L) {
+ days = (int) (millisUtc / MILLIS_PER_DAY);
+ } else {
+ days = (int) ((millisUtc - 86399999) / MILLIS_PER_DAY);
+ }
+ return days;
+ }
+
public static int dateToDays(Date d) {
// convert to equivalent time in UTC, then get day offset
long millisLocal = d.getTime();
- long millisUtc = millisLocal + LOCAL_TIMEZONE.get().getOffset(millisLocal);
- return (int)(millisUtc / MILLIS_PER_DAY);
+ return millisToDays(millisLocal);
}
public void setFromBytes(byte[] bytes, int offset, int length, VInt vInt) {