hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sze...@apache.org
Subject [27/44] hive git commit: HIVE-9569: Enable more unit tests for UNION ALL [Spark Branch] (Chao via Xuefu)
Date Thu, 23 Apr 2015 02:34:36 GMT
HIVE-9569: Enable more unit tests for UNION ALL [Spark Branch] (Chao via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1665645 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ec81a5a0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ec81a5a0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ec81a5a0

Branch: refs/heads/master
Commit: ec81a5a0964885743ca4131eef529c8365601f6f
Parents: 80c18e6
Author: Xuefu Zhang <xuefu@apache.org>
Authored: Tue Mar 10 18:18:34 2015 +0000
Committer: Szehon Ho <szehon@cloudera.com>
Committed: Wed Apr 22 19:33:51 2015 -0700

----------------------------------------------------------------------
 .../test/resources/testconfiguration.properties | 22 ++++++++++++++++++++
 ql/src/test/queries/clientpositive/union17.q    |  2 +-
 ql/src/test/queries/clientpositive/union20.q    |  2 +-
 ql/src/test/queries/clientpositive/union21.q    |  2 +-
 ql/src/test/queries/clientpositive/union27.q    |  2 +-
 .../test/results/clientpositive/union17.q.out   |  4 ++--
 .../test/results/clientpositive/union20.q.out   |  4 ++--
 .../test/results/clientpositive/union21.q.out   |  6 +++---
 .../test/results/clientpositive/union27.q.out   |  4 ++--
 9 files changed, 35 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index 5fc9fb2..2f9a293 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -939,31 +939,48 @@ spark.query.files=add_part_multiple.q, \
   union.q, \
   union10.q, \
   union11.q, \
+  union12.q, \
   union13.q, \
   union14.q, \
   union15.q, \
   union16.q, \
+  union17.q, \
   union18.q, \
   union19.q, \
   union2.q, \
+  union20.q, \
+  union21.q, \
+  union22.q, \
   union23.q, \
+  union24.q, \
   union25.q, \
+  union26.q, \
+  union27.q, \
   union28.q, \
   union29.q, \
   union3.q, \
   union30.q, \
+  union31.q, \
+  union32.q, \
   union33.q, \
+  union34.q, \
   union4.q, \
   union5.q, \
   union6.q, \
   union7.q, \
   union8.q, \
   union9.q, \
+  union_date.q, \
+  union_date_trim.q, \
+  union_lateralview.q, \
   union_null.q, \
   union_ppr.q, \
   union_remove_1.q, \
   union_remove_10.q, \
   union_remove_11.q, \
+  union_remove_12.q, \
+  union_remove_13.q, \
+  union_remove_14.q, \
   union_remove_15.q, \
   union_remove_16.q, \
   union_remove_17.q, \
@@ -972,15 +989,20 @@ spark.query.files=add_part_multiple.q, \
   union_remove_2.q, \
   union_remove_20.q, \
   union_remove_21.q, \
+  union_remove_22.q, \
+  union_remove_23.q, \
   union_remove_24.q, \
   union_remove_25.q, \
   union_remove_3.q, \
   union_remove_4.q, \
   union_remove_5.q, \
   union_remove_6.q, \
+  union_remove_6_subq.q, \
   union_remove_7.q, \
   union_remove_8.q, \
   union_remove_9.q, \
+  union_script.q, \
+  union_top_level.q, \
   uniquejoin.q, \
   union_view.q, \
   varchar_join1.q, \

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/queries/clientpositive/union17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union17.q b/ql/src/test/queries/clientpositive/union17.q
index 8cad979..2d31f6b 100644
--- a/ql/src/test/queries/clientpositive/union17.q
+++ b/ql/src/test/queries/clientpositive/union17.q
@@ -1,7 +1,7 @@
 CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
 
--- SORT_BEFORE_DIFF
+-- SORT_QUERY_RESULTS
 -- union case:map-reduce sub-queries followed by multi-table insert
 
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/queries/clientpositive/union20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union20.q b/ql/src/test/queries/clientpositive/union20.q
index 28269f4..e7d99bd 100644
--- a/ql/src/test/queries/clientpositive/union20.q
+++ b/ql/src/test/queries/clientpositive/union20.q
@@ -1,4 +1,4 @@
--- SORT_BEFORE_DIFF
+-- SORT_QUERY_RESULTS
 -- union :map-reduce sub-queries followed by join
 
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/queries/clientpositive/union21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union21.q b/ql/src/test/queries/clientpositive/union21.q
index ec12d3e..284669d 100644
--- a/ql/src/test/queries/clientpositive/union21.q
+++ b/ql/src/test/queries/clientpositive/union21.q
@@ -1,4 +1,4 @@
--- SORT_BEFORE_DIFF
+-- SORT_QUERY_RESULTS
 -- union of constants, udf outputs, and columns from text table and thrift table
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/queries/clientpositive/union27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union27.q b/ql/src/test/queries/clientpositive/union27.q
index f96c987..8f3af6b 100644
--- a/ql/src/test/queries/clientpositive/union27.q
+++ b/ql/src/test/queries/clientpositive/union27.q
@@ -1,4 +1,4 @@
--- SORT_BEFORE_DIFF
+-- SORT_QUERY_RESULTS
 create table jackson_sev_same as select * from src;
 create table dim_pho as select * from src;
 create table jackson_sev_add as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/results/clientpositive/union17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union17.q.out b/ql/src/test/results/clientpositive/union17.q.out
index e8f7202..56b335a 100644
--- a/ql/src/test/results/clientpositive/union17.q.out
+++ b/ql/src/test/results/clientpositive/union17.q.out
@@ -14,7 +14,7 @@ POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING)
STORED
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- SORT_BEFORE_DIFF
+PREHOOK: query: -- SORT_QUERY_RESULTS
 -- union case:map-reduce sub-queries followed by multi-table insert
 
 explain 
@@ -24,7 +24,7 @@ FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc.value,5))
GROUP BY unionsrc.key
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5))
GROUP BY unionsrc.key, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 -- union case:map-reduce sub-queries followed by multi-table insert
 
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/results/clientpositive/union20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union20.q.out b/ql/src/test/results/clientpositive/union20.q.out
index 81a9298..690d65c 100644
--- a/ql/src/test/results/clientpositive/union20.q.out
+++ b/ql/src/test/results/clientpositive/union20.q.out
@@ -1,4 +1,4 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
+PREHOOK: query: -- SORT_QUERY_RESULTS
 -- union :map-reduce sub-queries followed by join
 
 explain 
@@ -12,7 +12,7 @@ JOIN
       select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2
 ON (unionsrc1.key = unionsrc2.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 -- union :map-reduce sub-queries followed by join
 
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/results/clientpositive/union21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union21.q.out b/ql/src/test/results/clientpositive/union21.q.out
index 9a984b9..b24c276 100644
--- a/ql/src/test/results/clientpositive/union21.q.out
+++ b/ql/src/test/results/clientpositive/union21.q.out
@@ -1,4 +1,4 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
+PREHOOK: query: -- SORT_QUERY_RESULTS
 -- union of constants, udf outputs, and columns from text table and thrift table
 
 explain
@@ -16,7 +16,7 @@ FROM (
 ) union_output
 GROUP BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 -- union of constants, udf outputs, and columns from text table and thrift table
 
 explain
@@ -202,7 +202,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src_thrift
 #### A masked pattern was here ####
-NULL	2
 0	7
 001	2
 002	2
@@ -728,6 +727,7 @@ NULL	2
 984	4
 991	3
 993	2
+NULL	2
 record_0	1
 record_1	1
 record_2	1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec81a5a0/ql/src/test/results/clientpositive/union27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union27.q.out b/ql/src/test/results/clientpositive/union27.q.out
index abbb81d..9df606d 100644
--- a/ql/src/test/results/clientpositive/union27.q.out
+++ b/ql/src/test/results/clientpositive/union27.q.out
@@ -1,10 +1,10 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
+PREHOOK: query: -- SORT_QUERY_RESULTS
 create table jackson_sev_same as select * from src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@jackson_sev_same
-POSTHOOK: query: -- SORT_BEFORE_DIFF
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 create table jackson_sev_same as select * from src
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src


Mime
View raw message