You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/10/06 03:51:49 UTC

hive git commit: HIVE-12042 : LLAP: update some out files (Sergey Shelukhin)

Repository: hive
Updated Branches:
  refs/heads/llap 68e5ad9e6 -> 86e1c89ea


HIVE-12042 : LLAP: update some out files (Sergey Shelukhin)


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

Branch: refs/heads/llap
Commit: 86e1c89ea9dbb1162a3d143c7f2da553dcbba769
Parents: 68e5ad9
Author: Sergey Shelukhin <se...@apache.org>
Authored: Mon Oct 5 18:54:02 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Mon Oct 5 18:54:02 2015 -0700

----------------------------------------------------------------------
 .../llap/dynamic_partition_pruning.q.out        |  1 -
 .../clientpositive/llap/explainuser_1.q.out     | 70 ++++++++++----------
 .../vectorized_dynamic_partition_pruning.q.out  |  1 -
 .../tez/vector_groupby_reduce.q.out             | 14 ++--
 4 files changed, 42 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/86e1c89e/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
index cdb11b6..705e31d 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
@@ -4299,7 +4299,6 @@ STAGE PLANS:
                       input vertices:
                         1 Reducer 4
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/86e1c89e/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
index d41e02f..7161e01 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -6031,36 +6031,36 @@ Stage-0
          Reducer 2
          File Output Operator [FS_6]
             compressed:true
-            Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+            Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
             Select Operator [SEL_5]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
-               Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                Merge Join Operator [MERGEJOIN_7]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"key (type: int)","1":"key (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col5","_col6"]
-               |  Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               |  Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [SIMPLE_EDGE]
                |  Reduce Output Operator [RS_2]
                |     key expressions:key (type: int)
                |     Map-reduce partition columns:key (type: int)
                |     sort order:+
-               |     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:value (type: int)
                |     TableScan [TS_0]
                |        alias:a
-               |        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |<-Map 3 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_3]
                      key expressions:key (type: int)
                      Map-reduce partition columns:key (type: int)
                      sort order:+
-                     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                      value expressions:value (type: int)
                      TableScan [TS_1]
                         alias:b
-                        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: explain select /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value
 PREHOOK: type: QUERY
@@ -6078,34 +6078,34 @@ Stage-0
          Reducer 2
          File Output Operator [FS_6]
             compressed:true
-            Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+            Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
             Select Operator [SEL_5]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
-               Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                Merge Join Operator [MERGEJOIN_7]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"key (type: int), value (type: int)","1":"key (type: int), value (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col5","_col6"]
-               |  Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               |  Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [SIMPLE_EDGE]
                |  Reduce Output Operator [RS_2]
                |     key expressions:key (type: int), value (type: int)
                |     Map-reduce partition columns:key (type: int), value (type: int)
                |     sort order:++
-               |     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |     TableScan [TS_0]
                |        alias:a
-               |        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |<-Map 3 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_3]
                      key expressions:key (type: int), value (type: int)
                      Map-reduce partition columns:key (type: int), value (type: int)
                      sort order:++
-                     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                      TableScan [TS_1]
                         alias:b
-                        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: explain select /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
@@ -6123,36 +6123,36 @@ Stage-0
          Reducer 2
          File Output Operator [FS_6]
             compressed:true
-            Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+            Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
             Select Operator [SEL_5]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
-               Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                Merge Join Operator [MERGEJOIN_7]
                |  condition map:[{"":"Right Outer Join0 to 1"}]
                |  keys:{"0":"key (type: int)","1":"key (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col5","_col6"]
-               |  Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               |  Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [SIMPLE_EDGE]
                |  Reduce Output Operator [RS_2]
                |     key expressions:key (type: int)
                |     Map-reduce partition columns:key (type: int)
                |     sort order:+
-               |     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:value (type: int)
                |     TableScan [TS_0]
                |        alias:a
-               |        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |<-Map 3 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_3]
                      key expressions:key (type: int)
                      Map-reduce partition columns:key (type: int)
                      sort order:+
-                     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                      value expressions:value (type: int)
                      TableScan [TS_1]
                         alias:b
-                        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: explain select /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
@@ -6170,36 +6170,36 @@ Stage-0
          Reducer 2
          File Output Operator [FS_6]
             compressed:true
-            Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+            Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
             Select Operator [SEL_5]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
-               Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                Merge Join Operator [MERGEJOIN_7]
                |  condition map:[{"":"Inner Join 0 to 1"}]
                |  keys:{"0":"key (type: int)","1":"key (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col5","_col6"]
-               |  Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               |  Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [SIMPLE_EDGE]
                |  Reduce Output Operator [RS_2]
                |     key expressions:key (type: int)
                |     Map-reduce partition columns:key (type: int)
                |     sort order:+
-               |     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:value (type: int)
                |     TableScan [TS_0]
                |        alias:a
-               |        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |<-Map 3 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_3]
                      key expressions:key (type: int)
                      Map-reduce partition columns:key (type: int)
                      sort order:+
-                     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                      value expressions:value (type: int)
                      TableScan [TS_1]
                         alias:b
-                        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: explain select /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key
 PREHOOK: type: QUERY
@@ -6217,36 +6217,36 @@ Stage-0
          Reducer 2
          File Output Operator [FS_6]
             compressed:true
-            Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+            Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
             Select Operator [SEL_5]
                outputColumnNames:["_col0","_col1","_col2","_col3"]
-               Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                Merge Join Operator [MERGEJOIN_7]
                |  condition map:[{"":"Left Outer Join0 to 1"}]
                |  keys:{"0":"key (type: int)","1":"key (type: int)"}
                |  outputColumnNames:["_col0","_col1","_col5","_col6"]
-               |  Statistics:Num rows: 24 Data size: 174 Basic stats: COMPLETE Column stats: NONE
+               |  Statistics:Num rows: 14 Data size: 122 Basic stats: COMPLETE Column stats: NONE
                |<-Map 1 [SIMPLE_EDGE]
                |  Reduce Output Operator [RS_2]
                |     key expressions:key (type: int)
                |     Map-reduce partition columns:key (type: int)
                |     sort order:+
-               |     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |     value expressions:value (type: int)
                |     TableScan [TS_0]
                |        alias:a
-               |        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+               |        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                |<-Map 3 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_3]
                      key expressions:key (type: int)
                      Map-reduce partition columns:key (type: int)
                      sort order:+
-                     Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                     Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
                      value expressions:value (type: int)
                      TableScan [TS_1]
                         alias:b
-                        Statistics:Num rows: 22 Data size: 159 Basic stats: COMPLETE Column stats: NONE
+                        Statistics:Num rows: 13 Data size: 111 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: drop table sales
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/86e1c89e/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
index 182d6f7..44f4568 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
@@ -4299,7 +4299,6 @@ STAGE PLANS:
                       input vertices:
                         1 Reducer 4
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/86e1c89e/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out b/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
index a0771b3..9942629 100644
--- a/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_groupby_reduce.q.out
@@ -378,6 +378,7 @@ STAGE PLANS:
                         Statistics: Num rows: 1000 Data size: 88276 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: int)
@@ -398,8 +399,8 @@ STAGE PLANS:
                       key expressions: _col0 (type: int)
                       sort order: +
                       Statistics: Num rows: 250 Data size: 22069 Basic stats: COMPLETE Column stats: NONE
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int)
@@ -412,7 +413,6 @@ STAGE PLANS:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-            Execution mode: vectorized
 
   Stage: Stage-0
     Fetch Operator
@@ -588,6 +588,7 @@ STAGE PLANS:
                         value expressions: _col2 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
@@ -607,8 +608,8 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: int)
                     Statistics: Num rows: 500 Data size: 44138 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col1 (type: bigint), _col2 (type: bigint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), sum(VALUE._col1)
@@ -621,8 +622,8 @@ STAGE PLANS:
                   sort order: +
                   Statistics: Num rows: 250 Data size: 22069 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint), _col2 (type: bigint)
-            Execution mode: vectorized
         Reducer 4 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: bigint)
@@ -635,7 +636,6 @@ STAGE PLANS:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-            Execution mode: vectorized
 
   Stage: Stage-0
     Fetch Operator
@@ -810,6 +810,7 @@ STAGE PLANS:
                         value expressions: _col2 (type: int)
             Execution mode: vectorized
         Reducer 2 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
@@ -832,8 +833,8 @@ STAGE PLANS:
                       sort order: ++
                       Statistics: Num rows: 250 Data size: 22069 Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col2 (type: bigint)
-            Execution mode: vectorized
         Reducer 3 
+            Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: int), VALUE._col0 (type: bigint)
@@ -846,7 +847,6 @@ STAGE PLANS:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-            Execution mode: vectorized
 
   Stage: Stage-0
     Fetch Operator