Author: xuefu Date: Tue Jan 20 05:43:52 2015 New Revision: 1653196 URL: http://svn.apache.org/r1653196 Log: HIVE-9403: File tests determinism with multiple reducers (Jimmy via Xuefu)
Modified: hive/trunk/ql/src/test/queries/clientpositive/auto_join21.q hive/trunk/ql/src/test/queries/clientpositive/auto_join23.q hive/trunk/ql/src/test/queries/clientpositive/groupby2.q hive/trunk/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q hive/trunk/ql/src/test/queries/clientpositive/groupby_ppr.q hive/trunk/ql/src/test/queries/clientpositive/input14.q hive/trunk/ql/src/test/queries/clientpositive/input17.q hive/trunk/ql/src/test/queries/clientpositive/input18.q hive/trunk/ql/src/test/queries/clientpositive/input_part2.q hive/trunk/ql/src/test/queries/clientpositive/join0.q hive/trunk/ql/src/test/queries/clientpositive/join15.q hive/trunk/ql/src/test/queries/clientpositive/join18.q hive/trunk/ql/src/test/queries/clientpositive/join20.q hive/trunk/ql/src/test/queries/clientpositive/join21.q hive/trunk/ql/src/test/queries/clientpositive/join23.q hive/trunk/ql/src/test/queries/clientpositive/join6.q hive/trunk/ql/src/test/queries/clientpositive/join7.q hive/trunk/ql/src/test/queries/clientpositive/join_array.q hive/trunk/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q hive/trunk/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q hive/trunk/ql/src/test/queries/clientpositive/mapjoin_test_outer.q hive/trunk/ql/src/test/queries/clientpositive/ppd_transform.q hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q hive/trunk/ql/src/test/queries/clientpositive/ptf_register_tblfn.q hive/trunk/ql/src/test/queries/clientpositive/ptf_seqfile.q hive/trunk/ql/src/test/queries/clientpositive/sample3.q hive/trunk/ql/src/test/queries/clientpositive/sample5.q hive/trunk/ql/src/test/queries/clientpositive/scriptfile1.q hive/trunk/ql/src/test/queries/clientpositive/semijoin.q hive/trunk/ql/src/test/queries/clientpositive/sort.q hive/trunk/ql/src/test/queries/clientpositive/stats1.q hive/trunk/ql/src/test/queries/clientpositive/transform_ppr1.q hive/trunk/ql/src/test/queries/clientpositive/transform_ppr2.q hive/trunk/ql/src/test/queries/clientpositive/union10.q hive/trunk/ql/src/test/queries/clientpositive/union18.q hive/trunk/ql/src/test/queries/clientpositive/union19.q hive/trunk/ql/src/test/queries/clientpositive/union6.q hive/trunk/ql/src/test/queries/clientpositive/union_ppr.q hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out hive/trunk/ql/src/test/results/clientpositive/input14.q.out hive/trunk/ql/src/test/results/clientpositive/input17.q.out hive/trunk/ql/src/test/results/clientpositive/input18.q.out hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out hive/trunk/ql/src/test/results/clientpositive/join0.q.java1.7.out hive/trunk/ql/src/test/results/clientpositive/join15.q.out hive/trunk/ql/src/test/results/clientpositive/join18.q.out hive/trunk/ql/src/test/results/clientpositive/join20.q.out hive/trunk/ql/src/test/results/clientpositive/join21.q.out hive/trunk/ql/src/test/results/clientpositive/join23.q.out hive/trunk/ql/src/test/results/clientpositive/join6.q.out hive/trunk/ql/src/test/results/clientpositive/join7.q.out hive/trunk/ql/src/test/results/clientpositive/join_array.q.out hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out hive/trunk/ql/src/test/results/clientpositive/ptf_matchpath.q.out hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out hive/trunk/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out hive/trunk/ql/src/test/results/clientpositive/sample3.q.out hive/trunk/ql/src/test/results/clientpositive/sample5.q.out hive/trunk/ql/src/test/results/clientpositive/scriptfile1.q.out hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out hive/trunk/ql/src/test/results/clientpositive/sort.q.out hive/trunk/ql/src/test/results/clientpositive/spark/auto_join21.q.out hive/trunk/ql/src/test/results/clientpositive/spark/auto_join23.q.out hive/trunk/ql/src/test/results/clientpositive/spark/groupby2.q.out hive/trunk/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out hive/trunk/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out hive/trunk/ql/src/test/results/clientpositive/spark/input14.q.out hive/trunk/ql/src/test/results/clientpositive/spark/input17.q.out hive/trunk/ql/src/test/results/clientpositive/spark/input18.q.out hive/trunk/ql/src/test/results/clientpositive/spark/input_part2.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out hive/trunk/ql/src/test/results/clientpositive/spark/join15.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join18.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join20.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join21.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join23.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join6.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join7.q.out hive/trunk/ql/src/test/results/clientpositive/spark/join_array.q.out hive/trunk/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ppd_transform.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ptf_rcfile.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ptf_register_tblfn.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ptf_seqfile.q.out hive/trunk/ql/src/test/results/clientpositive/spark/sample3.q.out hive/trunk/ql/src/test/results/clientpositive/spark/sample5.q.out hive/trunk/ql/src/test/results/clientpositive/spark/scriptfile1.q.out hive/trunk/ql/src/test/results/clientpositive/spark/semijoin.q.out hive/trunk/ql/src/test/results/clientpositive/spark/sort.q.out hive/trunk/ql/src/test/results/clientpositive/spark/stats1.q.out hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out hive/trunk/ql/src/test/results/clientpositive/spark/union10.q.out hive/trunk/ql/src/test/results/clientpositive/spark/union18.q.out hive/trunk/ql/src/test/results/clientpositive/spark/union19.q.out hive/trunk/ql/src/test/results/clientpositive/spark/union6.q.out hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out hive/trunk/ql/src/test/results/clientpositive/stats1.q.out hive/trunk/ql/src/test/results/clientpositive/tez/groupby2.q.out hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.java1.7.out hive/trunk/ql/src/test/results/clientpositive/tez/scriptfile1.q.out hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out hive/trunk/ql/src/test/results/clientpositive/tez/union6.q.out hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out hive/trunk/ql/src/test/results/clientpositive/union10.q.out hive/trunk/ql/src/test/results/clientpositive/union18.q.out hive/trunk/ql/src/test/results/clientpositive/union19.q.out hive/trunk/ql/src/test/results/clientpositive/union6.q.out hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out Modified: hive/trunk/ql/src/test/queries/clientpositive/auto_join21.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/auto_join21.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/auto_join21.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/auto_join21.q Tue Jan 20 05:43:52 2015 @@ -1,4 +1,7 @@ set hive.auto.convert.join = true; + +-- 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/trunk/ql/src/test/queries/clientpositive/auto_join23.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/auto_join23.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/auto_join23.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/auto_join23.q Tue Jan 20 05:43:52 2015 @@ -1,5 +1,7 @@ set hive.auto.convert.join = true; +-- 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/trunk/ql/src/test/queries/clientpositive/groupby2.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/groupby2.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/groupby2.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/groupby2.q Tue Jan 20 05:43:52 2015 @@ -11,4 +11,6 @@ INSERT OVERWRITE TABLE dest_g2 SELECT su FROM src INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1); +-- SORT_QUERY_RESULTS + SELECT dest_g2.* FROM dest_g2; Modified: hive/trunk/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q Tue Jan 20 05:43:52 2015 @@ -3,6 +3,8 @@ set hive.multigroupby.singlereducer=true CREATE TABLE dest_g2(key STRING, c1 INT) STORED AS TEXTFILE; CREATE TABLE dest_g3(key STRING, c1 INT, c2 INT) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS + EXPLAIN FROM src INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1) Modified: hive/trunk/ql/src/test/queries/clientpositive/groupby_ppr.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/groupby_ppr.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/groupby_ppr.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/groupby_ppr.q Tue Jan 20 05:43:52 2015 @@ -1,6 +1,8 @@ set hive.map.aggr=false; set hive.groupby.skewindata=false; +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE; EXPLAIN EXTENDED Modified: hive/trunk/ql/src/test/queries/clientpositive/input14.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input14.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/input14.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/input14.q Tue Jan 20 05:43:52 2015 @@ -17,4 +17,6 @@ FROM ( ) tmap INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100; +-- SORT_QUERY_RESULTS + SELECT dest1.* FROM dest1; Modified: hive/trunk/ql/src/test/queries/clientpositive/input17.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input17.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/input17.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/input17.q Tue Jan 20 05:43:52 2015 @@ -17,4 +17,6 @@ FROM ( ) tmap INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue; +-- SORT_QUERY_RESULTS + SELECT dest1.* FROM dest1; Modified: hive/trunk/ql/src/test/queries/clientpositive/input18.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input18.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/input18.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/input18.q Tue Jan 20 05:43:52 2015 @@ -17,4 +17,6 @@ FROM ( ) tmap INSERT OVERWRITE TABLE dest1 SELECT tmap.key, regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100; +-- SORT_QUERY_RESULTS + SELECT dest1.* FROM dest1; Modified: hive/trunk/ql/src/test/queries/clientpositive/input_part2.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input_part2.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/input_part2.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/input_part2.q Tue Jan 20 05:43:52 2015 @@ -1,6 +1,8 @@ CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE; CREATE TABLE dest2(key INT, value STRING, hr STRING, ds STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS + EXPLAIN EXTENDED FROM srcpart INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12' Modified: hive/trunk/ql/src/test/queries/clientpositive/join0.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join0.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join0.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join0.q Tue Jan 20 05:43:52 2015 @@ -1,4 +1,5 @@ -- JAVA_VERSION_SPECIFIC_OUTPUT +-- SORT_QUERY_RESULTS EXPLAIN SELECT src1.key as k1, src1.value as v1, Modified: hive/trunk/ql/src/test/queries/clientpositive/join15.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join15.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join15.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join15.q Tue Jan 20 05:43:52 2015 @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value; Modified: hive/trunk/ql/src/test/queries/clientpositive/join18.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join18.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join18.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join18.q Tue Jan 20 05:43:52 2015 @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT a.key, a.value, b.key, b.value FROM Modified: hive/trunk/ql/src/test/queries/clientpositive/join20.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join20.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join20.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join20.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/join21.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join21.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join21.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join21.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/join23.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join23.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join23.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join23.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/join6.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join6.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join6.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join6.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/join7.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join7.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join7.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join7.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/join_array.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join_array.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/join_array.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/join_array.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/limit_partition_metadataonly.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/mapjoin_test_outer.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/mapjoin_test_outer.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/mapjoin_test_outer.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/mapjoin_test_outer.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/ppd_transform.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ppd_transform.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/ppd_transform.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/ppd_transform.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/ptf_matchpath.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/ptf_rcfile.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/ptf_register_tblfn.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_register_tblfn.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/ptf_register_tblfn.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/ptf_register_tblfn.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/ptf_seqfile.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_seqfile.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/ptf_seqfile.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/ptf_seqfile.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/sample3.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/sample3.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/sample3.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/sample3.q Tue Jan 20 05:43:52 2015 @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + -- no input pruning, sample filter EXPLAIN SELECT s.key Modified: hive/trunk/ql/src/test/queries/clientpositive/sample5.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/sample5.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/sample5.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/sample5.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/scriptfile1.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/scriptfile1.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/scriptfile1.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/scriptfile1.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/semijoin.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/semijoin.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/semijoin.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/semijoin.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/sort.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/sort.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/sort.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/sort.q Tue Jan 20 05:43:52 2015 @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT x.* FROM SRC x SORT BY key; Modified: hive/trunk/ql/src/test/queries/clientpositive/stats1.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/stats1.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/stats1.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/stats1.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/transform_ppr1.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/transform_ppr1.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/transform_ppr1.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/transform_ppr1.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/transform_ppr2.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/transform_ppr2.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/transform_ppr2.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/transform_ppr2.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/union10.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/union10.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/union10.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/union10.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/union18.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/union18.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/union18.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/union18.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/union19.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/union19.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/union19.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/union19.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/union6.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/union6.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/union6.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/union6.q Tue Jan 20 05:43:52 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/trunk/ql/src/test/queries/clientpositive/union_ppr.q URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/union_ppr.q?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/queries/clientpositive/union_ppr.q (original) +++ hive/trunk/ql/src/test/queries/clientpositive/union_ppr.q Tue Jan 20 05:43:52 2015 @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN EXTENDED SELECT * FROM ( SELECT X.* FROM SRCPART X WHERE X.key < 100 Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out Tue Jan 20 05:43:52 2015 @@ -1,7 +1,11 @@ -PREHOOK: query: explain +PREHOOK: query: -- 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 PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out Tue Jan 20 05:43:52 2015 @@ -1,8 +1,12 @@ Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain +PREHOOK: query: -- 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 PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Modified: hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out Tue Jan 20 05:43:52 2015 @@ -81,11 +81,15 @@ POSTHOOK: Output: default@dest_g2 POSTHOOK: Lineage: dest_g2.c1 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dest_g2.c2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dest_g2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -PREHOOK: query: SELECT dest_g2.* FROM dest_g2 +PREHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest_g2.* FROM dest_g2 PREHOOK: type: QUERY PREHOOK: Input: default@dest_g2 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest_g2.* FROM dest_g2 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest_g2.* FROM dest_g2 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest_g2 #### A masked pattern was here #### Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out Tue Jan 20 05:43:52 2015 @@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest_g3(ke POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_g3 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1) INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1) INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1) Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out Tue Jan 20 05:43:52 2015 @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 Modified: hive/trunk/ql/src/test/results/clientpositive/input14.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input14.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/input14.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/input14.q.out Tue Jan 20 05:43:52 2015 @@ -105,11 +105,15 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: SELECT dest1.* FROM dest1 +PREHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest1.* FROM dest1 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### Modified: hive/trunk/ql/src/test/results/clientpositive/input17.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input17.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/input17.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/input17.q.out Tue Jan 20 05:43:52 2015 @@ -102,15 +102,18 @@ POSTHOOK: Input: default@src_thrift POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ] POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ] -PREHOOK: query: SELECT dest1.* FROM dest1 +PREHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest1.* FROM dest1 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -NULL NULL -1461153966 {"myint":49,"mystring":"343","underscore_int":7} -1952710705 {"myint":25,"mystring":"125","underscore_int":5} -734328905 {"myint":16,"mystring":"64","underscore_int":4} @@ -121,3 +124,4 @@ NULL NULL 336964422 {"myint":81,"mystring":"729","underscore_int":9} 465985201 {"myint":1,"mystring":"1","underscore_int":1} 477111225 {"myint":9,"mystring":"27","underscore_int":3} +NULL NULL Modified: hive/trunk/ql/src/test/results/clientpositive/input18.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input18.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/input18.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/input18.q.out Tue Jan 20 05:43:52 2015 @@ -105,11 +105,15 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@dest1 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: SELECT dest1.* FROM dest1 +PREHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 PREHOOK: type: QUERY PREHOOK: Input: default@dest1 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest1.* FROM dest1 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### Modified: hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out Tue Jan 20 05:43:52 2015 @@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest2(key POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest2 -PREHOOK: query: EXPLAIN EXTENDED +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM srcpart INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12' INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12' PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN EXTENDED +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM srcpart INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12' INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12' @@ -714,13 +718,6 @@ POSTHOOK: Input: default@dest1 0 val_0 12 2008-04-08 0 val_0 12 2008-04-08 0 val_0 12 2008-04-08 -2 val_2 12 2008-04-08 -4 val_4 12 2008-04-08 -5 val_5 12 2008-04-08 -5 val_5 12 2008-04-08 -5 val_5 12 2008-04-08 -8 val_8 12 2008-04-08 -9 val_9 12 2008-04-08 10 val_10 12 2008-04-08 11 val_11 12 2008-04-08 12 val_12 12 2008-04-08 @@ -731,6 +728,7 @@ POSTHOOK: Input: default@dest1 18 val_18 12 2008-04-08 18 val_18 12 2008-04-08 19 val_19 12 2008-04-08 +2 val_2 12 2008-04-08 20 val_20 12 2008-04-08 24 val_24 12 2008-04-08 24 val_24 12 2008-04-08 @@ -746,12 +744,16 @@ POSTHOOK: Input: default@dest1 35 val_35 12 2008-04-08 37 val_37 12 2008-04-08 37 val_37 12 2008-04-08 +4 val_4 12 2008-04-08 41 val_41 12 2008-04-08 42 val_42 12 2008-04-08 42 val_42 12 2008-04-08 43 val_43 12 2008-04-08 44 val_44 12 2008-04-08 47 val_47 12 2008-04-08 +5 val_5 12 2008-04-08 +5 val_5 12 2008-04-08 +5 val_5 12 2008-04-08 51 val_51 12 2008-04-08 51 val_51 12 2008-04-08 53 val_53 12 2008-04-08 @@ -775,6 +777,7 @@ POSTHOOK: Input: default@dest1 76 val_76 12 2008-04-08 77 val_77 12 2008-04-08 78 val_78 12 2008-04-08 +8 val_8 12 2008-04-08 80 val_80 12 2008-04-08 82 val_82 12 2008-04-08 83 val_83 12 2008-04-08 @@ -784,6 +787,7 @@ POSTHOOK: Input: default@dest1 85 val_85 12 2008-04-08 86 val_86 12 2008-04-08 87 val_87 12 2008-04-08 +9 val_9 12 2008-04-08 90 val_90 12 2008-04-08 90 val_90 12 2008-04-08 90 val_90 12 2008-04-08 @@ -806,13 +810,6 @@ POSTHOOK: Input: default@dest2 0 val_0 12 2008-04-09 0 val_0 12 2008-04-09 0 val_0 12 2008-04-09 -2 val_2 12 2008-04-09 -4 val_4 12 2008-04-09 -5 val_5 12 2008-04-09 -5 val_5 12 2008-04-09 -5 val_5 12 2008-04-09 -8 val_8 12 2008-04-09 -9 val_9 12 2008-04-09 10 val_10 12 2008-04-09 11 val_11 12 2008-04-09 12 val_12 12 2008-04-09 @@ -823,6 +820,7 @@ POSTHOOK: Input: default@dest2 18 val_18 12 2008-04-09 18 val_18 12 2008-04-09 19 val_19 12 2008-04-09 +2 val_2 12 2008-04-09 20 val_20 12 2008-04-09 24 val_24 12 2008-04-09 24 val_24 12 2008-04-09 @@ -838,12 +836,16 @@ POSTHOOK: Input: default@dest2 35 val_35 12 2008-04-09 37 val_37 12 2008-04-09 37 val_37 12 2008-04-09 +4 val_4 12 2008-04-09 41 val_41 12 2008-04-09 42 val_42 12 2008-04-09 42 val_42 12 2008-04-09 43 val_43 12 2008-04-09 44 val_44 12 2008-04-09 47 val_47 12 2008-04-09 +5 val_5 12 2008-04-09 +5 val_5 12 2008-04-09 +5 val_5 12 2008-04-09 51 val_51 12 2008-04-09 51 val_51 12 2008-04-09 53 val_53 12 2008-04-09 @@ -867,6 +869,7 @@ POSTHOOK: Input: default@dest2 76 val_76 12 2008-04-09 77 val_77 12 2008-04-09 78 val_78 12 2008-04-09 +8 val_8 12 2008-04-09 80 val_80 12 2008-04-09 82 val_82 12 2008-04-09 83 val_83 12 2008-04-09 @@ -876,6 +879,7 @@ POSTHOOK: Input: default@dest2 85 val_85 12 2008-04-09 86 val_86 12 2008-04-09 87 val_87 12 2008-04-09 +9 val_9 12 2008-04-09 90 val_90 12 2008-04-09 90 val_90 12 2008-04-09 90 val_90 12 2008-04-09 Modified: hive/trunk/ql/src/test/results/clientpositive/join0.q.java1.7.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join0.q.java1.7.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join0.q.java1.7.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join0.q.java1.7.out Tue Jan 20 05:43:52 2015 @@ -1,5 +1,6 @@ Warning: Shuffle Join JOIN[8][tables = [src1, src2]] in Stage 'Stage-1:MAPRED' is a cross product PREHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT +-- SORT_QUERY_RESULTS EXPLAIN SELECT src1.key as k1, src1.value as v1, @@ -10,6 +11,7 @@ SELECT src1.key as k1, src1.value as v1, SORT BY k1, v1, k2, v2 PREHOOK: type: QUERY POSTHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT +-- SORT_QUERY_RESULTS EXPLAIN SELECT src1.key as k1, src1.value as v1, Modified: hive/trunk/ql/src/test/results/clientpositive/join15.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join15.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join15.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join15.q.out Tue Jan 20 05:43:52 2015 @@ -1,7 +1,11 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Modified: hive/trunk/ql/src/test/results/clientpositive/join18.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join18.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join18.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join18.q.out Tue Jan 20 05:43:52 2015 @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT a.key, a.value, b.key, b.value FROM ( @@ -11,7 +13,9 @@ PREHOOK: query: EXPLAIN ) b ON (a.key = b.key) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT a.key, a.value, b.key, b.value FROM ( @@ -176,7 +180,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### -NULL NULL 7 0 3 NULL NULL 10 1 NULL NULL 100 2 NULL NULL @@ -486,3 +489,4 @@ NULL NULL 7 96 1 NULL NULL 97 2 NULL NULL 98 2 98 1 +NULL NULL 7 Modified: hive/trunk/ql/src/test/results/clientpositive/join20.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join20.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join20.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join20.q.out Tue Jan 20 05:43:52 2015 @@ -1,8 +1,12 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- 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 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- 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 POSTHOOK: type: QUERY @@ -111,6 +115,64 @@ SORT BY src1.key, src1.value, src2.key, POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +2 val_2 2 val_2 2 val_2 +4 val_4 4 val_4 4 val_4 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +8 val_8 8 val_8 8 val_8 +9 val_9 9 val_9 9 val_9 NULL NULL NULL NULL 10 val_10 NULL NULL NULL NULL 100 val_100 NULL NULL NULL NULL 100 val_100 @@ -601,64 +663,6 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -2 val_2 2 val_2 2 val_2 -4 val_4 4 val_4 4 val_4 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -8 val_8 8 val_8 8 val_8 -9 val_9 9 val_9 9 val_9 PREHOOK: query: EXPLAIN SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) 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 @@ -772,6 +776,64 @@ SORT BY src1.key, src1.value, src2.key, POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +0 val_0 0 val_0 0 val_0 +2 val_2 2 val_2 2 val_2 +4 val_4 4 val_4 4 val_4 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +5 val_5 5 val_5 5 val_5 +8 val_8 8 val_8 8 val_8 +9 val_9 9 val_9 9 val_9 NULL NULL NULL NULL 10 val_10 NULL NULL NULL NULL 100 val_100 NULL NULL NULL NULL 100 val_100 @@ -1262,61 +1324,3 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -0 val_0 0 val_0 0 val_0 -2 val_2 2 val_2 2 val_2 -4 val_4 4 val_4 4 val_4 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -5 val_5 5 val_5 5 val_5 -8 val_8 8 val_8 8 val_8 -9 val_9 9 val_9 9 val_9 Modified: hive/trunk/ql/src/test/results/clientpositive/join21.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join21.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join21.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join21.q.out Tue Jan 20 05:43:52 2015 @@ -1,7 +1,11 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- 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 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Modified: hive/trunk/ql/src/test/results/clientpositive/join23.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join23.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join23.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join23.q.out Tue Jan 20 05:43:52 2015 @@ -1,8 +1,12 @@ Warning: Shuffle Join JOIN[4][tables = [src1, src2]] in Stage 'Stage-1:MAPRED' is a cross product -PREHOOK: query: EXPLAIN +PREHOOK: query: -- 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 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Modified: hive/trunk/ql/src/test/results/clientpositive/join6.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join6.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join6.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join6.q.out Tue Jan 20 05:43:52 2015 @@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM ( @@ -21,7 +23,9 @@ FROM ( ) c INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM ( Modified: hive/trunk/ql/src/test/results/clientpositive/join7.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join7.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join7.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join7.q.out Tue Jan 20 05:43:52 2015 @@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM ( @@ -26,7 +28,9 @@ FROM ( ) c INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM ( Modified: hive/trunk/ql/src/test/results/clientpositive/join_array.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_array.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/join_array.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/join_array.q.out Tue Jan 20 05:43:52 2015 @@ -30,11 +30,15 @@ POSTHOOK: query: load data local inpath POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@tinyb -PREHOOK: query: select * from tinyA +PREHOOK: query: -- SORT_QUERY_RESULTS + +select * from tinyA PREHOOK: type: QUERY PREHOOK: Input: default@tinya #### A masked pattern was here #### -POSTHOOK: query: select * from tinyA +POSTHOOK: query: -- SORT_QUERY_RESULTS + +select * from tinyA POSTHOOK: type: QUERY POSTHOOK: Input: default@tinya #### A masked pattern was here #### Modified: hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out Tue Jan 20 05:43:52 2015 @@ -1,6 +1,10 @@ -PREHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08' +PREHOOK: query: -- SORT_QUERY_RESULTS + +explain select ds from srcpart where hr=11 and ds='2008-04-08' PREHOOK: type: QUERY -POSTHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08' +POSTHOOK: query: -- SORT_QUERY_RESULTS + +explain select ds from srcpart where hr=11 and ds='2008-04-08' POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-0 is a root stage Modified: hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out Tue Jan 20 05:43:52 2015 @@ -1,4 +1,6 @@ -PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition +PREHOOK: query: -- SORT_QUERY_RESULTS + +--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition SELECT * FROM src1 RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) @@ -8,7 +10,9 @@ PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition +POSTHOOK: query: -- SORT_QUERY_RESULTS + +--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition SELECT * FROM src1 RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) Modified: hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out Tue Jan 20 05:43:52 2015 @@ -1,10 +1,14 @@ -PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition +PREHOOK: query: -- 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 PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest_1 -POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition +POSTHOOK: query: -- 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 POSTHOOK: type: CREATETABLE @@ -66,7 +70,6 @@ POSTHOOK: Input: default@dest_1 POSTHOOK: Input: default@dest_2 POSTHOOK: Input: default@src1 #### A masked pattern was here #### -NULL NULL 333444 555666 333444 555666 @@ -231,6 +234,7 @@ NULL NULL 333444 555666 333444 555666 146 val_146 146 val_146 146 val_146 224 224 224 369 369 369 +NULL NULL 333444 555666 333444 555666 PREHOOK: query: explain SELECT /*+ mapjoin(src1, src2) */ * FROM src1 RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key) @@ -341,7 +345,6 @@ POSTHOOK: Input: default@dest_1 POSTHOOK: Input: default@dest_2 POSTHOOK: Input: default@src1 #### A masked pattern was here #### -NULL NULL 333444 555666 333444 555666 @@ -506,6 +509,7 @@ NULL NULL 333444 555666 333444 555666 146 val_146 146 val_146 146 val_146 224 224 224 369 369 369 +NULL NULL 333444 555666 333444 555666 PREHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1 RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key) JOIN dest_2 src3 ON (src1.key = src3.key) @@ -1162,7 +1166,6 @@ POSTHOOK: Input: default@dest_1 POSTHOOK: Input: default@dest_2 POSTHOOK: Input: default@src1 #### A masked pattern was here #### -NULL NULL 333444 555666 333444 555666 @@ -1327,3 +1330,4 @@ NULL NULL 333444 555666 333444 555666 146 val_146 146 val_146 146 val_146 224 224 224 369 369 369 +NULL NULL 333444 555666 333444 555666 Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out Tue Jan 20 05:43:52 2015 @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM src SELECT TRANSFORM(src.key, src.value) @@ -7,7 +9,9 @@ FROM ( ) tmap SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM ( FROM src SELECT TRANSFORM(src.key, src.value) Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_matchpath.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_matchpath.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ptf_matchpath.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ptf_matchpath.q.out Tue Jan 20 05:43:52 2015 @@ -34,7 +34,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@flights_tiny -PREHOOK: query: -- 1. basic Matchpath test +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- 1. basic Matchpath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from matchpath(on flights_tiny @@ -47,7 +49,9 @@ from matchpath(on PREHOOK: type: QUERY PREHOOK: Input: default@flights_tiny #### A masked pattern was here #### -POSTHOOK: query: -- 1. basic Matchpath test +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- 1. basic Matchpath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from matchpath(on flights_tiny @@ -65,17 +69,17 @@ Baltimore 1142 2010 10 21 5 21 Baltimore 1142 2010 10 22 4 22 Baltimore 1142 2010 10 25 3 25 Baltimore 1142 2010 10 26 2 26 -Chicago 1531 2010 10 21 2 21 -Chicago 1531 2010 10 25 3 25 -Chicago 1531 2010 10 26 2 26 Baltimore 1599 2010 10 21 2 21 Baltimore 1599 2010 10 25 3 25 Baltimore 1599 2010 10 26 2 26 +Chicago 1531 2010 10 21 2 21 +Chicago 1531 2010 10 25 3 25 +Chicago 1531 2010 10 26 2 26 Chicago 361 2010 10 20 2 20 -Washington 7291 2010 10 27 2 27 Chicago 897 2010 10 20 4 20 Chicago 897 2010 10 21 3 21 Chicago 897 2010 10 22 2 22 +Washington 7291 2010 10 27 2 27 PREHOOK: query: -- 2. Matchpath on 1 partition select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from matchpath(on Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out Tue Jan 20 05:43:52 2015 @@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@part_rc -PREHOOK: query: -- testWindowingPTFWithPartRC +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- testWindowingPTFWithPartRC select p_mfgr, p_name, p_size, rank() over (partition by p_mfgr order by p_name) as r, dense_rank() over (partition by p_mfgr order by p_name) as dr, @@ -49,7 +51,9 @@ order by p_name) PREHOOK: type: QUERY PREHOOK: Input: default@part_rc #### A masked pattern was here #### -POSTHOOK: query: -- testWindowingPTFWithPartRC +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- testWindowingPTFWithPartRC select p_mfgr, p_name, p_size, rank() over (partition by p_mfgr order by p_name) as r, dense_rank() over (partition by p_mfgr order by p_name) as dr, Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out Tue Jan 20 05:43:52 2015 @@ -40,7 +40,9 @@ PREHOOK: Output: matchpathtest POSTHOOK: query: create temporary function matchpathtest as 'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver' POSTHOOK: type: CREATEFUNCTION POSTHOOK: Output: matchpathtest -PREHOOK: query: -- 1. basic Matchpath test +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- 1. basic Matchpath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from matchpathtest(on flights_tiny @@ -53,7 +55,9 @@ from matchpathtest(on PREHOOK: type: QUERY PREHOOK: Input: default@flights_tiny #### A masked pattern was here #### -POSTHOOK: query: -- 1. basic Matchpath test +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- 1. basic Matchpath test select origin_city_name, fl_num, year, month, day_of_month, sz, tpath from matchpathtest(on flights_tiny @@ -71,17 +75,17 @@ Baltimore 1142 2010 10 21 5 21 Baltimore 1142 2010 10 22 4 22 Baltimore 1142 2010 10 25 3 25 Baltimore 1142 2010 10 26 2 26 -Chicago 1531 2010 10 21 2 21 -Chicago 1531 2010 10 25 3 25 -Chicago 1531 2010 10 26 2 26 Baltimore 1599 2010 10 21 2 21 Baltimore 1599 2010 10 25 3 25 Baltimore 1599 2010 10 26 2 26 +Chicago 1531 2010 10 21 2 21 +Chicago 1531 2010 10 25 3 25 +Chicago 1531 2010 10 26 2 26 Chicago 361 2010 10 20 2 20 -Washington 7291 2010 10 27 2 27 Chicago 897 2010 10 20 4 20 Chicago 897 2010 10 21 3 21 Chicago 897 2010 10 22 2 22 +Washington 7291 2010 10 27 2 27 PREHOOK: query: drop temporary function matchpathtest PREHOOK: type: DROPFUNCTION PREHOOK: Output: matchpathtest Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out Tue Jan 20 05:43:52 2015 @@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@part_seq -PREHOOK: query: -- testWindowingPTFWithPartSeqFile +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- testWindowingPTFWithPartSeqFile select p_mfgr, p_name, p_size, rank() over (partition by p_mfgr order by p_name) as r, dense_rank() over (partition by p_mfgr order by p_name) as dr, @@ -49,7 +51,9 @@ order by p_name) PREHOOK: type: QUERY PREHOOK: Input: default@part_seq #### A masked pattern was here #### -POSTHOOK: query: -- testWindowingPTFWithPartSeqFile +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- testWindowingPTFWithPartSeqFile select p_mfgr, p_name, p_size, rank() over (partition by p_mfgr order by p_name) as r, dense_rank() over (partition by p_mfgr order by p_name) as dr, Modified: hive/trunk/ql/src/test/results/clientpositive/sample3.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample3.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/sample3.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/sample3.q.out Tue Jan 20 05:43:52 2015 @@ -1,9 +1,13 @@ -PREHOOK: query: -- no input pruning, sample filter +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- no input pruning, sample filter EXPLAIN SELECT s.key FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s PREHOOK: type: QUERY -POSTHOOK: query: -- no input pruning, sample filter +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- no input pruning, sample filter EXPLAIN SELECT s.key FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s @@ -55,48 +59,8 @@ POSTHOOK: Input: default@srcbucket 0 0 0 -5 -5 -5 -5 10 10 -15 -15 -15 -15 -20 -20 -20 -30 -30 -35 -35 -35 -35 -35 -35 -40 -40 -50 -60 -65 -65 -65 -70 -70 -70 -70 -75 -80 -80 -85 -85 -90 -90 -90 -95 -95 100 100 100 @@ -116,6 +80,10 @@ POSTHOOK: Input: default@srcbucket 135 140 145 +15 +15 +15 +15 150 155 160 @@ -134,6 +102,9 @@ POSTHOOK: Input: default@srcbucket 190 195 195 +20 +20 +20 200 200 205 @@ -167,6 +138,8 @@ POSTHOOK: Input: default@srcbucket 285 295 295 +30 +30 300 300 305 @@ -184,6 +157,12 @@ POSTHOOK: Input: default@srcbucket 335 340 345 +35 +35 +35 +35 +35 +35 355 355 360 @@ -204,6 +183,8 @@ POSTHOOK: Input: default@srcbucket 395 395 395 +40 +40 400 405 410 @@ -239,3 +220,26 @@ POSTHOOK: Input: default@srcbucket 490 495 495 +5 +5 +5 +5 +50 +60 +65 +65 +65 +70 +70 +70 +70 +75 +80 +80 +85 +85 +90 +90 +90 +95 +95 Modified: hive/trunk/ql/src/test/results/clientpositive/sample5.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample5.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/sample5.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/sample5.q.out Tue Jan 20 05:43:52 2015 @@ -6,12 +6,16 @@ POSTHOOK: query: CREATE TABLE dest1(key POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 -PREHOOK: query: -- no input pruning, sample filter +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- no input pruning, sample filter EXPLAIN EXTENDED INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s PREHOOK: type: QUERY -POSTHOOK: query: -- no input pruning, sample filter +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- no input pruning, sample filter EXPLAIN EXTENDED INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s @@ -349,48 +353,8 @@ POSTHOOK: Input: default@dest1 0 val_0 0 val_1 0 val_1 -5 val_5 -5 val_5 -5 val_5 -5 val_6 10 val_10 10 val_11 -15 val_15 -15 val_15 -15 val_16 -15 val_16 -20 val_20 -20 val_21 -20 val_21 -30 val_30 -30 val_31 -35 val_35 -35 val_35 -35 val_35 -35 val_36 -35 val_36 -35 val_36 -40 val_41 -40 val_41 -50 val_51 -60 val_61 -65 val_65 -65 val_66 -65 val_66 -70 val_70 -70 val_70 -70 val_70 -70 val_71 -75 val_76 -80 val_80 -80 val_81 -85 val_85 -85 val_86 -90 val_90 -90 val_90 -90 val_90 -95 val_95 -95 val_95 100 val_100 100 val_100 100 val_101 @@ -410,6 +374,10 @@ POSTHOOK: Input: default@dest1 135 val_136 140 val_141 145 val_145 +15 val_15 +15 val_15 +15 val_16 +15 val_16 150 val_150 155 val_155 160 val_160 @@ -428,6 +396,9 @@ POSTHOOK: Input: default@dest1 190 val_190 195 val_195 195 val_195 +20 val_20 +20 val_21 +20 val_21 200 val_200 200 val_200 205 val_205 @@ -461,6 +432,8 @@ POSTHOOK: Input: default@dest1 285 val_286 295 val_296 295 val_296 +30 val_30 +30 val_31 300 val_301 300 val_301 305 val_305 @@ -478,6 +451,12 @@ POSTHOOK: Input: default@dest1 335 val_336 340 val_341 345 val_345 +35 val_35 +35 val_35 +35 val_35 +35 val_36 +35 val_36 +35 val_36 355 val_356 355 val_356 360 val_360 @@ -498,6 +477,8 @@ POSTHOOK: Input: default@dest1 395 val_395 395 val_396 395 val_396 +40 val_41 +40 val_41 400 val_400 405 val_406 410 val_411 @@ -533,3 +514,26 @@ POSTHOOK: Input: default@dest1 490 val_491 495 val_495 495 val_496 +5 val_5 +5 val_5 +5 val_5 +5 val_6 +50 val_51 +60 val_61 +65 val_65 +65 val_66 +65 val_66 +70 val_70 +70 val_70 +70 val_70 +70 val_71 +75 val_76 +80 val_80 +80 val_81 +85 val_85 +85 val_86 +90 val_90 +90 val_90 +90 val_90 +95 val_95 +95 val_95 Modified: hive/trunk/ql/src/test/results/clientpositive/scriptfile1.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/scriptfile1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/scriptfile1.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/scriptfile1.q.out Tue Jan 20 05:43:52 2015 @@ -1,9 +1,13 @@ -PREHOOK: query: -- EXCLUDE_OS_WINDOWS +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- EXCLUDE_OS_WINDOWS CREATE TABLE dest1(key INT, value STRING) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: -- EXCLUDE_OS_WINDOWS +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- EXCLUDE_OS_WINDOWS CREATE TABLE dest1(key INT, value STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default