hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sze...@apache.org
Subject [44/44] hive git commit: HIVE-10347 : Merge spark to trunk 4/15/2015 (Szehon, reviewed by Xuefu)
Date Thu, 23 Apr 2015 02:34:53 GMT
HIVE-10347 : Merge spark to trunk 4/15/2015 (Szehon, reviewed by Xuefu)


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

Branch: refs/heads/master
Commit: 864d7e98df6ebc70a11874ba9adfc4cb7ef85b9e
Parents: 31bec32
Author: Szehon Ho <szehon@cloudera.com>
Authored: Wed Apr 22 13:46:20 2015 -0700
Committer: Szehon Ho <szehon@cloudera.com>
Committed: Wed Apr 22 19:33:54 2015 -0700

----------------------------------------------------------------------
 ql/pom.xml                                        | 16 ++++++++++++++++
 .../clientpositive/spark/cbo_simple_select.q.out  | 10 ++++++++++
 .../spark/union_remove_6_subq.q.out               |  4 ++--
 ql/src/test/results/clientpositive/union20.q.out  | 18 +++++++++---------
 4 files changed, 37 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/864d7e98/ql/pom.xml
----------------------------------------------------------------------
diff --git a/ql/pom.xml b/ql/pom.xml
index cfcc171..6ac521e 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -235,6 +235,14 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>   
     <dependency>
@@ -253,6 +261,14 @@
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/hive/blob/864d7e98/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out b/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out
index b392637..d161d9f 100644
--- a/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out
+++ b/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out
@@ -120,6 +120,16 @@ POSTHOOK: Input: default@cbo_t1@dt=2014
 1	1	25.0
 NULL	NULL	NULL
 NULL	NULL	NULL
+PREHOOK: query: select * from cbo_t1 where (((key=1) and (c_float=10)) and (c_int=20))
+PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
+POSTHOOK: query: select * from cbo_t1 where (((key=1) and (c_float=10)) and (c_int=20))
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+#### A masked pattern was here ####
 PREHOOK: query: -- 2. Test Select + TS + FIL
 select * from cbo_t1 where cbo_t1.c_int >= 0
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/864d7e98/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
index 7e7b867..977d0f5 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
@@ -504,14 +504,14 @@ STAGE PLANS:
                         raw input shape:
                         window functions:
                             window function definition
-                              alias: _wcol0
+                              alias: avg_window_0
                               arguments: _col1
                               name: avg
                               window function: GenericUDAFAverageEvaluatorDouble
                               window frame: PRECEDING(MAX)~
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column
stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _wcol0 (type: double)
+                    expressions: _col0 (type: string), avg_window_0 (type: double)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column
stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/864d7e98/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 690d65c..b80ec1e 100644
--- a/ql/src/test/results/clientpositive/union20.q.out
+++ b/ql/src/test/results/clientpositive/union20.q.out
@@ -98,6 +98,15 @@ STAGE PLANS:
                     Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column
stats: PARTIAL
                     value expressions: _col1 (type: string)
           TableScan
+            Union
+              Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column stats:
PARTIAL
+              Reduce Output Operator
+                key expressions: _col0 (type: string)
+                sort order: +
+                Map-reduce partition columns: _col0 (type: string)
+                Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column stats:
PARTIAL
+                value expressions: _col1 (type: string)
+          TableScan
             alias: s1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats:
NONE
             Filter Operator
@@ -115,15 +124,6 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column
stats: PARTIAL
                     value expressions: _col1 (type: string)
-          TableScan
-            Union
-              Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column stats:
PARTIAL
-              Reduce Output Operator
-                key expressions: _col0 (type: string)
-                sort order: +
-                Map-reduce partition columns: _col0 (type: string)
-                Statistics: Num rows: 167 Data size: 2035 Basic stats: COMPLETE Column stats:
PARTIAL
-                value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:


Mime
View raw message