You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/12 18:38:13 UTC
svn commit: r1531557 [9/20] - in /hive/branches/maven: ./ 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/
cli/src/test/org/apache/hadoop/hive/cli/ commo...
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/leftsemijoin_mr.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/leftsemijoin_mr.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/leftsemijoin_mr.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/leftsemijoin_mr.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_binary_data.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_binary_data.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_binary_data.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_binary_data.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_fs.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_fs.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_fs.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_fs.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_fs2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_fs2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_fs2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_fs2.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_overwrite.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_overwrite.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_overwrite.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_overwrite.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/load_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/load_part_authsuccess.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/load_part_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/load_part_authsuccess.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/loadpart1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/loadpart1.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/loadpart1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/loadpart1.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/loadpart_err.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/loadpart_err.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/loadpart_err.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/loadpart_err.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/mapjoin_subquery2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/mapjoin_subquery2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/mapjoin_subquery2.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/metadata_export_drop.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/metadata_export_drop.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/metadata_export_drop.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/metadata_export_drop.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/nested_complex.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/nested_complex.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/nested_complex.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/nested_complex.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/newline.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/newline.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/newline.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/newline.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/null_column.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/null_column.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/null_column.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/null_column.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/nullgroup3.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup3.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup3.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup3.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/nullgroup5.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup5.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup5.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/nullgroup5.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/nullscript.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/nullscript.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/nullscript.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/nullscript.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/orc_create.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/orc_create.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/orc_create.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/orc_create.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/parallel_orderby.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/parallel_orderby.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/parallel_orderby.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/parallel_orderby.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/partition_type_check.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/partition_type_check.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/partition_type_check.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/partition_type_check.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q Sat Oct 12 16:37:47 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-internal/${system:hive.version}/hive-internal-${system:hive.version}-custom-serde.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/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q Sat Oct 12 16:37:47 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-internal/${system:hive.version}/hive-internal-${system:hive.version}-custom-serde.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/branches/maven/ql/src/test/queries/clientpositive/pcr.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/pcr.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/pcr.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/pcr.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/ppd_multi_insert.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ppd_multi_insert.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ppd_multi_insert.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ppd_multi_insert.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/progress_1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/progress_1.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/progress_1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/progress_1.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/ptf.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/ptf_decimal.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_decimal.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_decimal.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_decimal.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/ptf_general_queries.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_general_queries.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_general_queries.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_general_queries.q Sat Oct 12 16:37:47 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/branches/maven/ql/src/test/queries/clientpositive/ptf_npath.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_npath.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_npath.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_npath.q Sat Oct 12 16:37:47 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 Npath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/ptf_rcfile.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_rcfile.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_rcfile.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_rcfile.q Sat Oct 12 16:37:47 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,
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/ptf_register_tblfn.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_register_tblfn.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_register_tblfn.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_register_tblfn.q Sat Oct 12 16:37:47 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;
create temporary function npathtest as 'org.apache.hadoop.hive.ql.udf.ptf.NPath$NPathResolver';
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/ptf_seqfile.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_seqfile.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_seqfile.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_seqfile.q Sat Oct 12 16:37:47 2013
@@ -12,7 +12,7 @@ CREATE TABLE part_seq(
p_comment STRING
) STORED AS SEQUENCEFILE ;
-LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq;
+LOAD DATA LOCAL INPATH '../../data/files/part.seq' overwrite into table part_seq;
-- testWindowingPTFWithPartSeqFile
select p_mfgr, p_name, p_size,
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q Sat Oct 12 16:37:47 2013
@@ -19,7 +19,7 @@ CREATE TABLE lineitem (L_ORDERKEY I
ROW FORMAT DELIMITED
FIELDS TERMINATED BY '|';
-LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
+LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
CREATE INDEX lineitem_lshipdate_idx ON TABLE lineitem(l_shipdate) AS 'org.apache.hadoop.hive.ql.index.AggregateIndexHandler' WITH DEFERRED REBUILD IDXPROPERTIES("AGGREGATES"="count(l_shipdate)");
ALTER INDEX lineitem_lshipdate_idx ON lineitem REBUILD;
@@ -156,7 +156,7 @@ DROP INDEX tbl_part_index on tblpart;
DROP TABLE tblpart;
CREATE TABLE tbl(key int, value int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|';
-LOAD DATA LOCAL INPATH '../data/files/tbl.txt' OVERWRITE INTO TABLE tbl;
+LOAD DATA LOCAL INPATH '../../data/files/tbl.txt' OVERWRITE INTO TABLE tbl;
CREATE INDEX tbl_key_idx ON TABLE tbl(key) AS 'org.apache.hadoop.hive.ql.index.AggregateIndexHandler' WITH DEFERRED REBUILD IDXPROPERTIES("AGGREGATES"="count(key)");
ALTER INDEX tbl_key_idx ON tbl REBUILD;
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/rcfile_bigdata.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/rcfile_bigdata.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/rcfile_bigdata.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/rcfile_bigdata.q Sat Oct 12 16:37:47 2013
@@ -1,7 +1,7 @@
set hive.map.aggr.hash.percentmemory = 0.3;
set hive.mapred.local.mem = 256;
-add file ../data/scripts/dumpdata_script.py;
+add file ../../data/scripts/dumpdata_script.py;
CREATE table columnTable_Bigdata (key STRING, value STRING)
ROW FORMAT SERDE
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/remote_script.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/remote_script.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/remote_script.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/remote_script.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-dfs -put ../data/scripts/newline.py /newline.py;
+dfs -put ../../data/scripts/newline.py /newline.py;
add file hdfs:///newline.py;
set hive.transform.escape.input=true;
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/repair.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/repair.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/repair.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/repair.q Sat Oct 12 16:37:47 2013
@@ -2,9 +2,9 @@ CREATE TABLE repairtable(col STRING) PAR
MSCK TABLE repairtable;
-dfs ${system:test.dfs.mkdir} ../build/ql/test/data/warehouse/repairtable/p1=a/p2=a;
-dfs ${system:test.dfs.mkdir} ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a;
-dfs -touchz ../build/ql/test/data/warehouse/repairtable/p1=b/p2=a/datafile;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/warehouse/repairtable/p1=a/p2=a;
+dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/warehouse/repairtable/p1=b/p2=a;
+dfs -touchz ${system:test.tmp.dir}/warehouse/repairtable/p1=b/p2=a/datafile;
MSCK TABLE repairtable;
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/serde_regex.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/serde_regex.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/serde_regex.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/serde_regex.q Sat Oct 12 16:37:47 2013
@@ -31,8 +31,8 @@ WITH SERDEPROPERTIES (
)
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH "../data/files/apache.access.log" INTO TABLE serde_regex;
-LOAD DATA LOCAL INPATH "../data/files/apache.access.2.log" INTO TABLE serde_regex;
+LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex;
+LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex;
SELECT * FROM serde_regex ORDER BY time;
@@ -59,7 +59,7 @@ WITH SERDEPROPERTIES (
)
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH "../data/files/kv7.txt" INTO TABLE serde_regex1;
+LOAD DATA LOCAL INPATH "../../data/files/kv7.txt" INTO TABLE serde_regex1;
SELECT key, value FROM serde_regex1 ORDER BY key, value;
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q Sat Oct 12 16:37:47 2013
@@ -24,7 +24,7 @@ set b=a;
set c=${hiveconf:${hiveconf:b}};
set c;
-set jar=${system:build.ivy.lib.dir}/default/derby-${system:derby.version}.jar;
+set ver=$(system:hive.version};
add file ${hiveconf:jar};
delete file ${hiveconf:jar};
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin.q Sat Oct 12 16:37:47 2013
@@ -13,10 +13,10 @@ CREATE TABLE T3(key STRING, val STRING)
CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE dest_j1(key INT, value 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
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q Sat Oct 12 16:37:47 2013
@@ -20,12 +20,12 @@ set mapred.input.dir.recursive=true;
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- a simple join query with skew on both the tables on the join key
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q Sat Oct 12 16:37:47 2013
@@ -12,16 +12,16 @@ set mapred.input.dir.recursive=true;
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
-- This is to test the union->selectstar->filesink and skewjoin optimization
-- Union of 3 map-reduce subqueries is performed for the skew join
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt1.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt1.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- a simple join query with skew on both the tables on the join key
-- adding a order by at the end to make the results deterministic
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt10.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt10.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt10.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt10.q Sat Oct 12 16:37:47 2013
@@ -4,7 +4,7 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
drop table array_valued_T1;
create table array_valued_T1 (key string, value array<string>) SKEWED BY (key) ON ((8));
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt11.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt11.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt11.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt11.q Sat Oct 12 16:37:47 2013
@@ -5,11 +5,11 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- This test is to verify the skew join compile optimization when the join is followed
-- by a union. Both sides of a union consist of a join, which should have used
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt12.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt12.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt12.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt12.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- Both the join tables are skewed by 2 keys, and one of the skewed values
-- is common to both the tables. The join key matches the skewed key set.
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt13.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt13.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt13.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt13.q Sat Oct 12 16:37:47 2013
@@ -4,16 +4,16 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
CREATE TABLE T3(key STRING, val STRING)
SKEWED BY (val) ON ((12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
-- This test is for skewed join compile time optimization for more than 2 tables.
-- The join key for table 3 is different from the join key used for joining
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt14.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt14.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt14.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt14.q Sat Oct 12 16:37:47 2013
@@ -5,16 +5,16 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
CREATE TABLE T3(key STRING, val STRING)
SKEWED BY (val) ON ((12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
-- This test is for skewed join compile time optimization for more than 2 tables.
-- The join key for table 3 is different from the join key used for joining
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt15.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt15.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt15.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt15.q Sat Oct 12 16:37:47 2013
@@ -4,7 +4,7 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE tmpT1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1;
-- testing skew on other data types - int
CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2));
@@ -12,7 +12,7 @@ INSERT OVERWRITE TABLE T1 SELECT key, va
CREATE TABLE tmpT2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE tmpT2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE tmpT2;
CREATE TABLE T2(key INT, val STRING) SKEWED BY (key) ON ((3));
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt16.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt16.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt16.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt16.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- One of the tables is skewed by 2 columns, and the other table is
-- skewed by one column. Ths join is performed on the both the columns
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt17.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt17.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt17.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt17.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- One of the tables is skewed by 2 columns, and the other table is
-- skewed by one column. Ths join is performed on the first skewed column
@@ -31,12 +31,12 @@ DROP TABLE T2;
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- One of the tables is skewed by 2 columns, and the other table is
-- skewed by one column. Ths join is performed on the both the columns
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt18.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt18.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt18.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt18.q Sat Oct 12 16:37:47 2013
@@ -4,7 +4,7 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE tmpT1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE tmpT1;
-- testing skew on other data types - int
CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2));
@@ -16,7 +16,7 @@ INSERT OVERWRITE TABLE T1 SELECT key, va
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- Once HIVE-3445 is fixed, the compile time skew join optimization would be
-- applicable here. Till the above jira is fixed, it would be performed as a
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt19.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt19.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt19.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt19.q Sat Oct 12 16:37:47 2013
@@ -6,11 +6,11 @@ CREATE TABLE T1(key STRING, val STRING)
CLUSTERED BY (key) INTO 4 BUCKETS
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- add a test where the skewed key is also the bucketized key
-- it should not matter, and the compile time skewed join
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt2.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2), (7)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- a simple query with skew on both the tables on the join key
-- multiple skew values are present for the skewed keys
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt20.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt20.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt20.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt20.q Sat Oct 12 16:37:47 2013
@@ -6,11 +6,11 @@ CREATE TABLE T1(key STRING, val STRING)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- add a test where the skewed key is also the bucketized/sorted key
-- it should not matter, and the compile time skewed join
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt3.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt3.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt3.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt3.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- a simple query with skew on both the tables. One of the skewed
-- value is common to both the tables. The skewed value should not be
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt4.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt4.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt4.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt4.q Sat Oct 12 16:37:47 2013
@@ -5,11 +5,11 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- only of the tables of the join (the left table of the join) is skewed
-- the skewed filter would still be applied to both the tables
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt5.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt5.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt5.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt5.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- One of the tables is skewed by 2 columns, and the other table is
-- skewed by one column. Ths join is performed on the first skewed column
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt6.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt6.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt6.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt6.q Sat Oct 12 16:37:47 2013
@@ -5,12 +5,12 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key, val) ON ((2, 12), (8, 18)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key, val) ON ((3, 13), (8, 18)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
-- Both the join tables are skewed by 2 keys, and one of the skewed values
-- is common to both the tables. The join key is a subset of the skewed key set:
Modified: hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt7.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt7.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt7.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/skewjoinopt7.q Sat Oct 12 16:37:47 2013
@@ -5,16 +5,16 @@ set hive.optimize.skewjoin.compiletime =
CREATE TABLE T1(key STRING, val STRING)
SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
-- This test is for validating skewed join compile time optimization for more than
-- 2 tables. The join key is the same, and so a 3-way join would be performed.