hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1476348 [11/29] - in /hive/branches/vectorization: ./ beeline/ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/ beeline/src/test/org/apache/ beeline/src/test/org/apache/hive/ beeline/src/test/org/apache/hive/beeline/ beeline...
Date Fri, 26 Apr 2013 19:16:13 GMT
Modified: hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q Fri Apr 26 19:14:49 2013
@@ -14,7 +14,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_22_export_authfail.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_22_export_authfail.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_22_export_authfail.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_22_export_authfail.q Fri Apr 26 19:14:49 2013
@@ -5,7 +5,7 @@ create table exim_department ( dep_id in
 
 set hive.security.authorization.enabled=true;
 
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 

Modified: hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q Fri Apr 26 19:14:49 2013
@@ -3,7 +3,7 @@ set hive.test.mode.prefix=;
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../data/files/test.dat" into table exim_department;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q Fri Apr 26 19:14:49 2013
@@ -9,7 +9,7 @@ create table exim_employee ( emp_id int 
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="tn");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q Fri Apr 26 19:14:49 2013
@@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_dep
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../data/files/test.dat" into table exim_department;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/allcolref_in_udf.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/allcolref_in_udf.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/allcolref_in_udf.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/allcolref_in_udf.q Fri Apr 26 19:14:49 2013
@@ -14,3 +14,8 @@ select stack(2, *) as (e1,e2,e3) from (
 select stack(2, *) as (e1,e2,e3) from (
   select concat(*), concat(a.*), concat(b.*), concat(a.*, b.key), concat(a.key, b.*)
   from src a join src b on a.key+1=b.key where a.key < 100) x limit 10;
+
+-- HIVE-4181 TOK_FUNCTIONSTAR for UDTF
+create table allcolref as select array(key, value) from src;
+explain select explode(*) as x from allcolref limit 10;
+select explode(*) as x from allcolref limit 10;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q Fri Apr 26 19:14:49 2013
@@ -1,6 +1,7 @@
 -- small 1 part, 2 bucket & big 2 part, 4 bucket
 
-CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) 
+CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
 load data local inpath '../data/files/smallsrcsortbucket1outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');
 load data local inpath '../data/files/smallsrcsortbucket2outof4.txt' INTO TABLE bucket_small partition(ds='2008-04-08');
 
@@ -20,6 +21,7 @@ set hive.auto.convert.sortmerge.join=tru
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.TableSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -28,3 +30,7 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q Fri Apr 26 19:14:49 2013
@@ -17,7 +17,7 @@ set hive.optimize.bucketmapjoin.sortedme
 set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
 
 set hive.auto.convert.sortmerge.join=true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 -- One of the subqueries contains a union, so it should not be converted to a sort-merge join.
 explain
 select count(*) from 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q Fri Apr 26 19:14:49 2013
@@ -16,9 +16,17 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
 -- Since the leftmost table is assumed as the big table, arrange the tables in the join accordingly
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+set hive.mapjoin.localtask.max.memory.usage = 0.0001;
+set hive.mapjoin.check.memory.rows = 2;
+
+-- The mapjoin should fail resulting in the sort-merge join
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q Fri Apr 26 19:14:49 2013
@@ -16,7 +16,7 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.TableSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -25,3 +25,7 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q Fri Apr 26 19:14:49 2013
@@ -18,7 +18,7 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.AvgPartitionSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -27,3 +27,7 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q Fri Apr 26 19:14:49 2013
@@ -12,7 +12,7 @@ load data local inpath '../data/files/sr
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.AvgPartitionSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -21,3 +21,8 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+set hive.auto.convert.join=true;
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q Fri Apr 26 19:14:49 2013
@@ -18,6 +18,24 @@ set hive.optimize.bucketmapjoin.sortedme
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=200;
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
+-- A SMB join is being followed by a regular join on a non-bucketed table on a different key
+explain select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join src c on c.value = a.value;
+select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join src c on c.value = a.value;
+
+-- A SMB join is being followed by a regular join on a non-bucketed table on the same key
+explain select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join src c on c.key = a.key;
+select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join src c on c.key = a.key;
+
+-- A SMB join is being followed by a regular join on a bucketed table on the same key
+explain select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join tbl3 c on c.key = a.key;
+select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join tbl3 c on c.key = a.key;
+
+-- A SMB join is being followed by a regular join on a bucketed table on a different key
+explain select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join tbl4 c on c.value = a.value;
+select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join tbl4 c on c.value = a.value;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
 
 -- A SMB join is being followed by a regular join on a non-bucketed table on a different key
 explain select count(*) FROM tbl1 a JOIN tbl2 b ON a.key = b.key join src c on c.value = a.value;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q Fri Apr 26 19:14:49 2013
@@ -21,7 +21,7 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.AvgPartitionSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -30,3 +30,7 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q Fri Apr 26 19:14:49 2013
@@ -21,7 +21,7 @@ set hive.auto.convert.join=true;
 set hive.auto.convert.sortmerge.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.TableSizeBasedBigTableSelectorForAutoSMJ;
 
 -- Since size is being used to find the big table, the order of the tables in the join does not matter
@@ -30,3 +30,11 @@ select count(*) FROM bucket_small a JOIN
 
 explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
 select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+set hive.mapjoin.localtask.max.memory.usage = 0.0001;
+set hive.mapjoin.check.memory.rows = 2;
+
+-- The mapjoin should fail resulting in the sort-merge join
+explain extended select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;
+select count(*) FROM bucket_big a JOIN bucket_small b ON a.key = b.key;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ set hive.auto.convert.join=true;
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 set hive.auto.convert.sortmerge.join=true;
-
+set hive.auto.convert.sortmerge.join.to.mapjoin=false;
 -- The join is being performed as part of sub-query. It should be converted to a sort-merge join
 explain
 select count(*) from (
@@ -281,3 +281,256 @@ select count(*) from (
   ) subq2
 join tbl2 b
 on subq2.key = b.key) a;
+
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
+-- The join is being performed as part of sub-query. It should be converted to a sort-merge join
+explain
+select count(*) from (
+  select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+) subq1;
+
+select count(*) from (
+  select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+) subq1;
+
+-- The join is being performed as part of sub-query. It should be converted to a sort-merge join
+-- Add a order by at the end to make the results deterministic.
+explain
+select key, count(*) from 
+(
+  select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+) subq1
+group by key
+order by key;
+
+select key, count(*) from 
+(
+  select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+) subq1
+group by key
+order by key;
+
+-- The join is being performed as part of more than one sub-query. It should be converted to a sort-merge join
+explain
+select count(*) from
+(
+  select key, count(*) from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq1
+  group by key
+) subq2;
+
+select count(*) from
+(
+  select key, count(*) from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq1
+  group by key
+) subq2;
+
+-- A join is being performed across different sub-queries, where a join is being performed in each of them.
+-- Each sub-query should be converted to a sort-merge join.
+explain
+select src1.key, src1.cnt1, src2.cnt1 from
+(
+  select key, count(*) as cnt1 from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq1 group by key
+) src1
+join
+(
+  select key, count(*) as cnt1 from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq2 group by key
+) src2
+on src1.key = src2.key
+order by src1.key, src1.cnt1, src2.cnt1;
+
+select src1.key, src1.cnt1, src2.cnt1 from
+(
+  select key, count(*) as cnt1 from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq1 group by key
+) src1
+join
+(
+  select key, count(*) as cnt1 from 
+  (
+    select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
+  ) subq2 group by key
+) src2
+on src1.key = src2.key
+order by src1.key, src1.cnt1, src2.cnt1;
+
+-- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should 
+-- be converted to a sort-merge join.
+explain
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
+  on subq1.key = subq2.key;
+
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
+  on subq1.key = subq2.key;
+
+-- The subquery itself is being joined. Since the sub-query only contains selects and filters, it should 
+-- be converted to a sort-merge join, although there is more than one level of sub-query
+explain
+select count(*) from 
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1 
+  where key < 6
+  ) subq2
+  join tbl2 b
+  on subq2.key = b.key;
+
+select count(*) from 
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1 
+  where key < 6
+  ) subq2
+  join tbl2 b
+  on subq2.key = b.key;
+
+-- Both the tables are nested sub-queries i.e more then 1 level of sub-query.
+-- The join should be converted to a sort-merge join
+explain
+select count(*) from 
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1 
+  where key < 6
+  ) subq2
+  join
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq3 
+  where key < 6
+  ) subq4
+  on subq2.key = subq4.key;
+
+select count(*) from 
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1 
+  where key < 6
+  ) subq2
+  join
+  (
+  select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq3 
+  where key < 6
+  ) subq4
+  on subq2.key = subq4.key;
+
+-- The subquery itself is being joined. Since the sub-query only contains selects and filters and the join key
+-- is not getting modified, it should be converted to a sort-merge join. Note that the sub-query modifies one 
+-- item, but that is not part of the join key.
+explain
+select count(*) from 
+  (select a.key as key, concat(a.value, a.value) as value from tbl1 a where key < 8) subq1 
+    join
+  (select a.key as key, concat(a.value, a.value) as value from tbl2 a where key < 8) subq2
+  on subq1.key = subq2.key;
+
+select count(*) from 
+  (select a.key as key, concat(a.value, a.value) as value from tbl1 a where key < 8) subq1 
+    join
+  (select a.key as key, concat(a.value, a.value) as value from tbl2 a where key < 8) subq2
+  on subq1.key = subq2.key;
+
+-- The left table is a sub-query and the right table is not.
+-- It should be converted to a sort-merge join.
+explain
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join tbl2 a on subq1.key = a.key;
+
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join tbl2 a on subq1.key = a.key;
+
+-- The right table is a sub-query and the left table is not.
+-- It should be converted to a sort-merge join.
+explain
+select count(*) from tbl1 a
+  join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq1 
+  on a.key = subq1.key;
+
+select count(*) from tbl1 a
+  join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq1 
+  on a.key = subq1.key;
+
+-- There are more than 2 inputs to the join, all of them being sub-queries. 
+-- It should be converted to to a sort-merge join
+explain
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
+  on (subq1.key = subq2.key)
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq3
+  on (subq1.key = subq3.key);
+
+select count(*) from 
+  (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
+  on subq1.key = subq2.key
+    join
+  (select a.key as key, a.value as value from tbl2 a where key < 6) subq3
+  on (subq1.key = subq3.key);
+
+-- The join is being performed on a nested sub-query, and an aggregation is performed after that.
+-- The join should be converted to a sort-merge join
+explain
+select count(*) from (
+  select subq2.key as key, subq2.value as value1, b.value as value2 from
+  (
+    select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1
+    where key < 6
+  ) subq2
+join tbl2 b
+on subq2.key = b.key) a;
+
+select count(*) from (
+  select subq2.key as key, subq2.value as value1, b.value as value2 from
+  (
+    select * from
+    (
+      select a.key as key, a.value as value from tbl1 a where key < 8
+    ) subq1
+    where key < 6
+  ) subq2
+join tbl2 b
+on subq2.key = b.key) a;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q Fri Apr 26 19:14:49 2013
@@ -6,6 +6,8 @@ set hive.exec.reducers.max = 1;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q Fri Apr 26 19:14:49 2013
@@ -6,6 +6,8 @@ set hive.exec.reducers.max = 1;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key, key2) SORTED BY (key ASC, key2 DESC) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q Fri Apr 26 19:14:49 2013
@@ -9,6 +9,8 @@ set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
 
+set hive.auto.convert.sortmerge.join.to.mapjoin=true;
+
 -- Create two bucketed and sorted tables
 CREATE TABLE test_table1 (key INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/database_drop.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/database_drop.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/database_drop.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/database_drop.q Fri Apr 26 19:14:49 2013
@@ -8,9 +8,9 @@ CREATE DATABASE db5;
 SHOW DATABASES;
 USE db5;
 
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp;
 dfs -rmr ${system:test.tmp.dir}/dbcascade;
-dfs -mkdir ${system:test.tmp.dir}/dbcascade;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade;
 
 -- add a table, index and view
 CREATE TABLE temp_tbl (id INT, name STRING);
@@ -19,8 +19,8 @@ CREATE VIEW temp_tbl_view AS SELECT * FR
 CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD;
 ALTER INDEX idx1 ON temp_tbl REBUILD;
 
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp_tbl2;
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2;
 -- add a table, index and view with a different storage location
 CREATE TABLE temp_tbl2 (id INT, name STRING) LOCATION 'file:${system:test.tmp.dir}/dbcascade/temp_tbl2';
 LOAD DATA LOCAL INPATH '../data/files/kv1.txt' into table temp_tbl2;
@@ -36,8 +36,8 @@ CREATE INDEX idx3 ON TABLE part_tab(id) 
 ALTER INDEX idx3 ON part_tab PARTITION (ds='2008-04-09') REBUILD;
 ALTER INDEX idx3 ON part_tab PARTITION (ds='2009-04-09') REBUILD;
 
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab2;
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab2_idx4;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2_idx4;
 -- add a partitioned table, index and view with a different storage location
 CREATE TABLE part_tab2 (id INT, name STRING)  PARTITIONED BY (ds string)
 		LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab2';
@@ -49,9 +49,9 @@ ALTER INDEX idx4 ON part_tab2 PARTITION 
 ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2009-04-09') REBUILD;
 
 
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3;
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3_p1;
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/part_tab3_idx5;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_p1;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_idx5;
 -- add a partitioned table, index and view with a different storage location
 CREATE TABLE part_tab3 (id INT, name STRING)  PARTITIONED BY (ds string)
 		LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab3';
@@ -65,7 +65,7 @@ ALTER INDEX idx5 ON part_tab3 PARTITION 
 
 
 
-dfs -mkdir ${system:test.tmp.dir}/dbcascade/extab1;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/extab1;
 dfs -touchz ${system:test.tmp.dir}/dbcascade/extab1/file1.txt;
 -- add an external table
 CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_precision.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_precision.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_precision.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_precision.q Fri Apr 26 19:14:49 2013
@@ -17,4 +17,11 @@ SELECT dec, dec * dec FROM DECIMAL_PRECI
 
 SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION;
 
+SELECT dec * cast('123456789012345678901234567890.123456789' as decimal) FROM DECIMAL_PRECISION LIMIT 1;
+SELECT * from DECIMAL_PRECISION WHERE dec > cast('123456789012345678901234567890.123456789' as decimal) LIMIT 1;
+SELECT dec * 123456789012345678901234567890.123456789 FROM DECIMAL_PRECISION LIMIT 1;
+
+SELECT MIN(cast('123456789012345678901234567890.123456789' as decimal)) FROM DECIMAL_PRECISION;
+SELECT COUNT(cast('123456789012345678901234567890.123456789' as decimal)) FROM DECIMAL_PRECISION;
+
 DROP TABLE DECIMAL_PRECISION;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_udf.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_udf.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_udf.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/decimal_udf.q Fri Apr 26 19:14:49 2013
@@ -113,4 +113,16 @@ SELECT value, stddev_samp(key), var_samp
 EXPLAIN SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF; 
 SELECT histogram_numeric(key, 3) FROM DECIMAL_UDF; 
 
+-- min
+EXPLAIN SELECT MIN(key) FROM DECIMAL_UDF;
+SELECT MIN(key) FROM DECIMAL_UDF;
+
+-- max
+EXPLAIN SELECT MAX(key) FROM DECIMAL_UDF;
+SELECT MAX(key) FROM DECIMAL_UDF;
+
+-- count
+EXPLAIN SELECT COUNT(key) FROM DECIMAL_UDF;
+SELECT COUNT(key) FROM DECIMAL_UDF;
+
 DROP TABLE IF EXISTS DECIMAL_UDF;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q Fri Apr 26 19:14:49 2013
@@ -5,7 +5,7 @@ set hive.test.mode.nosamplelist=exim_dep
 create table exim_department ( dep_id int comment "department id") 	
 	stored as textfile	
 	tblproperties("creator"="krishna");
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_01_nonpart.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_01_nonpart.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_01_nonpart.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_01_nonpart.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q Fri Apr 26 19:14:49 2013
@@ -7,7 +7,7 @@ create table exim_employee ( emp_id int 
 	partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
 	stored as textfile	
 	tblproperties("creator"="krishna");
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_part.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_part.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_part.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_02_part.q Fri Apr 26 19:14:49 2013
@@ -9,7 +9,7 @@ create table exim_employee ( emp_id int 
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="tn");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_all_part.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_all_part.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_all_part.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_all_part.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q Fri Apr 26 19:14:49 2013
@@ -19,7 +19,7 @@ alter table exim_employee set fileformat
 	outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat";
 
 alter table exim_employee add partition (emp_country='in', emp_state='ka');
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_05_some_part.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_05_some_part.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_05_some_part.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_05_some_part.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee partition (emp_state="ka") to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_06_one_part.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_06_one_part.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_06_one_part.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_06_one_part.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee partition (emp_country="in",emp_state="ka") to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_10_external_managed.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_10_external_managed.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_10_external_managed.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_10_external_managed.q Fri Apr 26 19:14:49 2013
@@ -2,14 +2,14 @@ set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_department;
 create external table exim_department ( dep_id int comment "department id") 	
 	stored as textfile	
 	location 'ql/test/data/tablestore/exim_department'
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_11_managed_external.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_11_managed_external.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_11_managed_external.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_11_managed_external.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_12_external_location.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_12_external_location.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_12_external_location.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_12_external_location.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
@@ -14,7 +14,7 @@ drop table exim_department;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_department;
 
 import external table exim_department from 'ql/test/data/exports/exim_department' 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_13_managed_location.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_13_managed_location.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_13_managed_location.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_13_managed_location.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
@@ -14,7 +14,7 @@ drop table exim_department;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_department;
 
 import table exim_department from 'ql/test/data/exports/exim_department' 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q Fri Apr 26 19:14:49 2013
@@ -6,7 +6,7 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" into table exim_department;		
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
@@ -14,7 +14,7 @@ drop table exim_department;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_department/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_department;
 
 create table exim_department ( dep_id int comment "department id") 	

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_15_external_part.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_15_external_part.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_15_external_part.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_15_external_part.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -23,7 +23,7 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
 
 create external table exim_employee ( emp_id int comment "employee id") 	

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_16_part_external.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_16_part_external.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_16_part_external.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_16_part_external.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -23,9 +23,9 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
-dfs -mkdir ../build/ql/test/data/tablestore2/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore2/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore2/exim_employee;
 
 create external table exim_employee ( emp_id int comment "employee id") 	

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_17_part_managed.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_17_part_managed.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_17_part_managed.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_17_part_managed.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -23,7 +23,7 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
 
 create table exim_employee ( emp_id int comment "employee id") 	

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_18_part_external.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_18_part_external.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_18_part_external.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_18_part_external.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q Fri Apr 26 19:14:49 2013
@@ -11,7 +11,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="in", emp_state="tn");	
 load data local inpath "../data/files/test2.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="ka");	
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -19,7 +19,7 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
 
 import external table exim_employee 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_part_external_location.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_part_external_location.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_19_part_external_location.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -23,7 +23,7 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
 
 import external table exim_employee partition (emp_country="us", emp_state="tn") 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q Fri Apr 26 19:14:49 2013
@@ -15,7 +15,7 @@ load data local inpath "../data/files/te
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
@@ -23,7 +23,7 @@ drop table exim_employee;
 create database importer;
 use importer;
 
-dfs -mkdir ../build/ql/test/data/tablestore/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/tablestore/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/tablestore/exim_employee;
 
 import table exim_employee partition (emp_country="us", emp_state="tn") 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q Fri Apr 26 19:14:49 2013
@@ -7,7 +7,7 @@ load data local inpath "../data/files/te
 set hive.security.authorization.enabled=true;
 
 grant Select on table exim_department to user hive_test_user;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q Fri Apr 26 19:14:49 2013
@@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_dep
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../data/files/test.dat" into table exim_department;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q Fri Apr 26 19:14:49 2013
@@ -9,7 +9,7 @@ create table exim_employee ( emp_id int 
 	tblproperties("creator"="krishna");
 load data local inpath "../data/files/test.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="tn");
-dfs -mkdir ../build/ql/test/data/exports/exim_employee/temp;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_employee/temp;
 dfs -rmr ../build/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q Fri Apr 26 19:14:49 2013
@@ -4,7 +4,7 @@ set hive.test.mode.nosamplelist=exim_dep
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../data/files/test.dat" into table exim_department;
-dfs -mkdir ../build/ql/test/data/exports/exim_department/test;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/exim_department/test;
 dfs -rmr ../build/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/groupby_sort_8.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/groupby_sort_8.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/groupby_sort_8.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/groupby_sort_8.q Fri Apr 26 19:14:49 2013
@@ -12,9 +12,16 @@ LOAD DATA LOCAL INPATH '../data/files/T1
 INSERT OVERWRITE TABLE T1 PARTITION (ds='1') select key, val from T1 where ds = '1';
 
 -- The plan is not converted to a map-side, since although the sorting columns and grouping
--- columns match, the user is issueing a distinct
+-- columns match, the user is issueing a distinct.
+-- However, after HIVE-4310, partial aggregation is performed on the mapper
 EXPLAIN
 select count(distinct key) from T1;
 select count(distinct key) from T1;
 
-DROP TABLE T1;
\ No newline at end of file
+set hive.map.groupby.sorted.testmode=true;
+-- In testmode, the plan is not changed
+EXPLAIN
+select count(distinct key) from T1;
+select count(distinct key) from T1;
+
+DROP TABLE T1;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/insertexternal1.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/insertexternal1.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/insertexternal1.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/insertexternal1.q Fri Apr 26 19:14:49 2013
@@ -2,9 +2,9 @@
 
 create table texternal(key string, val string) partitioned by (insertdate string);
 
-dfs -mkdir ${system:test.tmp.dir}/texternal/temp;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/texternal/temp;
 dfs -rmr ${system:test.tmp.dir}/texternal;
-dfs -mkdir ${system:test.tmp.dir}/texternal/2008-01-01;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/texternal/2008-01-01;
 
 alter table texternal add partition (insertdate='2008-01-01') location 'pfile://${system:test.tmp.dir}/texternal/2008-01-01';
 from src insert overwrite table texternal partition (insertdate='2008-01-01') select *;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/leadlag.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/leadlag.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/leadlag.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/leadlag.q Fri Apr 26 19:14:49 2013
@@ -43,7 +43,7 @@ from part p1 join part p2 on p1.p_partke
 
 -- 4. testLagInSum
 select  p_mfgr,p_name, p_size,   
-sum(p_size - lag(p_size,1)) over(distribute by p_mfgr  sort by p_mfgr ) as deltaSum 
+sum(p_size - lag(p_size,1)) over(distribute by p_mfgr  sort by p_name ) as deltaSum 
 from part 
 window w1 as (rows between 2 preceding and 2 following) ;
 
@@ -51,7 +51,7 @@ window w1 as (rows between 2 preceding a
 select  p_mfgr,p_name, p_size,   
 sum(p_size - lag(p_size,1)) over w1 as deltaSum 
 from part 
-window w1 as (distribute by p_mfgr sort by p_mfgr rows between 2 preceding and 2 following) ;
+window w1 as (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) ;
 
 -- 6. testRankInLead
 select p_mfgr, p_name, p_size, r1,
@@ -76,7 +76,7 @@ order by p_name  
 -- 8. testOverNoPartitionMultipleAggregate
 select p_name, p_retailprice,
 lead(p_retailprice) over() as l1 ,
-lag(p_retailprice)  over() as l2
+lag(p_retailprice) over() as l2
 from part
-order by p_name;
+where p_retailprice = 1173.15;
 

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/metadata_export_drop.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/metadata_export_drop.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/metadata_export_drop.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/metadata_export_drop.q Fri Apr 26 19:14:49 2013
@@ -1,5 +1,5 @@
 create table tmp_meta_export_listener_drop_test (foo string);
-dfs -mkdir ../build/ql/test/data/exports/HIVE-3427;
+dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/HIVE-3427;
 set hive.metastore.pre.event.listeners=org.apache.hadoop.hive.ql.parse.MetaDataExportListener;
 set hive.metadata.export.location=../build/ql/test/data/exports/HIVE-3427;
 set hive.move.exported.metadata.to.trash=false;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin1.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin1.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin1.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/multiMapJoin1.q Fri Apr 26 19:14:49 2013
@@ -52,6 +52,8 @@ smallTbl2 on (firstjoin.value1 = smallTb
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=10000;
 
+-- Now run a query with two-way join, which should be converted into a
+-- map-join followed by groupby - two MR jobs overall 
 explain
 select count(*) FROM
 (select bigTbl.key as key, bigTbl.value as value1,
@@ -69,6 +71,32 @@ select count(*) FROM
 JOIN                                                                  
 smallTbl2 on (firstjoin.value1 = smallTbl2.value);
 
+set hive.optimize.mapjoin.mapreduce=true;
+
+-- Now run a query with two-way join, which should first be converted into a
+-- map-join followed by groupby and then finally into a single MR job.
+
+explain insert overwrite directory '${system:test.tmp.dir}/multiJoin1.output'
+select count(*) FROM
+(select bigTbl.key as key, bigTbl.value as value1,
+ bigTbl.value as value2 FROM bigTbl JOIN smallTbl1 
+ on (bigTbl.key = smallTbl1.key)
+) firstjoin
+JOIN                                                                  
+smallTbl2 on (firstjoin.value1 = smallTbl2.value)
+group by smallTbl2.key;
+
+insert overwrite directory '${system:test.tmp.dir}/multiJoin1.output'
+select count(*) FROM
+(select bigTbl.key as key, bigTbl.value as value1,
+ bigTbl.value as value2 FROM bigTbl JOIN smallTbl1 
+ on (bigTbl.key = smallTbl1.key)
+) firstjoin
+JOIN                                                                  
+smallTbl2 on (firstjoin.value1 = smallTbl2.value)
+group by smallTbl2.key;
+set hive.optimize.mapjoin.mapreduce=false;
+
 create table smallTbl3(key string, value string);
 insert overwrite table smallTbl3 select * from src where key < 10;
 
@@ -101,6 +129,21 @@ select * from
 
 set hive.auto.convert.join.noconditionaltask=false;
 
+explain
+select count(*) FROM
+ (
+   SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,
+          firstjoin.value1 as value1, firstjoin.value2 as value2 FROM
+    (SELECT bigTbl.key1 as key1, bigTbl.key2 as key2, 
+            bigTbl.value as value1, bigTbl.value as value2 
+     FROM bigTbl JOIN smallTbl1 
+     on (bigTbl.key1 = smallTbl1.key)
+    ) firstjoin
+    JOIN                                                                  
+    smallTbl2 on (firstjoin.value1 = smallTbl2.value)
+ ) secondjoin
+ JOIN smallTbl3 on (secondjoin.key2 = smallTbl3.key);
+
 select count(*) FROM
  (
    SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,
@@ -118,7 +161,8 @@ select count(*) FROM
 set hive.auto.convert.join.noconditionaltask=true;
 set hive.auto.convert.join.noconditionaltask.size=10000;
 
--- join with 4 tables on different keys is also executed as a single MR job
+-- join with 4 tables on different keys is also executed as a single MR job,
+-- So, overall two jobs - one for multi-way join and one for count(*)
 explain
 select count(*) FROM
  (
@@ -147,3 +191,37 @@ select count(*) FROM
     smallTbl2 on (firstjoin.value1 = smallTbl2.value)
  ) secondjoin
  JOIN smallTbl3 on (secondjoin.key2 = smallTbl3.key);
+
+set hive.optimize.mapjoin.mapreduce=true;
+-- Now run the above query with M-MR optimization
+-- This should be a single MR job end-to-end.
+explain
+select count(*) FROM
+ (
+   SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,
+          firstjoin.value1 as value1, firstjoin.value2 as value2 FROM
+    (SELECT bigTbl.key1 as key1, bigTbl.key2 as key2, 
+            bigTbl.value as value1, bigTbl.value as value2 
+     FROM bigTbl JOIN smallTbl1 
+     on (bigTbl.key1 = smallTbl1.key)
+    ) firstjoin
+    JOIN                                                                  
+    smallTbl2 on (firstjoin.value1 = smallTbl2.value)
+ ) secondjoin
+ JOIN smallTbl3 on (secondjoin.key2 = smallTbl3.key);
+
+select count(*) FROM
+ (
+   SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,
+          firstjoin.value1 as value1, firstjoin.value2 as value2 FROM
+    (SELECT bigTbl.key1 as key1, bigTbl.key2 as key2, 
+            bigTbl.value as value1, bigTbl.value as value2 
+     FROM bigTbl JOIN smallTbl1 
+     on (bigTbl.key1 = smallTbl1.key)
+    ) firstjoin
+    JOIN                                                                  
+    smallTbl2 on (firstjoin.value1 = smallTbl2.value)
+ ) secondjoin
+ JOIN smallTbl3 on (secondjoin.key2 = smallTbl3.key);
+
+set hive.optimize.mapjoin.mapreduce=false;

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert.q Fri Apr 26 19:14:49 2013
@@ -196,7 +196,7 @@ select * from src_multi2 order by key, v
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;
 
-dfs -mkdir ${system:test.tmp.dir}/hive_test/multiins_local/temp;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/hive_test/multiins_local/temp;
 dfs -rmr ${system:test.tmp.dir}/hive_test/multiins_local;
 
 explain

Modified: hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q?rev=1476348&r1=1476347&r2=1476348&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q (original)
+++ hive/branches/vectorization/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q Fri Apr 26 19:14:49 2013
@@ -196,7 +196,7 @@ select * from src_multi2 order by key, v
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;
 
-dfs -mkdir ${system:test.tmp.dir}/hive_test/multiins_local/temp;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/hive_test/multiins_local/temp;
 dfs -rmr ${system:test.tmp.dir}/hive_test/multiins_local;
 
 explain



Mime
View raw message