hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sunc...@apache.org
Subject hive git commit: HIVE-11296 - Merge from master to spark branch [Spark Branch] (Chao Sun, reviewed by Xuefu Zhang)
Date Wed, 29 Jul 2015 22:22:04 GMT
Repository: hive
Updated Branches:
  refs/heads/spark fb7ba8bde -> 89736c8b5


HIVE-11296 - Merge from master to spark branch [Spark Branch] (Chao Sun, reviewed by Xuefu
Zhang)


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

Branch: refs/heads/spark
Commit: 89736c8b50bb7ec90acd3bb3c1baa5d3d08cee58
Parents: fb7ba8b
Author: Chao Sun <sunchao@apache.org>
Authored: Wed Jul 29 15:21:29 2015 -0700
Committer: Chao Sun <sunchao@apache.org>
Committed: Wed Jul 29 15:21:29 2015 -0700

----------------------------------------------------------------------
 .../spark/dynamic_rdd_cache.q.out               | 48 ++++++++++++--------
 .../clientpositive/spark/load_dyn_part14.q.out  | 30 +-----------
 .../spark/vector_count_distinct.q.out           |  1 +
 3 files changed, 31 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/89736c8b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
index 61563e4..7045855 100644
--- a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
@@ -859,19 +859,23 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                Filter Operator
-                  predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END >
1) (type: boolean)
+                Select Operator
+                  expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4
(type: double), _col5 (type: double)
+                  outputColumnNames: _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                  Select Operator
-                    expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int),
_col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type:
double)
-                    outputColumnNames: _col1, _col2, _col3, _col5, _col6
+                  Filter Operator
+                    predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END
> 1) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                    Reduce Output Operator
-                      key expressions: _col2 (type: int), _col1 (type: int)
-                      sort order: ++
-                      Map-reduce partition columns: _col2 (type: int), _col1 (type: int)
+                    Select Operator
+                      expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int),
_col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type:
double)
+                      outputColumnNames: _col1, _col2, _col3, _col5, _col6
                       Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                      value expressions: _col3 (type: int), _col5 (type: double), _col6 (type:
double)
+                      Reduce Output Operator
+                        key expressions: _col2 (type: int), _col1 (type: int)
+                        sort order: ++
+                        Map-reduce partition columns: _col2 (type: int), _col1 (type: int)
+                        Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column
stats: NONE
+                        value expressions: _col3 (type: int), _col5 (type: double), _col6
(type: double)
         Reducer 4 
             Reduce Operator Tree:
               Join Operator
@@ -909,19 +913,23 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                Filter Operator
-                  predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END >
1) (type: boolean)
+                Select Operator
+                  expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4
(type: double), _col5 (type: double)
+                  outputColumnNames: _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                  Select Operator
-                    expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int),
_col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type:
double)
-                    outputColumnNames: _col1, _col2, _col3, _col5, _col6
+                  Filter Operator
+                    predicate: (CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END
> 1) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                    Reduce Output Operator
-                      key expressions: _col2 (type: int), _col1 (type: int)
-                      sort order: ++
-                      Map-reduce partition columns: _col2 (type: int), _col1 (type: int)
+                    Select Operator
+                      expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int),
_col5 (type: double), CASE (_col5) WHEN (0) THEN (null) ELSE ((_col4 / _col5)) END (type:
double)
+                      outputColumnNames: _col1, _col2, _col3, _col5, _col6
                       Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats:
NONE
-                      value expressions: _col3 (type: int), _col5 (type: double), _col6 (type:
double)
+                      Reduce Output Operator
+                        key expressions: _col2 (type: int), _col1 (type: int)
+                        sort order: ++
+                        Map-reduce partition columns: _col2 (type: int), _col1 (type: int)
+                        Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column
stats: NONE
+                        value expressions: _col3 (type: int), _col5 (type: double), _col6
(type: double)
         Reducer 6 
             Reduce Operator Tree:
               Join Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/89736c8b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
index 288ff69..9349a1c 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
@@ -63,8 +63,8 @@ STAGE PLANS:
     Spark
       Edges:
         Reducer 2 <- Map 1 (GROUP, 1)
-        Reducer 4 <- Map 3 (GROUP, 1)
-        Reducer 6 <- Map 5 (GROUP, 1)
+        Reducer 4 <- Map 1 (GROUP, 1)
+        Reducer 6 <- Map 1 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -80,32 +80,6 @@ STAGE PLANS:
                       Reduce Output Operator
                         sort order: 
                         Statistics: Num rows: 2 Data size: 172 Basic stats: COMPLETE Column
stats: COMPLETE
-        Map 3 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column
stats: COMPLETE
-                  Select Operator
-                    Statistics: Num rows: 500 Data size: 85000 Basic stats: COMPLETE Column
stats: COMPLETE
-                    Limit
-                      Number of rows: 2
-                      Statistics: Num rows: 2 Data size: 340 Basic stats: COMPLETE Column
stats: COMPLETE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 2 Data size: 340 Basic stats: COMPLETE Column
stats: COMPLETE
-        Map 5 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column
stats: COMPLETE
-                  Select Operator
-                    Statistics: Num rows: 500 Data size: 85500 Basic stats: COMPLETE Column
stats: COMPLETE
-                    Limit
-                      Number of rows: 2
-                      Statistics: Num rows: 2 Data size: 342 Basic stats: COMPLETE Column
stats: COMPLETE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 2 Data size: 342 Basic stats: COMPLETE Column
stats: COMPLETE
         Reducer 2 
             Reduce Operator Tree:
               Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/89736c8b/ql/src/test/results/clientpositive/spark/vector_count_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vector_count_distinct.q.out b/ql/src/test/results/clientpositive/spark/vector_count_distinct.q.out
index aaea86d..ee5462d 100644
--- a/ql/src/test/results/clientpositive/spark/vector_count_distinct.q.out
+++ b/ql/src/test/results/clientpositive/spark/vector_count_distinct.q.out
@@ -1287,6 +1287,7 @@ STAGE PLANS:
                     sort order: 
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats:
NONE
                     value expressions: _col0 (type: bigint)
+            Execution mode: vectorized
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator


Mime
View raw message