You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2019/07/24 14:13:16 UTC
[hive] branch master updated: HIVE-19113: Bucketing: Make CLUSTERED
BY do CLUSTER BY if no explicit sorting is specified (Jesus Camacho
Rodriguez, reviewed by Vineet Garg)
This is an automated email from the ASF dual-hosted git repository.
jcamacho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new d1343a6 HIVE-19113: Bucketing: Make CLUSTERED BY do CLUSTER BY if no explicit sorting is specified (Jesus Camacho Rodriguez, reviewed by Vineet Garg)
d1343a6 is described below
commit d1343a69e6be7a312b7c0bb2aeebefaa40535b65
Author: Jesus Camacho Rodriguez <jc...@apache.org>
AuthorDate: Thu Jul 18 14:51:50 2019 -0700
HIVE-19113: Bucketing: Make CLUSTERED BY do CLUSTER BY if no explicit sorting is specified (Jesus Camacho Rodriguez, reviewed by Vineet Garg)
Close apache/hive#731
---
.../java/org/apache/hadoop/hive/conf/HiveConf.java | 4 +
.../insert_into_dynamic_partitions.q.out | 9 +-
.../insert_overwrite_dynamic_partitions.q.out | 9 +-
.../org/apache/hadoop/hive/ql/TestAcidOnTez.java | 12 +-
.../ql/txn/compactor/TestCrudCompactorOnTez.java | 8 +-
.../ql/optimizer/SortedDynPartitionOptimizer.java | 10 +-
.../hadoop/hive/ql/parse/SemanticAnalyzer.java | 22 ++--
.../apache/hadoop/hive/ql/TestTxnAddPartition.java | 8 +-
.../org/apache/hadoop/hive/ql/TestTxnCommands.java | 14 +--
.../apache/hadoop/hive/ql/TestTxnCommands2.java | 10 +-
.../apache/hadoop/hive/ql/TestTxnConcatenate.java | 16 +--
.../apache/hadoop/hive/ql/TestTxnNoBuckets.java | 12 +-
.../hadoop/hive/ql/util/TestUpgradeTool.java | 12 +-
.../dynpart_sort_optimization_acid2.q | 1 +
.../results/clientpositive/acid_table_stats.q.out | 12 +-
.../results/clientpositive/autoColumnStats_4.q.out | 9 +-
.../clientpositive/beeline/smb_mapjoin_11.q.out | 119 +++++++++----------
ql/src/test/results/clientpositive/bucket1.q.out | 5 +-
ql/src/test/results/clientpositive/bucket2.q.out | 5 +-
ql/src/test/results/clientpositive/bucket3.q.out | 5 +-
.../dynpart_sort_opt_bucketing.q.out | 7 +-
.../clientpositive/llap/acid_bucket_pruning.q.out | 4 +-
.../clientpositive/llap/acid_no_buckets.q.out | 2 +-
.../llap/acid_vectorization_original.q.out | 12 +-
.../test/results/clientpositive/llap/bucket2.q.out | 7 +-
.../test/results/clientpositive/llap/bucket3.q.out | 7 +-
.../results/clientpositive/llap/bucket_many.q.out | 17 +--
.../clientpositive/llap/bucket_num_reducers.q.out | 7 +-
.../clientpositive/llap/bucket_num_reducers2.q.out | 7 +-
.../clientpositive/llap/check_constraint.q.out | 126 +++++++++++----------
.../clientpositive/llap/default_constraint.q.out | 92 ++++++++-------
.../llap/disable_merge_for_bucketing.q.out | 7 +-
.../llap/dynamic_semijoin_reduction_3.q.out | 27 +++--
.../llap/dynpart_sort_opt_vectorization.q.out | 36 +++---
.../llap/dynpart_sort_optimization.q.out | 16 +--
.../llap/dynpart_sort_optimization_acid.q.out | 2 +-
.../llap/enforce_constraint_notnull.q.out | 99 +++++++++-------
.../llap/insert_into_default_keyword.q.out | 120 +++++++++++---------
.../insert_values_orig_table_use_metadata.q.out | 4 +-
.../clientpositive/llap/load_dyn_part2.q.out | 9 +-
.../llap/murmur_hash_migration.q.out | 28 ++---
.../results/clientpositive/llap/sample10_mm.q.out | 56 ++++-----
.../clientpositive/llap/semijoin_hint.q.out | 18 +--
.../results/clientpositive/llap/sqlmerge.q.out | 18 +--
.../clientpositive/llap/sqlmerge_stats.q.out | 61 +++++-----
.../llap/tez_fixed_bucket_pruning.q.out | 8 +-
.../clientpositive/llap/vector_bucket.q.out | 9 +-
.../vectorized_insert_into_bucketed_table.q.out | 18 +--
.../results/clientpositive/load_dyn_part2.q.out | 7 +-
.../load_static_ptn_into_bucketed_table.q.out | 30 ++---
.../test/results/clientpositive/mm_buckets.q.out | 4 +-
.../results/clientpositive/smb_mapjoin_11.q.out | 119 +++++++++----------
.../results/clientpositive/smb_mapjoin_21.q.out | 7 +-
.../results/clientpositive/spark/bucket2.q.out | 5 +-
.../results/clientpositive/spark/bucket3.q.out | 5 +-
.../spark/disable_merge_for_bucketing.q.out | 5 +-
.../spark/disable_merge_for_bucketing.q.out_spark | 5 +-
.../spark/dynpart_sort_optimization.q.out | 16 +--
.../clientpositive/spark/load_dyn_part2.q.out | 7 +-
.../clientpositive/spark/smb_mapjoin_11.q.out | 9 +-
.../clientpositive/spark/smb_mapjoin_21.q.out | 7 +-
.../results/clientpositive/spark/stats10.q.out | 3 +-
ql/src/test/results/clientpositive/stats10.q.out | 3 +-
.../tez/acid_vectorization_original_tez.q.out | 36 +++---
.../results/clientpositive/vector_bucket.q.out | 7 +-
65 files changed, 756 insertions(+), 645 deletions(-)
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index f002c6e..2b7468a 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2210,6 +2210,10 @@ public class HiveConf extends Configuration {
"not a multiple of each other, bucketed map-side join cannot be performed, and the\n" +
"query will fail if hive.enforce.bucketmapjoin is set to true."),
+ HIVE_SORT_WHEN_BUCKETING("hive.optimize.clustered.sort", true,
+ "When this option is true, when a Hive table was created with a clustered by clause, we will also\n" +
+ "sort by same value (if sort columns were not specified)"),
+
HIVE_ENFORCE_NOT_NULL_CONSTRAINT("hive.constraint.notnull.enforce", true,
"Should \"IS NOT NULL \" constraint be enforced?"),
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
index a1746fc..cc0df62 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
@@ -107,12 +107,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col1 (type: string), _bucket_number (type: string)
- null sort order: aa
- sort order: ++
+ key expressions: _col1 (type: string), _bucket_number (type: string), _col0 (type: int)
+ null sort order: aaa
+ sort order: +++
Map-reduce partition columns: _col1 (type: string)
tag: -1
- value expressions: _col0 (type: int)
auto parallelism: false
Path -> Alias:
#### A masked pattern was here ####
@@ -158,7 +157,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), KEY._col1 (type: string), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: int), KEY._col1 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _bucket_number
File Output Operator
compressed: false
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
index ba3752d..4aeabcf 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
@@ -125,12 +125,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col1 (type: string), _bucket_number (type: string)
- null sort order: aa
- sort order: ++
+ key expressions: _col1 (type: string), _bucket_number (type: string), _col0 (type: int)
+ null sort order: aaa
+ sort order: +++
Map-reduce partition columns: _col1 (type: string)
tag: -1
- value expressions: _col0 (type: int)
auto parallelism: false
Path -> Alias:
#### A masked pattern was here ####
@@ -176,7 +175,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), KEY._col1 (type: string), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: int), KEY._col1 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _bucket_number
File Output Operator
compressed: false
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java
index cfd3bfe..ff8a84f 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestAcidOnTez.java
@@ -730,9 +730,9 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree ~/dev/hiverwgit/itests/h
String[][] expected2 = {
{"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t1\t2", "warehouse/t/delta_0000001_0000001_0000/bucket_00001"},
{"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":0}\t2\t4", "warehouse/t/delta_0000001_0000001_0000/bucket_00000"},
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":2}\t5\t6", "warehouse/t/delta_0000001_0000001_0000/bucket_00001"},
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t5\t6", "warehouse/t/delta_0000001_0000001_0000/bucket_00001"},
{"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":1}\t6\t8", "warehouse/t/delta_0000001_0000001_0000/bucket_00000"},
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t9\t10", "warehouse/t/delta_0000001_0000001_0000/bucket_00001"}
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":2}\t9\t10", "warehouse/t/delta_0000001_0000001_0000/bucket_00001"}
};
Assert.assertEquals("Unexpected row count", expected2.length, rs.size());
for(int i = 0; i < expected2.length; i++) {
@@ -866,14 +866,14 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree ~/dev/hiverwgit/itests/h
runStatementOnDriver("insert into " + tblName + " values(3,2),(3,3),(3,4),(4,2),(4,3),(4,4)", confForTez);
runStatementOnDriver("delete from " + tblName + " where b = 2");
List<String> expectedRs = new ArrayList<>();
- expectedRs.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":0}\t2\t4");
expectedRs.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":1}\t2\t3");
- expectedRs.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":0}\t3\t4");
+ expectedRs.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":2}\t2\t4");
expectedRs.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":1}\t3\t3");
- expectedRs.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t1\t4");
+ expectedRs.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":2}\t3\t4");
expectedRs.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t1\t3");
- expectedRs.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t4\t4");
+ expectedRs.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":2}\t1\t4");
expectedRs.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t4\t3");
+ expectedRs.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":2}\t4\t4");
List<String> rs =
runStatementOnDriver("select ROW__ID, * from " + tblName + " order by ROW__ID.bucketid, ROW__ID", confForTez);
HiveConf.setVar(confForTez, HiveConf.ConfVars.SPLIT_GROUPING_MODE, "compactor");
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
index d59cfe5..3b0d045 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
@@ -166,15 +166,15 @@ public class TestCrudCompactorOnTez {
Assert.fail("Expected: " + Arrays.toString(expectedDeleteDeltas) + ", found: " + Arrays.toString(deleteDeltas));
}
List<String> expectedRsBucket0 = new ArrayList<>();
- expectedRsBucket0.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":0}\t2\t4");
expectedRsBucket0.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":1}\t2\t3");
- expectedRsBucket0.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":0}\t3\t4");
+ expectedRsBucket0.add("{\"writeid\":1,\"bucketid\":536870912,\"rowid\":2}\t2\t4");
expectedRsBucket0.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":1}\t3\t3");
+ expectedRsBucket0.add("{\"writeid\":2,\"bucketid\":536870912,\"rowid\":2}\t3\t4");
List<String> expectedRsBucket1 = new ArrayList<>();
- expectedRsBucket1.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t1\t4");
expectedRsBucket1.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t1\t3");
- expectedRsBucket1.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t4\t4");
+ expectedRsBucket1.add("{\"writeid\":1,\"bucketid\":536936448,\"rowid\":2}\t1\t4");
expectedRsBucket1.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t4\t3");
+ expectedRsBucket1.add("{\"writeid\":2,\"bucketid\":536936448,\"rowid\":2}\t4\t4");
// Bucket 0
List<String> rsBucket0 = executeStatementOnDriverAndReturnResults("select ROW__ID, * from " + tblName
+ " where ROW__ID.bucketid = 536870912 order by ROW__ID", driver);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java
index 318e230..395a8c0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java
@@ -27,8 +27,10 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
+import java.util.stream.Collectors;
import org.apache.hadoop.hive.conf.Constants;
import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Order;
import org.apache.hadoop.hive.ql.exec.ColumnInfo;
@@ -239,6 +241,11 @@ public class SortedDynPartitionOptimizer extends Transform {
// Sort columns specified by table
sortPositions = getSortPositions(destTable.getSortCols(), destTable.getCols());
sortOrder = getSortOrders(destTable.getSortCols(), destTable.getCols());
+ } else if (HiveConf.getBoolVar(this.parseCtx.getConf(), HiveConf.ConfVars.HIVE_SORT_WHEN_BUCKETING) &&
+ !bucketPositions.isEmpty()) {
+ // We use clustered columns as sort columns
+ sortPositions = new ArrayList<>(bucketPositions);
+ sortOrder = sortPositions.stream().map(e -> 1).collect(Collectors.toList());
} else {
// Infer sort columns from operator tree
sortPositions = Lists.newArrayList();
@@ -276,8 +283,7 @@ public class SortedDynPartitionOptimizer extends Transform {
// Create ReduceSink operator
ReduceSinkOperator rsOp = getReduceSinkOp(partitionPositions, sortPositions, sortOrder, sortNullOrder,
- allRSCols, bucketColumns, numBuckets,
- fsParent, fsOp.getConf().getWriteType());
+ allRSCols, bucketColumns, numBuckets, fsParent, fsOp.getConf().getWriteType());
List<ExprNodeDesc> descs = new ArrayList<ExprNodeDesc>(allRSCols.size());
List<String> colNames = new ArrayList<String>();
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index d474578..91106b6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -6845,7 +6845,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
@SuppressWarnings("nls")
private Operator genBucketingSortingDest(String dest, Operator input, QB qb,
- TableDesc table_desc, Table dest_tab, SortBucketRSCtx ctx) throws SemanticException {
+ TableDesc table_desc, Table dest_tab, SortBucketRSCtx ctx) throws SemanticException {
// If the table is bucketed, and bucketing is enforced, do the following:
// If the number of buckets is smaller than the number of maximum reducers,
@@ -6854,10 +6854,9 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
// spray the data into multiple buckets. That way, we can support a very large
// number of buckets without needing a very large number of reducers.
boolean enforceBucketing = false;
- ArrayList<ExprNodeDesc> partnCols = new ArrayList<ExprNodeDesc>();
- ArrayList<ExprNodeDesc> sortCols = new ArrayList<ExprNodeDesc>();
- ArrayList<Integer> sortOrders = new ArrayList<Integer>();
- ArrayList<Integer> nullSortOrders = new ArrayList<Integer>();
+ ArrayList<ExprNodeDesc> partnCols = new ArrayList<>();
+ ArrayList<ExprNodeDesc> sortCols = new ArrayList<>();
+ ArrayList<Integer> sortOrders = new ArrayList<>();
boolean multiFileSpray = false;
int numFiles = 1;
int totalFiles = 1;
@@ -6869,8 +6868,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
} else {
partnCols = getPartitionColsFromBucketCols(dest, qb, dest_tab, table_desc, input, true);
}
- }
- else {
+ } else {
if(updating(dest) || deleting(dest)) {
partnCols = getPartitionColsFromBucketColsForUpdateDelete(input, true);
enforceBucketing = true;
@@ -6884,6 +6882,16 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
if (!enforceBucketing) {
throw new SemanticException(ErrorMsg.TBL_SORTED_NOT_BUCKETED.getErrorCodedMsg(dest_tab.getCompleteName()));
}
+ } else if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_SORT_WHEN_BUCKETING) &&
+ enforceBucketing && !updating(dest) && !deleting(dest)) {
+ sortCols = new ArrayList<>();
+ for (ExprNodeDesc expr : partnCols) {
+ sortCols.add(expr.clone());
+ }
+ sortOrders = new ArrayList<>();
+ for (int i = 0; i < sortCols.size(); i++) {
+ sortOrders.add(DirectionUtils.ASCENDING_CODE);
+ }
}
if (enforceBucketing) {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnAddPartition.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnAddPartition.java
index b02e187..e6bc11e 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnAddPartition.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnAddPartition.java
@@ -228,9 +228,9 @@ public class TestTxnAddPartition extends TxnCommandsBaseForTests {
List<String> rs = runStatementOnDriver(
"select ROW__ID, p, a, b, INPUT__FILE__NAME from T order by p, ROW__ID");
String[][] expected = new String[][]{
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t0\t1\t4",
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t0\t0\t2",
"warehouse/t/p=0/delta_0000001_0000001_0000/000001_0"},
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t0\t0\t2",
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t0\t1\t4",
"warehouse/t/p=0/delta_0000001_0000001_0000/000001_0"}};
checkExpected(rs, expected, "add partition (p=0)");
}
@@ -267,9 +267,9 @@ public class TestTxnAddPartition extends TxnCommandsBaseForTests {
List<String> rs = runStatementOnDriver(
"select ROW__ID, p, a, b, INPUT__FILE__NAME from T order by p, ROW__ID");
String[][] expected = new String[][]{
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t0\t1\t4",
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t0\t0\t2",
"warehouse/t/p=0/delta_0000001_0000001_0000/000001_0"},
- {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t0\t0\t2",
+ {"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t0\t1\t4",
"warehouse/t/p=0/delta_0000001_0000001_0000/000001_0"}};
checkExpected(rs, expected, "add partition (p=0)");
}
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
index 6a2e0ca..4859222 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java
@@ -995,11 +995,11 @@ public class TestTxnCommands extends TxnCommandsBaseForTests {
Assert.assertTrue("At i+1=" + (i+3) + explain.get(i + 3),
explain.get(i + 3).contains("Reducer 4 <- Reducer 2 (SIMPLE_EDGE)"));
Assert.assertTrue("At i+1=" + (i+4) + explain.get(i + 4),
- explain.get(i + 4).contains("Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)"));
+ explain.get(i + 4).contains("Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)"));
Assert.assertTrue("At i+1=" + (i+5) + explain.get(i + 5),
explain.get(i + 5).contains("Reducer 6 <- Reducer 2 (SIMPLE_EDGE)"));
- Assert.assertTrue("At i+1=" + (i+5) + explain.get(i + 5),
- explain.get(i + 6).contains("Reducer 7 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)"));
+ Assert.assertTrue("At i+1=" + (i+6) + explain.get(i + 6),
+ explain.get(i + 6).contains("Reducer 7 <- Reducer 2 (ONE_TO_ONE_EDGE)"));
break;
}
}
@@ -1156,8 +1156,8 @@ public class TestTxnCommands extends TxnCommandsBaseForTests {
String query = "select ROW__ID, a, b" + (isVectorized ? " from " : ", INPUT__FILE__NAME from ") + Table.NONACIDORCTBL + " order by ROW__ID";
String[][] expected = new String[][] {
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":0}\t1\t2", "nonacidorctbl/000001_0"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":1}\t1\t5", "nonacidorctbl/000001_0_copy_1"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t0\t12", "nonacidorctbl/000001_0_copy_1"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":1}\t0\t12", "nonacidorctbl/000001_0_copy_1"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t1\t5", "nonacidorctbl/000001_0_copy_1"},
{"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":0}\t1\t17", "nonacidorctbl/delta_10000001_10000001_0000/bucket_00001"}
};
checkResult(expected, query, isVectorized, "before compact", LOG);
@@ -1175,8 +1175,8 @@ public class TestTxnCommands extends TxnCommandsBaseForTests {
+ Table.NONACIDORCTBL + " order by ROW__ID";
String[][] expected2 = new String[][] {
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":0}\t1\t2", "nonacidorctbl/base_10000001_v0000020/bucket_00001"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":1}\t1\t5", "nonacidorctbl/base_10000001_v0000020/bucket_00001"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t0\t12", "nonacidorctbl/base_10000001_v0000020/bucket_00001"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":1}\t0\t12", "nonacidorctbl/base_10000001_v0000020/bucket_00001"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t1\t5", "nonacidorctbl/base_10000001_v0000020/bucket_00001"},
{"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":0}\t1\t17", "nonacidorctbl/base_10000001_v0000020/bucket_00001"}
};
checkResult(expected2, query, isVectorized, "after major compact", LOG);
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
index dddf063..6279331 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
@@ -376,15 +376,15 @@ public class TestTxnCommands2 {
* Note: order of rows in a file ends up being the reverse of order in values clause (why?!)
*/
String[][] expected = {
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":4}\t0\t13", "bucket_00001"},
- {"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":1}\t0\t15", "bucket_00001"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t0\t13", "bucket_00001"},
+ {"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":0}\t0\t15", "bucket_00001"},
{"{\"writeid\":10000003,\"bucketid\":536936448,\"rowid\":0}\t0\t17", "bucket_00001"},
{"{\"writeid\":10000002,\"bucketid\":536936448,\"rowid\":0}\t0\t120", "bucket_00001"},
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":1}\t1\t2", "bucket_00001"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":3}\t1\t4", "bucket_00001"},
- {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":2}\t1\t5", "bucket_00001"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":5}\t1\t4", "bucket_00001"},
+ {"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":4}\t1\t5", "bucket_00001"},
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":6}\t1\t6", "bucket_00001"},
- {"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":0}\t1\t16", "bucket_00001"}
+ {"{\"writeid\":10000001,\"bucketid\":536936448,\"rowid\":1}\t1\t16", "bucket_00001"}
};
Assert.assertEquals("Unexpected row count before compaction", expected.length, rs.size());
for(int i = 0; i < expected.length; i++) {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
index 05b5f3e..8676e0d 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
@@ -56,13 +56,13 @@ public class TestTxnConcatenate extends TxnCommandsBaseForTests {
runStatementOnDriver("insert into " + Table.ACIDTBL + " values(5,6),(8,8)");
String testQuery = "select ROW__ID, a, b, INPUT__FILE__NAME from " + Table.ACIDTBL + " order by a, b";
String[][] expected = new String[][] {
- {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t1\t4",
+ {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t1\t4",
"acidtbl/delta_0000002_0000002_0000/bucket_00001"},
- {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t4\t4",
+ {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t4\t4",
"acidtbl/delta_0000002_0000002_0000/bucket_00001"},
- {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":1}\t5\t6",
+ {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":0}\t5\t6",
"acidtbl/delta_0000003_0000003_0000/bucket_00001"},
- {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":0}\t8\t8",
+ {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":1}\t8\t8",
"acidtbl/delta_0000003_0000003_0000/bucket_00001"}};
checkResult(expected, testQuery, false, "check data", LOG);
@@ -80,13 +80,13 @@ public class TestTxnConcatenate extends TxnCommandsBaseForTests {
Assert.assertEquals(1, rsp.getCompactsSize());
Assert.assertEquals(TxnStore.CLEANING_RESPONSE, rsp.getCompacts().get(0).getState());
String[][] expected2 = new String[][] {
- {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t1\t4",
+ {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t1\t4",
"acidtbl/base_0000003_v0000019/bucket_00001"},
- {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t4\t4",
+ {"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":1}\t4\t4",
"acidtbl/base_0000003_v0000019/bucket_00001"},
- {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":1}\t5\t6",
+ {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":0}\t5\t6",
"acidtbl/base_0000003_v0000019/bucket_00001"},
- {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":0}\t8\t8",
+ {"{\"writeid\":3,\"bucketid\":536936448,\"rowid\":1}\t8\t8",
"acidtbl/base_0000003_v0000019/bucket_00001"}};
checkResult(expected2, testQuery, false, "check data after concatenate", LOG);
}
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
index 0a97673..0db926a 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
@@ -432,9 +432,9 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree /Users/ekoifman/dev/hiver
String expected2[][] = {
{"{\"writeid\":0,\"bucketid\":537001984,\"rowid\":0}\t1\t2", "warehouse/t/000002_0"},
{"{\"writeid\":0,\"bucketid\":537001984,\"rowid\":1}\t2\t4", "warehouse/t/000002_0"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t5\t6", "warehouse/t/000000_0"},
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t5\t6", "warehouse/t/000000_0"},
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":0}\t6\t8", "warehouse/t/000001_0"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t9\t10", "warehouse/t/000000_0"},
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t9\t10", "warehouse/t/000000_0"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":3}\t10\t20", "warehouse/t/HIVE_UNION_SUBDIR_15/000000_0"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":2}\t12\t12", "warehouse/t/000000_0_copy_1"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":4}\t20\t40", "warehouse/t/HIVE_UNION_SUBDIR_15/000000_0"},
@@ -453,8 +453,8 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree /Users/ekoifman/dev/hiver
String expected3[][] = {
{"{\"writeid\":0,\"bucketid\":537001984,\"rowid\":0}\t1\t2", "warehouse/t/000002_0"},
{"{\"writeid\":0,\"bucketid\":537001984,\"rowid\":1}\t2\t4", "warehouse/t/000002_0"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t5\t6", "warehouse/t/000000_0"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t9\t10", "warehouse/t/000000_0"},
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t5\t6", "warehouse/t/000000_0"},
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t9\t10", "warehouse/t/000000_0"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":3}\t10\t20", "warehouse/t/HIVE_UNION_SUBDIR_15/000000_0"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":2}\t12\t12", "warehouse/t/000000_0_copy_1"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":4}\t20\t40", "warehouse/t/HIVE_UNION_SUBDIR_15/000000_0"},
@@ -476,9 +476,9 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree /Users/ekoifman/dev/hiver
"warehouse/t/base_10000002_v0000029/bucket_00002"},
{"{\"writeid\":0,\"bucketid\":537001984,\"rowid\":1}\t2\t4",
"warehouse/t/base_10000002_v0000029/bucket_00002"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t5\t6",
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t5\t6",
"warehouse/t/base_10000002_v0000029/bucket_00000"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t9\t10",
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t9\t10",
"warehouse/t/base_10000002_v0000029/bucket_00000"},
{"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":3}\t10\t20",
"warehouse/t/base_10000002_v0000029/bucket_00000"},
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/util/TestUpgradeTool.java b/ql/src/test/org/apache/hadoop/hive/ql/util/TestUpgradeTool.java
index fa6f1ca..7974da8 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/util/TestUpgradeTool.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/util/TestUpgradeTool.java
@@ -165,11 +165,11 @@ public class TestUpgradeTool extends TxnCommandsBaseForTests {
* each set of copy_N goes into matching delta_N_N.*/
String testQuery = "select ROW__ID, a, b, INPUT__FILE__NAME from TAcid order by a, b, ROW__ID";
String[][] expected = new String[][] {
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t1\t2",
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t1\t2",
"tacid/000000_0"},
- {"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":1}\t1\t2",
+ {"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":0}\t1\t2",
"tacid/delta_0000001_0000001/000000_0"},
- {"{\"writeid\":2,\"bucketid\":536870912,\"rowid\":1}\t1\t2",
+ {"{\"writeid\":2,\"bucketid\":536870912,\"rowid\":0}\t1\t2",
"tacid/delta_0000002_0000002/000000_0"},
{"{\"writeid\":0,\"bucketid\":536936448,\"rowid\":0}\t3\t4",
"tacid/000001_0"},
@@ -177,11 +177,11 @@ public class TestUpgradeTool extends TxnCommandsBaseForTests {
"tacid/delta_0000001_0000001/000001_0"},
{"{\"writeid\":2,\"bucketid\":536936448,\"rowid\":0}\t3\t4",
"tacid/delta_0000002_0000002/000001_0"},
- {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":0}\t5\t6",
+ {"{\"writeid\":0,\"bucketid\":536870912,\"rowid\":1}\t5\t6",
"tacid/000000_0"},
- {"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":0}\t5\t6",
+ {"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":1}\t5\t6",
"tacid/delta_0000001_0000001/000000_0"},
- {"{\"writeid\":2,\"bucketid\":536870912,\"rowid\":0}\t5\t6",
+ {"{\"writeid\":2,\"bucketid\":536870912,\"rowid\":1}\t5\t6",
"tacid/delta_0000002_0000002/000000_0"}
};
checkResult(expected, testQuery, false, "TAcid post-check", LOG);
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
index ca8a442..00c35cf 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
@@ -1,6 +1,7 @@
--! qt:dataset:srcpart
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
+set hive.optimize.clustered.sort=false;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.optimize.sort.dynamic.partition.threshold=1;
diff --git a/ql/src/test/results/clientpositive/acid_table_stats.q.out b/ql/src/test/results/clientpositive/acid_table_stats.q.out
index 65d7a83..488096d 100644
--- a/ql/src/test/results/clientpositive/acid_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/acid_table_stats.q.out
@@ -97,7 +97,7 @@ Partition Parameters:
numFiles 2
numRows 1000
rawDataSize 0
- totalSize 4063
+ totalSize 4380
#### A masked pattern was here ####
# Storage Information
@@ -184,7 +184,7 @@ Partition Parameters:
numFiles 2
numRows 1000
rawDataSize 0
- totalSize 4063
+ totalSize 4380
#### A masked pattern was here ####
# Storage Information
@@ -235,7 +235,7 @@ Partition Parameters:
numFiles 2
numRows 1000
rawDataSize 0
- totalSize 4063
+ totalSize 4380
#### A masked pattern was here ####
# Storage Information
@@ -331,7 +331,7 @@ Partition Parameters:
numFiles 4
numRows 2000
rawDataSize 0
- totalSize 8126
+ totalSize 8761
#### A masked pattern was here ####
# Storage Information
@@ -380,7 +380,7 @@ Partition Parameters:
numFiles 4
numRows 2000
rawDataSize 0
- totalSize 8126
+ totalSize 8761
#### A masked pattern was here ####
# Storage Information
@@ -592,7 +592,7 @@ Partition Parameters:
numFiles 2
numRows 1000
rawDataSize 176000
- totalSize 3008
+ totalSize 3322
#### A masked pattern was here ####
# Storage Information
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
index 0629c60..0ca11df 100644
--- a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
+++ b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out
@@ -100,14 +100,15 @@ STAGE PLANS:
Map Operator Tree:
TableScan
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 10 Data size: 1728 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: varchar(128))
+ value expressions: _col1 (type: varchar(128))
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: varchar(128))
outputColumnNames: _col0, _col1
Statistics: Num rows: 10 Data size: 1728 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -255,7 +256,7 @@ Table Parameters:
numFiles 4
numRows 8
rawDataSize 0
- totalSize 3275
+ totalSize 3285
transactional true
transactional_properties default
#### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
index ff17708..010c807 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out
@@ -88,11 +88,12 @@ STAGE PLANS:
expressions: _col0 (type: int), _col7 (type: string)
outputColumnNames: _col0, _col1
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: _col0 (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
tag: -1
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
auto parallelism: false
Path -> Alias:
#### A masked pattern was here ####
@@ -153,7 +154,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
File Output Operator
compressed: false
@@ -2175,47 +2176,20 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_table3_n1
POSTHOOK: Input: default@test_table3_n1@ds=1
#### A masked pattern was here ####
-462 val_462 1
-462 val_462 1
-462 val_462 1
-462 val_462 1
-455 val_455 1
-439 val_439 1
-439 val_439 1
-439 val_439 1
-439 val_439 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-400 val_400 1
-321 val_321 1
-321 val_321 1
-321 val_321 1
-321 val_321 1
-309 val_309 1
-309 val_309 1
-309 val_309 1
-309 val_309 1
-282 val_282 1
-282 val_282 1
-282 val_282 1
-282 val_282 1
-280 val_280 1
-280 val_280 1
-280 val_280 1
-280 val_280 1
-275 val_275 1
-194 val_194 1
-176 val_176 1
-176 val_176 1
-176 val_176 1
-176 val_176 1
+8 val_8 1
+26 val_26 1
+26 val_26 1
+26 val_26 1
+26 val_26 1
+82 val_82 1
+103 val_103 1
+103 val_103 1
+103 val_103 1
+103 val_103 1
+118 val_118 1
+118 val_118 1
+118 val_118 1
+118 val_118 1
128 val_128 1
128 val_128 1
128 val_128 1
@@ -2225,20 +2199,47 @@ POSTHOOK: Input: default@test_table3_n1@ds=1
128 val_128 1
128 val_128 1
128 val_128 1
-118 val_118 1
-118 val_118 1
-118 val_118 1
-118 val_118 1
-103 val_103 1
-103 val_103 1
-103 val_103 1
-103 val_103 1
-82 val_82 1
-26 val_26 1
-26 val_26 1
-26 val_26 1
-26 val_26 1
-8 val_8 1
+176 val_176 1
+176 val_176 1
+176 val_176 1
+176 val_176 1
+194 val_194 1
+275 val_275 1
+280 val_280 1
+280 val_280 1
+280 val_280 1
+280 val_280 1
+282 val_282 1
+282 val_282 1
+282 val_282 1
+282 val_282 1
+309 val_309 1
+309 val_309 1
+309 val_309 1
+309 val_309 1
+321 val_321 1
+321 val_321 1
+321 val_321 1
+321 val_321 1
+400 val_400 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+439 val_439 1
+439 val_439 1
+439 val_439 1
+439 val_439 1
+455 val_455 1
+462 val_462 1
+462 val_462 1
+462 val_462 1
+462 val_462 1
PREHOOK: query: SELECT COUNT(*) FROM test_table3_n1 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1_n1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
PREHOOK: type: QUERY
PREHOOK: Input: default@test_table1_n1
diff --git a/ql/src/test/results/clientpositive/bucket1.q.out b/ql/src/test/results/clientpositive/bucket1.q.out
index 18781f0..f5158ad 100644
--- a/ql/src/test/results/clientpositive/bucket1.q.out
+++ b/ql/src/test/results/clientpositive/bucket1.q.out
@@ -39,8 +39,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/bucket2.q.out b/ql/src/test/results/clientpositive/bucket2.q.out
index a3cc4fb..ef6d630 100644
--- a/ql/src/test/results/clientpositive/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/bucket2.q.out
@@ -38,8 +38,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/bucket3.q.out b/ql/src/test/results/clientpositive/bucket3.q.out
index 0463853..d418750 100644
--- a/ql/src/test/results/clientpositive/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/bucket3.q.out
@@ -39,8 +39,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/dynpart_sort_opt_bucketing.q.out b/ql/src/test/results/clientpositive/dynpart_sort_opt_bucketing.q.out
index 4bbf2a4..5be969d 100644
--- a/ql/src/test/results/clientpositive/dynpart_sort_opt_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/dynpart_sort_opt_bucketing.q.out
@@ -288,13 +288,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col8 (type: string)
+ sort order: +
Map-reduce partition columns: _col8 (type: string)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: string), _col12 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: string), _col9 (type: string), _col10 (type: string), _col11 (type: string), _col12 (type: string)
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string), VALUE._col3 (type: string), VALUE._col4 (type: string), VALUE._col5 (type: string), VALUE._col6 (type: string), VALUE._col7 (type: string), VALUE._col8 (type: string), VALUE._col9 (type: string), VALUE._col10 (type: string), CAST( VALUE._col11 AS decimal(5,2)) (type: decimal(5,2)), VALUE._col12 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string), VALUE._col3 (type: string), VALUE._col4 (type: string), VALUE._col5 (type: string), VALUE._col6 (type: string), VALUE._col7 (type: string), KEY.reducesinkkey0 (type: string), VALUE._col8 (type: string), VALUE._col9 (type: string), CAST( VALUE._col10 AS decimal(5,2)) (type: decimal(5,2)), VALUE._col11 (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
index 74c75c8..892d291 100644
--- a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
@@ -112,7 +112,7 @@ STAGE PLANS:
serialization.ddl struct acidtbldefault { i32 a}
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 34795
+ totalSize 34777
transactional true
transactional_properties default
#### A masked pattern was here ####
@@ -138,7 +138,7 @@ STAGE PLANS:
serialization.ddl struct acidtbldefault { i32 a}
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 34795
+ totalSize 34777
transactional true
transactional_properties default
#### A masked pattern was here ####
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 ae1d97f..8270c72 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
@@ -2596,7 +2596,7 @@ STAGE PLANS:
Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
Reducer 5 <- Reducer 3 (SIMPLE_EDGE)
Reducer 6 <- Reducer 3 (SIMPLE_EDGE)
- Reducer 7 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
+ Reducer 7 <- Reducer 3 (SIMPLE_EDGE)
Reducer 8 <- Reducer 7 (SIMPLE_EDGE)
Vertices:
Map 1
diff --git a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
index c9f74aa..4225b7e 100644
--- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
@@ -551,12 +551,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 42
POSTHOOK: type: QUERY
POSTHOOK: Input: default@over10k_orc_bucketed
#### A masked pattern was here ####
-{"writeid":0,"bucketid":536870912,"rowid":104} 5 501 65585
-{"writeid":0,"bucketid":536870912,"rowid":420} 5 501 65585
-{"writeid":0,"bucketid":536936448,"rowid":37} -3 344 65733
-{"writeid":0,"bucketid":536936448,"rowid":295} -3 344 65733
-{"writeid":0,"bucketid":537067520,"rowid":173} 35 463 65646
-{"writeid":0,"bucketid":537067520,"rowid":406} 35 463 65646
+{"writeid":0,"bucketid":536870912,"rowid":294} 5 501 65585
+{"writeid":0,"bucketid":536870912,"rowid":610} 5 501 65585
+{"writeid":0,"bucketid":536936448,"rowid":101} -3 344 65733
+{"writeid":0,"bucketid":536936448,"rowid":359} -3 344 65733
+{"writeid":0,"bucketid":537067520,"rowid":190} 35 463 65646
+{"writeid":0,"bucketid":537067520,"rowid":423} 35 463 65646
PREHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 4294967363 and t < 100
PREHOOK: type: QUERY
PREHOOK: Input: default@over10k_orc_bucketed
diff --git a/ql/src/test/results/clientpositive/llap/bucket2.q.out b/ql/src/test/results/clientpositive/llap/bucket2.q.out
index 9d86258..9a7df0b 100644
--- a/ql/src/test/results/clientpositive/llap/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket2.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -45,8 +45,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/llap/bucket3.q.out b/ql/src/test/results/clientpositive/llap/bucket3.q.out
index fdcc22a..c2a4a71 100644
--- a/ql/src/test/results/clientpositive/llap/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket3.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -46,8 +46,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/llap/bucket_many.q.out b/ql/src/test/results/clientpositive/llap/bucket_many.q.out
index c14132f..02f8feb 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_many.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_many.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -46,8 +46,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
@@ -289,11 +290,11 @@ POSTHOOK: query: select * from bucket_many tablesample (bucket 2 out of 256) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket_many
#### A masked pattern was here ####
-462 val_462
-462 val_462
-309 val_309
-282 val_282
-282 val_282
176 val_176
176 val_176
+282 val_282
+282 val_282
309 val_309
+309 val_309
+462 val_462
+462 val_462
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out b/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
index 5991253..a5bbc25 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
@@ -29,7 +29,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
index 906e462..bd96436 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
@@ -29,7 +29,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/llap/check_constraint.q.out b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
index 883d51b..5671d7f 100644
--- a/ql/src/test/results/clientpositive/llap/check_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
@@ -95,7 +95,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -119,17 +119,18 @@ STAGE PLANS:
predicate: enforce_constraint((((((((- _col0) > (- 10)) is not false and (_col1 > 10) is not false) and _col2 is not null is not false) and _col3 BETWEEN _col0 AND _col1 is not false) and ((_col4 = 23.4) or (_col4 = 56) or (_col4 = 4)) is not false) and ((_col5 > round(567.6)) and (_col5 < round(1000.4))) is not false)) (type: boolean)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: boolean), _col3 (type: int), _col4 (type: decimal(3,1)), _col5 (type: decimal(4,1))
+ value expressions: _col1 (type: int), _col2 (type: boolean), _col3 (type: int), _col4 (type: decimal(3,1)), _col5 (type: decimal(4,1))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: boolean), VALUE._col3 (type: int), UDFToFloat(VALUE._col4) (type: float), UDFToLong(VALUE._col5) (type: bigint)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), VALUE._col1 (type: boolean), VALUE._col2 (type: int), UDFToFloat(VALUE._col3) (type: float), UDFToLong(VALUE._col4) (type: bigint)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1358,7 +1359,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1374,17 +1375,18 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and (_col1 >= CAST( _col0 AS decimal(5,2))) is not false)) (type: boolean)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 82000 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1443,7 +1445,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1477,15 +1479,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and (_col1 >= CAST( _col0 AS decimal(5,2))) is not false)) (type: boolean)
Statistics: Num rows: 5 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 5 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 5 Data size: 1640 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1547,7 +1550,7 @@ STAGE PLANS:
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
- Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
+ Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1629,15 +1632,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and (_col1 >= CAST( _col0 AS decimal(5,2))) is not false)) (type: boolean)
Statistics: Num rows: 5 Data size: 923 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 5 Data size: 923 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 4
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 5 Data size: 1528 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1686,15 +1690,15 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uami_n0
#### A masked pattern was here ####
2 2.00 val_2
-9 9.00 val_9
-8 8.00 val_8
-5 5.00 val_5
-5 5.00 val_5
-5 5.00 val_5
-4 4.00 val_4
0 0.00 val_0
0 0.00 val_0
0 0.00 val_0
+4 4.00 val_4
+5 5.00 val_5
+5 5.00 val_5
+5 5.00 val_5
+8 8.00 val_8
+9 9.00 val_9
10 10.00 val_10
0 0.00 val_0
0 0.00 val_0
@@ -1732,7 +1736,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1785,15 +1789,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and (_col1 >= CAST( _col0 AS decimal(5,2))) is not false)) (type: boolean)
Statistics: Num rows: 5 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 5 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 5 Data size: 1640 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1841,16 +1846,16 @@ POSTHOOK: query: select * from acid_uami_n0
POSTHOOK: type: QUERY
POSTHOOK: Input: default@acid_uami_n0
#### A masked pattern was here ####
-113 113.00 val_113
-105 105.00 val_105
10 10.00 val_10
-114 114.00 val_114
-111 111.00 val_111
+105 105.00 val_105
+113 113.00 val_113
+0 0.00 val_0
11 11.00 val_11
-104 104.00 val_104
-103 103.00 val_103
100 100.00 val_100
-0 0.00 val_0
+103 103.00 val_103
+104 104.00 val_104
+111 111.00 val_111
+114 114.00 val_114
PREHOOK: query: truncate table acid_uami_n0
PREHOOK: type: TRUNCATETABLE
PREHOOK: Output: default@acid_uami_n0
@@ -1892,7 +1897,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1908,10 +1913,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 83 Data size: 17181 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 83 Data size: 17181 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Filter Operator
predicate: ((key > 10) and (key < 20) and enforce_constraint(value is not null)) (type: boolean)
Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE
@@ -1933,7 +1939,7 @@ STAGE PLANS:
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 83 Data size: 27224 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2291,7 +2297,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2364,10 +2370,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -2404,7 +2411,7 @@ STAGE PLANS:
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -2492,7 +2499,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2585,10 +2592,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -2649,7 +2657,7 @@ STAGE PLANS:
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -2741,7 +2749,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2821,10 +2829,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -2869,7 +2878,7 @@ STAGE PLANS:
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -3053,7 +3062,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -3074,7 +3083,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToLong(_col1) (type: bigint)
+ sort order: +
Map-reduce partition columns: UDFToLong(_col1) (type: bigint)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int)
@@ -3206,7 +3216,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -3230,17 +3240,18 @@ STAGE PLANS:
predicate: enforce_constraint(((null = 4) or (null = 5)) is not false) (type: boolean)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col1 (type: bigint)
+ sort order: +
Map-reduce partition columns: _col1 (type: bigint)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: bigint)
+ value expressions: _col0 (type: int)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: UDFToByte(VALUE._col0) (type: tinyint), VALUE._col1 (type: bigint)
+ expressions: UDFToByte(VALUE._col0) (type: tinyint), KEY.reducesinkkey0 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -3285,7 +3296,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -3309,7 +3320,8 @@ STAGE PLANS:
predicate: enforce_constraint(((_col1 = 4) or (_col1 = 5)) is not false) (type: boolean)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToLong(_col1) (type: bigint)
+ sort order: +
Map-reduce partition columns: UDFToLong(_col1) (type: bigint)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int)
diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
index e7c060c..246f4a8 100644
--- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
@@ -87,7 +87,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -108,17 +108,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: tinyint)
+ sort order: +
Map-reduce partition columns: _col0 (type: tinyint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
+ value expressions: _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int), VALUE._col3 (type: bigint), VALUE._col4 (type: double), VALUE._col5 (type: decimal(9,2))
+ expressions: KEY.reducesinkkey0 (type: tinyint), VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: double), VALUE._col4 (type: decimal(9,2))
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -186,7 +187,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -207,17 +208,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: tinyint)
+ sort order: +
Map-reduce partition columns: _col0 (type: tinyint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: decimal(2,1)), _col5 (type: decimal(4,1))
+ value expressions: _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: decimal(2,1)), _col5 (type: decimal(4,1))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int), VALUE._col3 (type: bigint), UDFToDouble(VALUE._col4) (type: double), CAST( VALUE._col5 AS decimal(9,2)) (type: decimal(9,2))
+ expressions: KEY.reducesinkkey0 (type: tinyint), VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), UDFToDouble(VALUE._col3) (type: double), CAST( VALUE._col4 AS decimal(9,2)) (type: decimal(9,2))
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -601,7 +603,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -622,17 +624,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: string)
+ sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: varchar(350)), _col4 (type: char(20))
+ value expressions: _col1 (type: string), _col2 (type: string), _col3 (type: varchar(350)), _col4 (type: char(20))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), VALUE._col3 (type: varchar(350)), VALUE._col4 (type: char(20))
+ expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: varchar(350)), VALUE._col3 (type: char(20))
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -699,7 +702,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -720,17 +723,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: string)
+ sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
+ value expressions: _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string), CAST( VALUE._col3 AS varchar(350)) (type: varchar(350)), CAST( VALUE._col4 AS CHAR(20)) (type: char(20))
+ expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string), CAST( VALUE._col2 AS varchar(350)) (type: varchar(350)), CAST( VALUE._col3 AS CHAR(20)) (type: char(20))
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -859,7 +863,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -880,17 +884,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: boolean)
+ sort order: +
Map-reduce partition columns: _col0 (type: boolean)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: boolean), _col1 (type: binary)
+ value expressions: _col1 (type: binary)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: boolean), VALUE._col1 (type: binary)
+ expressions: KEY.reducesinkkey0 (type: boolean), VALUE._col0 (type: binary)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -954,7 +959,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -975,17 +980,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: boolean)
+ sort order: +
Map-reduce partition columns: _col0 (type: boolean)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: boolean), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: boolean), CAST( VALUE._col1 AS BINARY) (type: binary)
+ expressions: KEY.reducesinkkey0 (type: boolean), CAST( VALUE._col0 AS BINARY) (type: binary)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1434,7 +1440,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1455,7 +1461,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToShort(_col1) (type: smallint)
+ sort order: +
Map-reduce partition columns: UDFToShort(_col1) (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
@@ -1602,7 +1609,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1623,7 +1630,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToShort(_col1) (type: smallint)
+ sort order: +
Map-reduce partition columns: UDFToShort(_col1) (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
@@ -1865,7 +1873,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -1889,17 +1897,18 @@ STAGE PLANS:
predicate: enforce_constraint(127Y is not null) (type: boolean)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col1 (type: smallint)
+ sort order: +
Map-reduce partition columns: _col1 (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(5,2))
+ value expressions: _col0 (type: tinyint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(5,2))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int), VALUE._col3 (type: bigint), VALUE._col4 (type: double), CAST( VALUE._col5 AS decimal(9,2)) (type: decimal(9,2))
+ expressions: VALUE._col0 (type: tinyint), KEY.reducesinkkey0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: double), CAST( VALUE._col4 AS decimal(9,2)) (type: decimal(9,2))
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2205,7 +2214,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2229,17 +2238,18 @@ STAGE PLANS:
predicate: enforce_constraint(108Y is not null) (type: boolean)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col1 (type: smallint)
+ sort order: +
Map-reduce partition columns: _col1 (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(5,2))
+ value expressions: _col0 (type: tinyint), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(5,2))
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int), VALUE._col3 (type: bigint), VALUE._col4 (type: double), CAST( VALUE._col5 AS decimal(9,2)) (type: decimal(9,2))
+ expressions: VALUE._col0 (type: tinyint), KEY.reducesinkkey0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: double), CAST( VALUE._col4 AS decimal(9,2)) (type: decimal(9,2))
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2620,7 +2630,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2641,7 +2651,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToShort(_col1) (type: smallint)
+ sort order: +
Map-reduce partition columns: UDFToShort(_col1) (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
@@ -2788,7 +2799,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -2809,7 +2820,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToShort(_col1) (type: smallint)
+ sort order: +
Map-reduce partition columns: UDFToShort(_col1) (type: smallint)
Statistics: Num rows: 1 Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: tinyint), _col1 (type: int), _col2 (type: int), _col3 (type: bigint), _col4 (type: double), _col5 (type: decimal(9,2))
diff --git a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
index 9bf7603..0a7425a 100644
--- a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -45,8 +45,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
tag: -1
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
index c62c81b..f62788f 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
@@ -58,7 +58,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
@@ -170,10 +170,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -234,7 +235,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -379,7 +380,7 @@ STAGE PLANS:
Edges:
Map 1 <- Reducer 6 (BROADCAST_EDGE)
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
Reducer 6 <- Map 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
@@ -445,15 +446,16 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -582,7 +584,7 @@ STAGE PLANS:
Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
Reducer 5 <- Reducer 3 (SIMPLE_EDGE)
Reducer 6 <- Reducer 3 (SIMPLE_EDGE)
- Reducer 7 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
+ Reducer 7 <- Reducer 3 (ONE_TO_ONE_EDGE)
Reducer 8 <- Reducer 7 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -705,10 +707,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 4
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -769,7 +772,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
index 53932eb..1d2e17a 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
@@ -456,17 +456,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Execution mode: vectorized, llap
LLAP IO: all inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
@@ -954,17 +954,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Execution mode: vectorized, llap
LLAP IO: all inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
@@ -1333,7 +1333,7 @@ Partition Parameters:
numFiles 8
numRows 32
rawDataSize 640
- totalSize 4648
+ totalSize 4640
#### A masked pattern was here ####
# Storage Information
@@ -3214,15 +3214,15 @@ STAGE PLANS:
Number of rows: 10
Statistics: Num rows: 10 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col2 (type: string), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col2 (type: string), _bucket_number (type: string), _col1 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col2 (type: string)
- value expressions: _col0 (type: int), _col1 (type: smallint)
+ value expressions: _col0 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: smallint), KEY._col2 (type: string), KEY._bucket_number (type: string)
+ expressions: VALUE._col0 (type: int), KEY._col1 (type: smallint), KEY._col2 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _bucket_number
File Output Operator
compressed: false
@@ -3299,13 +3299,13 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@addcolumns_vectorization_true_disallowincompatible_true_fileformat_orc_tinyint
POSTHOOK: Input: default@addcolumns_vectorization_true_disallowincompatible_true_fileformat_orc_tinyint@s=cvLH6Eat2yFsyy7p
#### A masked pattern was here ####
+528534767 -15549 cvLH6Eat2yFsyy7p
528534767 -13326 cvLH6Eat2yFsyy7p
528534767 -9566 cvLH6Eat2yFsyy7p
528534767 7021 cvLH6Eat2yFsyy7p
-528534767 -15549 cvLH6Eat2yFsyy7p
-528534767 -4213 cvLH6Eat2yFsyy7p
528534767 -15813 cvLH6Eat2yFsyy7p
-528534767 15007 cvLH6Eat2yFsyy7p
-528534767 4963 cvLH6Eat2yFsyy7p
-528534767 -7824 cvLH6Eat2yFsyy7p
528534767 -15431 cvLH6Eat2yFsyy7p
+528534767 -7824 cvLH6Eat2yFsyy7p
+528534767 -4213 cvLH6Eat2yFsyy7p
+528534767 4963 cvLH6Eat2yFsyy7p
+528534767 15007 cvLH6Eat2yFsyy7p
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
index 68794d2..87054fd 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
@@ -400,17 +400,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
@@ -885,17 +885,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
index 4542b5c..3f18e52 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
@@ -1416,7 +1416,7 @@ STAGE PLANS:
TableScan
alias: acid_2l_part_sdpo
filterExpr: (value = 'bar') (type: boolean)
- Statistics: Num rows: 4200 Data size: 1253037 Basic stats: COMPLETE Column stats: PARTIAL
+ Statistics: Num rows: 4200 Data size: 1247197 Basic stats: COMPLETE Column stats: PARTIAL
Filter Operator
predicate: (value = 'bar') (type: boolean)
Statistics: Num rows: 5 Data size: 1375 Basic stats: COMPLETE Column stats: PARTIAL
diff --git a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
index 2e0ed45..c40e301 100644
--- a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
+++ b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
@@ -2518,7 +2518,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2543,17 +2543,18 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2663,7 +2664,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2680,17 +2681,18 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 82000 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2785,7 +2787,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2822,15 +2824,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 3
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 328 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2916,7 +2919,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2951,15 +2954,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 3
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 328 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -3045,7 +3049,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -3096,15 +3100,16 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 207 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Reducer 3
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 328 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -3189,7 +3194,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -3206,17 +3211,18 @@ STAGE PLANS:
predicate: enforce_constraint((_col1 is not null and _col2 is not null)) (type: boolean)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 250 Data size: 51750 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 250 Data size: 82000 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -3504,7 +3510,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
Reducer 4 <- Map 1 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
@@ -3522,10 +3528,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 83 Data size: 17181 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 83 Data size: 17181 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: decimal(5,2)), _col2 (type: string)
+ value expressions: _col1 (type: decimal(5,2)), _col2 (type: string)
Filter Operator
predicate: ((key > 10) and (key < 20) and enforce_constraint(value is not null)) (type: boolean)
Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE
@@ -3561,7 +3568,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: decimal(5,2)), CAST( VALUE._col2 AS varchar(128)) (type: varchar(128))
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(5,2)), CAST( VALUE._col1 AS varchar(128)) (type: varchar(128))
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 83 Data size: 27224 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -4265,7 +4272,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -4339,10 +4346,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -4379,7 +4387,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -4516,7 +4524,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (SIMPLE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -4610,10 +4618,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -4674,7 +4683,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -4818,7 +4827,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -4899,10 +4908,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -4947,7 +4957,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -5076,7 +5086,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -5158,10 +5168,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col2 (type: string)
+ sort order: +
Map-reduce partition columns: _col2 (type: string)
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
+ value expressions: _col0 (type: int), _col1 (type: string)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -5206,7 +5217,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY.reducesinkkey0 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
index a4f2a77..3ddaf85 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -53,7 +53,8 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: void)
@@ -171,7 +172,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -193,17 +194,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -311,7 +313,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -333,17 +335,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -452,7 +455,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -474,7 +477,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: void), _col1 (type: string)
@@ -592,7 +596,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -614,17 +618,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -750,7 +755,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -772,17 +777,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -900,7 +906,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -922,7 +928,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: void), _col1 (type: string)
@@ -1040,7 +1047,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1062,17 +1069,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1180,7 +1188,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1202,17 +1210,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1321,7 +1330,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1343,17 +1352,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1461,7 +1471,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1483,17 +1493,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1601,7 +1612,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1623,17 +1634,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1741,7 +1753,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1763,17 +1775,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: void)
+ value expressions: _col1 (type: void)
Execution mode: llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), CAST( VALUE._col1 AS STRING) (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), CAST( VALUE._col0 AS STRING) (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2601,7 +2614,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2656,7 +2669,8 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: null (type: string)
+ sort order: +
Map-reduce partition columns: null (type: string)
Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: int)
@@ -2813,7 +2827,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (SIMPLE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2907,7 +2921,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: null (type: string)
+ sort order: +
Map-reduce partition columns: null (type: string)
Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: int), _col1 (type: string)
@@ -3154,7 +3169,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -3199,7 +3214,8 @@ STAGE PLANS:
Select Operator
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: 404 (type: int)
+ sort order: +
Map-reduce partition columns: 404 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reducer 3
diff --git a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
index fcf097a..aef1053 100644
--- a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
@@ -173,7 +173,7 @@ Table Parameters:
numFiles 1
numRows 12288
rawDataSize 0
- totalSize 295638
+ totalSize 309558
transactional true
transactional_properties default
#### A masked pattern was here ####
@@ -536,7 +536,7 @@ Table Parameters:
numFiles 3
numRows 12292
rawDataSize 0
- totalSize 298943
+ totalSize 312862
transactional true
transactional_properties default
#### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
index c1a50df..df5bca3 100644
--- a/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_dyn_part2.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -70,17 +70,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: string)
+ sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+ value expressions: _col1 (type: string), _col2 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/murmur_hash_migration.q.out b/ql/src/test/results/clientpositive/llap/murmur_hash_migration.q.out
index 3360645..106bb66 100644
--- a/ql/src/test/results/clientpositive/llap/murmur_hash_migration.q.out
+++ b/ql/src/test/results/clientpositive/llap/murmur_hash_migration.q.out
@@ -169,7 +169,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -182,17 +182,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -270,7 +271,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -283,17 +284,18 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized, llap
LLAP IO: no inputs
Reducer 2
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 150 Data size: 14250 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -700,12 +702,12 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col2 (type: string), _bucket_number (type: string)
- null sort order: aa
- sort order: ++
+ key expressions: _col2 (type: string), _bucket_number (type: string), _col0 (type: int)
+ null sort order: aaa
+ sort order: +++
Map-reduce partition columns: _col2 (type: string)
tag: -1
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
auto parallelism: true
Execution mode: llap
LLAP IO: no inputs
@@ -755,7 +757,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), KEY._col2 (type: string), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: int), VALUE._col1 (type: int), KEY._col2 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _bucket_number
File Output Operator
compressed: false
diff --git a/ql/src/test/results/clientpositive/llap/sample10_mm.q.out b/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
index 7b0e662..e5fb917 100644
--- a/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
@@ -49,45 +49,45 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
#### A masked pattern was here ####
-5 val_5 2008-04-08 11
-2 val_2 2008-04-08 11
-5 val_5 2008-04-08 11
-5 val_5 2008-04-08 11
0 val_0 2008-04-08 11
0 val_0 2008-04-08 11
0 val_0 2008-04-08 11
-9 val_9 2008-04-08 11
+2 val_2 2008-04-08 11
+5 val_5 2008-04-08 11
+5 val_5 2008-04-08 11
+5 val_5 2008-04-08 11
8 val_8 2008-04-08 11
+9 val_9 2008-04-08 11
4 val_4 2008-04-08 11
-5 val_5 2008-04-08 12
-2 val_2 2008-04-08 12
-5 val_5 2008-04-08 12
-5 val_5 2008-04-08 12
0 val_0 2008-04-08 12
0 val_0 2008-04-08 12
0 val_0 2008-04-08 12
-9 val_9 2008-04-08 12
+2 val_2 2008-04-08 12
+5 val_5 2008-04-08 12
+5 val_5 2008-04-08 12
+5 val_5 2008-04-08 12
8 val_8 2008-04-08 12
+9 val_9 2008-04-08 12
4 val_4 2008-04-08 12
-5 val_5 2008-04-09 11
-2 val_2 2008-04-09 11
-5 val_5 2008-04-09 11
-5 val_5 2008-04-09 11
0 val_0 2008-04-09 11
0 val_0 2008-04-09 11
0 val_0 2008-04-09 11
-9 val_9 2008-04-09 11
+2 val_2 2008-04-09 11
+5 val_5 2008-04-09 11
+5 val_5 2008-04-09 11
+5 val_5 2008-04-09 11
8 val_8 2008-04-09 11
+9 val_9 2008-04-09 11
4 val_4 2008-04-09 11
-5 val_5 2008-04-09 12
-2 val_2 2008-04-09 12
-5 val_5 2008-04-09 12
-5 val_5 2008-04-09 12
0 val_0 2008-04-09 12
0 val_0 2008-04-09 12
0 val_0 2008-04-09 12
-9 val_9 2008-04-09 12
+2 val_2 2008-04-09 12
+5 val_5 2008-04-09 12
+5 val_5 2008-04-09 12
+5 val_5 2008-04-09 12
8 val_8 2008-04-09 12
+9 val_9 2008-04-09 12
4 val_4 2008-04-09 12
PREHOOK: query: explain select key from srcpartbucket tablesample (bucket 2 out of 4 on key)
PREHOOK: type: QUERY
@@ -154,34 +154,34 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
#### A masked pattern was here ####
-5
-2
-5
-5
0
0
0
-5
2
5
5
+5
0
0
0
-5
2
5
5
+5
0
0
0
-5
2
5
5
+5
0
0
0
+2
+5
+5
+5
PREHOOK: query: select key from srcpartbucket tablesample (bucket 3 out of 4 on key)
PREHOOK: type: QUERY
PREHOOK: Input: default@srcpartbucket
@@ -198,7 +198,6 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
#### A masked pattern was here ####
-9
8
9
8
@@ -206,6 +205,7 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
8
9
8
+9
PREHOOK: query: select key from srcpartbucket tablesample (bucket 4 out of 4 on key)
PREHOOK: type: QUERY
PREHOOK: Input: default@srcpartbucket
diff --git a/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out b/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
index d5f081d..ec6ffea 100644
--- a/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
+++ b/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
@@ -3256,7 +3256,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
@@ -3368,10 +3368,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -3432,7 +3433,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -3596,7 +3597,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
@@ -3708,10 +3709,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -3772,7 +3774,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
index ad1705d..f3b24ba 100644
--- a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
+++ b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
@@ -57,7 +57,7 @@ STAGE PLANS:
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 6 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 6 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 7 <- Reducer 6 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -151,10 +151,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -215,7 +216,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -347,7 +348,7 @@ STAGE PLANS:
#### A masked pattern was here ####
Edges:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
- Reducer 3 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 3 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 4 <- Reducer 3 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -395,15 +396,16 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/sqlmerge_stats.q.out b/ql/src/test/results/clientpositive/llap/sqlmerge_stats.q.out
index c38d3d2..989b34f 100644
--- a/ql/src/test/results/clientpositive/llap/sqlmerge_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/sqlmerge_stats.q.out
@@ -144,7 +144,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -226,10 +226,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -274,7 +275,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -673,7 +674,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -755,10 +756,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -803,7 +805,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -954,7 +956,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1036,10 +1038,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -1084,7 +1087,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1235,7 +1238,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1317,10 +1320,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -1365,7 +1369,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1516,7 +1520,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (ONE_TO_ONE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1598,10 +1602,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: int)
+ value expressions: _col1 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -1646,7 +1651,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -1849,7 +1854,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -1930,10 +1935,10 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -1978,7 +1983,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -2174,7 +2179,7 @@ STAGE PLANS:
Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
Reducer 4 <- Reducer 2 (SIMPLE_EDGE)
- Reducer 5 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
+ Reducer 5 <- Reducer 2 (SIMPLE_EDGE)
Reducer 6 <- Reducer 5 (CUSTOM_SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
@@ -2256,10 +2261,10 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int)
Reducer 3
Execution mode: vectorized, llap
Reduce Operator Tree:
@@ -2304,7 +2309,7 @@ STAGE PLANS:
Execution mode: llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), 1 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int), 1 (type: int)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/llap/tez_fixed_bucket_pruning.q.out b/ql/src/test/results/clientpositive/llap/tez_fixed_bucket_pruning.q.out
index c9c1e8d..eaed60c 100644
--- a/ql/src/test/results/clientpositive/llap/tez_fixed_bucket_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_fixed_bucket_pruning.q.out
@@ -738,7 +738,7 @@ STAGE PLANS:
serialization.ddl struct l3_monthly_dw_dimplan { i64 idp_warehouse_id, i64 idp_audit_id, date idp_data_date, i64 l3_snapshot_number, i64 plan_key, i64 project_key, i64 charge_code_key, i64 transclass_key, i64 resource_key, i64 finplan_detail_object_id, i64 project_object_id, i64 txn_class_object_id, i64 charge_code_object_id, i64 resoruce_object_id, varchar(1500) plan_name, varchar(500) plan_code, varchar(50) plan_type, varchar(50) period_type, varchar(3000) plan_desc [...]
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 5231448
+ totalSize 5242697
#### A masked pattern was here ####
serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
@@ -761,7 +761,7 @@ STAGE PLANS:
serialization.ddl struct l3_monthly_dw_dimplan { i64 idp_warehouse_id, i64 idp_audit_id, date idp_data_date, i64 l3_snapshot_number, i64 plan_key, i64 project_key, i64 charge_code_key, i64 transclass_key, i64 resource_key, i64 finplan_detail_object_id, i64 project_object_id, i64 txn_class_object_id, i64 charge_code_object_id, i64 resoruce_object_id, varchar(1500) plan_name, varchar(500) plan_code, varchar(50) plan_type, varchar(50) period_type, varchar(3000) plan_de [...]
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 5231448
+ totalSize 5242697
#### A masked pattern was here ####
serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
name: default.l3_monthly_dw_dimplan
@@ -1247,7 +1247,7 @@ STAGE PLANS:
serialization.ddl struct l3_monthly_dw_dimplan { i64 idp_warehouse_id, i64 idp_audit_id, date idp_data_date, i64 l3_snapshot_number, i64 plan_key, i64 project_key, i64 charge_code_key, i64 transclass_key, i64 resource_key, i64 finplan_detail_object_id, i64 project_object_id, i64 txn_class_object_id, i64 charge_code_object_id, i64 resoruce_object_id, varchar(1500) plan_name, varchar(500) plan_code, varchar(50) plan_type, varchar(50) period_type, varchar(3000) plan_desc [...]
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 5231448
+ totalSize 5242697
#### A masked pattern was here ####
serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
@@ -1270,7 +1270,7 @@ STAGE PLANS:
serialization.ddl struct l3_monthly_dw_dimplan { i64 idp_warehouse_id, i64 idp_audit_id, date idp_data_date, i64 l3_snapshot_number, i64 plan_key, i64 project_key, i64 charge_code_key, i64 transclass_key, i64 resource_key, i64 finplan_detail_object_id, i64 project_object_id, i64 txn_class_object_id, i64 charge_code_object_id, i64 resoruce_object_id, varchar(1500) plan_name, varchar(500) plan_code, varchar(50) plan_type, varchar(50) period_type, varchar(3000) plan_de [...]
serialization.format 1
serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
- totalSize 5231448
+ totalSize 5242697
#### A masked pattern was here ####
serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
name: default.l3_monthly_dw_dimplan
diff --git a/ql/src/test/results/clientpositive/llap/vector_bucket.q.out b/ql/src/test/results/clientpositive/llap/vector_bucket.q.out
index 277deda..19ee4fe 100644
--- a/ql/src/test/results/clientpositive/llap/vector_bucket.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_bucket.q.out
@@ -31,7 +31,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -52,10 +52,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: llap
LLAP IO: no inputs
Map Vectorization:
@@ -73,7 +74,7 @@ STAGE PLANS:
vectorized: true
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Select Vectorization:
className: VectorSelectOperator
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out
index 67fe239..8bdb365 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out
@@ -29,7 +29,7 @@ STAGE PLANS:
Tez
#### A masked pattern was here ####
Edges:
- Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+ Reducer 2 <- Map 1 (SIMPLE_EDGE)
#### A masked pattern was here ####
Vertices:
Map 1
@@ -50,10 +50,10 @@ STAGE PLANS:
outputColumnNames: _col0
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int)
Execution mode: llap
LLAP IO: no inputs
Map Vectorization:
@@ -66,19 +66,19 @@ STAGE PLANS:
Reduce Vectorization:
enabled: true
enableConditionsMet: hive.vectorized.execution.reduce.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true
- reduceColumnNullOrder:
- reduceColumnSortOrder:
+ reduceColumnNullOrder: a
+ reduceColumnSortOrder: +
allNative: false
usesVectorUDFAdaptor: false
vectorized: true
rowBatchContext:
dataColumnCount: 1
- dataColumns: VALUE._col0:int
+ dataColumns: KEY.reducesinkkey0:int
partitionColumnCount: 0
scratchColumnTypeNames: []
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int)
+ expressions: KEY.reducesinkkey0 (type: int)
outputColumnNames: _col0
Select Vectorization:
className: VectorSelectOperator
@@ -132,9 +132,9 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@foo
#### A masked pattern was here ####
2 000000_0
-9 000001_0
-4 000001_0
1 000001_0
+4 000001_0
+9 000001_0
3 000002_0
PREHOOK: query: drop table foo
PREHOOK: type: DROPTABLE
diff --git a/ql/src/test/results/clientpositive/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
index 9977292..b63a35a 100644
--- a/ql/src/test/results/clientpositive/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/load_dyn_part2.q.out
@@ -63,14 +63,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: string)
+ sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+ value expressions: _col1 (type: string), _col2 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out b/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
index d646077..b1e4afc 100644
--- a/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
@@ -31,14 +31,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -244,14 +245,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 35 Data size: 13020 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col2 (type: string), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col2 (type: string), _bucket_number (type: string), _col0 (type: int)
+ sort order: +++
Map-reduce partition columns: _col2 (type: string)
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _bucket_number
File Output Operator
compressed: false
@@ -458,14 +459,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 68 Data size: 24552 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col2 (type: string), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col2 (type: string), _bucket_number (type: string), _col0 (type: int)
+ sort order: +++
Map-reduce partition columns: _col2 (type: string)
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _bucket_number
File Output Operator
compressed: false
@@ -673,14 +674,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/mm_buckets.q.out b/ql/src/test/results/clientpositive/mm_buckets.q.out
index 1f12575..efcfba4 100644
--- a/ql/src/test/results/clientpositive/mm_buckets.q.out
+++ b/ql/src/test/results/clientpositive/mm_buckets.q.out
@@ -102,8 +102,8 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket0_mm
#### A masked pattern was here ####
-100 100
0 0
+100 100
103 103
PREHOOK: query: insert into table bucket0_mm select key, key from intermediate_n2
PREHOOK: type: QUERY
@@ -163,10 +163,10 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket0_mm
#### A masked pattern was here ####
-100 100
0 0
100 100
0 0
+100 100
103 103
103 103
PREHOOK: query: drop table bucket0_mm
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
index 3bd5409..b1fa4c1 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
@@ -88,11 +88,12 @@ STAGE PLANS:
expressions: _col0 (type: int), _col7 (type: string)
outputColumnNames: _col0, _col1
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: _col0 (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
tag: -1
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
auto parallelism: false
Path -> Alias:
#### A masked pattern was here ####
@@ -153,7 +154,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
File Output Operator
compressed: false
@@ -2175,47 +2176,20 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test_table3_n1
POSTHOOK: Input: default@test_table3_n1@ds=1
#### A masked pattern was here ####
-462 val_462 1
-462 val_462 1
-462 val_462 1
-462 val_462 1
-455 val_455 1
-439 val_439 1
-439 val_439 1
-439 val_439 1
-439 val_439 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-438 val_438 1
-400 val_400 1
-321 val_321 1
-321 val_321 1
-321 val_321 1
-321 val_321 1
-309 val_309 1
-309 val_309 1
-309 val_309 1
-309 val_309 1
-282 val_282 1
-282 val_282 1
-282 val_282 1
-282 val_282 1
-280 val_280 1
-280 val_280 1
-280 val_280 1
-280 val_280 1
-275 val_275 1
-194 val_194 1
-176 val_176 1
-176 val_176 1
-176 val_176 1
-176 val_176 1
+8 val_8 1
+26 val_26 1
+26 val_26 1
+26 val_26 1
+26 val_26 1
+82 val_82 1
+103 val_103 1
+103 val_103 1
+103 val_103 1
+103 val_103 1
+118 val_118 1
+118 val_118 1
+118 val_118 1
+118 val_118 1
128 val_128 1
128 val_128 1
128 val_128 1
@@ -2225,20 +2199,47 @@ POSTHOOK: Input: default@test_table3_n1@ds=1
128 val_128 1
128 val_128 1
128 val_128 1
-118 val_118 1
-118 val_118 1
-118 val_118 1
-118 val_118 1
-103 val_103 1
-103 val_103 1
-103 val_103 1
-103 val_103 1
-82 val_82 1
-26 val_26 1
-26 val_26 1
-26 val_26 1
-26 val_26 1
-8 val_8 1
+176 val_176 1
+176 val_176 1
+176 val_176 1
+176 val_176 1
+194 val_194 1
+275 val_275 1
+280 val_280 1
+280 val_280 1
+280 val_280 1
+280 val_280 1
+282 val_282 1
+282 val_282 1
+282 val_282 1
+282 val_282 1
+309 val_309 1
+309 val_309 1
+309 val_309 1
+309 val_309 1
+321 val_321 1
+321 val_321 1
+321 val_321 1
+321 val_321 1
+400 val_400 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+438 val_438 1
+439 val_439 1
+439 val_439 1
+439 val_439 1
+439 val_439 1
+455 val_455 1
+462 val_462 1
+462 val_462 1
+462 val_462 1
+462 val_462 1
PREHOOK: query: SELECT COUNT(*) FROM test_table3_n1 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1_n1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
PREHOOK: type: QUERY
PREHOOK: Input: default@test_table1_n1
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out
index 719d754..0e8b3f8 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_21.q.out
@@ -693,14 +693,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/spark/bucket2.q.out b/ql/src/test/results/clientpositive/spark/bucket2.q.out
index 71b2b8c..7d31439 100644
--- a/ql/src/test/results/clientpositive/spark/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket2.q.out
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
tag: -1
diff --git a/ql/src/test/results/clientpositive/spark/bucket3.q.out b/ql/src/test/results/clientpositive/spark/bucket3.q.out
index f3ea8d1..ffb98b7 100644
--- a/ql/src/test/results/clientpositive/spark/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket3.q.out
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
tag: -1
diff --git a/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out b/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out
index f690f26..d640cbb 100644
--- a/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
tag: -1
diff --git a/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out_spark b/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out_spark
index d332825..9b2a512 100644
--- a/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out_spark
+++ b/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out_spark
@@ -43,8 +43,9 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
tag: -1
diff --git a/ql/src/test/results/clientpositive/spark/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/spark/dynpart_sort_optimization.q.out
index 7417290..0c33d01 100644
--- a/ql/src/test/results/clientpositive/spark/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/spark/dynpart_sort_optimization.q.out
@@ -297,14 +297,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Reducer 2
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
@@ -657,14 +657,14 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2, _col3, _col4
Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col4 (type: tinyint), _bucket_number (type: string)
- sort order: ++
+ key expressions: _col4 (type: tinyint), _bucket_number (type: string), _col0 (type: smallint)
+ sort order: +++
Map-reduce partition columns: _col4 (type: tinyint)
- value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
+ value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float)
Reducer 2
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
+ expressions: KEY._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), KEY._col4 (type: tinyint), KEY._bucket_number (type: string)
outputColumnNames: _col0, _col1, _col2, _col3, _col4, _bucket_number
File Output Operator
compressed: false
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
index cefd6de..82e30d2 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
@@ -67,16 +67,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: string)
+ sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+ value expressions: _col1 (type: string), _col2 (type: string)
Execution mode: vectorized
Reducer 2
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
+ expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
index 9ad5888..ef10c41 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
@@ -94,12 +94,13 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- null sort order:
- sort order:
+ key expressions: _col0 (type: int)
+ null sort order: a
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
tag: -1
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
auto parallelism: false
Path -> Alias:
#### A masked pattern was here ####
@@ -162,7 +163,7 @@ STAGE PLANS:
Needs Tagging: false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_21.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_21.q.out
index b746230..e66a4a9 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_21.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_21.q.out
@@ -516,16 +516,17 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Execution mode: vectorized
Reducer 2
Execution mode: vectorized
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
File Output Operator
diff --git a/ql/src/test/results/clientpositive/spark/stats10.q.out b/ql/src/test/results/clientpositive/spark/stats10.q.out
index 17855c5..7a2861e 100644
--- a/ql/src/test/results/clientpositive/spark/stats10.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats10.q.out
@@ -40,7 +40,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
value expressions: _col0 (type: string), _col1 (type: string)
diff --git a/ql/src/test/results/clientpositive/stats10.q.out b/ql/src/test/results/clientpositive/stats10.q.out
index 612fce4..4506dde 100644
--- a/ql/src/test/results/clientpositive/stats10.q.out
+++ b/ql/src/test/results/clientpositive/stats10.q.out
@@ -36,7 +36,8 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: UDFToInteger(_col0) (type: int)
+ sort order: +
Map-reduce partition columns: UDFToInteger(_col0) (type: int)
Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
value expressions: _col0 (type: string), _col1 (type: string)
diff --git a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
index afc4cc6..919f605 100644
--- a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
+++ b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
@@ -370,10 +370,10 @@ POSTHOOK: Lineage: over10k_orc_bucketed_n0.si SIMPLE [(over10k_n9)over10k_n9.Fie
POSTHOOK: Lineage: over10k_orc_bucketed_n0.t SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:t, type:tinyint, comment:null), ]
POSTHOOK: Lineage: over10k_orc_bucketed_n0.ts SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:ts, type:timestamp, comment:null), ]
Found 4 items
--rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 8704 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7487 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7129 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7014 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: insert into over10k_orc_bucketed_n0 select * from over10k_n9
PREHOOK: type: QUERY
PREHOOK: Input: default@over10k_n9
@@ -394,14 +394,14 @@ POSTHOOK: Lineage: over10k_orc_bucketed_n0.si SIMPLE [(over10k_n9)over10k_n9.Fie
POSTHOOK: Lineage: over10k_orc_bucketed_n0.t SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:t, type:tinyint, comment:null), ]
POSTHOOK: Lineage: over10k_orc_bucketed_n0.ts SIMPLE [(over10k_n9)over10k_n9.FieldSchema(name:ts, type:timestamp, comment:null), ]
Found 8 items
--rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 8903 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7698 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7273 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ###
--rw-rw-rw- 3 ### USER ### ### GROUP ### 7180 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 8704 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 8704 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7487 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7487 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7129 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7129 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7014 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw- 3 ### USER ### ### GROUP ### 7014 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from over10k_orc_bucketed_n0
PREHOOK: type: QUERY
PREHOOK: Input: default@over10k_orc_bucketed_n0
@@ -567,12 +567,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed_n0 where b =
POSTHOOK: type: QUERY
POSTHOOK: Input: default@over10k_orc_bucketed_n0
POSTHOOK: Output: hdfs://### HDFS PATH ###
-{"writeid":0,"bucketid":536870912,"rowid":104} 5 501 65585
-{"writeid":0,"bucketid":536870912,"rowid":420} 5 501 65585
-{"writeid":0,"bucketid":536936448,"rowid":37} -3 344 65733
-{"writeid":0,"bucketid":536936448,"rowid":295} -3 344 65733
-{"writeid":0,"bucketid":537067520,"rowid":173} 35 463 65646
-{"writeid":0,"bucketid":537067520,"rowid":406} 35 463 65646
+{"writeid":0,"bucketid":536870912,"rowid":294} 5 501 65585
+{"writeid":0,"bucketid":536870912,"rowid":610} 5 501 65585
+{"writeid":0,"bucketid":536936448,"rowid":101} -3 344 65733
+{"writeid":0,"bucketid":536936448,"rowid":359} -3 344 65733
+{"writeid":0,"bucketid":537067520,"rowid":190} 35 463 65646
+{"writeid":0,"bucketid":537067520,"rowid":423} 35 463 65646
PREHOOK: query: explain update over10k_orc_bucketed_n0 set i = 0 where b = 4294967363 and t < 100
PREHOOK: type: QUERY
PREHOOK: Input: default@over10k_orc_bucketed_n0
diff --git a/ql/src/test/results/clientpositive/vector_bucket.q.out b/ql/src/test/results/clientpositive/vector_bucket.q.out
index baea304..3e56df1 100644
--- a/ql/src/test/results/clientpositive/vector_bucket.q.out
+++ b/ql/src/test/results/clientpositive/vector_bucket.q.out
@@ -45,10 +45,11 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- sort order:
+ key expressions: _col0 (type: int)
+ sort order: +
Map-reduce partition columns: _col0 (type: int)
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: int), _col1 (type: string)
+ value expressions: _col1 (type: string)
Map Vectorization:
enabled: false
enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true
@@ -60,7 +61,7 @@ STAGE PLANS:
enableConditionsNotMet: hive.execution.engine mr IN [tez, spark] IS false
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
+ expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator