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:06:20 UTC
hive git commit: HIVE-18406 : oad data should rename files consistent
with insert statements (bucketed tables only) Part8 (Deepak Jaiswal,
reviewed by Jason Dere)
Repository: hive
Updated Branches:
refs/heads/master 52d18a061 -> 7181cffab
HIVE-18406 : oad data should rename files consistent with insert statements (bucketed tables only) Part8 (Deepak Jaiswal, reviewed by Jason Dere)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7181cffa
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7181cffa
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7181cffa
Branch: refs/heads/master
Commit: 7181cffab895f39f64d563ce3eedb5b106283a41
Parents: 52d18a0
Author: djaiswal <dj...@apache.org>
Authored: Wed Jan 10 13:05:16 2018 -0800
Committer: djaiswal <dj...@apache.org>
Committed: Wed Jan 10 13:05:16 2018 -0800
----------------------------------------------------------------------
data/files/empty/000000_0 | 0
data/files/empty/000001_0 | 0
.../test/queries/clientpositive/auto_join32.q | 16 +++++-----
.../results/clientpositive/auto_join32.q.out | 32 ++++++++++----------
.../clientpositive/spark/auto_join32.q.out | 32 ++++++++++----------
5 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7181cffa/data/files/empty/000000_0
----------------------------------------------------------------------
diff --git a/data/files/empty/000000_0 b/data/files/empty/000000_0
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/hive/blob/7181cffa/data/files/empty/000001_0
----------------------------------------------------------------------
diff --git a/data/files/empty/000001_0 b/data/files/empty/000001_0
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/hive/blob/7181cffa/ql/src/test/queries/clientpositive/auto_join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join32.q b/ql/src/test/queries/clientpositive/auto_join32.q
index 7725f72..3cbc3f2 100644
--- a/ql/src/test/queries/clientpositive/auto_join32.q
+++ b/ql/src/test/queries/clientpositive/auto_join32.q
@@ -33,10 +33,10 @@ from studenttab10k_smb s join votertab10k_smb v
on (s.name = v.name)
group by s.name;
-load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb;
-load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb;
-load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb;
-load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb;
+load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_smb;
+load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_smb;
+load data local inpath '../../data/files/empty/000000_0' into table votertab10k_smb;
+load data local inpath '../../data/files/empty/000001_0' into table votertab10k_smb;
explain select s.name, count(distinct registration)
from studenttab10k_smb s join votertab10k_smb v
@@ -52,10 +52,10 @@ group by s.name;
create table studenttab10k_part (name string, age int, gpa double) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets;
create table votertab10k_part (name string, age int, registration string, contributions float) partitioned by (p string) clustered by (name) sorted by (name) into 2 buckets;
-load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo');
-load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo');
-load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo');
-load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo');
+load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_part partition (p='foo');
+load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_part partition (p='foo');
+load data local inpath '../../data/files/empty/000000_0' into table votertab10k_part partition (p='foo');
+load data local inpath '../../data/files/empty/000001_0' into table votertab10k_part partition (p='foo');
explain select s.name, count(distinct registration)
from studenttab10k_part s join votertab10k_part v
http://git-wip-us.apache.org/repos/asf/hive/blob/7181cffa/ql/src/test/results/clientpositive/auto_join32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out b/ql/src/test/results/clientpositive/auto_join32.q.out
index 4a233d4..0e1d3c6 100644
--- a/ql/src/test/results/clientpositive/auto_join32.q.out
+++ b/ql/src/test/results/clientpositive/auto_join32.q.out
@@ -219,35 +219,35 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@studenttab10k_smb
POSTHOOK: Input: default@votertab10k_smb
#### A masked pattern was here ####
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_smb
@@ -346,37 +346,37 @@ POSTHOOK: query: create table votertab10k_part (name string, age int, registrati
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@votertab10k_part
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_part
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_part
POSTHOOK: Output: default@studenttab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_part@p=foo
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_part
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_part
POSTHOOK: Output: default@votertab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_part@p=foo
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_part@p=foo
http://git-wip-us.apache.org/repos/asf/hive/blob/7181cffa/ql/src/test/results/clientpositive/spark/auto_join32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join32.q.out b/ql/src/test/results/clientpositive/spark/auto_join32.q.out
index 688b88d..4c246ba 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join32.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join32.q.out
@@ -246,35 +246,35 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@studenttab10k_smb
POSTHOOK: Input: default@votertab10k_smb
#### A masked pattern was here ####
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_smb
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_smb
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_smb
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_smb
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_smb
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_smb
@@ -388,37 +388,37 @@ POSTHOOK: query: create table votertab10k_part (name string, age int, registrati
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@votertab10k_part
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_part
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table studenttab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table studenttab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_part
POSTHOOK: Output: default@studenttab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@studenttab10k_part@p=foo
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table studenttab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table studenttab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@studenttab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_part
-POSTHOOK: query: load data local inpath '../../data/files/empty1.txt' into table votertab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000000_0' into table votertab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_part
POSTHOOK: Output: default@votertab10k_part@p=foo
-PREHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo')
+PREHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_part partition (p='foo')
PREHOOK: type: LOAD
#### A masked pattern was here ####
PREHOOK: Output: default@votertab10k_part@p=foo
-POSTHOOK: query: load data local inpath '../../data/files/empty2.txt' into table votertab10k_part partition (p='foo')
+POSTHOOK: query: load data local inpath '../../data/files/empty/000001_0' into table votertab10k_part partition (p='foo')
POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@votertab10k_part@p=foo