You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/01/23 20:59:24 UTC
svn commit: r1654355 [18/27] - in /hive/branches/llap: ./
beeline/src/java/org/apache/hive/beeline/
cli/src/java/org/apache/hadoop/hive/cli/
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/ data/conf/ data/con...
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join20.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join20.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join20.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join20.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
EXPLAIN
SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join21.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join21.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join21.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join21.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
EXPLAIN
SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join23.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join23.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join23.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join23.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
EXPLAIN
SELECT * FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join6.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join6.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join6.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join6.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
+-- SORT_QUERY_RESULTS
+
EXPLAIN
FROM (
FROM
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join7.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join7.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join7.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join7.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE;
+-- SORT_QUERY_RESULTS
+
EXPLAIN
FROM (
FROM
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/join_array.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/join_array.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/join_array.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/join_array.q Fri Jan 23 19:59:11 2015
@@ -4,6 +4,8 @@ create table tinyB(a bigint, bList array
load data local inpath '../../data/files/tiny_a.txt' into table tinyA;
load data local inpath '../../data/files/tiny_b.txt' into table tinyB;
+-- SORT_QUERY_RESULTS
+
select * from tinyA;
select * from tinyB;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
set hive.limit.query.max.table.partition=1;
+-- SORT_QUERY_RESULTS
+
explain select ds from srcpart where hr=11 and ds='2008-04-08';
select ds from srcpart where hr=11 and ds='2008-04-08';
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/limit_pushdown.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/limit_pushdown.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/limit_pushdown.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/limit_pushdown.q Fri Jan 23 19:59:11 2015
@@ -24,8 +24,8 @@ select value,avg(key + 1) from src group
-- distincts
explain
-select distinct(cdouble) from alltypesorc limit 20;
-select distinct(cdouble) from alltypesorc limit 20;
+select distinct(cdouble) as dis from alltypesorc order by dis limit 20;
+select distinct(cdouble) as dis from alltypesorc order by dis limit 20;
explain
select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20;
@@ -69,5 +69,5 @@ select key,value,value,value,value,value
-- flush for group-by
explain
-select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) limit 100;
-select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) limit 100;
+select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100;
+select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 100;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_decimal.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_decimal.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_decimal.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_decimal.q Fri Jan 23 19:59:11 2015
@@ -29,11 +29,6 @@ explain
select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec);
set hive.mapjoin.optimized.hashtable=false;
-set hive.mapjoin.optimized.keys=false;
-
-select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec);
-
-set hive.mapjoin.optimized.keys=true;
select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec);
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q Fri Jan 23 19:59:11 2015
@@ -1,4 +1,7 @@
set hive.auto.convert.join = false;
+
+-- SORT_QUERY_RESULTS
+
--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
SELECT * FROM src1
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_test_outer.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_test_outer.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_test_outer.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/mapjoin_test_outer.q Fri Jan 23 19:59:11 2015
@@ -1,4 +1,7 @@
set hive.auto.convert.join = false;
+
+-- SORT_QUERY_RESULTS
+
--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
create table dest_1 (key STRING, value STRING) stored as textfile;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/merge1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/merge1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/merge1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/merge1.q Fri Jan 23 19:59:11 2015
@@ -1,4 +1,5 @@
set hive.merge.mapredfiles=true;
+set hive.merge.sparkfiles=true;
-- SORT_QUERY_RESULTS
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/merge2.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/merge2.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/merge2.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/merge2.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,6 @@
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
+set hive.merge.sparkfiles=true;
set mapred.min.split.size=256;
set mapred.min.split.size.per.node=256;
set mapred.min.split.size.per.rack=256;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q Fri Jan 23 19:59:11 2015
@@ -7,9 +7,13 @@ set hive.fetch.task.conversion.threshold
explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10;
explain select cast(key as int) * 10, upper(value) from src limit 10;
+-- Scans without limit (should be Fetch task now)
+explain select concat(key, value) from src;
set hive.fetch.task.conversion.threshold=100;
-- from HIVE-7397, limit + partition pruning filter
explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10;
explain select cast(key as int) * 10, upper(value) from src limit 10;
+-- Scans without limit (should not be Fetch task now)
+explain select concat(key, value) from src;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/optimize_nullscan.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/optimize_nullscan.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/optimize_nullscan.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/optimize_nullscan.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,5 @@
set hive.cbo.enable=false;
--- SORT_BEFORE_DIFF
+-- SORT_QUERY_RESULTS
-- Disable CBO here, because it messes with the cases specifically crafted for the optimizer.
-- Instead, we could improve the optimizer to recognize more cases, e.g. filter before join.
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ppd_gby_join.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ppd_gby_join.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ppd_gby_join.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ppd_gby_join.q Fri Jan 23 19:59:11 2015
@@ -1,6 +1,8 @@
set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=false;
+-- SORT_QUERY_RESULTS
+
EXPLAIN
SELECT src1.c1, count(1)
FROM
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ppd_transform.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ppd_transform.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ppd_transform.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ppd_transform.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,8 @@ set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=false;
set hive.entity.capture.transform=true;
+-- SORT_QUERY_RESULTS
+
EXPLAIN
FROM (
FROM src
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ptf_matchpath.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ptf_matchpath.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ptf_matchpath.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ptf_matchpath.q Fri Jan 23 19:59:11 2015
@@ -12,6 +12,8 @@ FL_NUM string
LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny;
+-- SORT_QUERY_RESULTS
+
-- 1. basic Matchpath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
from matchpath(on
@@ -43,4 +45,4 @@ from matchpath(on
arg2('LATE'), arg3(arr_delay > 15),
arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as sz, tpath[0].day_of_month as tpath')
);
-
\ No newline at end of file
+
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ptf_rcfile.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ptf_rcfile.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ptf_rcfile.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ptf_rcfile.q Fri Jan 23 19:59:11 2015
@@ -14,6 +14,8 @@ CREATE TABLE part_rc(
LOAD DATA LOCAL INPATH '../../data/files/part.rc' overwrite into table part_rc;
+-- SORT_QUERY_RESULTS
+
-- testWindowingPTFWithPartRC
select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ptf_register_tblfn.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ptf_register_tblfn.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ptf_register_tblfn.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ptf_register_tblfn.q Fri Jan 23 19:59:11 2015
@@ -14,6 +14,7 @@ LOAD DATA LOCAL INPATH '../../data/files
create temporary function matchpathtest as 'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver';
+-- SORT_QUERY_RESULTS
-- 1. basic Matchpath test
select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/ptf_seqfile.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/ptf_seqfile.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/ptf_seqfile.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/ptf_seqfile.q Fri Jan 23 19:59:11 2015
@@ -14,6 +14,8 @@ CREATE TABLE part_seq(
LOAD DATA LOCAL INPATH '../../data/files/part.seq' overwrite into table part_seq;
+-- SORT_QUERY_RESULTS
+
-- testWindowingPTFWithPartSeqFile
select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/sample3.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/sample3.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/sample3.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/sample3.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
-- no input pruning, sample filter
EXPLAIN
SELECT s.key
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/sample5.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/sample5.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/sample5.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/sample5.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
+-- SORT_QUERY_RESULTS
+
-- no input pruning, sample filter
EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/scriptfile1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/scriptfile1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/scriptfile1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/scriptfile1.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
+-- SORT_QUERY_RESULTS
+
-- EXCLUDE_OS_WINDOWS
CREATE TABLE dest1(key INT, value STRING);
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/semijoin.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/semijoin.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/semijoin.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/semijoin.q Fri Jan 23 19:59:11 2015
@@ -1,7 +1,4 @@
-
-
-
-
+-- SORT_QUERY_RESULTS
create table t1 as select cast(key as int) key, value from src where key <= 10;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q Fri Jan 23 19:59:11 2015
@@ -6,6 +6,7 @@ set hive.optimize.union.remove=true;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
+set hive.merge.sparkfiles=false;
set mapred.input.dir.recursive=true;
-- This is to test the union->selectstar->filesink and skewjoin optimization
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q Fri Jan 23 19:59:11 2015
@@ -6,6 +6,7 @@ set hive.optimize.union.remove=true;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
+set hive.merge.sparkfiles=false;
set mapred.input.dir.recursive=true;
CREATE TABLE T1(key STRING, val STRING)
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/smb_mapjoin_11.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/smb_mapjoin_11.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/smb_mapjoin_11.q Fri Jan 23 19:59:11 2015
@@ -29,6 +29,13 @@ INSERT OVERWRITE TABLE test_table3 PARTI
INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') SELECT /*+ MAPJOIN(b) */ a.key, b.value FROM test_table1 a JOIN test_table2 b ON a.key = b.key AND a.ds = '1' AND b.ds = '1';
+SELECT * FROM test_table1 ORDER BY key;
+SELECT * FROM test_table3 ORDER BY key;
+EXPLAIN EXTENDED SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16);
+EXPLAIN EXTENDED SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16);
+SELECT * FROM test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16);
+SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16);
+
-- Join data from a sampled bucket to verify the data is bucketed
SELECT COUNT(*) FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1';
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/sort.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/sort.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/sort.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/sort.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
EXPLAIN
SELECT x.* FROM SRC x SORT BY key;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/stats1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/stats1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/stats1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/stats1.q Fri Jan 23 19:59:11 2015
@@ -4,6 +4,8 @@ set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set hive.map.aggr=true;
+-- SORT_QUERY_RESULTS
+
create table tmptable(key string, value string);
EXPLAIN
@@ -27,4 +29,4 @@ DESCRIBE FORMATTED tmptable;
-- Some stats (numFiles, totalSize) should be updated correctly
-- Some other stats (numRows, rawDataSize) should be cleared
load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE tmptable;
-DESCRIBE FORMATTED tmptable;
\ No newline at end of file
+DESCRIBE FORMATTED tmptable;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr1.q Fri Jan 23 19:59:11 2015
@@ -1,6 +1,8 @@
set hive.optimize.ppd=true;
set hive.entity.capture.transform=true;
+-- SORT_QUERY_RESULTS
+
EXPLAIN EXTENDED
FROM (
FROM srcpart src
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr2.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr2.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr2.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/transform_ppr2.q Fri Jan 23 19:59:11 2015
@@ -1,6 +1,8 @@
set hive.optimize.ppd=true;
set hive.entity.capture.transform=true;
+-- SORT_QUERY_RESULTS
+
EXPLAIN EXTENDED
FROM (
FROM srcpart src
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union10.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union10.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union10.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union10.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,7 @@
set hive.map.aggr = true;
+-- SORT_QUERY_RESULTS
+
-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
create table tmptable(key string, value int);
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union18.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union18.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union18.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union18.q Fri Jan 23 19:59:11 2015
@@ -1,6 +1,8 @@
CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
+-- SORT_QUERY_RESULTS
+
-- union case:map-reduce sub-queries followed by multi-table insert
explain
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union19.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union19.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union19.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union19.q Fri Jan 23 19:59:11 2015
@@ -1,5 +1,4 @@
-
-
+-- SORT_QUERY_RESULTS
CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union6.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union6.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union6.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union6.q Fri Jan 23 19:59:11 2015
@@ -1,7 +1,8 @@
set hive.map.aggr = true;
--- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
+-- SORT_QUERY_RESULTS
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
create table tmptable(key string, value string);
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_ppr.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_ppr.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_ppr.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_ppr.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
EXPLAIN EXTENDED
SELECT * FROM (
SELECT X.* FROM SRCPART X WHERE X.key < 100
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_1.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_1.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_1.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_1.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_10.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_10.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_10.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_10.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_11.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_11.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_11.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_11.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_12.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_12.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_12.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_12.q Fri Jan 23 19:59:11 2015
@@ -3,6 +3,7 @@ set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
set hive.auto.convert.join=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_13.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_13.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_13.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_13.q Fri Jan 23 19:59:11 2015
@@ -3,6 +3,7 @@ set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
set hive.auto.convert.join=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_14.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_14.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_14.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_14.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.auto.convert.join=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_15.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_15.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_15.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_15.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_16.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_16.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_16.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_16.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_17.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_17.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_17.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_17.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_18.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_18.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_18.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_18.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_19.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_19.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_19.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_19.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_2.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_2.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_2.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_2.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_20.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_20.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_20.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_20.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_21.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_21.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_21.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_21.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_22.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_22.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_22.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_22.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_23.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_23.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_23.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_23.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_24.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_24.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_24.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_24.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_25.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_25.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_25.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_25.q Fri Jan 23 19:59:11 2015
@@ -3,6 +3,7 @@ set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_3.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_3.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_3.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_3.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_4.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_4.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_4.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_4.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_5.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_5.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_5.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_5.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_6.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_6.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_6.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_6.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_7.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_7.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_7.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_7.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_8.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_8.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_8.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_8.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=false;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set mapred.input.dir.recursive=true;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_9.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_9.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_9.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/union_remove_9.q Fri Jan 23 19:59:11 2015
@@ -2,6 +2,7 @@ set hive.stats.autogather=false;
set hive.optimize.union.remove=true;
set hive.mapred.supports.subdirectories=true;
+set hive.merge.sparkfiles=true;
set hive.merge.mapfiles=true;
set hive.merge.mapredfiles=true;
set hive.merge.smallfiles.avgsize=1;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/vector_string_concat.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/vector_string_concat.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/vector_string_concat.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/vector_string_concat.q Fri Jan 23 19:59:11 2015
@@ -88,9 +88,11 @@ EXPLAIN
SELECT CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING)) AS `field`
FROM vectortab2korc
GROUP BY CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING))
+ ORDER BY `field`
LIMIT 50;
SELECT CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING)) AS `field`
FROM vectortab2korc
GROUP BY CONCAT(CONCAT(CONCAT('Quarter ',CAST(CAST((MONTH(dt) - 1) / 3 + 1 AS INT) AS STRING)),'-'),CAST(YEAR(dt) AS STRING))
+ ORDER BY `field`
LIMIT 50;
Modified: hive/branches/llap/ql/src/test/queries/clientpositive/windowing.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/windowing.q?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/windowing.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/windowing.q Fri Jan 23 19:59:11 2015
@@ -1,3 +1,6 @@
+set mapred.reduce.tasks=4;
+-- SORT_QUERY_RESULTS
+
-- 1. testWindowing
select p_mfgr, p_name, p_size,
rank() over(distribute by p_mfgr sort by p_name) as r,