You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by dj...@apache.org on 2018/01/10 21:12:44 UTC
hive git commit: HIVE-18399 : load data should rename files
consistent with insert statements (bucketed tables only) Part1. This patch
contains fix to original patch for this JIRA which accidentally had wrong
results for the test auto_sortmerge_join_16.q
Repository: hive
Updated Branches:
refs/heads/master 7181cffab -> ad0519008
HIVE-18399 : load data should rename files consistent with insert statements (bucketed tables only) Part1.
This patch contains fix to original patch for this JIRA which accidentally had wrong results for the test auto_sortmerge_join_16.q
(Deepak Jaiswal, reviewed by Eugene Koifman)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ad051900
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ad051900
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ad051900
Branch: refs/heads/master
Commit: ad05190082e2ba6c36abea8c3e5f8953139901ca
Parents: 7181cff
Author: djaiswal <dj...@apache.org>
Authored: Wed Jan 10 13:11:06 2018 -0800
Committer: djaiswal <dj...@apache.org>
Committed: Wed Jan 10 13:11:06 2018 -0800
----------------------------------------------------------------------
.../clientpositive/auto_sortmerge_join_16.q | 4 ++--
.../llap/auto_sortmerge_join_16.q.out | 22 ++++++++++++++++----
.../spark/auto_sortmerge_join_16.q.out | 22 ++++++++++++++++----
3 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/ad051900/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
index b247fa1..8216b53 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
@@ -44,8 +44,8 @@ PARTITIONED BY (pri bigint)
clustered by (key) sorted by (key) into 12 buckets
stored as RCFile;
-load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='1');
-load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='2');
+load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='1');
+load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='2');
insert overwrite table bucket_small partition(pri)
select
http://git-wip-us.apache.org/repos/asf/hive/blob/ad051900/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
index 210eef1..91408df 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
@@ -78,20 +78,20 @@ stored as RCFile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small
-PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
+PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@stage_bucket_small
-POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
+POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@stage_bucket_small
POSTHOOK: Output: default@stage_bucket_small@file_tag=1
-PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
+PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@stage_bucket_small
-POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
+POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@stage_bucket_small
@@ -228,10 +228,24 @@ POSTHOOK: Input: default@bucket_small@pri=2
#### A masked pattern was here ####
0 val_0 val_0 day1 1
0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
+103 val_103 val_103 day1 1
+103 val_103 val_103 day1 1
+169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
172 val_172 val_172 day1 1
172 val_172 val_172 day1 1
374 val_374 val_374 day1 1
http://git-wip-us.apache.org/repos/asf/hive/blob/ad051900/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
index 210eef1..91408df 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
@@ -78,20 +78,20 @@ stored as RCFile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small
-PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
+PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@stage_bucket_small
-POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
+POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='1')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@stage_bucket_small
POSTHOOK: Output: default@stage_bucket_small@file_tag=1
-PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
+PREHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@stage_bucket_small
-POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
+POSTHOOK: query: load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' overwrite into table stage_bucket_small partition (file_tag='2')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@stage_bucket_small
@@ -228,10 +228,24 @@ POSTHOOK: Input: default@bucket_small@pri=2
#### A masked pattern was here ####
0 val_0 val_0 day1 1
0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
+0 val_0 val_0 day1 1
103 val_103 val_103 day1 1
103 val_103 val_103 day1 1
+103 val_103 val_103 day1 1
+103 val_103 val_103 day1 1
+169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+169 val_169 val_169 day1 1
+172 val_172 val_172 day1 1
+172 val_172 val_172 day1 1
172 val_172 val_172 day1 1
172 val_172 val_172 day1 1
374 val_374 val_374 day1 1