diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkJoinDeDuplication.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkJoinDeDuplication.java index 76fea3adaf..0e8c2fb858 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkJoinDeDuplication.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/ReduceSinkJoinDeDuplication.java @@ -127,6 +127,10 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, // Already set return false; } + if( cRS.getConf().isOrdering()) { + // 1-1 edge is skipped for sorted shuffle + return false; + } if (cRS.getConf().getKeyCols().isEmpty()) { // Not supported return false; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java index 2877479edb..9a7d48d755 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java @@ -529,8 +529,13 @@ private static void findRoots(Operator op, List> ops) { return child; } - public static EdgeType determineEdgeType(BaseWork preceedingWork, BaseWork followingWork, ReduceSinkOperator reduceSinkOperator) { - if(reduceSinkOperator.getConf().isForwarding()) { + public static EdgeType determineEdgeType(BaseWork preceedingWork, BaseWork followingWork, + ReduceSinkOperator reduceSinkOperator) { + // The 1-1 edge should also work for sorted cases, however depending on the details of the shuffle + // this might end up writing multiple compressed files or end up using an in-memory partitioned kv writer + // the condition about ordering = false can be removed at some point with a tweak to the unordered writer + // to never split a single output across multiple files (and never attempt a final merge) + if (reduceSinkOperator.getConf().isForwarding() && !reduceSinkOperator.getConf().isOrdering()) { return EdgeType.ONE_TO_ONE_EDGE; } if (followingWork instanceof ReduceWork) { @@ -546,7 +551,7 @@ public static EdgeType determineEdgeType(BaseWork preceedingWork, BaseWork follo } } } - if(!reduceSinkOperator.getConf().isOrdering()) { + if (!reduceSinkOperator.getConf().isOrdering()) { //if no sort keys are specified, use an edge that does not sort return EdgeType.CUSTOM_SIMPLE_EDGE; } diff --git a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out index 8270c724b2..36ca3ce2a5 100644 --- a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out +++ b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out @@ -1742,7 +1742,7 @@ STAGE PLANS: Tez Edges: Reducer 2 <- Map 1 (SIMPLE_EDGE) - Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (ONE_TO_ONE_EDGE) + Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) Reducer 5 <- Reducer 3 (SIMPLE_EDGE) Reducer 6 <- Reducer 3 (SIMPLE_EDGE) @@ -1765,11 +1765,10 @@ STAGE PLANS: vectorProcessingMode: HASH projectedOutputColumnNums: [] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 0:string, 1:string, 2:string, 3:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 0:string, 1:string, 2:string, 3:string Execution mode: vectorized, llap LLAP IO: may be used (ACID table) Map Vectorization: @@ -1794,11 +1793,10 @@ STAGE PLANS: native: true vectorizationSchemaColumns: [0:key:string, 1:value:string, 2:ds:string, 3:hr:string, 4:ROW__ID:struct] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 2:string, 3:string, 0:string, 1:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 2:string, 3:string, 0:string, 1:string valueColumns: 4:struct Execution mode: vectorized, llap LLAP IO: may be used (ACID table) @@ -1843,11 +1841,10 @@ STAGE PLANS: vectorProcessingMode: MERGE_PARTIAL projectedOutputColumnNums: [] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 0:string, 1:string, 2:string, 3:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 0:string, 1:string, 2:string, 3:string Select Vectorization: className: VectorSelectOperator native: true @@ -2592,7 +2589,7 @@ STAGE PLANS: Tez Edges: Reducer 2 <- Map 1 (SIMPLE_EDGE) - Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (ONE_TO_ONE_EDGE) + Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) Reducer 5 <- Reducer 3 (SIMPLE_EDGE) Reducer 6 <- Reducer 3 (SIMPLE_EDGE) @@ -2616,11 +2613,10 @@ STAGE PLANS: vectorProcessingMode: HASH projectedOutputColumnNums: [] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 0:string, 1:string, 2:string, 3:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 0:string, 1:string, 2:string, 3:string Execution mode: vectorized, llap LLAP IO: may be used (ACID table) Map Vectorization: @@ -2645,11 +2641,10 @@ STAGE PLANS: native: true vectorizationSchemaColumns: [0:key:string, 1:value:string, 2:ds:string, 3:hr:string, 4:ROW__ID:struct] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 2:string, 3:string, 0:string, 1:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 2:string, 3:string, 0:string, 1:string valueColumns: 4:struct Execution mode: vectorized, llap LLAP IO: may be used (ACID table) @@ -2694,11 +2689,10 @@ STAGE PLANS: vectorProcessingMode: MERGE_PARTIAL projectedOutputColumnNums: [] Reduce Sink Vectorization: - className: VectorReduceSinkObjectHashOperator + className: VectorReduceSinkMultiKeyOperator keyColumns: 0:string, 1:string, 2:string, 3:string native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - partitionColumns: 0:string, 1:string, 2:string, 3:string Select Vectorization: className: VectorSelectOperator native: true diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out index 77bc231b11..81d69b18ed 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out @@ -702,7 +702,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 7 (ONE_TO_ONE_EDGE) + Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE) Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE) Reducer 4 <- Reducer 2 (SIMPLE_EDGE) Reducer 6 <- Map 5 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) @@ -1679,7 +1679,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 7 (ONE_TO_ONE_EDGE) + Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE) Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE) Reducer 4 <- Reducer 2 (SIMPLE_EDGE) Reducer 6 <- Map 5 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) diff --git a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out index 4594be81fb..ec4c02408b 100644 --- a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out +++ b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out @@ -44,7 +44,7 @@ STAGE PLANS: #### A masked pattern was here #### Edges: Reducer 2 <- Map 1 (SIMPLE_EDGE) - Reducer 3 <- Reducer 2 (ONE_TO_ONE_EDGE) + Reducer 3 <- Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE) Reducer 5 <- Reducer 3 (CUSTOM_SIMPLE_EDGE) #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/perf/tez/query10.q.out b/ql/src/test/results/clientpositive/perf/tez/query10.q.out index 5bfaf0689e..e6b57b87e5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query10.q.out @@ -146,8 +146,8 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE) Reducer 20 <- Reducer 19 (SIMPLE_EDGE) Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 14 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 18 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 20 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 18 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 20 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (SIMPLE_EDGE) Reducer 9 <- Reducer 5 (CUSTOM_SIMPLE_EDGE) @@ -181,13 +181,13 @@ Stage-0 predicate:(_col14 is not null or _col16 is not null) Merge Join Operator [MERGEJOIN_181] (rows=52 width=379) Conds:RS_61._col0=RS_219._col1(Left Outer),Output:["_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col16"] - <-Reducer 5 [ONE_TO_ONE_EDGE] + <-Reducer 5 [SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_61] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_180] (rows=53 width=379) Conds:RS_58._col0=RS_211._col1(Left Outer),Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"] - <-Reducer 4 [ONE_TO_ONE_EDGE] - FORWARD [RS_58] + <-Reducer 4 [SIMPLE_EDGE] + SHUFFLE [RS_58] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_179] (rows=20705 width=375) Conds:RS_55._col0=RS_56._col0(Left Semi),Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] @@ -266,8 +266,8 @@ Stage-0 predicate:((ca_county) IN ('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona Ana County') and ca_address_sk is not null) TableScan [TS_3] (rows=40000000 width=102) default@customer_address,ca,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_county"] - <-Reducer 18 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_211] + <-Reducer 18 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_211] PartitionCols:_col1 Select Operator [SEL_210] (rows=155749 width=7) Output:["_col0","_col1"] @@ -298,14 +298,14 @@ Stage-0 Group By Operator [GBY_204] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] - FORWARD [RS_151] + SHUFFLE [RS_151] Group By Operator [GBY_150] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] Select Operator [SEL_149] (rows=20705 width=4) Output:["_col0"] Please refer to the previous Merge Join Operator [MERGEJOIN_179] - <-Reducer 20 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_219] + <-Reducer 20 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_219] PartitionCols:_col1 Select Operator [SEL_218] (rows=153181 width=7) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query14.q.out b/ql/src/test/results/clientpositive/perf/tez/query14.q.out index a887c504da..f283414975 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query14.q.out @@ -234,31 +234,31 @@ Map 80 <- Reducer 23 (BROADCAST_EDGE) Reducer 11 <- Map 10 (CUSTOM_SIMPLE_EDGE) Reducer 12 <- Map 10 (SIMPLE_EDGE), Map 79 (SIMPLE_EDGE) Reducer 13 <- Map 24 (SIMPLE_EDGE), Reducer 12 (SIMPLE_EDGE) -Reducer 14 <- Reducer 13 (ONE_TO_ONE_EDGE), Reducer 33 (SIMPLE_EDGE) +Reducer 14 <- Reducer 13 (SIMPLE_EDGE), Reducer 33 (SIMPLE_EDGE) Reducer 15 <- Reducer 14 (SIMPLE_EDGE) Reducer 16 <- Reducer 15 (CUSTOM_SIMPLE_EDGE), Reducer 60 (CUSTOM_SIMPLE_EDGE), Union 7 (CONTAINS) Reducer 17 <- Map 10 (CUSTOM_SIMPLE_EDGE) Reducer 18 <- Map 10 (SIMPLE_EDGE), Map 80 (SIMPLE_EDGE) Reducer 19 <- Map 24 (SIMPLE_EDGE), Reducer 18 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE) -Reducer 20 <- Reducer 19 (ONE_TO_ONE_EDGE), Reducer 37 (SIMPLE_EDGE) +Reducer 20 <- Reducer 19 (SIMPLE_EDGE), Reducer 37 (SIMPLE_EDGE) Reducer 21 <- Reducer 20 (SIMPLE_EDGE) Reducer 22 <- Reducer 21 (CUSTOM_SIMPLE_EDGE), Reducer 63 (CUSTOM_SIMPLE_EDGE), Union 7 (CONTAINS) Reducer 23 <- Map 10 (CUSTOM_SIMPLE_EDGE) -Reducer 25 <- Map 24 (SIMPLE_EDGE), Reducer 29 (ONE_TO_ONE_EDGE) +Reducer 25 <- Map 24 (SIMPLE_EDGE), Reducer 29 (SIMPLE_EDGE) Reducer 26 <- Map 24 (SIMPLE_EDGE), Reducer 47 (SIMPLE_EDGE) Reducer 27 <- Reducer 26 (SIMPLE_EDGE), Union 28 (CONTAINS) Reducer 29 <- Union 28 (SIMPLE_EDGE) Reducer 3 <- Map 24 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 30 <- Reducer 26 (SIMPLE_EDGE), Union 31 (CONTAINS) Reducer 32 <- Union 31 (SIMPLE_EDGE) -Reducer 33 <- Map 24 (SIMPLE_EDGE), Reducer 32 (ONE_TO_ONE_EDGE) +Reducer 33 <- Map 24 (SIMPLE_EDGE), Reducer 32 (SIMPLE_EDGE) Reducer 34 <- Reducer 26 (SIMPLE_EDGE), Union 35 (CONTAINS) Reducer 36 <- Union 35 (SIMPLE_EDGE) -Reducer 37 <- Map 24 (SIMPLE_EDGE), Reducer 36 (ONE_TO_ONE_EDGE) +Reducer 37 <- Map 24 (SIMPLE_EDGE), Reducer 36 (SIMPLE_EDGE) Reducer 38 <- Map 24 (SIMPLE_EDGE), Reducer 50 (SIMPLE_EDGE) Reducer 39 <- Reducer 38 (SIMPLE_EDGE), Union 28 (CONTAINS) -Reducer 4 <- Reducer 25 (SIMPLE_EDGE), Reducer 3 (ONE_TO_ONE_EDGE) +Reducer 4 <- Reducer 25 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) Reducer 40 <- Reducer 38 (SIMPLE_EDGE), Union 31 (CONTAINS) Reducer 41 <- Reducer 38 (SIMPLE_EDGE), Union 35 (CONTAINS) Reducer 42 <- Map 24 (SIMPLE_EDGE), Reducer 52 (SIMPLE_EDGE) @@ -336,8 +336,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3"] Merge Join Operator [MERGEJOIN_1168] (rows=1 width=128) Conds:RS_238._col1=RS_239._col0(Left Semi),Output:["_col2","_col3","_col6","_col7","_col8"] - <-Reducer 13 [ONE_TO_ONE_EDGE] - FORWARD [RS_238] + <-Reducer 13 [SIMPLE_EDGE] + SHUFFLE [RS_238] PartitionCols:_col1 Merge Join Operator [MERGEJOIN_1144] (rows=7790806 width=110) Conds:RS_233._col1=RS_1326._col0(Inner),Output:["_col1","_col2","_col3","_col6","_col7","_col8"] @@ -399,8 +399,8 @@ Stage-0 Filter Operator [FIL_1309] (rows=458612 width=15) predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] - <-Reducer 32 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_1355] + <-Reducer 32 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_1355] PartitionCols:_col0, _col1, _col2 Select Operator [SEL_1354] (rows=1 width=12) Output:["_col0","_col1","_col2"] @@ -716,8 +716,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3"] Merge Join Operator [MERGEJOIN_1169] (rows=1 width=128) Conds:RS_385._col1=RS_386._col0(Left Semi),Output:["_col2","_col3","_col6","_col7","_col8"] - <-Reducer 19 [ONE_TO_ONE_EDGE] - FORWARD [RS_385] + <-Reducer 19 [SIMPLE_EDGE] + SHUFFLE [RS_385] PartitionCols:_col1 Merge Join Operator [MERGEJOIN_1156] (rows=3942084 width=130) Conds:RS_380._col1=RS_1328._col0(Inner),Output:["_col1","_col2","_col3","_col6","_col7","_col8"] @@ -773,8 +773,8 @@ Stage-0 Filter Operator [FIL_1311] (rows=458612 width=15) predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] - <-Reducer 36 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_1371] + <-Reducer 36 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_1371] PartitionCols:_col0, _col1, _col2 Select Operator [SEL_1370] (rows=1 width=12) Output:["_col0","_col1","_col2"] @@ -922,8 +922,8 @@ Stage-0 Filter Operator [FIL_1304] (rows=458612 width=15) predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] - <-Reducer 29 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_1333] + <-Reducer 29 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_1333] PartitionCols:_col0, _col1, _col2 Select Operator [SEL_1332] (rows=1 width=12) Output:["_col0","_col1","_col2"] @@ -965,8 +965,8 @@ Stage-0 SHUFFLE [RS_70] PartitionCols:_col0, _col1, _col2 Please refer to the previous Group By Operator [GBY_69] - <-Reducer 3 [ONE_TO_ONE_EDGE] - FORWARD [RS_92] + <-Reducer 3 [SIMPLE_EDGE] + SHUFFLE [RS_92] PartitionCols:_col1 Merge Join Operator [MERGEJOIN_1132] (rows=15062131 width=15) Conds:RS_87._col1=RS_1321._col0(Inner),Output:["_col1","_col2","_col3","_col6","_col7","_col8"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query16.q.out b/ql/src/test/results/clientpositive/perf/tez/query16.q.out index 8c5fa3991a..fc72b5d2b3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query16.q.out @@ -81,7 +81,7 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE) Reducer 3 <- Map 11 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Map 13 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) Reducer 5 <- Map 14 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) -Reducer 6 <- Reducer 16 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 6 <- Reducer 16 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (CUSTOM_SIMPLE_EDGE) Reducer 9 <- Reducer 4 (CUSTOM_SIMPLE_EDGE) @@ -111,8 +111,8 @@ Stage-0 predicate:_col13 is null Merge Join Operator [MERGEJOIN_126] (rows=10300512 width=214) Conds:RS_38._col4=RS_155._col1(Left Outer),Output:["_col4","_col5","_col6","_col13"] - <-Reducer 16 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_155] + <-Reducer 16 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_155] PartitionCols:_col1 Select Operator [SEL_154] (rows=18238808 width=8) Output:["_col0","_col1"] @@ -127,8 +127,8 @@ Stage-0 predicate:cr_order_number is not null TableScan [TS_25] (rows=28798881 width=4) default@catalog_returns,cr1,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_order_number"] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_38] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_38] PartitionCols:_col4 Select Operator [SEL_37] (rows=5150256 width=200) Output:["_col4","_col5","_col6"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query2.q.out b/ql/src/test/results/clientpositive/perf/tez/query2.q.out index 45161a07ab..5a8b0c99a3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query2.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query2.q.out @@ -131,10 +131,10 @@ Map 1 <- Union 2 (CONTAINS) Map 9 <- Union 2 (CONTAINS) Reducer 3 <- Map 10 (SIMPLE_EDGE), Union 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Map 11 (SIMPLE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 5 (ONE_TO_ONE_EDGE), Reducer 8 (SIMPLE_EDGE) +Reducer 5 <- Map 11 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 5 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) -Reducer 8 <- Map 11 (SIMPLE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) +Reducer 8 <- Map 11 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) Stage-0 Fetch Operator @@ -150,8 +150,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Merge Join Operator [MERGEJOIN_146] (rows=70850 width=1572) Conds:RS_53._col0=RS_54.(_col0 - 53)(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col10","_col11","_col12","_col13","_col14","_col15","_col16"] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_53] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_53] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_143] (rows=652 width=788) Conds:RS_164._col0=RS_170._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] @@ -164,8 +164,8 @@ Stage-0 predicate:((d_year = 2001) and d_week_seq is not null) TableScan [TS_20] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_week_seq","d_year"] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_164] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_164] PartitionCols:_col0 Group By Operator [GBY_163] (rows=13152 width=788) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)"],keys:KEY._col0 @@ -219,8 +219,8 @@ Stage-0 Filter Operator [FIL_167] (rows=652 width=8) predicate:((d_year = 2002) and d_week_seq is not null) Please refer to the previous TableScan [TS_20] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_165] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_165] PartitionCols:_col0 Please refer to the previous Group By Operator [GBY_163] diff --git a/ql/src/test/results/clientpositive/perf/tez/query31.q.out b/ql/src/test/results/clientpositive/perf/tez/query31.q.out index 84039d53df..0359a5e63f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query31.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query31.q.out @@ -131,8 +131,8 @@ Reducer 18 <- Map 35 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 19 <- Map 32 (SIMPLE_EDGE), Reducer 18 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 20 <- Reducer 19 (SIMPLE_EDGE) -Reducer 21 <- Reducer 20 (ONE_TO_ONE_EDGE), Reducer 26 (ONE_TO_ONE_EDGE) -Reducer 22 <- Reducer 21 (ONE_TO_ONE_EDGE), Reducer 30 (ONE_TO_ONE_EDGE) +Reducer 21 <- Reducer 20 (SIMPLE_EDGE), Reducer 26 (SIMPLE_EDGE) +Reducer 22 <- Reducer 21 (SIMPLE_EDGE), Reducer 30 (SIMPLE_EDGE) Reducer 23 <- Map 8 (CUSTOM_SIMPLE_EDGE) Reducer 24 <- Map 36 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 25 <- Map 32 (SIMPLE_EDGE), Reducer 24 (SIMPLE_EDGE) @@ -144,9 +144,9 @@ Reducer 3 <- Map 32 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 30 <- Reducer 29 (SIMPLE_EDGE) Reducer 31 <- Map 8 (CUSTOM_SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 12 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 16 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) -Reducer 7 <- Reducer 22 (ONE_TO_ONE_EDGE), Reducer 6 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 12 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 16 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) +Reducer 7 <- Reducer 22 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE) Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE) Stage-0 @@ -161,18 +161,18 @@ Stage-0 predicate:(CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END) Merge Join Operator [MERGEJOIN_450] (rows=440 width=778) Conds:RS_133._col0=RS_134._col0(Inner),Output:["_col1","_col2","_col4","_col6","_col7","_col8","_col9","_col11","_col13"] - <-Reducer 22 [ONE_TO_ONE_EDGE] - FORWARD [RS_134] + <-Reducer 22 [SIMPLE_EDGE] + SHUFFLE [RS_134] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_448] (rows=1605 width=434) Conds:RS_123._col0=RS_538._col0(Inner),Output:["_col0","_col1","_col3","_col5"] - <-Reducer 21 [ONE_TO_ONE_EDGE] - FORWARD [RS_123] + <-Reducer 21 [SIMPLE_EDGE] + SHUFFLE [RS_123] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_447] (rows=1605 width=322) Conds:RS_524._col0=RS_531._col0(Inner),Output:["_col0","_col1","_col3"] - <-Reducer 20 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_524] + <-Reducer 20 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_524] PartitionCols:_col0 Group By Operator [GBY_523] (rows=1605 width=210) Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0 @@ -226,8 +226,8 @@ Stage-0 Select Operator [SEL_470] (rows=130 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_460] - <-Reducer 26 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_531] + <-Reducer 26 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_531] PartitionCols:_col0 Group By Operator [GBY_530] (rows=1605 width=210) Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0 @@ -275,8 +275,8 @@ Stage-0 Select Operator [SEL_472] (rows=130 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_461] - <-Reducer 30 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_538] + <-Reducer 30 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_538] PartitionCols:_col0 Group By Operator [GBY_537] (rows=1605 width=210) Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0 @@ -324,13 +324,13 @@ Stage-0 Select Operator [SEL_474] (rows=130 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_462] - <-Reducer 6 [ONE_TO_ONE_EDGE] - FORWARD [RS_133] + <-Reducer 6 [SIMPLE_EDGE] + SHUFFLE [RS_133] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_449] (rows=440 width=442) Conds:RS_130._col0=RS_517._col0(Inner),Output:["_col0","_col1","_col2","_col4","_col6","_col7"] - <-Reducer 16 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_517] + <-Reducer 16 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_517] PartitionCols:_col0 Select Operator [SEL_516] (rows=440 width=214) Output:["_col0","_col1","_col2"] @@ -380,13 +380,13 @@ Stage-0 Select Operator [SEL_468] (rows=130 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_459] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_130] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_130] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_446] (rows=440 width=326) Conds:RS_502._col0=RS_509._col0(Inner),Output:["_col0","_col1","_col2","_col4"] - <-Reducer 12 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_509] + <-Reducer 12 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_509] PartitionCols:_col0 Group By Operator [GBY_508] (rows=440 width=210) Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0 @@ -434,8 +434,8 @@ Stage-0 Select Operator [SEL_466] (rows=130 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_458] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_502] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_502] PartitionCols:_col0 Select Operator [SEL_501] (rows=440 width=214) Output:["_col0","_col1","_col2"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query32.q.out b/ql/src/test/results/clientpositive/perf/tez/query32.q.out index 97beaf5682..e7360296a0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query32.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query32.q.out @@ -67,7 +67,7 @@ Map 1 <- Reducer 10 (BROADCAST_EDGE) Reducer 10 <- Map 9 (CUSTOM_SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) -Reducer 4 <- Reducer 3 (ONE_TO_ONE_EDGE), Reducer 7 (ONE_TO_ONE_EDGE) +Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE) Reducer 5 <- Reducer 4 (CUSTOM_SIMPLE_EDGE) Reducer 6 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) @@ -90,8 +90,8 @@ Stage-0 predicate:(_col2 > _col6) Merge Join Operator [MERGEJOIN_103] (rows=97 width=113) Conds:RS_30._col4=RS_125._col0(Inner),Output:["_col2","_col6"] - <-Reducer 3 [ONE_TO_ONE_EDGE] - FORWARD [RS_30] + <-Reducer 3 [SIMPLE_EDGE] + SHUFFLE [RS_30] PartitionCols:_col4 Merge Join Operator [MERGEJOIN_101] (rows=441513 width=4) Conds:RS_27._col1=RS_106._col0(Inner),Output:["_col2","_col4"] @@ -138,8 +138,8 @@ Stage-0 predicate:(CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] - <-Reducer 7 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_125] + <-Reducer 7 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_125] PartitionCols:_col0 Select Operator [SEL_124] (rows=6917 width=116) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query33.q.out b/ql/src/test/results/clientpositive/perf/tez/query33.q.out index b0f0d86027..36e9bd5627 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query33.q.out @@ -173,7 +173,7 @@ Reducer 15 <- Map 14 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE) Reducer 16 <- Map 25 (SIMPLE_EDGE), Reducer 15 (SIMPLE_EDGE) Reducer 18 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 19 <- Map 17 (SIMPLE_EDGE), Map 26 (SIMPLE_EDGE) -Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (ONE_TO_ONE_EDGE) +Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (SIMPLE_EDGE) Reducer 20 <- Map 25 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE) Reducer 21 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 22 <- Map 17 (SIMPLE_EDGE), Map 27 (SIMPLE_EDGE) @@ -229,8 +229,8 @@ Stage-0 predicate:(i_manufact_id is not null and i_item_sk is not null) TableScan [TS_0] (rows=462000 width=7) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_manufact_id"] - <-Reducer 13 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_325] + <-Reducer 13 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_325] PartitionCols:_col0 Group By Operator [GBY_324] (rows=69 width=4) Output:["_col0"],keys:KEY._col0 diff --git a/ql/src/test/results/clientpositive/perf/tez/query35.q.out b/ql/src/test/results/clientpositive/perf/tez/query35.q.out index 9c90dd8add..fd21fc9580 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query35.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query35.q.out @@ -142,8 +142,8 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE) Reducer 20 <- Reducer 19 (SIMPLE_EDGE) Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 14 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 18 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 20 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 18 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 20 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (SIMPLE_EDGE) Reducer 9 <- Reducer 5 (CUSTOM_SIMPLE_EDGE) @@ -177,13 +177,13 @@ Stage-0 predicate:(_col11 is not null or _col13 is not null) Merge Join Operator [MERGEJOIN_182] (rows=61 width=276) Conds:RS_61._col0=RS_220._col1(Left Outer),Output:["_col4","_col6","_col7","_col8","_col9","_col10","_col11","_col13"] - <-Reducer 5 [ONE_TO_ONE_EDGE] + <-Reducer 5 [SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_61] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_181] (rows=62 width=276) Conds:RS_58._col0=RS_212._col1(Left Outer),Output:["_col0","_col4","_col6","_col7","_col8","_col9","_col10","_col11"] - <-Reducer 4 [ONE_TO_ONE_EDGE] - FORWARD [RS_58] + <-Reducer 4 [SIMPLE_EDGE] + SHUFFLE [RS_58] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_180] (rows=148065 width=272) Conds:RS_55._col0=RS_56._col0(Left Semi),Output:["_col0","_col4","_col6","_col7","_col8","_col9","_col10"] @@ -262,8 +262,8 @@ Stage-0 predicate:ca_address_sk is not null TableScan [TS_3] (rows=40000000 width=90) default@customer_address,ca,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state"] - <-Reducer 18 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_212] + <-Reducer 18 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_212] PartitionCols:_col1 Select Operator [SEL_211] (rows=168147 width=7) Output:["_col0","_col1"] @@ -294,14 +294,14 @@ Stage-0 Group By Operator [GBY_205] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] - FORWARD [RS_152] + SHUFFLE [RS_152] Group By Operator [GBY_151] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] Select Operator [SEL_150] (rows=148065 width=4) Output:["_col0"] Please refer to the previous Merge Join Operator [MERGEJOIN_180] - <-Reducer 20 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_220] + <-Reducer 20 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_220] PartitionCols:_col1 Select Operator [SEL_219] (rows=165374 width=7) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query45.q.out b/ql/src/test/results/clientpositive/perf/tez/query45.q.out index c6c224953d..8f04890e93 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query45.q.out @@ -63,7 +63,7 @@ Reducer 3 <- Reducer 10 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 17 (CUSTOM_SIMPLE_EDGE), Reducer 3 (CUSTOM_SIMPLE_EDGE) Reducer 5 <- Reducer 4 (SIMPLE_EDGE) Reducer 6 <- Reducer 5 (SIMPLE_EDGE) -Reducer 9 <- Map 8 (SIMPLE_EDGE), Reducer 11 (ONE_TO_ONE_EDGE) +Reducer 9 <- Map 8 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE) Stage-0 Fetch Operator @@ -164,8 +164,8 @@ Stage-0 predicate:i_item_sk is not null TableScan [TS_6] (rows=462000 width=104) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"] - <-Reducer 11 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_149] + <-Reducer 11 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_149] PartitionCols:_col0 Select Operator [SEL_148] (rows=5 width=104) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query56.q.out b/ql/src/test/results/clientpositive/perf/tez/query56.q.out index 7191245477..d8cc655070 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query56.q.out @@ -159,7 +159,7 @@ Reducer 15 <- Map 14 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE) Reducer 16 <- Map 25 (SIMPLE_EDGE), Reducer 15 (SIMPLE_EDGE) Reducer 18 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 19 <- Map 17 (SIMPLE_EDGE), Map 26 (SIMPLE_EDGE) -Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (ONE_TO_ONE_EDGE) +Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (SIMPLE_EDGE) Reducer 20 <- Map 25 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE) Reducer 21 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 22 <- Map 17 (SIMPLE_EDGE), Map 27 (SIMPLE_EDGE) @@ -215,8 +215,8 @@ Stage-0 predicate:(i_item_id is not null and i_item_sk is not null) TableScan [TS_0] (rows=462000 width=104) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"] - <-Reducer 13 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_325] + <-Reducer 13 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_325] PartitionCols:_col0 Group By Operator [GBY_324] (rows=10500 width=100) Output:["_col0"],keys:KEY._col0 diff --git a/ql/src/test/results/clientpositive/perf/tez/query58.q.out b/ql/src/test/results/clientpositive/perf/tez/query58.q.out index f8e56e18a9..64b0c09c08 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query58.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query58.q.out @@ -150,7 +150,7 @@ Reducer 11 <- Reducer 10 (SIMPLE_EDGE) Reducer 12 <- Map 27 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 13 <- Reducer 12 (SIMPLE_EDGE), Reducer 16 (SIMPLE_EDGE) Reducer 14 <- Reducer 13 (SIMPLE_EDGE) -Reducer 16 <- Map 15 (SIMPLE_EDGE), Reducer 24 (ONE_TO_ONE_EDGE) +Reducer 16 <- Map 15 (SIMPLE_EDGE), Reducer 24 (SIMPLE_EDGE) Reducer 17 <- Reducer 16 (CUSTOM_SIMPLE_EDGE) Reducer 18 <- Reducer 16 (CUSTOM_SIMPLE_EDGE) Reducer 19 <- Reducer 16 (CUSTOM_SIMPLE_EDGE) @@ -161,8 +161,8 @@ Reducer 23 <- Map 25 (SIMPLE_EDGE), Reducer 22 (SIMPLE_EDGE) Reducer 24 <- Reducer 23 (SIMPLE_EDGE) Reducer 3 <- Reducer 16 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 11 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 14 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 11 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 14 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 9 <- Map 26 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) @@ -184,8 +184,8 @@ Stage-0 predicate:(_col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND _col7 and _col1 BETWEEN _col10 AND _col11 and _col5 BETWEEN _col10 AND _col11) Merge Join Operator [MERGEJOIN_419] (rows=1 width=1108) Conds:RS_155._col0=RS_467._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col9","_col10","_col11"] - <-Reducer 14 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_467] + <-Reducer 14 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_467] PartitionCols:_col0 Select Operator [SEL_466] (rows=69 width=436) Output:["_col0","_col1","_col2","_col3"] @@ -212,8 +212,8 @@ Stage-0 predicate:(d_date is not null and d_date_sk is not null) TableScan [TS_6] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] - <-Reducer 24 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_438] + <-Reducer 24 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_438] PartitionCols:_col0 Group By Operator [GBY_437] (rows=2 width=94) Output:["_col0"],keys:KEY._col0 @@ -295,15 +295,15 @@ Stage-0 Select Operator [SEL_361] (rows=2 width=4) Output:["_col0"] Please refer to the previous Merge Join Operator [MERGEJOIN_406] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_155] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_155] PartitionCols:_col0 Filter Operator [FIL_153] (rows=1 width=772) predicate:(_col1 BETWEEN _col6 AND _col7 and _col5 BETWEEN _col2 AND _col3) Merge Join Operator [MERGEJOIN_418] (rows=68 width=772) Conds:RS_451._col0=RS_459._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7"] - <-Reducer 11 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_459] + <-Reducer 11 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_459] PartitionCols:_col0 Select Operator [SEL_458] (rows=69 width=436) Output:["_col0","_col1","_col2","_col3"] @@ -349,8 +349,8 @@ Stage-0 Select Operator [SEL_315] (rows=2 width=4) Output:["_col0"] Please refer to the previous Merge Join Operator [MERGEJOIN_406] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_451] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_451] PartitionCols:_col0 Select Operator [SEL_450] (rows=68 width=436) Output:["_col0","_col1","_col2","_col3"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query60.q.out b/ql/src/test/results/clientpositive/perf/tez/query60.q.out index 712f428178..16a4d6b8e7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query60.q.out @@ -179,7 +179,7 @@ Reducer 15 <- Map 14 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE) Reducer 16 <- Map 25 (SIMPLE_EDGE), Reducer 15 (SIMPLE_EDGE) Reducer 18 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 19 <- Map 17 (SIMPLE_EDGE), Map 26 (SIMPLE_EDGE) -Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (ONE_TO_ONE_EDGE) +Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 13 (SIMPLE_EDGE) Reducer 20 <- Map 25 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE) Reducer 21 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 22 <- Map 17 (SIMPLE_EDGE), Map 27 (SIMPLE_EDGE) @@ -237,8 +237,8 @@ Stage-0 predicate:(i_item_id is not null and i_item_sk is not null) TableScan [TS_0] (rows=462000 width=104) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"] - <-Reducer 13 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_329] + <-Reducer 13 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_329] PartitionCols:_col0 Group By Operator [GBY_328] (rows=23100 width=100) Output:["_col0"],keys:KEY._col0 diff --git a/ql/src/test/results/clientpositive/perf/tez/query64.q.out b/ql/src/test/results/clientpositive/perf/tez/query64.q.out index 797d627a19..92c694d8c7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query64.q.out @@ -277,7 +277,7 @@ Reducer 14 <- Map 53 (SIMPLE_EDGE), Reducer 13 (SIMPLE_EDGE) Reducer 15 <- Map 36 (SIMPLE_EDGE), Reducer 14 (SIMPLE_EDGE) Reducer 16 <- Reducer 15 (SIMPLE_EDGE) Reducer 18 <- Map 17 (SIMPLE_EDGE), Reducer 39 (SIMPLE_EDGE) -Reducer 19 <- Reducer 18 (SIMPLE_EDGE), Reducer 46 (ONE_TO_ONE_EDGE) +Reducer 19 <- Reducer 18 (SIMPLE_EDGE), Reducer 46 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 17 (SIMPLE_EDGE) Reducer 20 <- Map 50 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE) Reducer 21 <- Map 34 (SIMPLE_EDGE), Reducer 20 (SIMPLE_EDGE) @@ -286,7 +286,7 @@ Reducer 23 <- Map 37 (SIMPLE_EDGE), Reducer 22 (SIMPLE_EDGE) Reducer 24 <- Map 52 (SIMPLE_EDGE), Reducer 23 (SIMPLE_EDGE) Reducer 25 <- Map 17 (CUSTOM_SIMPLE_EDGE) Reducer 26 <- Map 17 (SIMPLE_EDGE), Reducer 42 (SIMPLE_EDGE) -Reducer 27 <- Reducer 26 (SIMPLE_EDGE), Reducer 49 (ONE_TO_ONE_EDGE) +Reducer 27 <- Reducer 26 (SIMPLE_EDGE), Reducer 49 (SIMPLE_EDGE) Reducer 28 <- Map 50 (SIMPLE_EDGE), Reducer 27 (SIMPLE_EDGE) Reducer 29 <- Map 34 (SIMPLE_EDGE), Reducer 28 (SIMPLE_EDGE) Reducer 3 <- Map 17 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) @@ -566,8 +566,8 @@ Stage-0 Select Operator [SEL_1124] (rows=652 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_1119] - <-Reducer 46 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_1178] + <-Reducer 46 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_1178] PartitionCols:_col0 Select Operator [SEL_1177] (rows=13257 width=4) Output:["_col0"] @@ -747,8 +747,8 @@ Stage-0 Select Operator [SEL_1126] (rows=652 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_1120] - <-Reducer 49 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_1209] + <-Reducer 49 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_1209] PartitionCols:_col0 Select Operator [SEL_1208] (rows=13257 width=4) Output:["_col0"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query69.q.out b/ql/src/test/results/clientpositive/perf/tez/query69.q.out index c9e4a03425..1bd5cc4a28 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query69.q.out @@ -122,8 +122,8 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE) Reducer 20 <- Reducer 19 (SIMPLE_EDGE) Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 14 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 18 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 20 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 18 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 20 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (SIMPLE_EDGE) Reducer 9 <- Reducer 5 (CUSTOM_SIMPLE_EDGE) @@ -157,7 +157,7 @@ Stage-0 predicate:_col13 is null Merge Join Operator [MERGEJOIN_184] (rows=1 width=363) Conds:RS_63._col0=RS_222._col1(Left Outer),Output:["_col6","_col7","_col8","_col9","_col10","_col13"] - <-Reducer 5 [ONE_TO_ONE_EDGE] + <-Reducer 5 [SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_63] PartitionCols:_col0 Select Operator [SEL_48] (rows=1 width=367) @@ -166,8 +166,8 @@ Stage-0 predicate:_col11 is null Merge Join Operator [MERGEJOIN_183] (rows=30 width=367) Conds:RS_44._col0=RS_214._col1(Left Outer),Output:["_col0","_col6","_col7","_col8","_col9","_col10","_col11"] - <-Reducer 4 [ONE_TO_ONE_EDGE] - FORWARD [RS_44] + <-Reducer 4 [SIMPLE_EDGE] + SHUFFLE [RS_44] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_182] (rows=6239 width=363) Conds:RS_41._col0=RS_42._col0(Left Semi),Output:["_col0","_col6","_col7","_col8","_col9","_col10"] @@ -246,8 +246,8 @@ Stage-0 predicate:((ca_state) IN ('CO', 'IL', 'MN') and ca_address_sk is not null) TableScan [TS_3] (rows=40000000 width=90) default@customer_address,ca,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state"] - <-Reducer 18 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_214] + <-Reducer 18 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_214] PartitionCols:_col1 Select Operator [SEL_213] (rows=116231 width=7) Output:["_col0","_col1"] @@ -278,14 +278,14 @@ Stage-0 Group By Operator [GBY_207] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] - FORWARD [RS_153] + SHUFFLE [RS_153] Group By Operator [GBY_152] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] Select Operator [SEL_151] (rows=6239 width=4) Output:["_col0"] Please refer to the previous Merge Join Operator [MERGEJOIN_182] - <-Reducer 20 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_222] + <-Reducer 20 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_222] PartitionCols:_col1 Select Operator [SEL_221] (rows=114314 width=7) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query77.q.out b/ql/src/test/results/clientpositive/perf/tez/query77.q.out index 6fb5cbb6f9..e104b89355 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query77.q.out @@ -251,14 +251,14 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE) Reducer 20 <- Map 32 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE) Reducer 21 <- Map 33 (SIMPLE_EDGE), Reducer 20 (SIMPLE_EDGE) Reducer 22 <- Reducer 21 (SIMPLE_EDGE) -Reducer 23 <- Reducer 22 (ONE_TO_ONE_EDGE), Reducer 27 (ONE_TO_ONE_EDGE), Union 6 (CONTAINS) +Reducer 23 <- Reducer 22 (SIMPLE_EDGE), Reducer 27 (SIMPLE_EDGE), Union 6 (CONTAINS) Reducer 24 <- Map 9 (CUSTOM_SIMPLE_EDGE) Reducer 25 <- Map 34 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE) Reducer 26 <- Map 33 (SIMPLE_EDGE), Reducer 25 (SIMPLE_EDGE) Reducer 27 <- Reducer 26 (SIMPLE_EDGE) Reducer 3 <- Map 28 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 13 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE), Union 6 (CONTAINS) +Reducer 5 <- Reducer 13 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE), Union 6 (CONTAINS) Reducer 7 <- Union 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (SIMPLE_EDGE) @@ -364,8 +364,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3","_col4"] Merge Join Operator [MERGEJOIN_323] (rows=44 width=340) Conds:RS_390._col0=RS_395._col0(Left Outer),Output:["_col0","_col1","_col2","_col4","_col5"] - <-Reducer 22 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_390] + <-Reducer 22 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_390] PartitionCols:_col0 Group By Operator [GBY_389] (rows=23 width=228) Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0 @@ -414,8 +414,8 @@ Stage-0 Select Operator [SEL_338] (rows=8116 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_330] - <-Reducer 27 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_395] + <-Reducer 27 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_395] PartitionCols:_col0 Group By Operator [GBY_394] (rows=21 width=228) Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0 @@ -459,8 +459,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3","_col4"] Merge Join Operator [MERGEJOIN_311] (rows=10 width=452) Conds:RS_356._col0=RS_361._col0(Left Outer),Output:["_col0","_col1","_col2","_col4","_col5"] - <-Reducer 13 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_361] + <-Reducer 13 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_361] PartitionCols:_col0 Group By Operator [GBY_360] (rows=10 width=228) Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0 @@ -498,8 +498,8 @@ Stage-0 predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_20] (rows=57591150 width=223) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_356] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_356] PartitionCols:_col0 Group By Operator [GBY_355] (rows=10 width=228) Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0 diff --git a/ql/src/test/results/clientpositive/perf/tez/query78.q.out b/ql/src/test/results/clientpositive/perf/tez/query78.q.out index 85cebfd8fc..30680f73eb 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query78.q.out @@ -143,7 +143,7 @@ Reducer 18 <- Map 17 (SIMPLE_EDGE), Map 19 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 15 (SIMPLE_EDGE) Reducer 21 <- Map 20 (SIMPLE_EDGE), Map 22 (SIMPLE_EDGE) Reducer 3 <- Reducer 2 (SIMPLE_EDGE) -Reducer 4 <- Reducer 3 (ONE_TO_ONE_EDGE), Reducer 9 (ONE_TO_ONE_EDGE) +Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE) Reducer 5 <- Reducer 12 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) Reducer 6 <- Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Map 1 (CUSTOM_SIMPLE_EDGE) @@ -236,8 +236,8 @@ Stage-0 PartitionCols:_col1 Merge Join Operator [MERGEJOIN_222] (rows=9165006707 width=471) Conds:RS_248._col1, _col0=RS_260._col1, _col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col7","_col8","_col9"] - <-Reducer 3 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_248] + <-Reducer 3 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_248] PartitionCols:_col1, _col0 Select Operator [SEL_247] (rows=114214965 width=239) Output:["_col0","_col1","_col2","_col3","_col4"] @@ -292,8 +292,8 @@ Stage-0 predicate:(sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_6] (rows=57591150 width=8) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_ticket_number"] - <-Reducer 9 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_260] + <-Reducer 9 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_260] PartitionCols:_col1, _col0 Select Operator [SEL_259] (rows=40539971 width=239) Output:["_col0","_col1","_col2","_col3","_col4"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query83.q.out b/ql/src/test/results/clientpositive/perf/tez/query83.q.out index 950e99715a..b8b99f160b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query83.q.out @@ -150,14 +150,14 @@ Reducer 11 <- Reducer 10 (SIMPLE_EDGE) Reducer 12 <- Map 22 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 13 <- Reducer 12 (SIMPLE_EDGE), Reducer 16 (SIMPLE_EDGE) Reducer 14 <- Reducer 13 (SIMPLE_EDGE) -Reducer 16 <- Map 15 (SIMPLE_EDGE), Reducer 19 (ONE_TO_ONE_EDGE) +Reducer 16 <- Map 15 (SIMPLE_EDGE), Reducer 19 (SIMPLE_EDGE) Reducer 18 <- Map 17 (SIMPLE_EDGE), Map 20 (SIMPLE_EDGE) Reducer 19 <- Reducer 18 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 3 <- Reducer 16 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 11 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) -Reducer 6 <- Reducer 14 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 11 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 14 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 9 <- Map 21 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) @@ -177,8 +177,8 @@ Stage-0 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Merge Join Operator [MERGEJOIN_363] (rows=57 width=148) Conds:RS_123._col0=RS_398._col0(Inner),Output:["_col0","_col1","_col2","_col4","_col5","_col7","_col8"] - <-Reducer 14 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_398] + <-Reducer 14 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_398] PartitionCols:_col0 Select Operator [SEL_397] (rows=57 width=116) Output:["_col0","_col1","_col2"] @@ -205,8 +205,8 @@ Stage-0 predicate:(d_date is not null and d_date_sk is not null) TableScan [TS_6] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] - <-Reducer 19 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_383] + <-Reducer 19 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_383] PartitionCols:_col0 Group By Operator [GBY_382] (rows=2 width=94) Output:["_col0"],keys:KEY._col0 @@ -260,13 +260,13 @@ Stage-0 predicate:(wr_returned_date_sk is not null and wr_item_sk is not null) TableScan [TS_80] (rows=14398467 width=11) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_returned_date_sk","wr_item_sk","wr_return_quantity"] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_123] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_123] PartitionCols:_col0 Merge Join Operator [MERGEJOIN_362] (rows=60 width=132) Conds:RS_386._col0=RS_392._col0(Inner),Output:["_col0","_col1","_col2","_col4","_col5"] - <-Reducer 11 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_392] + <-Reducer 11 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_392] PartitionCols:_col0 Select Operator [SEL_391] (rows=63 width=116) Output:["_col0","_col1","_col2"] @@ -301,8 +301,8 @@ Stage-0 predicate:(sr_returned_date_sk is not null and sr_item_sk is not null) TableScan [TS_40] (rows=57591150 width=11) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_return_quantity"] - <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_386] + <-Reducer 4 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_386] PartitionCols:_col0 Select Operator [SEL_385] (rows=60 width=116) Output:["_col0","_col1","_col2"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query92.q.out b/ql/src/test/results/clientpositive/perf/tez/query92.q.out index edb8961c47..69b998ea00 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query92.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query92.q.out @@ -71,7 +71,7 @@ Map 1 <- Reducer 10 (BROADCAST_EDGE) Reducer 10 <- Map 9 (CUSTOM_SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) -Reducer 4 <- Reducer 3 (ONE_TO_ONE_EDGE), Reducer 7 (ONE_TO_ONE_EDGE) +Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE) Reducer 5 <- Reducer 4 (CUSTOM_SIMPLE_EDGE) Reducer 6 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) @@ -94,8 +94,8 @@ Stage-0 predicate:(_col2 > _col6) Merge Join Operator [MERGEJOIN_103] (rows=97 width=113) Conds:RS_30._col4=RS_125._col0(Inner),Output:["_col2","_col6"] - <-Reducer 3 [ONE_TO_ONE_EDGE] - FORWARD [RS_30] + <-Reducer 3 [SIMPLE_EDGE] + SHUFFLE [RS_30] PartitionCols:_col4 Merge Join Operator [MERGEJOIN_101] (rows=222882 width=97) Conds:RS_27._col1=RS_106._col0(Inner),Output:["_col2","_col4"] @@ -142,8 +142,8 @@ Stage-0 predicate:(CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] - <-Reducer 7 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_125] + <-Reducer 7 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_125] PartitionCols:_col0 Select Operator [SEL_124] (rows=6950 width=116) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query94.q.out b/ql/src/test/results/clientpositive/perf/tez/query94.q.out index a69beb2053..6a6d53e5bf 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query94.q.out @@ -77,7 +77,7 @@ Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE) Reducer 3 <- Map 11 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Map 13 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) Reducer 5 <- Map 14 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) -Reducer 6 <- Reducer 16 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 6 <- Reducer 16 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (CUSTOM_SIMPLE_EDGE) Reducer 9 <- Reducer 4 (CUSTOM_SIMPLE_EDGE) @@ -107,8 +107,8 @@ Stage-0 predicate:_col13 is null Merge Join Operator [MERGEJOIN_126] (rows=10045750 width=229) Conds:RS_38._col4=RS_155._col1(Left Outer),Output:["_col4","_col5","_col6","_col13"] - <-Reducer 16 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_155] + <-Reducer 16 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_155] PartitionCols:_col1 Select Operator [SEL_154] (rows=8007986 width=8) Output:["_col0","_col1"] @@ -123,8 +123,8 @@ Stage-0 predicate:wr_order_number is not null TableScan [TS_25] (rows=14398467 width=4) default@web_returns,wr1,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_order_number"] - <-Reducer 5 [ONE_TO_ONE_EDGE] - FORWARD [RS_38] + <-Reducer 5 [SIMPLE_EDGE] + SHUFFLE [RS_38] PartitionCols:_col4 Select Operator [SEL_37] (rows=5022875 width=231) Output:["_col4","_col5","_col6"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query95.q.out b/ql/src/test/results/clientpositive/perf/tez/query95.q.out index 49de287689..f15afbed4b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query95.q.out @@ -86,12 +86,12 @@ Reducer 16 <- Map 15 (SIMPLE_EDGE), Map 18 (SIMPLE_EDGE) Reducer 17 <- Reducer 16 (SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE) Reducer 20 <- Map 19 (SIMPLE_EDGE), Map 23 (SIMPLE_EDGE) -Reducer 21 <- Map 24 (SIMPLE_EDGE), Reducer 20 (ONE_TO_ONE_EDGE) +Reducer 21 <- Map 24 (SIMPLE_EDGE), Reducer 20 (SIMPLE_EDGE) Reducer 22 <- Reducer 21 (SIMPLE_EDGE) Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Map 14 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE) -Reducer 5 <- Reducer 17 (ONE_TO_ONE_EDGE), Reducer 4 (SIMPLE_EDGE) -Reducer 6 <- Reducer 22 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) +Reducer 5 <- Reducer 17 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE) +Reducer 6 <- Reducer 22 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE) Reducer 7 <- Reducer 6 (SIMPLE_EDGE) Reducer 8 <- Reducer 7 (CUSTOM_SIMPLE_EDGE) Reducer 9 <- Reducer 5 (CUSTOM_SIMPLE_EDGE) @@ -117,7 +117,7 @@ Stage-0 Output:["_col0","_col2","_col3"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col3 Merge Join Operator [MERGEJOIN_237] (rows=5022875 width=227) Conds:RS_61._col3=RS_279._col0(Inner),Output:["_col3","_col4","_col5"] - <-Reducer 5 [ONE_TO_ONE_EDGE] + <-Reducer 5 [SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_61] PartitionCols:_col3 Merge Join Operator [MERGEJOIN_236] (rows=5022875 width=227) @@ -184,8 +184,8 @@ Stage-0 predicate:(CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00' and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] - <-Reducer 17 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_265] + <-Reducer 17 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_265] PartitionCols:_col0 Group By Operator [GBY_264] (rows=14686712 width=4) Output:["_col0"],keys:KEY._col0 @@ -232,8 +232,8 @@ Stage-0 <-Reducer 10 [BROADCAST_EDGE] vectorized BROADCAST [RS_257] Please refer to the previous Group By Operator [GBY_255] - <-Reducer 22 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_279] + <-Reducer 22 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_279] PartitionCols:_col0 Group By Operator [GBY_278] (rows=8007986 width=4) Output:["_col0"],keys:KEY._col0 @@ -253,8 +253,8 @@ Stage-0 predicate:wr_order_number is not null TableScan [TS_38] (rows=14398467 width=4) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_order_number"] - <-Reducer 20 [ONE_TO_ONE_EDGE] - FORWARD [RS_41] + <-Reducer 20 [SIMPLE_EDGE] + SHUFFLE [RS_41] PartitionCols:_col0 Select Operator [SEL_37] (rows=1411940834 width=4) Output:["_col0"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query97.q.out b/ql/src/test/results/clientpositive/perf/tez/query97.q.out index 5392f2a325..7c8a847951 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query97.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query97.q.out @@ -62,7 +62,7 @@ Map 11 <- Reducer 10 (BROADCAST_EDGE) Reducer 10 <- Map 6 (CUSTOM_SIMPLE_EDGE) Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE) Reducer 3 <- Reducer 2 (SIMPLE_EDGE) -Reducer 4 <- Reducer 3 (ONE_TO_ONE_EDGE), Reducer 9 (ONE_TO_ONE_EDGE) +Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE) Reducer 5 <- Reducer 4 (CUSTOM_SIMPLE_EDGE) Reducer 7 <- Map 6 (CUSTOM_SIMPLE_EDGE) Reducer 8 <- Map 11 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE) @@ -84,8 +84,8 @@ Stage-0 Output:["_col0","_col1","_col2"] Merge Join Operator [MERGEJOIN_68] (rows=19216436912 width=7) Conds:RS_85._col0, _col1=RS_92._col0, _col1(Outer),Output:["_col0","_col2"] - <-Reducer 3 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_85] + <-Reducer 3 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_85] PartitionCols:_col0, _col1 Group By Operator [GBY_84] (rows=95493908 width=6) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 @@ -125,8 +125,8 @@ Stage-0 Select Operator [SEL_72] (rows=317 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_70] - <-Reducer 9 [ONE_TO_ONE_EDGE] vectorized - FORWARD [RS_92] + <-Reducer 9 [SIMPLE_EDGE] vectorized + SHUFFLE [RS_92] PartitionCols:_col0, _col1 Group By Operator [GBY_91] (rows=49393705 width=7) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1