hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject svn commit: r1633916 - in /hive/branches/spark: ./ hbase-handler/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/
Date Thu, 23 Oct 2014 18:46:20 GMT
Author: xuefu
Date: Thu Oct 23 18:46:20 2014
New Revision: 1633916

URL: http://svn.apache.org/r1633916
Log:
HIVE-8256: Add SORT_QUERY_RESULTS for test that doesn't guarantee order #2 (Chao via Xuefu)
merged from trunk r1633911

Modified:
    hive/branches/spark/   (props changed)
    hive/branches/spark/hbase-handler/pom.xml   (props changed)
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby10.q
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby11.q
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby7.q
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby8.q
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby9.q
    hive/branches/spark/ql/src/test/queries/clientpositive/groupby_complex_types.q
    hive/branches/spark/ql/src/test/queries/clientpositive/table_access_keys_stats.q
    hive/branches/spark/ql/src/test/results/clientpositive/groupby10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/groupby_complex_types.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/table_access_keys_stats.q.out

Propchange: hive/branches/spark/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1633911

Propchange: hive/branches/spark/hbase-handler/pom.xml
------------------------------------------------------------------------------
  Merged /hive/trunk/hbase-handler/pom.xml:r1633911

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby10.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby10.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby10.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby10.q Thu Oct 23 18:46:20
2014
@@ -2,6 +2,8 @@ set hive.map.aggr=false;
 set hive.multigroupby.singlereducer=false;
 set hive.groupby.skewindata=true;
 
+-- SORT_QUERY_RESULTS
+
 CREATE TABLE dest1(key INT, val1 INT, val2 INT);
 CREATE TABLE dest2(key INT, val1 INT, val2 INT);
 

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby11.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby11.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby11.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby11.q Thu Oct 23 18:46:20
2014
@@ -1,8 +1,7 @@
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 
-
-
+-- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string);
 CREATE TABLE dest2(key STRING, val1 INT, val2 INT) partitioned by (ds string);

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby7.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby7.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby7.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby7.q Thu Oct 23 18:46:20
2014
@@ -1,6 +1,8 @@
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 
+-- SORT_QUERY_RESULTS
+
 CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
 

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby8.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby8.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby8.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby8.q Thu Oct 23 18:46:20
2014
@@ -1,6 +1,8 @@
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 
+-- SORT_QUERY_RESULTS
+
 CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key INT, value STRING) STORED AS TEXTFILE;
 

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby9.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby9.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby9.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby9.q Thu Oct 23 18:46:20
2014
@@ -1,3 +1,4 @@
+-- SORT_QUERY_RESULTS
 
 CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key INT, val1 STRING, val2 STRING) STORED AS TEXTFILE;

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/groupby_complex_types.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/groupby_complex_types.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/groupby_complex_types.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/groupby_complex_types.q Thu Oct
23 18:46:20 2014
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
 CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key MAP<STRING, STRING>, value BIGINT) STORED AS TEXTFILE;
 CREATE TABLE DEST3(key STRUCT<col1:STRING, col2:STRING>, value BIGINT) STORED AS TEXTFILE;

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/table_access_keys_stats.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/table_access_keys_stats.q?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/table_access_keys_stats.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/table_access_keys_stats.q Thu Oct
23 18:46:20 2014
@@ -1,6 +1,7 @@
 SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.CheckTableAccessHook;
 SET hive.stats.collect.tablekeys=true;
 
+-- SORT_QUERY_RESULTS
 -- This test is used for testing the TableAccessAnalyzer
 
 CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby10.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby10.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby10.q.out Thu Oct 23 18:46:20
2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE dest1(key INT, val1 INT, val2 INT)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key INT, val1 INT, val2 INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: CREATE TABLE dest1(key INT, val1 INT, val2 INT)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key INT, val1 INT, val2 INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
@@ -204,10 +208,6 @@ POSTHOOK: query: SELECT * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-27	1	1
-66	1	1
-86	1	1
-98	1	1
 128	1	1
 150	1	1
 165	1	1
@@ -217,6 +217,7 @@ POSTHOOK: Input: default@dest1
 238	3	3
 255	1	1
 265	1	1
+27	1	1
 273	1	1
 278	1	1
 311	1	1
@@ -224,6 +225,9 @@ POSTHOOK: Input: default@dest1
 401	1	1
 409	1	1
 484	1	1
+66	1	1
+86	1	1
+98	1	1
 PREHOOK: query: SELECT * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
@@ -232,10 +236,6 @@ POSTHOOK: query: SELECT * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
-27	27	27
-66	66	66
-86	86	86
-98	98	98
 128	128	128
 150	150	150
 165	165	165
@@ -245,6 +245,7 @@ POSTHOOK: Input: default@dest2
 238	717	717
 255	255	255
 265	265	265
+27	27	27
 273	273	273
 278	278	278
 311	311	311
@@ -252,6 +253,9 @@ POSTHOOK: Input: default@dest2
 401	401	401
 409	409	409
 484	484	484
+66	66	66
+86	86	86
+98	98	98
 PREHOOK: query: EXPLAIN
 FROM INPUT 
 INSERT OVERWRITE TABLE dest1 SELECT INPUT.key, count(substr(INPUT.value,5)), count(distinct
substr(INPUT.value,5)) GROUP BY INPUT.key
@@ -426,10 +430,6 @@ POSTHOOK: query: SELECT * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-27	1	1
-66	1	1
-86	1	1
-98	1	1
 128	1	1
 150	1	1
 165	1	1
@@ -439,6 +439,7 @@ POSTHOOK: Input: default@dest1
 238	3	3
 255	1	1
 265	1	1
+27	1	1
 273	1	1
 278	1	1
 311	1	1
@@ -446,6 +447,9 @@ POSTHOOK: Input: default@dest1
 401	1	1
 409	1	1
 484	1	1
+66	1	1
+86	1	1
+98	1	1
 PREHOOK: query: SELECT * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
@@ -454,10 +458,6 @@ POSTHOOK: query: SELECT * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
-27	27	27
-66	66	66
-86	86	86
-98	98	98
 128	128	128
 150	150	150
 165	165	165
@@ -467,6 +467,7 @@ POSTHOOK: Input: default@dest2
 238	717	717
 255	255	255
 265	265	265
+27	27	27
 273	273	273
 278	278	278
 311	311	311
@@ -474,6 +475,9 @@ POSTHOOK: Input: default@dest2
 401	401	401
 409	409	409
 484	484	484
+66	66	66
+86	86	86
+98	98	98
 PREHOOK: query: -- HIVE-3852 Multi-groupby optimization fails when same distinct column is
used twice or more
 EXPLAIN
 FROM INPUT
@@ -650,10 +654,6 @@ POSTHOOK: query: SELECT * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-27	27	1
-66	66	1
-86	86	1
-98	98	1
 128	128	1
 150	150	1
 165	165	1
@@ -663,6 +663,7 @@ POSTHOOK: Input: default@dest1
 238	717	3
 255	255	1
 265	265	1
+27	27	1
 273	273	1
 278	278	1
 311	311	1
@@ -670,6 +671,9 @@ POSTHOOK: Input: default@dest1
 401	401	1
 409	409	1
 484	484	1
+66	66	1
+86	86	1
+98	98	1
 PREHOOK: query: SELECT * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
@@ -678,10 +682,6 @@ POSTHOOK: query: SELECT * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
-27	27	27
-66	66	66
-86	86	86
-98	98	98
 128	128	128
 150	150	150
 165	165	165
@@ -691,6 +691,7 @@ POSTHOOK: Input: default@dest2
 238	717	239
 255	255	255
 265	265	265
+27	27	27
 273	273	273
 278	278	278
 311	311	311
@@ -698,3 +699,6 @@ POSTHOOK: Input: default@dest2
 401	401	401
 409	409	409
 484	484	484
+66	66	66
+86	86	86
+98	98	98

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby11.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby11.q.out Thu Oct 23 18:46:20
2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, val1 INT, val2 INT) partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby7.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby7.q.out Thu Oct 23 18:46:20
2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby8.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby8.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby8.q.out Thu Oct 23 18:46:20
2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby9.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby9.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby9.q.out Thu Oct 23 18:46:20
2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_complex_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_complex_types.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_complex_types.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_complex_types.q.out Thu
Oct 23 18:46:20 2014
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/table_access_keys_stats.q.out?rev=1633916&r1=1633915&r2=1633916&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/table_access_keys_stats.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/table_access_keys_stats.q.out Thu
Oct 23 18:46:20 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- This test is used for testing the TableAccessAnalyzer
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- This test is used for testing the TableAccessAnalyzer
 
 CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
@@ -133,11 +134,11 @@ Operator:GBY_2
 Table:default@t1
 Keys:key
 
+14.0	1
+16.0	2
 2.0	1
 4.0	1
 6.0	1
-14.0	1
-16.0	2
 PREHOOK: query: -- group by followed by union
 SELECT * FROM (
 SELECT key, count(1) as c FROM T1 GROUP BY key
@@ -156,15 +157,15 @@ Table:default@t1
 Keys:key
 
 1	1
-2	1
-3	1
-7	1
-8	2
 1	1
 2	1
+2	1
 3	1
+3	1
+7	1
 7	1
 8	2
+8	2
 PREHOOK: query: -- group by followed by a join
 SELECT * FROM
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq1



Mime
View raw message