Index: ql/src/test/queries/clientpositive/smb_mapjoin_1.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_1.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_1.q (working copy) @@ -12,6 +12,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_2.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_2.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_2.q (working copy) @@ -11,7 +11,8 @@ load data local inpath '../data/files/smbbucket_3.rc' overwrite into table smb_bucket_3; set hive.optimize.bucketmapjoin = true; -set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_3 b on a.key = b.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_3.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_3.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_3.q (working copy) @@ -12,6 +12,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain select /*+mapjoin(a)*/ * from smb_bucket_2 a join smb_bucket_3 b on a.key = b.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_4.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_4.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_4.q (working copy) @@ -12,6 +12,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_5.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_5.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_5.q (working copy) @@ -12,6 +12,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain select /*+mapjoin(a,c)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_6.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_6.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_6.q (working copy) @@ -19,6 +19,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; explain insert overwrite table smb_join_results Index: ql/src/test/queries/clientpositive/smb_mapjoin_7.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_7.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_7.q (working copy) @@ -23,6 +23,7 @@ set hive.optimize.bucketmapjoin = true; set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; insert overwrite table smb_join_results_empty_bigtable select /*+mapjoin(b)*/ * from smb_bucket4_1 a full outer join smb_bucket4_2 b on a.key = b.key; Index: ql/src/test/queries/clientpositive/smb_mapjoin_8.q =================================================================== --- ql/src/test/queries/clientpositive/smb_mapjoin_8.q (revision 986970) +++ ql/src/test/queries/clientpositive/smb_mapjoin_8.q (working copy) @@ -1,15 +1,11 @@ set hive.enforce.bucketing = true; +set hive.enforce.sorting = true; set hive.exec.reducers.max = 1; create table smb_bucket_input (key int, value string) stored as rcfile; load data local inpath '../data/files/smb_bucket_input.rc' into table smb_bucket_input; -set hive.optimize.bucketmapjoin = true; -set hive.optimize.bucketmapjoin.sortedmerge = true; -set hive.enforce.sorting = true; -set hive.exec.reducers.max = 1; - CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS; @@ -20,6 +16,10 @@ insert overwrite table smb_bucket4_1 select * from smb_bucket_input where key=4 or key=2000 or key=4000; insert overwrite table smb_bucket4_2 select * from smb_bucket_input where key=484 or key=3000 or key=5000; +set hive.optimize.bucketmapjoin = true; +set hive.optimize.bucketmapjoin.sortedmerge = true; +set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; + select /*+mapjoin(a)*/ * from smb_bucket4_1 a full outer join smb_bucket4_2 b on a.key = b.key; select /*+mapjoin(b)*/ * from smb_bucket4_1 a full outer join smb_bucket4_2 b on a.key = b.key;