HIVE-5674 - Merge latest trunk into branch and fix resulting tests
git-svn-id: https://svn.apache.org/repos/asf/hive/branches/maven@1536493 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-delete-ant.xml b/maven-delete-ant.sh
similarity index 94%
rename from maven-delete-ant.xml
rename to maven-delete-ant.sh
index 8a04efc..127d6ae 100644
--- a/maven-delete-ant.xml
+++ b/maven-delete-ant.sh
@@ -43,3 +43,6 @@
delete hcatalog/build-support/ant/deploy.xml
delete hcatalog/build-support/ant/test.xml
delete ivy
+delete maven-rollback.sh
+delete maven-rollforward.sh
+delete maven-delete-ant.sh
diff --git a/ql/src/test/queries/clientnegative/subquery_windowing_corr.q b/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
index bcc767b..105d3d2 100644
--- a/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
+++ b/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
@@ -13,7 +13,7 @@
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;
-- corr and windowing
diff --git a/ql/src/test/queries/clientpositive/decimal_5.q b/ql/src/test/queries/clientpositive/decimal_5.q
index ecf9376..70e5db0 100644
--- a/ql/src/test/queries/clientpositive/decimal_5.q
+++ b/ql/src/test/queries/clientpositive/decimal_5.q
@@ -5,7 +5,7 @@
FIELDS TERMINATED BY ' '
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5;
+LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5;
SELECT key FROM DECIMAL_5 ORDER BY key;
diff --git a/ql/src/test/queries/clientpositive/decimal_6.q b/ql/src/test/queries/clientpositive/decimal_6.q
index c1135f1..b58e224 100644
--- a/ql/src/test/queries/clientpositive/decimal_6.q
+++ b/ql/src/test/queries/clientpositive/decimal_6.q
@@ -12,8 +12,8 @@
FIELDS TERMINATED BY ' '
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1;
-LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2;
SELECT T.key from (
SELECT key, value from DECIMAL_6_1
diff --git a/ql/src/test/queries/clientpositive/split.q b/ql/src/test/queries/clientpositive/split.q
index 9960fd6..f5d7ff8 100644
--- a/ql/src/test/queries/clientpositive/split.q
+++ b/ql/src/test/queries/clientpositive/split.q
@@ -2,7 +2,7 @@
CREATE table tmp_jo_tab_test (message_line STRING)
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/input.txt'
+LOAD DATA LOCAL INPATH '../../data/files/input.txt'
OVERWRITE INTO TABLE tmp_jo_tab_test;
select size(split(message_line, '\t')) from tmp_jo_tab_test;
diff --git a/ql/src/test/queries/clientpositive/subquery_in.q b/ql/src/test/queries/clientpositive/subquery_in.q
index 6f83a88..37bb5d7 100644
--- a/ql/src/test/queries/clientpositive/subquery_in.q
+++ b/ql/src/test/queries/clientpositive/subquery_in.q
@@ -13,7 +13,7 @@
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;
DROP TABLE lineitem;
CREATE TABLE lineitem (L_ORDERKEY INT,
@@ -35,7 +35,7 @@
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;
-- non agg, non corr
explain
diff --git a/ql/src/test/queries/clientpositive/subquery_notin.q b/ql/src/test/queries/clientpositive/subquery_notin.q
index 7bc7a1b..d7eca3e 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin.q
@@ -13,7 +13,7 @@
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;
DROP TABLE lineitem;
CREATE TABLE lineitem (L_ORDERKEY INT,
@@ -35,7 +35,7 @@
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;
-- non agg, non corr
explain
diff --git a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
index c7de7b2..3cc2fa4 100644
--- a/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
+++ b/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
@@ -29,10 +29,10 @@
)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
PREHOOK: type: LOAD
PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
POSTHOOK: type: LOAD
POSTHOOK: Output: default@part
FAILED: SemanticException Line 9:8 Unsupported SubQuery Expression '1' in definition of SubQuery sq_1 [
diff --git a/ql/src/test/results/clientpositive/decimal_5.q.out b/ql/src/test/results/clientpositive/decimal_5.q.out
index 13f4117..77c3724 100644
--- a/ql/src/test/results/clientpositive/decimal_5.q.out
+++ b/ql/src/test/results/clientpositive/decimal_5.q.out
@@ -13,10 +13,10 @@
STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@DECIMAL_5
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5
PREHOOK: type: LOAD
PREHOOK: Output: default@decimal_5
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5
POSTHOOK: type: LOAD
POSTHOOK: Output: default@decimal_5
PREHOOK: query: SELECT key FROM DECIMAL_5 ORDER BY key
diff --git a/ql/src/test/results/clientpositive/decimal_6.q.out b/ql/src/test/results/clientpositive/decimal_6.q.out
index d0e2f5a..043321f 100644
--- a/ql/src/test/results/clientpositive/decimal_6.q.out
+++ b/ql/src/test/results/clientpositive/decimal_6.q.out
@@ -32,16 +32,16 @@
STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@DECIMAL_6_2
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
PREHOOK: type: LOAD
PREHOOK: Output: default@decimal_6_1
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
POSTHOOK: type: LOAD
POSTHOOK: Output: default@decimal_6_1
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
PREHOOK: type: LOAD
PREHOOK: Output: default@decimal_6_2
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@decimal_6_2
PREHOOK: query: SELECT T.key from (
diff --git a/ql/src/test/results/clientpositive/split.q.out b/ql/src/test/results/clientpositive/split.q.out
index e9b53f1..8bd206a 100644
--- a/ql/src/test/results/clientpositive/split.q.out
+++ b/ql/src/test/results/clientpositive/split.q.out
@@ -9,11 +9,11 @@
STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@tmp_jo_tab_test
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/input.txt'
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt'
OVERWRITE INTO TABLE tmp_jo_tab_test
PREHOOK: type: LOAD
PREHOOK: Output: default@tmp_jo_tab_test
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/input.txt'
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt'
OVERWRITE INTO TABLE tmp_jo_tab_test
POSTHOOK: type: LOAD
POSTHOOK: Output: default@tmp_jo_tab_test
diff --git a/ql/src/test/results/clientpositive/subquery_in.q.out b/ql/src/test/results/clientpositive/subquery_in.q.out
index 32a248a..b04b508 100644
--- a/ql/src/test/results/clientpositive/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/subquery_in.q.out
@@ -29,10 +29,10 @@
)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
PREHOOK: type: LOAD
PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
POSTHOOK: type: LOAD
POSTHOOK: Output: default@part
PREHOOK: query: DROP TABLE lineitem
@@ -78,10 +78,10 @@
FIELDS TERMINATED BY '|'
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@lineitem
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
PREHOOK: type: LOAD
PREHOOK: Output: default@lineitem
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
POSTHOOK: type: LOAD
POSTHOOK: Output: default@lineitem
PREHOOK: query: -- non agg, non corr
diff --git a/ql/src/test/results/clientpositive/subquery_notin.q.out b/ql/src/test/results/clientpositive/subquery_notin.q.out
index f80af93..bf87e3b 100644
--- a/ql/src/test/results/clientpositive/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/subquery_notin.q.out
@@ -29,10 +29,10 @@
)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
PREHOOK: type: LOAD
PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part
POSTHOOK: type: LOAD
POSTHOOK: Output: default@part
PREHOOK: query: DROP TABLE lineitem
@@ -78,10 +78,10 @@
FIELDS TERMINATED BY '|'
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@lineitem
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
PREHOOK: type: LOAD
PREHOOK: Output: default@lineitem
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem
POSTHOOK: type: LOAD
POSTHOOK: Output: default@lineitem
PREHOOK: query: -- non agg, non corr
