You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2014/11/26 16:12:13 UTC
svn commit: r1641830 - in /hive/trunk/ql/src/test: queries/clientpositive/
results/clientpositive/ results/clientpositive/tez/
Author: xuefu
Date: Wed Nov 26 15:12:12 2014
New Revision: 1641830
URL: http://svn.apache.org/r1641830
Log:
HIVE-8962: Add SORT_QUERY_RESULTS for join tests that do not guarantee order #2 (Chao via Xuefu)
Modified:
hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q
hive/trunk/ql/src/test/queries/clientpositive/ptf_streaming.q
hive/trunk/ql/src/test/queries/clientpositive/subquery_exists.q
hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q
hive/trunk/ql/src/test/queries/clientpositive/vectorized_ptf.q
hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out
hive/trunk/ql/src/test/results/clientpositive/ptf_streaming.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out
Modified: hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ppd_multi_insert.q Wed Nov 26 15:12:12 2014
@@ -1,6 +1,8 @@
set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=false;
+-- SORT_QUERY_RESULTS
+
CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE;
CREATE TABLE mi2(key INT, value STRING) STORED AS TEXTFILE;
CREATE TABLE mi3(key INT) PARTITIONED BY(ds STRING, hr STRING) STORED AS TEXTFILE;
Modified: hive/trunk/ql/src/test/queries/clientpositive/ptf_streaming.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/ptf_streaming.q?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/ptf_streaming.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/ptf_streaming.q Wed Nov 26 15:12:12 2014
@@ -1,5 +1,7 @@
create temporary function noopstreaming as 'org.apache.hadoop.hive.ql.udf.ptf.NoopStreaming$NoopStreamingResolver';
+-- SORT_QUERY_RESULTS
+
--1. test1
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/subquery_exists.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/subquery_exists.q?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/subquery_exists.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/subquery_exists.q Wed Nov 26 15:12:12 2014
@@ -1,4 +1,4 @@
-
+-- SORT_QUERY_RESULTS
-- no agg, corr
explain
@@ -42,4 +42,4 @@ from (select *
from src a
where b.value = a.value and a.key = b.key and a.value > 'val_9')
) a
-;
\ No newline at end of file
+;
Modified: hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q Wed Nov 26 15:12:12 2014
@@ -1,5 +1,7 @@
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
+-- SORT_QUERY_RESULTS
+
CREATE TABLE src_4(
key STRING,
value STRING
@@ -79,4 +81,4 @@ INSERT OVERWRITE TABLE src_5
select * from src_4
;
select * from src_5
-;
\ No newline at end of file
+;
Modified: hive/trunk/ql/src/test/queries/clientpositive/vectorized_ptf.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/vectorized_ptf.q?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/vectorized_ptf.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/vectorized_ptf.q Wed Nov 26 15:12:12 2014
@@ -1,5 +1,7 @@
SET hive.vectorized.execution.enabled=true;
+-- SORT_QUERY_RESULTS
+
DROP TABLE part_staging;
DROP TABLE part_orc;
Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out Wed Nov 26 15:12:12 2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@mi1
-POSTHOOK: query: CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE mi1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@mi1
Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_streaming.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_streaming.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_streaming.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_streaming.q.out Wed Nov 26 15:12:12 2014
@@ -4,7 +4,9 @@ PREHOOK: Output: noopstreaming
POSTHOOK: query: create temporary function noopstreaming as 'org.apache.hadoop.hive.ql.udf.ptf.NoopStreaming$NoopStreamingResolver'
POSTHOOK: type: CREATEFUNCTION
POSTHOOK: Output: noopstreaming
-PREHOOK: query: --1. test1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+--1. test1
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,
@@ -16,7 +18,9 @@ from noopstreaming(on part
PREHOOK: type: QUERY
PREHOOK: Input: default@part
#### A masked pattern was here ####
-POSTHOOK: query: --1. test1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+--1. test1
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,
@@ -118,20 +122,6 @@ order by p_name
POSTHOOK: type: QUERY
POSTHOOK: Input: default@part
#### A masked pattern was here ####
-15103 almond aquamarine dodger light gainsboro Manufacturer#5 Brand#53 ECONOMY BURNISHED STEEL 46 LG PACK 1018.1 packages hinder carefu
-17273 almond antique forest lavender goldenrod Manufacturer#3 Brand#35 PROMO ANODIZED TIN 14 JUMBO CASE 1190.27 along the
-17927 almond aquamarine yellow dodger mint Manufacturer#4 Brand#41 ECONOMY BRUSHED COPPER 7 SM PKG 1844.92 ites. eve
-33357 almond azure aquamarine papaya violet Manufacturer#4 Brand#41 STANDARD ANODIZED TIN 12 WRAP CASE 1290.35 reful
-40982 almond antique misty red olive Manufacturer#3 Brand#32 ECONOMY PLATED COPPER 1 LG PKG 1922.98 c foxes can s
-42669 almond antique medium spring khaki Manufacturer#5 Brand#51 STANDARD BURNISHED TIN 6 MED CAN 1611.66 sits haggl
-45261 almond aquamarine floral ivory bisque Manufacturer#4 Brand#42 SMALL PLATED STEEL 27 WRAP CASE 1206.26 careful
-48427 almond antique violet mint lemon Manufacturer#4 Brand#42 PROMO POLISHED STEEL 39 SM CASE 1375.42 hely ironic i
-49671 almond antique gainsboro frosted violet Manufacturer#4 Brand#41 SMALL BRUSHED BRASS 10 SM BOX 1620.67 ccounts run quick
-65667 almond aquamarine pink moccasin thistle Manufacturer#1 Brand#12 LARGE BURNISHED STEEL 42 JUMBO CASE 1632.66 e across the expr
-78486 almond azure blanched chiffon midnight Manufacturer#5 Brand#52 LARGE BRUSHED BRASS 23 MED BAG 1464.48 hely blith
-85768 almond antique chartreuse lavender yellow Manufacturer#1 Brand#12 LARGE BRUSHED STEEL 34 SM BAG 1753.76 refull
-86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully
-90681 almond antique chartreuse khaki white Manufacturer#3 Brand#31 MEDIUM BURNISHED TIN 17 SM CASE 1671.68 are slyly after the sl
105685 almond antique violet chocolate turquoise Manufacturer#2 Brand#22 MEDIUM ANODIZED COPPER 14 MED CAN 1690.68 ly pending requ
110592 almond antique salmon chartreuse burlywood Manufacturer#1 Brand#15 PROMO BURNISHED NICKEL 6 JUMBO PKG 1602.59 to the furiously
112398 almond antique metallic orange dim Manufacturer#3 Brand#32 MEDIUM BURNISHED BRASS 19 JUMBO JAR 1410.39 ole car
@@ -142,10 +132,24 @@ POSTHOOK: Input: default@part
132666 almond aquamarine rose maroon antique Manufacturer#2 Brand#24 SMALL POLISHED NICKEL 25 MED BOX 1698.66 even
144293 almond antique olive coral navajo Manufacturer#3 Brand#34 STANDARD POLISHED STEEL 45 JUMBO CAN 1337.29 ag furiously about
146985 almond aquamarine midnight light salmon Manufacturer#2 Brand#23 MEDIUM BURNISHED COPPER 2 SM CASE 2031.98 s cajole caref
+15103 almond aquamarine dodger light gainsboro Manufacturer#5 Brand#53 ECONOMY BURNISHED STEEL 46 LG PACK 1018.1 packages hinder carefu
155733 almond antique sky peru orange Manufacturer#5 Brand#53 SMALL PLATED BRASS 2 WRAP DRUM 1788.73 furiously. bra
+17273 almond antique forest lavender goldenrod Manufacturer#3 Brand#35 PROMO ANODIZED TIN 14 JUMBO CASE 1190.27 along the
+17927 almond aquamarine yellow dodger mint Manufacturer#4 Brand#41 ECONOMY BRUSHED COPPER 7 SM PKG 1844.92 ites. eve
191709 almond antique violet turquoise frosted Manufacturer#2 Brand#22 ECONOMY POLISHED STEEL 40 MED BOX 1800.7 haggle
192697 almond antique blue firebrick mint Manufacturer#5 Brand#52 MEDIUM BURNISHED TIN 31 LG DRUM 1789.69 ickly ir
195606 almond aquamarine sandy cyan gainsboro Manufacturer#2 Brand#25 STANDARD PLATED TIN 18 SM PKG 1701.6 ic de
+33357 almond azure aquamarine papaya violet Manufacturer#4 Brand#41 STANDARD ANODIZED TIN 12 WRAP CASE 1290.35 reful
+40982 almond antique misty red olive Manufacturer#3 Brand#32 ECONOMY PLATED COPPER 1 LG PKG 1922.98 c foxes can s
+42669 almond antique medium spring khaki Manufacturer#5 Brand#51 STANDARD BURNISHED TIN 6 MED CAN 1611.66 sits haggl
+45261 almond aquamarine floral ivory bisque Manufacturer#4 Brand#42 SMALL PLATED STEEL 27 WRAP CASE 1206.26 careful
+48427 almond antique violet mint lemon Manufacturer#4 Brand#42 PROMO POLISHED STEEL 39 SM CASE 1375.42 hely ironic i
+49671 almond antique gainsboro frosted violet Manufacturer#4 Brand#41 SMALL BRUSHED BRASS 10 SM BOX 1620.67 ccounts run quick
+65667 almond aquamarine pink moccasin thistle Manufacturer#1 Brand#12 LARGE BURNISHED STEEL 42 JUMBO CASE 1632.66 e across the expr
+78486 almond azure blanched chiffon midnight Manufacturer#5 Brand#52 LARGE BRUSHED BRASS 23 MED BAG 1464.48 hely blith
+85768 almond antique chartreuse lavender yellow Manufacturer#1 Brand#12 LARGE BRUSHED STEEL 34 SM BAG 1753.76 refull
+86428 almond aquamarine burnished black steel Manufacturer#1 Brand#12 STANDARD ANODIZED STEEL 28 WRAP BAG 1414.42 arefully
+90681 almond antique chartreuse khaki white Manufacturer#3 Brand#31 MEDIUM BURNISHED TIN 17 SM CASE 1671.68 are slyly after the sl
PREHOOK: query: -- 9. testNoopWithMap
select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name, p_size desc) as r
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out Wed Nov 26 15:12:12 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- no agg, corr
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no agg, corr
explain
select *
from src b
@@ -8,7 +10,9 @@ where exists
where b.value = a.value and a.key = b.key and a.value > 'val_9'
)
PREHOOK: type: QUERY
-POSTHOOK: query: -- no agg, corr
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no agg, corr
explain
select *
from src b
Modified: hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out Wed Nov 26 15:12:12 2014
@@ -1,11 +1,15 @@
-PREHOOK: query: CREATE TABLE src_4(
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src_4(
key STRING,
value STRING
)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@src_4
-POSTHOOK: query: CREATE TABLE src_4(
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src_4(
key STRING,
value STRING
)
@@ -873,17 +877,17 @@ POSTHOOK: query: select * from src_4
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src_4
#### A masked pattern was here ####
-98 val_98
+90 val_90
+90 val_90
+90 val_90
92 val_92
-96 val_96
95 val_95
-98 val_98
-90 val_90
95 val_95
-90 val_90
+96 val_96
97 val_97
-90 val_90
97 val_97
+98 val_98
+98 val_98
PREHOOK: query: select * from src_5
PREHOOK: type: QUERY
PREHOOK: Input: default@src_5
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out Wed Nov 26 15:12:12 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- no agg, corr
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no agg, corr
explain
select *
from src b
@@ -8,7 +10,9 @@ where exists
where b.value = a.value and a.key = b.key and a.value > 'val_9'
)
PREHOOK: type: QUERY
-POSTHOOK: query: -- no agg, corr
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no agg, corr
explain
select *
from src b
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out Wed Nov 26 15:12:12 2014 differ
Modified: hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out?rev=1641830&r1=1641829&r2=1641830&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out Wed Nov 26 15:12:12 2014 differ