You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/11/05 08:01:58 UTC
svn commit: r1538880 [11/46] - in /hive/branches/tez: ./ ant/
ant/src/org/apache/hadoop/hive/ant/ beeline/
beeline/src/java/org/apache/hive/beeline/ beeline/src/main/
beeline/src/test/org/apache/hive/beeline/src/test/ cli/ common/
common/src/java/conf/...
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_hive_626.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_hive_626.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_hive_626.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_hive_626.q Tue Nov 5 07:01:32 2013
@@ -13,9 +13,9 @@ delimited fields terminated by ',' store
create table hive_count (bar_id int, n int) row format delimited fields
terminated by ',' stored as textfile;
-load data local inpath '../data/files/hive_626_foo.txt' overwrite into table hive_foo;
-load data local inpath '../data/files/hive_626_bar.txt' overwrite into table hive_bar;
-load data local inpath '../data/files/hive_626_count.txt' overwrite into table hive_count;
+load data local inpath '../../data/files/hive_626_foo.txt' overwrite into table hive_foo;
+load data local inpath '../../data/files/hive_626_bar.txt' overwrite into table hive_bar;
+load data local inpath '../../data/files/hive_626_count.txt' overwrite into table hive_count;
explain
select hive_foo.foo_name, hive_bar.bar_name, n from hive_foo join hive_bar on hive_foo.foo_id =
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_nulls.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_nulls.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_nulls.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_nulls.q Tue Nov 5 07:01:32 2013
@@ -1,5 +1,5 @@
CREATE TABLE myinput1(key int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' INTO TABLE myinput1;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' INTO TABLE myinput1;
SELECT * FROM myinput1 a JOIN myinput1 b ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ORDER BY a.key ASC, a.value ASC, b.key ASC, b.value ASC;
@@ -42,10 +42,10 @@ SELECT /*+ MAPJOIN(a) */ * FROM myinput1
CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS;
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in1.txt' into table smb_input2;
-LOAD DATA LOCAL INPATH '../data/files/in2.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in1.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in2.txt' into table smb_input2;
SET hive.optimize.bucketmapJOIN = true;
SET hive.optimize.bucketmapJOIN.sortedmerge = true;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_nullsafe.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_nullsafe.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_nullsafe.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_nullsafe.q Tue Nov 5 07:01:32 2013
@@ -1,7 +1,7 @@
set hive.nullsafe.equijoin=true;
CREATE TABLE myinput1(key int, value int);
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' INTO TABLE myinput1;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE myinput1;
-- merging
explain select * from myinput1 a join myinput1 b on a.key<=>b.value ORDER BY a.key, a.value, b.key, b.value;
@@ -31,10 +31,10 @@ SELECT /*+ MAPJOIN(b) */ * FROM myinput1
-- smbs
CREATE TABLE smb_input1(key int, value int) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
CREATE TABLE smb_input2(key int, value int) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS;
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in9.txt' into table smb_input1;
-LOAD DATA LOCAL INPATH '../data/files/in8.txt' into table smb_input2;
-LOAD DATA LOCAL INPATH '../data/files/in9.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input1;
+LOAD DATA LOCAL INPATH '../../data/files/in8.txt' into table smb_input2;
+LOAD DATA LOCAL INPATH '../../data/files/in9.txt' into table smb_input2;
SET hive.optimize.bucketmapJOIN = true;
SET hive.optimize.bucketmapJOIN.sortedmerge = true;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder.q Tue Nov 5 07:01:32 2013
@@ -6,9 +6,9 @@ CREATE TABLE T1(key STRING, val STRING)
CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
SELECT a.key, a.val, c.key;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder2.q Tue Nov 5 07:01:32 2013
@@ -8,10 +8,10 @@ CREATE TABLE T2(key STRING, val STRING)
CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T4;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4;
EXPLAIN
SELECT /*+ STREAMTABLE(a) */ *
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder3.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder3.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder3.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder3.q Tue Nov 5 07:01:32 2013
@@ -8,10 +8,10 @@ CREATE TABLE T2(key STRING, val STRING)
CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T4;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4;
EXPLAIN
SELECT /*+ STREAMTABLE(a,c) */ *
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder4.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder4.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder4.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_reorder4.q Tue Nov 5 07:01:32 2013
@@ -2,9 +2,9 @@ CREATE TABLE T1(key1 STRING, val1 STRING
CREATE TABLE T2(key2 STRING, val2 STRING) STORED AS TEXTFILE;
CREATE TABLE T3(key3 STRING, val3 STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1;
-LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2;
-LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3;
+LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1;
+LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2;
+LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3;
set hive.auto.convert.join=true;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/join_star.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/join_star.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/join_star.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/join_star.q Tue Nov 5 07:01:32 2013
@@ -7,14 +7,14 @@ create table dim5(f9 int, f10 int);
create table dim6(f11 int, f12 int);
create table dim7(f13 int, f14 int);
-LOAD DATA LOCAL INPATH '../data/files/fact-data.txt' INTO TABLE fact;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim1;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim2;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim3;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim4;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim5;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim6;
-LOAD DATA LOCAL INPATH '../data/files/dim-data.txt' INTO TABLE dim7;
+LOAD DATA LOCAL INPATH '../../data/files/fact-data.txt' INTO TABLE fact;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim1;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim2;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim3;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim4;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim5;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim6;
+LOAD DATA LOCAL INPATH '../../data/files/dim-data.txt' INTO TABLE dim7;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/lateral_view_noalias.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/lateral_view_noalias.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/lateral_view_noalias.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/lateral_view_noalias.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
--HIVE-2608 Do not require AS a,b,c part in LATERAL VIEW
EXPLAIN SELECT myTab.* from src LATERAL VIEW explode(map('key1', 100, 'key2', 200)) myTab limit 2;
SELECT myTab.* from src LATERAL VIEW explode(map('key1', 100, 'key2', 200)) myTab limit 2;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/leadlag.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/leadlag.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/leadlag.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/leadlag.q Tue Nov 5 07:01:32 2013
@@ -13,7 +13,7 @@ CREATE TABLE part(
p_comment STRING
);
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
--1. testLagWithPTFWindowing
select p_mfgr, p_name,
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/leadlag_queries.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/leadlag_queries.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/leadlag_queries.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/leadlag_queries.q Tue Nov 5 07:01:32 2013
@@ -11,7 +11,7 @@ CREATE TABLE part(
p_comment STRING
);
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
-- 1. testLeadUDAF
select p_mfgr, p_retailprice,
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin.q Tue Nov 5 07:01:32 2013
@@ -9,9 +9,9 @@ ROW FORMAT DELIMITED FIELDS TERMINATED B
CREATE TABLE things (id INT, name STRING) partitioned by (ds string)
ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t';
-load data local inpath '../data/files/sales.txt' INTO TABLE sales;
-load data local inpath '../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23');
-load data local inpath '../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24');
+load data local inpath '../../data/files/sales.txt' INTO TABLE sales;
+load data local inpath '../../data/files/things.txt' INTO TABLE things partition(ds='2011-10-23');
+load data local inpath '../../data/files/things2.txt' INTO TABLE things partition(ds='2011-10-24');
SELECT name,id FROM sales ORDER BY name ASC, id ASC;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin_mr.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin_mr.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin_mr.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/leftsemijoin_mr.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/literal_decimal.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/literal_decimal.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/literal_decimal.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/literal_decimal.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
EXPLAIN SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 99999999999999999BD, 99999999999999999.9999999999999BD, 1E-99BD, 1E99BD FROM src LIMIT 1;
SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 99999999999999999BD, 99999999999999999.9999999999999BD, 1E-99BD, 1E99BD FROM src LIMIT 1;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/literal_double.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/literal_double.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/literal_double.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/literal_double.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
EXPLAIN SELECT 3.14, -3.14, 3.14e8, 3.14e-8, -3.14e8, -3.14e-8, 3.14e+8, 3.14E8, 3.14E-8 FROM src LIMIT 1;
SELECT 3.14, -3.14, 3.14e8, 3.14e-8, -3.14e8, -3.14e-8, 3.14e+8, 3.14E8, 3.14E-8 FROM src LIMIT 1;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/literal_ints.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/literal_ints.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/literal_ints.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/literal_ints.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
EXPLAIN SELECT 100, 100Y, 100S, 100L FROM src LIMIT 1;
SELECT 100, 100Y, 100S, 100L FROM src LIMIT 1;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/literal_string.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/literal_string.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/literal_string.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/literal_string.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
EXPLAIN SELECT 'face''book', 'face' 'book', 'face'
'book',
"face""book", "face" "book", "face"
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/load_binary_data.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_binary_data.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_binary_data.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_binary_data.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_exist_part_authsuccess.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_file_with_space_in_the_name.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_fs.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_fs.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_fs.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_fs.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_fs2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_fs2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_fs2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_fs2.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_nonpart_authsuccess.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_overwrite.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_overwrite.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_overwrite.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_overwrite.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/load_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/load_part_authsuccess.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/load_part_authsuccess.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/load_part_authsuccess.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/loadpart1.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/loadpart1.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/loadpart1.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/loadpart1.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/loadpart_err.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/loadpart_err.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/loadpart_err.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/loadpart_err.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/macro.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/macro.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/macro.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/macro.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
CREATE TEMPORARY MACRO SIGMOID (x DOUBLE) 1.0 / (1.0 + EXP(-x));
SELECT SIGMOID(2) FROM src LIMIT 1;
EXPLAIN SELECT SIGMOID(2) FROM src LIMIT 1;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/mapjoin_subquery2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/mapjoin_subquery2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/mapjoin_subquery2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/mapjoin_subquery2.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition2.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition3.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition4.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/merge_dynamic_partition5.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/metadata_export_drop.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/metadata_export_drop.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/metadata_export_drop.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/metadata_export_drop.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/nested_complex.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/nested_complex.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/nested_complex.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/nested_complex.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/newline.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/newline.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/newline.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/newline.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/nonreserved_keywords_input37.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/null_cast.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/null_cast.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/null_cast.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/null_cast.q Tue Nov 5 07:01:32 2013
@@ -2,10 +2,10 @@ EXPLAIN SELECT ARRAY(NULL, 0),
ARRAY(NULL, ARRAY()),
ARRAY(NULL, MAP()),
ARRAY(NULL, STRUCT(0))
- FROM src LIMIT 1;
+ FROM src tablesample (1 rows);
SELECT ARRAY(NULL, 0),
ARRAY(NULL, ARRAY()),
ARRAY(NULL, MAP()),
ARRAY(NULL, STRUCT(0))
-FROM src LIMIT 1;
+FROM src tablesample (1 rows);
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/null_column.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/null_column.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/null_column.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/null_column.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/nullgroup3.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup3.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup3.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup3.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/nullgroup5.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup5.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup5.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/nullgroup5.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/nullscript.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/nullscript.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/nullscript.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/nullscript.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/num_op_type_conv.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/num_op_type_conv.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/num_op_type_conv.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/num_op_type_conv.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
EXPLAIN SELECT null + 7, 1.0 - null, null + null,
CAST(21 AS BIGINT) % CAST(5 AS TINYINT),
CAST(21 AS BIGINT) % CAST(21 AS BIGINT),
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/ops_comparison.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/ops_comparison.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/ops_comparison.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/ops_comparison.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,4 @@
+set hive.fetch.task.conversion=more;
select 1.0 < 2.0 from src limit 1;
select 2.0 < 2.0 from src limit 1;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/orc_create.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_create.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_create.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_create.q Tue Nov 5 07:01:32 2013
@@ -40,7 +40,7 @@ set hive.default.fileformat=orc;
CREATE TABLE orc_create (key INT, value STRING)
PARTITIONED BY (ds string);
-set hive.default.fileformat=text;
+set hive.default.fileformat=TextFile;
DESCRIBE FORMATTED orc_create;
@@ -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/tez/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_diff_part_cols.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_diff_part_cols.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_diff_part_cols.q Tue Nov 5 07:01:32 2013
@@ -10,7 +10,7 @@ set hive.input.format=org.apache.hadoop.
-- to another partition
-- This can produce unexpected results with CombineHiveInputFormat
-INSERT OVERWRITE TABLE test_orc PARTITION (part = '1') SELECT key FROM src LIMIT 5;
+INSERT OVERWRITE TABLE test_orc PARTITION (part = '1') SELECT key FROM src tablesample (5 rows);
ALTER TABLE test_orc ADD COLUMNS (cnt INT);
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/orc_empty_strings.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_empty_strings.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_empty_strings.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_empty_strings.q Tue Nov 5 07:01:32 2013
@@ -3,13 +3,13 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive
STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat';
-INSERT OVERWRITE TABLE test_orc SELECT '' FROM src limit 10;
+INSERT OVERWRITE TABLE test_orc SELECT '' FROM src tablesample (10 rows);
-- Test reading a column which is just empty strings
SELECT * FROM test_orc;
-INSERT OVERWRITE TABLE test_orc SELECT IF (key % 3 = 0, key, '') FROM src limit 10;
+INSERT OVERWRITE TABLE test_orc SELECT IF (key % 3 = 0, key, '') FROM src tablesample (10 rows);
-- Test reading a column which has some empty strings
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/parallel_orderby.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/parallel_orderby.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/parallel_orderby.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/parallel_orderby.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/partcols1.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partcols1.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partcols1.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partcols1.q Tue Nov 5 07:01:32 2013
@@ -1,7 +1,7 @@
create table test1(col1 string) partitioned by (partitionId int);
insert overwrite table test1 partition (partitionId=1)
- select key from src limit 10;
+ select key from src tablesample (10 rows);
FROM (
FROM test1
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_date.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_date.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_date.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_date.q Tue Nov 5 07:01:32 2013
@@ -2,14 +2,14 @@ drop table partition_date_1;
create table partition_date_1 (key string, value string) partitioned by (dt date, region int);
-insert overwrite table partition_date_1 partition(dt='2000-01-01', region=1)
- select * from src limit 10;
-insert overwrite table partition_date_1 partition(dt='2000-01-01', region=2)
- select * from src limit 5;
+insert overwrite table partition_date_1 partition(dt='2000-01-01', region=1)
+ select * from src tablesample (10 rows);
+insert overwrite table partition_date_1 partition(dt='2000-01-01', region=2)
+ select * from src tablesample (5 rows);
insert overwrite table partition_date_1 partition(dt='2013-08-08', region=1)
- select * from src limit 20;
+ select * from src tablesample (20 rows);
insert overwrite table partition_date_1 partition(dt='2013-08-08', region=10)
- select * from src limit 11;
+ select * from src tablesample (11 rows);
select distinct dt from partition_date_1;
select * from partition_date_1 where dt = '2000-01-01' and region = 2 order by key,value;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_date2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_date2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_date2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_date2.q Tue Nov 5 07:01:32 2013
@@ -3,7 +3,7 @@ drop table partition_date2_1;
create table partition_date2_1 (key string, value string) partitioned by (dt date, region int);
-- test date literal syntax
-from (select * from src limit 1) x
+from (select * from src tablesample (1 rows)) x
insert overwrite table partition_date2_1 partition(dt=date '2000-01-01', region=1) select *
insert overwrite table partition_date2_1 partition(dt=date '2000-01-01', region=2) select *
insert overwrite table partition_date2_1 partition(dt=date '1999-01-01', region=2) select *;
@@ -13,7 +13,7 @@ select * from partition_date2_1;
-- insert overwrite
insert overwrite table partition_date2_1 partition(dt=date '2000-01-01', region=2)
- select 'changed_key', 'changed_value' from src limit 2;
+ select 'changed_key', 'changed_value' from src tablesample (2 rows);
select * from partition_date2_1;
-- truncate
@@ -41,7 +41,7 @@ alter table partition_date2_1 partition(
describe extended partition_date2_1 partition(dt=date '1980-01-02', region=3);
insert overwrite table partition_date2_1 partition(dt=date '1980-01-02', region=3)
- select * from src limit 2;
+ select * from src tablesample (2 rows);
select * from partition_date2_1 order by key,value,dt,region;
-- alter table set location
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_decode_name.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_decode_name.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_decode_name.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_decode_name.q Tue Nov 5 07:01:32 2013
@@ -1,9 +1,9 @@
create table sc as select *
-from (select '2011-01-11', '2011-01-11+14:18:26' from src limit 1
+from (select '2011-01-11', '2011-01-11+14:18:26' from src tablesample (1 rows)
union all
- select '2011-01-11', '2011-01-11+15:18:26' from src limit 1
+ select '2011-01-11', '2011-01-11+15:18:26' from src tablesample (1 rows)
union all
- select '2011-01-11', '2011-01-11+16:18:26' from src limit 1 ) s;
+ select '2011-01-11', '2011-01-11+16:18:26' from src tablesample (1 rows) ) s;
create table sc_part (key string) partitioned by (ts string) stored as rcfile;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_special_char.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_special_char.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_special_char.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_special_char.q Tue Nov 5 07:01:32 2013
@@ -1,9 +1,9 @@
create table sc as select *
-from (select '2011-01-11', '2011-01-11+14:18:26' from src limit 1
+from (select '2011-01-11', '2011-01-11+14:18:26' from src tablesample (1 rows)
union all
- select '2011-01-11', '2011-01-11+15:18:26' from src limit 1
+ select '2011-01-11', '2011-01-11+15:18:26' from src tablesample (1 rows)
union all
- select '2011-01-11', '2011-01-11+16:18:26' from src limit 1 ) s;
+ select '2011-01-11', '2011-01-11+16:18:26' from src tablesample (1 rows) ) s;
create table sc_part (key string) partitioned by (ts string) stored as rcfile;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_type_check.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_type_check.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_type_check.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_type_check.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/partition_varchar1.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_varchar1.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_varchar1.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_varchar1.q Tue Nov 5 07:01:32 2013
@@ -3,13 +3,13 @@ drop table partition_varchar_1;
create table partition_varchar_1 (key string, value varchar(20)) partitioned by (dt varchar(10), region int);
insert overwrite table partition_varchar_1 partition(dt='2000-01-01', region=1)
- select * from src limit 10;
+ select * from src tablesample (10 rows);
insert overwrite table partition_varchar_1 partition(dt='2000-01-01', region=2)
- select * from src limit 5;
+ select * from src tablesample (5 rows);
insert overwrite table partition_varchar_1 partition(dt='2013-08-08', region=1)
- select * from src limit 20;
+ select * from src tablesample (20 rows);
insert overwrite table partition_varchar_1 partition(dt='2013-08-08', region=10)
- select * from src limit 11;
+ select * from src tablesample (11 rows);
select distinct dt from partition_varchar_1;
select * from partition_varchar_1 where dt = '2000-01-01' and region = 2 order by key,value;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q Tue Nov 5 07:01:32 2013
@@ -3,9 +3,9 @@
-- CustomSerDe(1, 2, 3) irrespective of the inserted values
DROP TABLE PW17;
-ADD JAR ../build/ql/test/test-serdes.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
CREATE TABLE PW17(USER STRING, COMPLEXDT ARRAY<INT>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1');
ALTER TABLE PW17 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2';
ALTER TABLE PW17 SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
-- Without the fix HIVE-5199, will throw cast exception via FetchOperator
@@ -14,13 +14,13 @@ SELECT * FROM PW17;
-- Test for non-parititioned table.
DROP TABLE PW17_2;
CREATE TABLE PW17_2(USER STRING, COMPLEXDT ARRAY<INT>) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_2;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_2;
-- Without the fix HIVE-5199, will throw cast exception via MapOperator
SELECT COUNT(*) FROM PW17_2;
DROP TABLE PW17_3;
CREATE TABLE PW17_3(USER STRING, COMPLEXDT ARRAY<ARRAY<INT> >) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_3 PARTITION (YEAR='1');
ALTER TABLE PW17_3 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2';
ALTER TABLE PW17_3 SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
-- Without the fix HIVE-5285, will throw cast exception via FetchOperator
@@ -28,7 +28,7 @@ SELECT * FROM PW17;
DROP TABLE PW17_4;
CREATE TABLE PW17_4(USER STRING, COMPLEXDT ARRAY<ARRAY<INT> >) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe3';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW17_4;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17_4;
-- Without the fix HIVE-5285, will throw cast exception via MapOperator
SELECT COUNT(*) FROM PW17_4;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q Tue Nov 5 07:01:32 2013
@@ -4,9 +4,9 @@
-- CustomSerDe(4, 5) irrespective of the inserted values
DROP TABLE PW18;
-ADD JAR ../build/ql/test/test-serdes.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
CREATE TABLE PW18(USER STRING, COMPLEXDT UNIONTYPE<INT, DOUBLE>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1');
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1');
ALTER TABLE PW18 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe4';
-- Without the fix HIVE-5202, will throw unsupported data type exception.
SELECT * FROM PW18;
@@ -14,6 +14,6 @@ SELECT * FROM PW18;
-- Test for non-parititioned table.
DROP TABLE PW18_2;
CREATE TABLE PW18_2(USER STRING, COMPLEXDT UNIONTYPE<INT, DOUBLE>) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5';
-LOAD DATA LOCAL INPATH '../data/files/pw17.txt' INTO TABLE PW18_2;
+LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18_2;
-- Without the fix HIVE-5202, will throw unsupported data type exception
SELECT COUNT(*) FROM PW18_2;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/pcr.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/pcr.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/pcr.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/pcr.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/ppd_multi_insert.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/ppd_multi_insert.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/ppd_multi_insert.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/ppd_multi_insert.q Tue Nov 5 07:01:32 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/tez/ql/src/test/queries/clientpositive/ppd_union_view.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/ppd_union_view.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/ppd_union_view.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/ppd_union_view.q Tue Nov 5 07:01:32 2013
@@ -5,26 +5,26 @@ drop view v;
create table t1_new (key string, value string) partitioned by (ds string);
insert overwrite table t1_new partition (ds = '2011-10-15')
-select 'key1', 'value1' from src limit 1;
+select 'key1', 'value1' from src tablesample (1 rows);
insert overwrite table t1_new partition (ds = '2011-10-16')
-select 'key2', 'value2' from src limit 1;
+select 'key2', 'value2' from src tablesample (1 rows);
create table t1_old (keymap string, value string) partitioned by (ds string);
insert overwrite table t1_old partition (ds = '2011-10-13')
-select 'keymap3', 'value3' from src limit 1;
+select 'keymap3', 'value3' from src tablesample (1 rows);
insert overwrite table t1_old partition (ds = '2011-10-14')
-select 'keymap4', 'value4' from src limit 1;
+select 'keymap4', 'value4' from src tablesample (1 rows);
create table t1_mapping (key string, keymap string) partitioned by (ds string);
insert overwrite table t1_mapping partition (ds = '2011-10-13')
-select 'key3', 'keymap3' from src limit 1;
+select 'key3', 'keymap3' from src tablesample (1 rows);
insert overwrite table t1_mapping partition (ds = '2011-10-14')
-select 'key4', 'keymap4' from src limit 1;
+select 'key4', 'keymap4' from src tablesample (1 rows);
create view t1 partitioned on (ds) as
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown.q Tue Nov 5 07:01:32 2013
@@ -1,3 +1,5 @@
+set hive.fetch.task.conversion=more;
+
create table ppr_test (key string) partitioned by (ds string);
alter table ppr_test add partition (ds = '1234');
@@ -9,14 +11,14 @@ alter table ppr_test add partition (ds =
alter table ppr_test add partition (ds = '12%4');
alter table ppr_test add partition (ds = '12*4');
-insert overwrite table ppr_test partition(ds = '1234') select * from (select '1234' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '1224') select * from (select '1224' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '1214') select * from (select '1214' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '12+4') select * from (select '12+4' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '12.4') select * from (select '12.4' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '12:4') select * from (select '12:4' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '12%4') select * from (select '12%4' from src limit 1 union all select 'abcd' from src limit 1) s;
-insert overwrite table ppr_test partition(ds = '12*4') select * from (select '12*4' from src limit 1 union all select 'abcd' from src limit 1) s;
+insert overwrite table ppr_test partition(ds = '1234') select * from (select '1234' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '1224') select * from (select '1224' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '1214') select * from (select '1214' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '12+4') select * from (select '12+4' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '12.4') select * from (select '12.4' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '12:4') select * from (select '12:4' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '12%4') select * from (select '12%4' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
+insert overwrite table ppr_test partition(ds = '12*4') select * from (select '12*4' from src tablesample (1 rows) union all select 'abcd' from src tablesample (1 rows)) s;
select * from ppr_test where ds = '1234' order by key;
Modified: hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown2.q
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown2.q?rev=1538880&r1=1538879&r2=1538880&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown2.q (original)
+++ hive/branches/tez/ql/src/test/queries/clientpositive/ppr_pushdown2.q Tue Nov 5 07:01:32 2013
@@ -1,24 +1,26 @@
+set hive.fetch.task.conversion=more;
+
create table ppr_test (key string) partitioned by (ds string);
-insert overwrite table ppr_test partition(ds='2') select '2' from src limit 1;
-insert overwrite table ppr_test partition(ds='22') select '22' from src limit 1;
+insert overwrite table ppr_test partition(ds='2') select '2' from src tablesample (1 rows);
+insert overwrite table ppr_test partition(ds='22') select '22' from src tablesample (1 rows);
select * from ppr_test where ds = '2';
select * from ppr_test where ds = '22';
create table ppr_test2 (key string) partitioned by (ds string, s string);
-insert overwrite table ppr_test2 partition(ds='1', s='2') select '1' from src limit 1;
-insert overwrite table ppr_test2 partition(ds='2', s='1') select '2' from src limit 1;
+insert overwrite table ppr_test2 partition(ds='1', s='2') select '1' from src tablesample (1 rows);
+insert overwrite table ppr_test2 partition(ds='2', s='1') select '2' from src tablesample (1 rows);
select * from ppr_test2 where s = '1';
select * from ppr_test2 where ds = '1';
create table ppr_test3 (key string) partitioned by (col string, ol string, l string);
-insert overwrite table ppr_test3 partition(col='1', ol='2', l = '3') select '1' from src limit 1;
-insert overwrite table ppr_test3 partition(col='1', ol='1', l = '2') select '2' from src limit 1;
-insert overwrite table ppr_test3 partition(col='1', ol='2', l = '1') select '3' from src limit 1;
+insert overwrite table ppr_test3 partition(col='1', ol='2', l = '3') select '1' from src tablesample (1 rows);
+insert overwrite table ppr_test3 partition(col='1', ol='1', l = '2') select '2' from src tablesample (1 rows);
+insert overwrite table ppr_test3 partition(col='1', ol='2', l = '1') select '3' from src tablesample (1 rows);
select * from ppr_test3 where l = '1';
select * from ppr_test3 where l = '2';