You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/12/29 17:12:35 UTC
svn commit: r1648384 - in
/hive/branches/spark/ql/src/test/results/clientpositive/spark:
auto_sortmerge_join_6.q.out auto_sortmerge_join_8.q.out
limit_pushdown.q.out optimize_nullscan.q.out
Author: brock
Date: Mon Dec 29 16:12:34 2014
New Revision: 1648384
URL: http://svn.apache.org/r1648384
Log:
HIVE-9157 - Merge from trunk to spark 12/26/2014 [Spark Branch] (Post Merge Fixes)
Modified:
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out?rev=1648384&r1=1648383&r2=1648384&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out Mon Dec 29 16:12:34 2014
@@ -96,7 +96,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -208,7 +208,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -320,7 +320,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -428,7 +428,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5), Map 5 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3), Map 5 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -624,7 +624,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -732,7 +732,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -840,7 +840,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 5), Map 4 (PARTITION-LEVEL SORT, 5), Map 5 (PARTITION-LEVEL SORT, 5)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3), Map 5 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
@@ -1036,7 +1036,7 @@ STAGE PLANS:
Stage: Stage-1
Spark
Edges:
- Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 7), Map 4 (PARTITION-LEVEL SORT, 7)
+ Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
Reducer 3 <- Reducer 2 (GROUP, 1)
#### A masked pattern was here ####
Vertices:
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out?rev=1648384&r1=1648383&r2=1648384&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out Mon Dec 29 16:12:34 2014
@@ -178,9 +178,6 @@ STAGE PLANS:
Sorted Merge Bucket Map Join Operator
condition map:
Inner Join 0 to 1
- condition expressions:
- 0
- 1
keys:
0 key (type: string)
1 key (type: string)
@@ -212,7 +209,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -235,7 +232,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -260,7 +257,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -283,7 +280,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -418,9 +415,6 @@ STAGE PLANS:
Sorted Merge Bucket Map Join Operator
condition map:
Inner Join 0 to 1
- condition expressions:
- 0
- 1
keys:
0 key (type: string)
1 key (type: string)
@@ -452,7 +446,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -475,7 +469,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -500,7 +494,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -523,7 +517,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -657,9 +651,6 @@ STAGE PLANS:
predicate: key is not null (type: boolean)
Statistics: Num rows: 1 Data size: 114 Basic stats: COMPLETE Column stats: NONE
Spark HashTable Sink Operator
- condition expressions:
- 0
- 1
keys:
0 key (type: string)
1 key (type: string)
@@ -686,7 +677,7 @@ STAGE PLANS:
bucket_count 2
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_small
@@ -709,7 +700,7 @@ STAGE PLANS:
bucket_count 2
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_small
@@ -734,7 +725,7 @@ STAGE PLANS:
bucket_count 2
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_small
@@ -757,7 +748,7 @@ STAGE PLANS:
bucket_count 2
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_small
@@ -793,9 +784,6 @@ STAGE PLANS:
Map Join Operator
condition map:
Inner Join 0 to 1
- condition expressions:
- 0
- 1
keys:
0 key (type: string)
1 key (type: string)
@@ -837,7 +825,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -860,7 +848,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -885,7 +873,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
@@ -908,7 +896,7 @@ STAGE PLANS:
bucket_count 4
bucket_field_name key
columns key,value
- columns.comments
+ columns.comments
columns.types string:string
#### A masked pattern was here ####
name default.bucket_big
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out?rev=1648384&r1=1648383&r2=1648384&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out Mon Dec 29 16:12:34 2014
@@ -810,9 +810,9 @@ STAGE PLANS:
Spark
Edges:
Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
- Reducer 5 <- Map 4 (GROUP, 2)
+ Reducer 5 <- Map 4 (GROUP, 3)
Reducer 6 <- Reducer 5 (GROUP, 1)
- Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 6 (PARTITION-LEVEL SORT, 2)
+ Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 3), Reducer 6 (PARTITION-LEVEL SORT, 3)
#### A masked pattern was here ####
Vertices:
Map 1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out?rev=1648384&r1=1648383&r2=1648384&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out Mon Dec 29 16:12:34 2014
@@ -1788,9 +1788,9 @@ STAGE PLANS:
value expressions: key (type: string)
auto parallelism: false
Path -> Alias:
- -mr-10004default.src{} [s1]
+ -mr-10003default.src{} [s1]
Path -> Partition:
- -mr-10004default.src{}
+ -mr-10003default.src{}
Partition
input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1834,7 +1834,7 @@ STAGE PLANS:
name: default.src
name: default.src
Truncated Path -> Alias:
- -mr-10004default.src{} [s1]
+ -mr-10003default.src{} [s1]
Map 3
Map Operator Tree:
TableScan
@@ -1854,9 +1854,9 @@ STAGE PLANS:
value expressions: key (type: string)
auto parallelism: false
Path -> Alias:
- -mr-10003default.src{} [s2]
+ -mr-10004default.src{} [s2]
Path -> Partition:
- -mr-10003default.src{}
+ -mr-10004default.src{}
Partition
input format: org.apache.hadoop.hive.ql.io.OneNullRowInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -1900,7 +1900,7 @@ STAGE PLANS:
name: default.src
name: default.src
Truncated Path -> Alias:
- -mr-10003default.src{} [s2]
+ -mr-10004default.src{} [s2]
Reducer 2
Needs Tagging: true
Reduce Operator Tree: