diff --git a/data/files/SortCol1Col2.txt b/data/files/SortCol1Col2/000000_0 similarity index 100% rename from data/files/SortCol1Col2.txt rename to data/files/SortCol1Col2/000000_0 diff --git a/data/files/SortCol2Col1.txt b/data/files/SortCol2Col1/000000_0 similarity index 100% rename from data/files/SortCol2Col1.txt rename to data/files/SortCol2Col1/000000_0 diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_1.q b/ql/src/test/queries/clientpositive/bucket_map_join_1.q index 2e62e5e765..f170a71435 100644 --- a/ql/src/test/queries/clientpositive/bucket_map_join_1.q +++ b/ql/src/test/queries/clientpositive/bucket_map_join_1.q @@ -11,8 +11,8 @@ sorted by (key, value) into 1 BUCKETS stored as textfile; create table table2(key string, value string) clustered by (value, key) sorted by (value, key) into 1 BUCKETS stored as textfile; -load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1; -load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2; +load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1; +load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2; set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_2.q b/ql/src/test/queries/clientpositive/bucket_map_join_2.q index 4c2fe820b1..ece89c87ba 100644 --- a/ql/src/test/queries/clientpositive/bucket_map_join_2.q +++ b/ql/src/test/queries/clientpositive/bucket_map_join_2.q @@ -11,8 +11,8 @@ sorted by (key desc, value desc) into 1 BUCKETS stored as textfile; create table table2(key string, value string) clustered by (value, key) sorted by (value desc, key desc) into 1 BUCKETS stored as textfile; -load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1; -load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2; +load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1; +load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2; set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out index a5612c6700..b68e1aa95c 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -26,19 +26,19 @@ sorted by (value, key) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 -PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table1 -POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table1 -PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table2 -POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table2 diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out index 97c5e8000a..d1cbe3d9d1 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -26,19 +26,19 @@ sorted by (value desc, key desc) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 -PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table1 -POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table1 -PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table2 -POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table2 diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out index 02dae943e2..f50fd6452e 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out @@ -26,19 +26,19 @@ sorted by (value, key) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 -PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table1 -POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table1 -PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table2 -POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table2 diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out index 4380869509..50d8c2f457 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out @@ -26,19 +26,19 @@ sorted by (value desc, key desc) into 1 BUCKETS stored as textfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@table2 -PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +PREHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table1 -POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2.txt' overwrite into table table1 +POSTHOOK: query: load data local inpath '../../data/files/SortCol1Col2/000000_0' overwrite into table table1 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table1 -PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +PREHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@table2 -POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1.txt' overwrite into table table2 +POSTHOOK: query: load data local inpath '../../data/files/SortCol2Col1/000000_0' overwrite into table table2 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@table2