svn commit: r1537576 [10/23] - in /hive/trunk: ./ ant/ ant/src/org/apache/hadoop/hive/ant/ beeline/ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/apache/hive/beeline/src/test/ cli/ common/ common/src/java/conf/ common/src/scripts/ comm...

[br...@apache.org]

Modified: hive/trunk/ql/src/test/queries/clientpositive/input43.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input43.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input43.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input43.q Thu Oct 31 18:27:31 2013
@@ -1,7 +1,7 @@
 drop table tst_src1;
 create table tst_src1 like src1;
-load data local inpath '../data/files/kv1.txt' into table tst_src1 ;
+load data local inpath '../../data/files/kv1.txt' into table tst_src1 ;
 select count(1) from tst_src1;
-load data local inpath '../data/files/kv1.txt' into table tst_src1 ;
+load data local inpath '../../data/files/kv1.txt' into table tst_src1 ;
 select count(1) from tst_src1;
 drop table tst_src1;

Modified: hive/trunk/ql/src/test/queries/clientpositive/input44.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input44.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input44.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input44.q Thu Oct 31 18:27:31 2013
@@ -3,4 +3,4 @@ CREATE TABLE dest(key INT, value STRING)
 SET hive.output.file.extension=.txt;
 INSERT OVERWRITE TABLE dest SELECT src.* FROM src;
 
-dfs -cat ../build/ql/test/data/warehouse/dest/*.txt
\ No newline at end of file
+dfs -cat ${system:test.warehouse.dir}/dest/*.txt

Modified: hive/trunk/ql/src/test/queries/clientpositive/input45.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input45.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input45.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input45.q Thu Oct 31 18:27:31 2013
@@ -2,8 +2,8 @@ SET hive.insert.into.multilevel.dirs=tru
 
 SET hive.output.file.extension=.txt;
 
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/x/y/z/' SELECT src.* FROM src;
+INSERT OVERWRITE DIRECTORY 'target/data/x/y/z/' SELECT src.* FROM src;
 
-dfs -cat ../build/ql/test/data/x/y/z/*.txt;
+dfs -cat ${system:build.dir}/data/x/y/z/*.txt;
 
-dfs -rmr ../build/ql/test/data/x;
\ No newline at end of file
+dfs -rmr ${system:build.dir}/data/x;

Modified: hive/trunk/ql/src/test/queries/clientpositive/input4_cb_delim.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input4_cb_delim.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input4_cb_delim.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input4_cb_delim.q Thu Oct 31 18:27:31 2013
@@ -1,4 +1,4 @@
 CREATE TABLE INPUT4_CB(KEY STRING, VALUE STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002' LINES TERMINATED BY '\012' STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1_cb.txt' INTO TABLE INPUT4_CB;
+LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT4_CB;
 SELECT INPUT4_CB.VALUE, INPUT4_CB.KEY FROM INPUT4_CB;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/input_dfs.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input_dfs.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input_dfs.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input_dfs.q Thu Oct 31 18:27:31 2013
@@ -1,2 +1,2 @@
-dfs -cat ../data/files/kv1.txt;
+dfs -cat ../../data/files/kv1.txt;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/inputddl5.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/inputddl5.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/inputddl5.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/inputddl5.q Thu Oct 31 18:27:31 2013
@@ -1,7 +1,7 @@
 -- test for internationalization
 -- kv4.txt contains the utf-8 character 0xE982B5E993AE which we are verifying later on
 CREATE TABLE INPUTDDL5(name STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv4.txt' INTO TABLE INPUTDDL5;
+LOAD DATA LOCAL INPATH '../../data/files/kv4.txt' INTO TABLE INPUTDDL5;
 DESCRIBE INPUTDDL5;
 SELECT INPUTDDL5.name from INPUTDDL5;
 SELECT count(1) FROM INPUTDDL5 WHERE INPUTDDL5.name = _UTF-8 0xE982B5E993AE;

Modified: hive/trunk/ql/src/test/queries/clientpositive/inputddl6.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/inputddl6.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/inputddl6.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/inputddl6.q Thu Oct 31 18:27:31 2013
@@ -2,8 +2,8 @@
 -- test for describe extended table partition
 -- test for alter table drop partition
 CREATE TABLE INPUTDDL6(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-09');
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-08');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE INPUTDDL6 PARTITION (ds='2008-04-08');
 DESCRIBE EXTENDED INPUTDDL6;
 DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08');
 SHOW PARTITIONS INPUTDDL6;

Modified: hive/trunk/ql/src/test/queries/clientpositive/inputddl7.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/inputddl7.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/inputddl7.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/inputddl7.q Thu Oct 31 18:27:31 2013
@@ -3,22 +3,22 @@
 
 
 CREATE TABLE T1(name STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T1;
 SELECT COUNT(1) FROM T1;
 
 
 CREATE TABLE T2(name STRING) STORED AS SEQUENCEFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.seq' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T2;
 SELECT COUNT(1) FROM T2;
 
 
 CREATE TABLE T3(name STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE T3 PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE T3 PARTITION (ds='2008-04-09');
 SELECT COUNT(1) FROM T3 where T3.ds='2008-04-09';
 
 
 CREATE TABLE T4(name STRING) PARTITIONED BY(ds STRING) STORED AS SEQUENCEFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.seq' INTO TABLE T4 PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T4 PARTITION (ds='2008-04-09');
 SELECT COUNT(1) FROM T4 where T4.ds='2008-04-09';
 
 DESCRIBE EXTENDED T1;

Modified: hive/trunk/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/insert1_overwrite_partitions.q Thu Oct 31 18:27:31 2013
@@ -1,8 +1,8 @@
 CREATE TABLE sourceTable (one string,two string) PARTITIONED BY (ds string,hr string);
 
-load data local inpath '../data/files/kv1.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='11');
+load data local inpath '../../data/files/kv1.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='11');
 
-load data local inpath '../data/files/kv3.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='12');
+load data local inpath '../../data/files/kv3.txt' INTO TABLE sourceTable partition(ds='2011-11-11', hr='12');
 
 CREATE TABLE destinTable (one string,two string) PARTITIONED BY (ds string,hr string);
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/insert2_overwrite_partitions.q Thu Oct 31 18:27:31 2013
@@ -4,9 +4,9 @@ CREATE DATABASE db2;
 
 CREATE TABLE db1.sourceTable (one string,two string) PARTITIONED BY (ds string);
 
-load data local inpath '../data/files/kv1.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11');
+load data local inpath '../../data/files/kv1.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11');
 
-load data local inpath '../data/files/kv3.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11');
+load data local inpath '../../data/files/kv3.txt' INTO TABLE db1.sourceTable partition(ds='2011-11-11');
 
 CREATE TABLE db2.destinTable (one string,two string) PARTITIONED BY (ds string);
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q Thu Oct 31 18:27:31 2013
@@ -1,40 +1,40 @@
-insert overwrite local directory '../data/files/local_src_table_1'
+insert overwrite local directory '../../data/files/local_src_table_1'
 select * from src ;
-dfs -cat ../data/files/local_src_table_1/000000_0;
+dfs -cat ../../data/files/local_src_table_1/000000_0;
 
-insert overwrite local directory '../data/files/local_src_table_2'
+insert overwrite local directory '../../data/files/local_src_table_2'
 row format delimited 
 FIELDS TERMINATED BY ':' 
 select * from src ;
 
-dfs -cat ../data/files/local_src_table_2/000000_0;
+dfs -cat ../../data/files/local_src_table_2/000000_0;
 
 create table array_table (a array<string>, b array<string>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '\t'
 COLLECTION ITEMS TERMINATED BY ',';
 
-load data local inpath "../data/files/array_table.txt" overwrite into table array_table;
+load data local inpath "../../data/files/array_table.txt" overwrite into table array_table;
 
-insert overwrite local directory '../data/files/local_array_table_1'
+insert overwrite local directory '../../data/files/local_array_table_1'
 select * from array_table;
-dfs -cat ../data/files/local_array_table_1/000000_0;
+dfs -cat ../../data/files/local_array_table_1/000000_0;
 
-insert overwrite local directory '../data/files/local_array_table_2'
+insert overwrite local directory '../../data/files/local_array_table_2'
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ':'
 COLLECTION ITEMS TERMINATED BY '#'
 select * from array_table;
 
-dfs -cat ../data/files/local_array_table_2/000000_0;
+dfs -cat ../../data/files/local_array_table_2/000000_0;
 
-insert overwrite local directory '../data/files/local_array_table_2_withfields'
+insert overwrite local directory '../../data/files/local_array_table_2_withfields'
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ':'
 COLLECTION ITEMS TERMINATED BY '#'
 select b,a from array_table;
 
-dfs -cat ../data/files/local_array_table_2_withfields/000000_0;
+dfs -cat ../../data/files/local_array_table_2_withfields/000000_0;
 
 
 create table map_table (foo STRING , bar MAP<STRING, STRING>)
@@ -44,63 +44,63 @@ COLLECTION ITEMS TERMINATED BY ','
 MAP KEYS TERMINATED BY ':'
 STORED AS TEXTFILE;
 
-load data local inpath "../data/files/map_table.txt" overwrite into table map_table;
+load data local inpath "../../data/files/map_table.txt" overwrite into table map_table;
 
-insert overwrite local directory '../data/files/local_map_table_1'
+insert overwrite local directory '../../data/files/local_map_table_1'
 select * from map_table;
-dfs -cat ../data/files/local_map_table_1/000000_0;
+dfs -cat ../../data/files/local_map_table_1/000000_0;
 
-insert overwrite local directory '../data/files/local_map_table_2'
+insert overwrite local directory '../../data/files/local_map_table_2'
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ':'
 COLLECTION ITEMS TERMINATED BY '#'
 MAP KEYS TERMINATED BY '='
 select * from map_table;
 
-dfs -cat ../data/files/local_map_table_2/000000_0;
+dfs -cat ../../data/files/local_map_table_2/000000_0;
 
-insert overwrite local directory '../data/files/local_map_table_2_withfields'
+insert overwrite local directory '../../data/files/local_map_table_2_withfields'
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ':'
 COLLECTION ITEMS TERMINATED BY '#'
 MAP KEYS TERMINATED BY '='
 select bar,foo from map_table;
 
-dfs -cat ../data/files/local_map_table_2_withfields/000000_0;
+dfs -cat ../../data/files/local_map_table_2_withfields/000000_0;
 
-insert overwrite local directory '../data/files/local_array_table_3'
+insert overwrite local directory '../../data/files/local_array_table_3'
 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.DelimitedJSONSerDe'
 STORED AS TEXTFILE
 select * from array_table;
 
-dfs -cat ../data/files/local_array_table_3/000000_0;
+dfs -cat ../../data/files/local_array_table_3/000000_0;
 
-insert overwrite local directory '../data/files/local_map_table_3'
+insert overwrite local directory '../../data/files/local_map_table_3'
 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.DelimitedJSONSerDe'
 STORED AS TEXTFILE
 select * from map_table;
 
-dfs -cat ../data/files/local_map_table_3/000000_0;
+dfs -cat ../../data/files/local_map_table_3/000000_0;
 
-insert overwrite local directory '../data/files/local_rctable'
+insert overwrite local directory '../../data/files/local_rctable'
 STORED AS RCFILE
 select value,key from src;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/local_rctable/temp;
 dfs -rmr ${system:test.tmp.dir}/local_rctable;
 dfs ${system:test.dfs.mkdir}  ${system:test.tmp.dir}/local_rctable;
-dfs -put ../data/files/local_rctable/000000_0 ${system:test.tmp.dir}/local_rctable/000000_0;
+dfs -put ../../data/files/local_rctable/000000_0 ${system:test.tmp.dir}/local_rctable/000000_0;
 
 create external table local_rctable(value string, key string)
 STORED AS RCFILE
 LOCATION '${system:test.tmp.dir}/local_rctable';
 
-insert overwrite local directory '../data/files/local_rctable_out'
+insert overwrite local directory '../../data/files/local_rctable_out'
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '\t'
 select key,value from local_rctable;
 
-dfs -cat ../data/files/local_rctable_out/000000_0;
+dfs -cat ../../data/files/local_rctable_out/000000_0;
 
 drop table local_rctable;
 drop table array_table;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_1to1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_1to1.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_1to1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_1to1.q Thu Oct 31 18:27:31 2013
@@ -1,9 +1,9 @@
 
 CREATE TABLE join_1to1_1(key1 int, key2 int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in5.txt' INTO TABLE join_1to1_1;
+LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE join_1to1_1;
 
 CREATE TABLE join_1to1_2(key1 int, key2 int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in6.txt' INTO TABLE join_1to1_2;
+LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE join_1to1_2;
 
 
 set hive.outerjoin.supports.filters=false;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_array.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_array.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_array.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_array.q Thu Oct 31 18:27:31 2013
@@ -1,8 +1,8 @@
 create table tinyA(a bigint, b bigint) stored as textfile;
 create table tinyB(a bigint, bList array<int>) stored as textfile;
 
-load data local inpath '../data/files/tiny_a.txt' into table tinyA;
-load data local inpath '../data/files/tiny_b.txt' into table tinyB;
+load data local inpath '../../data/files/tiny_a.txt' into table tinyA;
+load data local inpath '../../data/files/tiny_b.txt' into table tinyB;
 
 select * from tinyA;
 select * from tinyB;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_casesensitive.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_casesensitive.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_casesensitive.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_casesensitive.q Thu Oct 31 18:27:31 2013
@@ -1,8 +1,8 @@
 
 CREATE TABLE joinone(key1 int, key2 int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in5.txt' INTO TABLE joinone;
+LOAD DATA LOCAL INPATH '../../data/files/in5.txt' INTO TABLE joinone;
 
 CREATE TABLE joinTwo(key1 int, key2 int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in6.txt' INTO TABLE joinTwo;
+LOAD DATA LOCAL INPATH '../../data/files/in6.txt' INTO TABLE joinTwo;
 
 SELECT * FROM joinone JOIN joinTwo ON(joinone.key2=joinTwo.key2) ORDER BY joinone.key1 ASC, joinone.key2 ASC, joinone.value ASC, joinTwo.key1 ASC, joinTwo.key2 ASC, joinTwo.value ASC;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_filters.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_filters.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_filters.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_filters.q Thu Oct 31 18:27:31 2013
@@ -1,5 +1,5 @@
 CREATE TABLE myinput1(key int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in3.txt' INTO TABLE myinput1;
+LOAD DATA LOCAL INPATH '../../data/files/in3.txt' INTO TABLE myinput1;
 
 SELECT * FROM myinput1 a JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
 SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b on a.key > 40 AND a.value > 50 AND a.key = a.value AND b.key > 40 AND b.value > 50 AND b.key = b.value ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
@@ -55,10 +55,10 @@ SELECT /*+ MAPJOIN(a) */ * FROM myinput1
 
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS; 
 CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS; 
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input2;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2;
 
 SET hive.optimize.bucketmapjoin = true;
 SET hive.optimize.bucketmapjoin.sortedmerge = true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_hive_626.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_hive_626.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_hive_626.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_hive_626.q Thu Oct 31 18:27:31 2013
@@ -13,9 +13,9 @@ delimited fields terminated by ',' store
 create table hive_count (bar_id int, n int) row format delimited fields 
 terminated by ',' stored as textfile;
 
-load data local inpath '../data/files/hive_626_foo.txt' overwrite into table hive_foo;
-load data local inpath '../data/files/hive_626_bar.txt' overwrite into table hive_bar;
-load data local inpath '../data/files/hive_626_count.txt' overwrite into table hive_count;
+load data local inpath '../../data/files/hive_626_foo.txt' overwrite into table hive_foo;
+load data local inpath '../../data/files/hive_626_bar.txt' overwrite into table hive_bar;
+load data local inpath '../../data/files/hive_626_count.txt' overwrite into table hive_count;
 
 explain
 select hive_foo.foo_name, hive_bar.bar_name, n from hive_foo join hive_bar on hive_foo.foo_id =

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_nulls.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_nulls.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_nulls.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_nulls.q Thu Oct 31 18:27:31 2013
@@ -1,5 +1,5 @@
 CREATE TABLE myinput1(key int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' INTO TABLE myinput1;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1;
 
 SELECT * FROM myinput1 a JOIN myinput1 b ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
 SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
@@ -42,10 +42,10 @@ SELECT /*+ MAPJOIN(a) */ * FROM myinput1
 
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS; 
 CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS; 
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input2;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2;
 
 SET hive.optimize.bucketmapJOIN = true;
 SET hive.optimize.bucketmapJOIN.sortedmerge = true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_nullsafe.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_nullsafe.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_nullsafe.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_nullsafe.q Thu Oct 31 18:27:31 2013
@@ -1,7 +1,7 @@
 set hive.nullsafe.equijoin=true;
 
 CREATE TABLE myinput1(key int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' INTO TABLE myinput1;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE myinput1;
 
 -- merging
 explain select * from myinput1 a join myinput1 b on a.key<=>b.value ORDER BY a.key, a.value, b.key, b.value;
@@ -31,10 +31,10 @@ SELECT /*+ MAPJOIN(b) */ * FROM myinput1
 -- smbs
 CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
 CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS;
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in9.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' into table smb_input2;
-LOAD DATA LOCAL INPATH '../data/files/in9.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2;
 
 SET hive.optimize.bucketmapJOIN = true;
 SET hive.optimize.bucketmapJOIN.sortedmerge = true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_reorder.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_reorder.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_reorder.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_reorder.q Thu Oct 31 18:27:31 2013
@@ -6,9 +6,9 @@ CREATE TABLE T1(key STRING, val STRING) 
 CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
 CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
 
 EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
 SELECT a.key, a.val, c.key;

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_reorder2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_reorder2.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_reorder2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_reorder2.q Thu Oct 31 18:27:31 2013
@@ -8,10 +8,10 @@ CREATE TABLE T2(key STRING, val STRING) 
 CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
 CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T4;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4;
 
 EXPLAIN
 SELECT /*+ STREAMTABLE(a) */ *

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_reorder3.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_reorder3.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_reorder3.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_reorder3.q Thu Oct 31 18:27:31 2013
@@ -8,10 +8,10 @@ CREATE TABLE T2(key STRING, val STRING) 
 CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
 CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T4;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4;
 
 EXPLAIN
 SELECT /*+ STREAMTABLE(a,c) */ *

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_reorder4.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_reorder4.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_reorder4.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_reorder4.q Thu Oct 31 18:27:31 2013
@@ -2,9 +2,9 @@ CREATE TABLE T1(key1 STRING, val1 STRING
 CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE;
 CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
 
 set hive.auto.convert.join=true;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/join_star.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_star.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join_star.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join_star.q Thu Oct 31 18:27:31 2013
@@ -7,14 +7,14 @@ create table dim5(f9 int, f10 int);
 create table dim6(f11 int, f12 int);
 create table dim7(f13 int, f14 int);
 
-LOAD DATA LOCAL INPATH '../data/files/fact-data.txt' INTO TABLE fact;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim1;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim2;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim3;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim4;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim5;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim6;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim7;
+LOAD DATA LOCAL INPATH '../../data/files/fact-data.txt' INTO TABLE fact;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim1;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim2;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim3;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim4;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim5;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim6;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim7;
 
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/leadlag.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/leadlag.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/leadlag.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/leadlag.q Thu Oct 31 18:27:31 2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 --1. testLagWithPTFWindowing
 select p_mfgr, p_name,

Modified: hive/trunk/ql/src/test/queries/clientpositive/leadlag_queries.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/leadlag_queries.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/leadlag_queries.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/leadlag_queries.q Thu Oct 31 18:27:31 2013
@@ -11,7 +11,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 -- 1. testLeadUDAF
 select p_mfgr, p_retailprice,

Modified: hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin.q Thu Oct 31 18:27:31 2013
@@ -9,9 +9,9 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 CREATE TABLE things (id INT, name STRING) partitioned by (ds string)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t';
 
-load data local inpath '../data/files/sales.txt' INTO TABLE sales;
-load data local inpath '../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23');
-load data local inpath '../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24');
+load data local inpath '../../data/files/sales.txt' INTO TABLE sales;
+load data local inpath '../../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23');
+load data local inpath '../../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24');
 
 SELECT name,id FROM sales ORDER BY name ASC, id ASC;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin_mr.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin_mr.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin_mr.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/leftsemijoin_mr.q Thu Oct 31 18:27:31 2013
@@ -1,7 +1,7 @@
 CREATE TABLE T1(key INT);
-LOAD DATA LOCAL INPATH '../data/files/leftsemijoin_mr_t1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t1.txt' INTO TABLE T1;
 CREATE TABLE T2(key INT);
-LOAD DATA LOCAL INPATH '../data/files/leftsemijoin_mr_t2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/leftsemijoin_mr_t2.txt' INTO TABLE T2;
 
 -- Run this query using TestMinimrCliDriver
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_binary_data.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_binary_data.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_binary_data.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_binary_data.q Thu Oct 31 18:27:31 2013
@@ -4,7 +4,7 @@ FIELDS TERMINATED BY '9'
 STORED AS TEXTFILE;
 -- this query loads native binary data, stores in a table and then queries it. Note that string.txt contains binary data. Also uses transform clause and then length udf.
 
-LOAD DATA LOCAL INPATH '../data/files/string.txt' INTO TABLE mytable;
+LOAD DATA LOCAL INPATH '../../data/files/string.txt' INTO TABLE mytable;
 
 create table dest1 (key binary, value int);
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q Thu Oct 31 18:27:31 2013
@@ -2,4 +2,4 @@ create table hive_test_src ( col1 string
 alter table hive_test_src add partition (pcol1 = 'test_part');
 set hive.security.authorization.enabled=true;
 grant Update on table hive_test_src to user hive_test_user;
-load data local inpath '../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');
+load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q Thu Oct 31 18:27:31 2013
@@ -2,4 +2,4 @@
 
 
 CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT);
-LOAD DATA LOCAL INPATH '../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;
+LOAD DATA LOCAL INPATH '../../data/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_fs.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_fs.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_fs.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_fs.q Thu Oct 31 18:27:31 2013
@@ -2,9 +2,9 @@
 create table load_overwrite (key string, value string) stored as textfile location 'file:${system:test.tmp.dir}/load_overwrite';
 create table load_overwrite2 (key string, value string) stored as textfile location 'file:${system:test.tmp.dir}/load2_overwrite2';
 
-load data local inpath '../data/files/kv1.txt' into table load_overwrite;
-load data local inpath '../data/files/kv2.txt' into table load_overwrite;
-load data local inpath '../data/files/kv3.txt' into table load_overwrite;
+load data local inpath '../../data/files/kv1.txt' into table load_overwrite;
+load data local inpath '../../data/files/kv2.txt' into table load_overwrite;
+load data local inpath '../../data/files/kv3.txt' into table load_overwrite;
 
 show table extended like load_overwrite;
 desc extended load_overwrite;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_fs2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_fs2.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_fs2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_fs2.q Thu Oct 31 18:27:31 2013
@@ -4,17 +4,17 @@
 create table result (key string, value string);
 create table loader (key string, value string);
 
-load data local inpath '../data/files/kv1.txt' into table loader;
+load data local inpath '../../data/files/kv1.txt' into table loader;
 
 load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result;
 show table extended like result;
 
-load data local inpath '../data/files/kv1.txt' into table loader;
+load data local inpath '../../data/files/kv1.txt' into table loader;
 
 load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result;
 show table extended like result;
 
-load data local inpath '../data/files/kv1.txt' into table loader;
+load data local inpath '../../data/files/kv1.txt' into table loader;
 
 load data inpath '/build/ql/test/data/warehouse/loader/kv1.txt' into table result;
 show table extended like result;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q Thu Oct 31 18:27:31 2013
@@ -1,6 +1,6 @@
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
 
-dfs -copyFromLocal ../data/files hdfs:///tmp/test/.;
+dfs -copyFromLocal ../../data/files hdfs:///tmp/test/.;
 
 CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT);
 LOAD DATA INPATH 'hdfs:///tmp/test/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q Thu Oct 31 18:27:31 2013
@@ -1,4 +1,4 @@
 create table hive_test_src ( col1 string ) stored as textfile;
 set hive.security.authorization.enabled=true;
 grant Update on table hive_test_src to user hive_test_user;
-load data local inpath '../data/files/test.dat' overwrite into table hive_test_src ;
+load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src ;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_overwrite.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_overwrite.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_overwrite.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_overwrite.q Thu Oct 31 18:27:31 2013
@@ -5,11 +5,11 @@ show table extended like load_overwrite;
 select count(*) from load_overwrite;
 
 
-load data local inpath '../data/files/kv1.txt' into table load_overwrite;
+load data local inpath '../../data/files/kv1.txt' into table load_overwrite;
 show table extended like load_overwrite;
 select count(*) from load_overwrite;
 
 
-load data local inpath '../data/files/kv1.txt' overwrite into table load_overwrite;
+load data local inpath '../../data/files/kv1.txt' overwrite into table load_overwrite;
 show table extended like load_overwrite;
 select count(*) from load_overwrite;

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_part_authsuccess.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_part_authsuccess.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_part_authsuccess.q Thu Oct 31 18:27:31 2013
@@ -1,4 +1,4 @@
 create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile;
 set hive.security.authorization.enabled=true;
 grant Update on table hive_test_src to user hive_test_user;
-load data local inpath '../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');
+load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');

Modified: hive/trunk/ql/src/test/queries/clientpositive/loadpart1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/loadpart1.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/loadpart1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/loadpart1.q Thu Oct 31 18:27:31 2013
@@ -2,7 +2,7 @@
 
 
 create table hive_test_src ( col1 string ) stored as textfile ;
-load data local inpath '../data/files/test.dat' overwrite into table hive_test_src ;
+load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src ;
 
 create table hive_test_dst ( col1 string ) partitioned by ( pcol1 string , pcol2 string) stored as sequencefile;
 insert overwrite table hive_test_dst partition ( pcol1='test_part', pCol2='test_Part') select col1 from hive_test_src ;

Modified: hive/trunk/ql/src/test/queries/clientpositive/loadpart_err.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/loadpart_err.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/loadpart_err.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/loadpart_err.q Thu Oct 31 18:27:31 2013
@@ -1,6 +1,6 @@
 set hive.cli.errors.ignore=true;
 
-ADD FILE ../data/scripts/error_script;
+ADD FILE ../../data/scripts/error_script;
 
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19, 0.20, 0.20S, 0.23)
 -- (this test is flaky so it is currently disabled for all Hadoop versions)
@@ -14,7 +14,7 @@ FROM src;
 DESCRIBE loadpart1;
 SHOW PARTITIONS loadpart1;
 
-LOAD DATA LOCAL INPATH '../data1/files/kv1.txt' INTO TABLE loadpart1 PARTITION(ds='2009-05-05');
+LOAD DATA LOCAL INPATH '../../data1/files/kv1.txt' INTO TABLE loadpart1 PARTITION(ds='2009-05-05');
 SHOW PARTITIONS loadpart1;
 
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/mapjoin_subquery2.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/mapjoin_subquery2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/mapjoin_subquery2.q Thu Oct 31 18:27:31 2013
@@ -11,9 +11,9 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
 CREATE TABLE z (id INT, name STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t';
 
-load data local inpath '../data/files/x.txt' INTO TABLE x;
-load data local inpath '../data/files/y.txt' INTO TABLE y;
-load data local inpath '../data/files/z.txt' INTO TABLE z;
+load data local inpath '../../data/files/x.txt' INTO TABLE x;
+load data local inpath '../../data/files/y.txt' INTO TABLE y;
+load data local inpath '../../data/files/z.txt' INTO TABLE z;
 
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask=true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition.q Thu Oct 31 18:27:31 2013
@@ -5,10 +5,10 @@ create table srcpart_merge_dp like srcpa
 
 create table merge_dynamic_part like srcpart;
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; 
 set hive.merge.mapfiles=false;

Modified: hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q Thu Oct 31 18:27:31 2013
@@ -5,12 +5,12 @@ create table srcpart_merge_dp like srcpa
 
 create table merge_dynamic_part like srcpart;
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket0.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket0.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
 
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; 

Modified: hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q Thu Oct 31 18:27:31 2013
@@ -5,20 +5,20 @@ create table srcpart_merge_dp like srcpa
 
 create table merge_dynamic_part like srcpart;
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-
-load data local inpath '../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11);
-load data local inpath '../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11);
-load data local inpath '../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12);
-load data local inpath '../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+
+load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11);
+load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=11);
+load data local inpath '../../data/files/kv1.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12);
+load data local inpath '../../data/files/kv2.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-09', hr=12);
 
 show partitions srcpart_merge_dp;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q Thu Oct 31 18:27:31 2013
@@ -9,15 +9,15 @@ alter table srcpart_merge_dp_rc set file
 create table merge_dynamic_part like srcpart;
 alter table merge_dynamic_part set fileformat RCFILE;
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
 
 insert overwrite table srcpart_merge_dp_rc partition (ds = '2008-04-08', hr) 
 select key, value, hr from srcpart_merge_dp where ds = '2008-04-08';

Modified: hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q Thu Oct 31 18:27:31 2013
@@ -8,12 +8,12 @@ alter table srcpart_merge_dp_rc set file
 create table merge_dynamic_part like srcpart;
 alter table merge_dynamic_part set fileformat RCFILE;
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
-load data local inpath '../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket21.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket22.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
+load data local inpath '../../data/files/srcbucket23.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=11);
 
-load data local inpath '../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
+load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_merge_dp partition(ds='2008-04-08', hr=12);
 
 insert overwrite table srcpart_merge_dp_rc partition (ds = '2008-04-08', hr) 
 select key, value, hr from srcpart_merge_dp where ds = '2008-04-08';

Modified: hive/trunk/ql/src/test/queries/clientpositive/metadata_export_drop.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/metadata_export_drop.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/metadata_export_drop.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/metadata_export_drop.q Thu Oct 31 18:27:31 2013
@@ -1,8 +1,8 @@
 create table tmp_meta_export_listener_drop_test (foo string);
-dfs ${system:test.dfs.mkdir} ../build/ql/test/data/exports/HIVE-3427;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/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.metadata.export.location=${system:test.tmp.dir}/data/exports/HIVE-3427;
 set hive.move.exported.metadata.to.trash=false;
 drop table tmp_meta_export_listener_drop_test;
-dfs -rmr ../build/ql/test/data/exports/HIVE-3427;
+dfs -rmr ${system:test.tmp.dir}/data/exports/HIVE-3427;
 set hive.metastore.pre.event.listeners=;

Modified: hive/trunk/ql/src/test/queries/clientpositive/nested_complex.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/nested_complex.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/nested_complex.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/nested_complex.q Thu Oct 31 18:27:31 2013
@@ -17,6 +17,6 @@ describe nestedcomplex;
 describe extended nestedcomplex;
 
 
-load data local inpath '../data/files/nested_complex.txt' overwrite into table nestedcomplex;
+load data local inpath '../../data/files/nested_complex.txt' overwrite into table nestedcomplex;
 
 select * from nestedcomplex sort by simple_int;

Modified: hive/trunk/ql/src/test/queries/clientpositive/newline.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/newline.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/newline.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/newline.q Thu Oct 31 18:27:31 2013
@@ -1,4 +1,4 @@
-add file ../data/scripts/newline.py;
+add file ../../data/scripts/newline.py;
 set hive.transform.escape.input=true;
 
 create table tmp_tmp(key string, value string) stored as rcfile;
@@ -10,10 +10,10 @@ select * from tmp_tmp ORDER BY key ASC, 
 
 drop table tmp_tmp;
 
-add file ../data/scripts/escapednewline.py;
-add file ../data/scripts/escapedtab.py;
-add file ../data/scripts/doubleescapedtab.py;
-add file ../data/scripts/escapedcarriagereturn.py;
+add file ../../data/scripts/escapednewline.py;
+add file ../../data/scripts/escapedtab.py;
+add file ../../data/scripts/doubleescapedtab.py;
+add file ../../data/scripts/escapedcarriagereturn.py;
 
 create table tmp_tmp(key string, value string) stored as rcfile;
 insert overwrite table tmp_tmp

Modified: hive/trunk/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q Thu Oct 31 18:27:31 2013
@@ -1,12 +1,12 @@
 CREATE TABLE table(string string) STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/docurl.txt' INTO TABLE table;
+LOAD DATA LOCAL INPATH '../../data/files/docurl.txt' INTO TABLE table;
 
 SELECT table, count(1)
 FROM
 (
   FROM table
   SELECT TRANSFORM (table.string)
-  USING 'java -cp ../build/ql/test/classes org.apache.hadoop.hive.scripts.extracturl' AS (table, count)
+  USING 'java -cp ../util/target/classes/ org.apache.hadoop.hive.scripts.extracturl' AS (table, count)
 ) subq
 GROUP BY table;

Modified: hive/trunk/ql/src/test/queries/clientpositive/null_column.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/null_column.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/null_column.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/null_column.q Thu Oct 31 18:27:31 2013
@@ -3,7 +3,7 @@
 
 
 create table temp_null(a int) stored as textfile;
-load data local inpath '../data/files/test.dat' overwrite into table temp_null;
+load data local inpath '../../data/files/test.dat' overwrite into table temp_null;
 
 select null, null from temp_null;
 
@@ -15,8 +15,8 @@ create table tt_b(a int, b string) row f
 insert overwrite table tt_b select null, null from temp_null;
 select * from tt_b;
 
-insert overwrite directory "../build/ql/test/data/warehouse/null_columns.out" select null, null from temp_null;
-dfs -cat ../build/ql/test/data/warehouse/null_columns.out/*;
+insert overwrite directory "target/warehouse/null_columns.out" select null, null from temp_null;
+dfs -cat ${system:test.warehouse.dir}/null_columns.out/*;
 
 
 create table temp_null2 (key string, value string) partitioned by (ds string);

Modified: hive/trunk/ql/src/test/queries/clientpositive/nullgroup3.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/nullgroup3.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/nullgroup3.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/nullgroup3.q Thu Oct 31 18:27:31 2013
@@ -1,28 +1,28 @@
 CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');
 explain
 select count(1) from tstparttbl;
 select count(1) from tstparttbl;
 
 CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09');
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08');
 explain
 select count(1) from tstparttbl2;
 select count(1) from tstparttbl2;
 DROP TABLE tstparttbl;
 CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl PARTITION (ds='2008-04-08');
 explain
 select count(1) from tstparttbl;
 select count(1) from tstparttbl;
 
 DROP TABLE tstparttbl2;
 CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09');
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE tstparttbl2 PARTITION (ds='2008-04-08');
 explain
 select count(1) from tstparttbl2;
 select count(1) from tstparttbl2;

Modified: hive/trunk/ql/src/test/queries/clientpositive/nullgroup5.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/nullgroup5.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/nullgroup5.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/nullgroup5.q Thu Oct 31 18:27:31 2013
@@ -1,10 +1,10 @@
 
 CREATE TABLE tstparttbl(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2009-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl PARTITION (ds='2009-04-09');
 
 
 CREATE TABLE tstparttbl2(KEY STRING, VALUE STRING) PARTITIONED BY(ds string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE tstparttbl2 PARTITION (ds='2009-04-09');
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE tstparttbl2 PARTITION (ds='2009-04-09');
 
 explain
 select u.* from

Modified: hive/trunk/ql/src/test/queries/clientpositive/nullscript.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/nullscript.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/nullscript.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/nullscript.q Thu Oct 31 18:27:31 2013
@@ -1,7 +1,7 @@
 
 CREATE TABLE nullscript(KEY STRING, VALUE STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE nullscript;
-LOAD DATA LOCAL INPATH '../data/files/nullfile.txt' INTO TABLE nullscript;
+LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE nullscript;
+LOAD DATA LOCAL INPATH '../../data/files/nullfile.txt' INTO TABLE nullscript;
 explain
 select transform(key) using 'cat' as key1 from nullscript;
 select transform(key) using 'cat' as key1 from nullscript;

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_create.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_create.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_create.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_create.q Thu Oct 31 18:27:31 2013
@@ -53,7 +53,7 @@ CREATE TABLE orc_create_complex (
 
 DESCRIBE FORMATTED orc_create_complex;
 
-LOAD DATA LOCAL INPATH '../data/files/orc_create.txt' OVERWRITE INTO TABLE orc_create_staging;
+LOAD DATA LOCAL INPATH '../../data/files/orc_create.txt' OVERWRITE INTO TABLE orc_create_staging;
 
 SELECT * from orc_create_staging;
 
@@ -72,7 +72,7 @@ CREATE TABLE orc_create_people_staging (
   address string,
   state string);
 
-LOAD DATA LOCAL INPATH '../data/files/orc_create_people.txt'
+LOAD DATA LOCAL INPATH '../../data/files/orc_create_people.txt'
   OVERWRITE INTO TABLE orc_create_people_staging;
 
 CREATE TABLE orc_create_people (

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q Thu Oct 31 18:27:31 2013
@@ -19,7 +19,7 @@ SELECT * FROM test_orc; 
 ALTER TABLE test_orc SET SERDEPROPERTIES ('orc.stripe.size' = '1');
 
 CREATE TABLE src_thousand(key STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv1kv2.cogroup.txt' 
+LOAD DATA LOCAL INPATH '../../data/files/kv1kv2.cogroup.txt' 
      INTO TABLE src_thousand;
 
 set hive.exec.orc.dictionary.key.size.threshold=0.5;

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q Thu Oct 31 18:27:31 2013
@@ -10,7 +10,7 @@ ALTER TABLE test_orc SET SERDEPROPERTIES
 -- to last index stride are the same (there's only two index strides)
 
 CREATE TABLE src_null(a STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/nulls.txt' INTO TABLE src_null;
+LOAD DATA LOCAL INPATH '../../data/files/nulls.txt' INTO TABLE src_null;
 
 INSERT OVERWRITE TABLE test_orc SELECT a FROM src_null;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q Thu Oct 31 18:27:31 2013
@@ -27,7 +27,7 @@ CREATE TABLE staging(t tinyint,
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '|'
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/over1k' OVERWRITE INTO TABLE staging;
+LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO TABLE staging;
 
 INSERT INTO TABLE orc_pred select * from staging;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/parallel_orderby.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/parallel_orderby.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/parallel_orderby.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/parallel_orderby.q Thu Oct 31 18:27:31 2013
@@ -1,6 +1,6 @@
 create table src5 (key string, value string);
-load data local inpath '../data/files/kv5.txt' into table src5;
-load data local inpath '../data/files/kv5.txt' into table src5;
+load data local inpath '../../data/files/kv5.txt' into table src5;
+load data local inpath '../../data/files/kv5.txt' into table src5;
 
 set mapred.reduce.tasks = 4;
 set hive.optimize.sampling.orderby=true;

Modified: hive/trunk/ql/src/test/queries/clientpositive/partition_type_check.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/partition_type_check.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/partition_type_check.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/partition_type_check.q Thu Oct 31 18:27:31 2013
@@ -2,14 +2,14 @@ set hive.typecheck.on.insert = true;
 
 -- begin part(string, string) pass(string, int)
 CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day string) stored as textfile;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day=2);
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day=2);
 
 select * from tab1;
 drop table tab1;
 
 -- begin part(string, int) pass(string, string)
 CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) stored as textfile;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2');
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2');
 
 select * from tab1;
 drop table tab1;
@@ -17,7 +17,7 @@ drop table tab1;
 -- begin part(string, date) pass(string, date)
 create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day date) stored as textfile;
 alter table tab1 add partition (month='June', day='2008-01-01');
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2008-01-01');
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='2008-01-01');
 
 select id1, id2, day from tab1 where day='2008-01-01';
 drop table tab1;

Modified: hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q Thu Oct 31 18:27:31 2013
@@ -3,9 +3,9 @@
 -- CustomSerDe(1, 2, 3) irrespective of the inserted values
 
 DROP TABLE PW17;
-ADD JAR ../build/ql/test/test-serdes.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
 CREATE TABLE PW17(USER STRING, COMPLEXDT ARRAY<INT>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1');
 ALTER TABLE PW17 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2';
 ALTER TABLE PW17 SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
 -- Without the fix HIVE-5199, will throw cast exception via FetchOperator
@@ -14,13 +14,13 @@ SELECT * FROM PW17;
 -- Test for non-parititioned table. 
 DROP TABLE PW17_2;
 CREATE TABLE PW17_2(USER STRING, COMPLEXDT ARRAY<INT>) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_2;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_2;
 -- Without the fix HIVE-5199, will throw cast exception via MapOperator
 SELECT COUNT(*) FROM PW17_2;
 
 DROP TABLE PW17_3;
 CREATE TABLE PW17_3(USER STRING, COMPLEXDT ARRAY<ARRAY<INT> >) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1');
 ALTER TABLE PW17_3 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2';
 ALTER TABLE PW17_3 SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
 -- Without the fix HIVE-5285, will throw cast exception via FetchOperator
@@ -28,7 +28,7 @@ SELECT * FROM PW17;
 
 DROP TABLE PW17_4;
 CREATE TABLE PW17_4(USER STRING, COMPLEXDT ARRAY<ARRAY<INT> >) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_4;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_4;
 -- Without the fix HIVE-5285, will throw cast exception via MapOperator
 SELECT COUNT(*) FROM PW17_4;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q Thu Oct 31 18:27:31 2013
@@ -4,9 +4,9 @@
 -- CustomSerDe(4, 5) irrespective of the inserted values
 
 DROP TABLE PW18;
-ADD JAR ../build/ql/test/test-serdes.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
 CREATE TABLE PW18(USER STRING, COMPLEXDT UNIONTYPE<INT, DOUBLE>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1');
 ALTER TABLE PW18 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe4';
 -- Without the fix HIVE-5202, will throw unsupported data type exception.
 SELECT * FROM PW18;
@@ -14,6 +14,6 @@ SELECT * FROM PW18;
 -- Test for non-parititioned table. 
 DROP TABLE PW18_2;
 CREATE TABLE PW18_2(USER STRING, COMPLEXDT UNIONTYPE<INT, DOUBLE>) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW18_2;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18_2;
 -- Without the fix HIVE-5202, will throw unsupported data type exception
 SELECT COUNT(*) FROM PW18_2;

Modified: hive/trunk/ql/src/test/queries/clientpositive/pcr.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/pcr.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/pcr.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/pcr.q Thu Oct 31 18:27:31 2013
@@ -127,7 +127,7 @@ create table ab(strct struct<a:int, b:st
 row format delimited
   fields terminated by '\t'
   collection items terminated by '\001';
-load data local inpath '../data/files/kv1.txt'
+load data local inpath '../../data/files/kv1.txt'
 overwrite into table ab;
 
 -- Create partitioned table with struct data:

Modified: hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q Thu Oct 31 18:27:31 2013
@@ -10,18 +10,18 @@ FROM src a JOIN src b ON (a.key = b.key)
 INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100
 INSERT OVERWRITE TABLE mi2 SELECT a.key, a.value WHERE a.key >= 100 and a.key < 200
 INSERT OVERWRITE TABLE mi3 PARTITION(ds='2008-04-08', hr='12') SELECT a.key WHERE a.key >= 200 and a.key < 300
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
+INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
 
 FROM src a JOIN src b ON (a.key = b.key)
 INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100
 INSERT OVERWRITE TABLE mi2 SELECT a.key, a.value WHERE a.key >= 100 and a.key < 200
 INSERT OVERWRITE TABLE mi3 PARTITION(ds='2008-04-08', hr='12') SELECT a.key WHERE a.key >= 200 and a.key < 300
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
+INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
 
 SELECT mi1.* FROM mi1;
 SELECT mi2.* FROM mi2;
 SELECT mi3.* FROM mi3;
-dfs -cat ../build/ql/test/data/warehouse/mi4.out/*;
+dfs -cat ${system:test.warehouse.dir}/mi4.out/*;
 
 
 set hive.ppd.remove.duplicatefilters=true;
@@ -31,15 +31,15 @@ FROM src a JOIN src b ON (a.key = b.key)
 INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100
 INSERT OVERWRITE TABLE mi2 SELECT a.key, a.value WHERE a.key >= 100 and a.key < 200
 INSERT OVERWRITE TABLE mi3 PARTITION(ds='2008-04-08', hr='12') SELECT a.key WHERE a.key >= 200 and a.key < 300
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
+INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
 
 FROM src a JOIN src b ON (a.key = b.key)
 INSERT OVERWRITE TABLE mi1 SELECT a.* WHERE a.key < 100
 INSERT OVERWRITE TABLE mi2 SELECT a.key, a.value WHERE a.key >= 100 and a.key < 200
 INSERT OVERWRITE TABLE mi3 PARTITION(ds='2008-04-08', hr='12') SELECT a.key WHERE a.key >= 200 and a.key < 300
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
+INSERT OVERWRITE DIRECTORY 'target/warehouse/mi4.out' SELECT a.value WHERE a.key >= 300;
 
 SELECT mi1.* FROM mi1;
 SELECT mi2.* FROM mi2;
 SELECT mi3.* FROM mi3;
-dfs -cat ../build/ql/test/data/warehouse/mi4.out/*;
+dfs -cat ${system:test.warehouse.dir}/mi4.out/*;

Modified: hive/trunk/ql/src/test/queries/clientpositive/progress_1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/progress_1.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/progress_1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/progress_1.q Thu Oct 31 18:27:31 2013
@@ -2,7 +2,7 @@ set hive.heartbeat.interval=5; 
 
 
 CREATE TABLE PROGRESS_1(key int, value string) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv6.txt' INTO TABLE PROGRESS_1;
+LOAD DATA LOCAL INPATH '../../data/files/kv6.txt' INTO TABLE PROGRESS_1;
 
 select count(1) from PROGRESS_1 t1 join PROGRESS_1 t2 on t1.key=t2.key;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf.q Thu Oct 31 18:27:31 2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 --1. test1
 select p_mfgr, p_name, p_size,

Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf_decimal.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_decimal.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf_decimal.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf_decimal.q Thu Oct 31 18:27:31 2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 -- 1. aggregate functions with decimal type
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf_general_queries.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_general_queries.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf_general_queries.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf_general_queries.q Thu Oct 31 18:27:31 2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 -- 1. testNoPTFNoWindowing
 select p_mfgr, p_name, p_size

Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q Thu Oct 31 18:27:31 2013
@@ -10,7 +10,7 @@ ARR_DELAY float, 
 FL_NUM string 
 );
 
-LOAD DATA LOCAL INPATH '../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny;
+LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny;
 
 -- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 

Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q?rev=1537576&r1=1537575&r2=1537576&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q Thu Oct 31 18:27:31 2013
@@ -12,7 +12,7 @@ CREATE TABLE part_rc( 
     p_comment STRING
 )  STORED AS RCFILE ;
 
-LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc;
+LOAD DATA LOCAL INPATH '../../data/files/part.rc' overwrite into table part_rc;
 
 -- testWindowingPTFWithPartRC
 select p_mfgr, p_name, p_size,