diff --git a/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out b/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out index 63368c292f..960027e2ae 100644 --- a/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out +++ b/accumulo-handler/src/test/results/positive/accumulo_predicate_pushdown.q.out @@ -285,7 +285,7 @@ STAGE PLANS: filterExpr: (key >= '90') (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) = UDFToDouble(UDFToInteger(value))) and (value like '%9%')) (type: boolean) + predicate: ((value like '%9%') and (UDFToDouble(key) = UDFToDouble(UDFToInteger(value)))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -458,10 +458,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: accumulo_pushdown - filterExpr: ((key <= '80') or (value like '%90%')) (type: boolean) + filterExpr: ((value like '%90%') or (key <= '80')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <= '80') or (value like '%90%')) (type: boolean) + predicate: ((value like '%90%') or (key <= '80')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out index 32a6e44d20..8a08332d86 100644 --- a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out +++ b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out @@ -303,7 +303,7 @@ STAGE PLANS: alias: accumulo_table_1 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 120) and (key > 100)) (type: boolean) + predicate: ((key > 100) and (key < 120)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) diff --git a/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out b/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out index 12343d5a5f..a090362704 100644 --- a/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out +++ b/accumulo-handler/src/test/results/positive/accumulo_single_sourced_multi_insert.q.out @@ -77,7 +77,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 50) and (key > 0)) (type: boolean) + predicate: ((key > 0) and (key < 50)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), '' (type: string) @@ -106,7 +106,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 100) and (key > 50)) (type: boolean) + predicate: ((key > 50) and (key < 100)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), '' (type: string) 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 e50ff997a9..600b187d5a 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2348,6 +2348,9 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal HIVE_OPTIMIZE_CONSTRAINTS_JOIN("hive.optimize.constraints.join", true, "Whether to use referential constraints\n" + "to optimize (remove or transform) join operators"), + HIVE_OPTIMIZE_SORT_PREDS_WITH_STATS("hive.optimize.filter.preds.sort", true, "Whether to sort conditions in filters\n" + + "based on estimated selectivity and compute cost"), + HIVE_OPTIMIZE_REDUCE_WITH_STATS("hive.optimize.filter.stats.reduction", false, "Whether to simplify comparison\n" + "expressions in filter operators using column stats"), diff --git a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out index 44a3cd23cb..2077727d4e 100644 --- a/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out +++ b/hbase-handler/src/test/results/positive/hbase_custom_key2.q.out @@ -111,7 +111,7 @@ STAGE PLANS: Processor Tree: TableScan alias: hbase_ck_4 - filterExpr: ((key.col1 >= '165') and (key.col1 < '27')) (type: boolean) + filterExpr: ((key.col1 < '27') and (key.col1 >= '165')) (type: boolean) Statistics: Num rows: 1 Data size: 792 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key.col1 < '27') and (key.col1 >= '165')) (type: boolean) diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out index 5ab5bb3841..f6c5ea1713 100644 --- a/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ppd_key_range.q.out @@ -285,7 +285,7 @@ STAGE PLANS: filterExpr: (key >= '90') (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) = UDFToDouble(UDFToInteger(value))) and (value like '%9%')) (type: boolean) + predicate: ((value like '%9%') and (UDFToDouble(key) = UDFToDouble(UDFToInteger(value)))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -459,7 +459,7 @@ STAGE PLANS: alias: hbase_pushdown Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <= '80') or (value like '%90%')) (type: boolean) + predicate: ((value like '%90%') or (key <= '80')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out index d3cdd9e4f7..963acc1060 100644 --- a/hbase-handler/src/test/results/positive/hbase_pushdown.q.out +++ b/hbase-handler/src/test/results/positive/hbase_pushdown.q.out @@ -184,7 +184,7 @@ STAGE PLANS: filterExpr: (key = 90) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = UDFToInteger(value)) and (value like '%90%')) (type: boolean) + predicate: ((value like '%90%') and (key = UDFToInteger(value))) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: 90 (type: int), value (type: string) diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out index 0c21d6d748..47f2d90054 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -303,7 +303,7 @@ STAGE PLANS: alias: hbase_table_1 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 120) and (key > 100)) (type: boolean) + predicate: ((key > 100) and (key < 120)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) diff --git a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out index e3d0b9ddb9..de67b9f964 100644 --- a/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out +++ b/hbase-handler/src/test/results/positive/hbase_single_sourced_multi_insert.q.out @@ -77,7 +77,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 50) and (key > 0)) (type: boolean) + predicate: ((key > 0) and (key < 50)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), '' (type: string) @@ -106,7 +106,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 100) and (key > 50)) (type: boolean) + predicate: ((key > 50) and (key < 100)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), '' (type: string) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java index 8223d6b823..4a71a5b411 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java @@ -957,14 +957,8 @@ public JSONObject outputPlan(Object work, PrintStream out, Object val = null; try { - if(postProcess(xpl_note)) { - val = m.invoke(work, inTest); - } - else{ - val = m.invoke(work); - } - } - catch (InvocationTargetException ex) { + val = m.invoke(work); + } catch (InvocationTargetException ex) { // Ignore the exception, this may be caused by external jars val = null; } @@ -1083,15 +1077,6 @@ public JSONObject outputPlan(Object work, PrintStream out, return null; } - /** - * use case: this is only use for testing purposes. For instance, we might - * want to sort the expressions in a filter so we get deterministic comparable - * golden files - */ - private boolean postProcess(Explain exp) { - return exp.postProcess(); - } - /** * use case: we want to print the object in explain only if it is true * how to do : print it unless the following 3 are all true: diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelOptUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelOptUtil.java index 3742efe87a..b8380d63cd 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelOptUtil.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelOptUtil.java @@ -558,8 +558,16 @@ public static PKFKJoinInfo extractPKFKJoin( // 1) Gather all tables from the FK side and the table from the // non-FK side final Set leftTables = mq.getTableReferences(join.getLeft()); - final Set rightTables = - Sets.difference(mq.getTableReferences(join), mq.getTableReferences(join.getLeft())); + if (leftTables == null) { + // Could not infer, bail out + return cannotExtract; + } + final Set joinTables = mq.getTableReferences(join); + if (joinTables == null) { + // Could not infer, bail out + return cannotExtract; + } + final Set rightTables = Sets.difference(joinTables, leftTables); final Set fkTables = join.getLeft() == fkInput ? leftTables : rightTables; final Set nonFkTables = join.getLeft() == fkInput ? rightTables : leftTables; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/RelOptHiveTable.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/RelOptHiveTable.java index 53eeb0ce3e..0c5140bd39 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/RelOptHiveTable.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/RelOptHiveTable.java @@ -682,7 +682,9 @@ private void updateColStats(Set projIndxLst, boolean allowMissingStats) Set projIndxSet = new HashSet(projIndxLst); if (projIndxLst != null) { for (Integer i : projIndxLst) { - if (hiveColStatsMap.get(i) != null) { + if (i >= noOfNonVirtualCols) { + projIndxSet.remove(i); + } else if (hiveColStatsMap.get(i) != null) { colStatsBldr.add(hiveColStatsMap.get(i)); projIndxSet.remove(i); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortPredicates.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortPredicates.java new file mode 100644 index 0000000000..df75e93dd5 --- /dev/null +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFilterSortPredicates.java @@ -0,0 +1,282 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hive.ql.optimizer.calcite.rules; + +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.core.Filter; +import org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.calcite.rex.RexCall; +import org.apache.calcite.rex.RexDynamicParam; +import org.apache.calcite.rex.RexFieldAccess; +import org.apache.calcite.rex.RexInputRef; +import org.apache.calcite.rex.RexLiteral; +import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexVisitorImpl; +import org.apache.calcite.util.Pair; +import org.apache.hadoop.hive.ql.optimizer.calcite.stats.FilterSelectivityEstimator; +import org.apache.hadoop.hive.ql.optimizer.calcite.stats.HiveRelMdSize; + + +/** + * Rule that sorts conditions in a filter predicate to accelerate query processing + * based on selectivity and compute cost. Currently it is not applied recursively, + * i.e., it is only applied to top predicates in the condition. + */ +public class HiveFilterSortPredicates extends RelOptRule { + + public static final HiveFilterSortPredicates INSTANCE = new HiveFilterSortPredicates(); + + + private HiveFilterSortPredicates() { + super( + operand(Filter.class, + operand(RelNode.class, any()))); + } + + @Override + public boolean matches(RelOptRuleCall call) { + final Filter filter = call.rel(0); + + HiveRulesRegistry registry = call.getPlanner().getContext().unwrap(HiveRulesRegistry.class); + + // If this operator has been visited already by the rule, + // we do not need to apply the optimization + if (registry != null && registry.getVisited(this).contains(filter)) { + return false; + } + + return true; + } + + @Override + public void onMatch(RelOptRuleCall call) { + final Filter filter = call.rel(0); + final RelNode input = call.rel(1); + + // Register that we have visited this operator in this rule + HiveRulesRegistry registry = call.getPlanner().getContext().unwrap(HiveRulesRegistry.class); + if (registry != null) { + registry.registerVisited(this, filter); + } + + final RexNode originalCond = filter.getCondition(); + RexSortPredicatesShuttle sortPredicatesShuttle = new RexSortPredicatesShuttle( + input, filter.getCluster().getMetadataQuery()); + final RexNode newCond = originalCond.accept(sortPredicatesShuttle); + if (!sortPredicatesShuttle.modified) { + // We are done, bail out + return; + } + + // We register the new filter so we do not fire the rule on it again + final Filter newFilter = filter.copy(filter.getTraitSet(), input, newCond); + if (registry != null) { + registry.registerVisited(this, newFilter); + } + + call.transformTo(newFilter); + } + + /** + * If the expression is an AND/OR, it will sort predicates accordingly + * to maximize performance. + */ + private static class RexSortPredicatesShuttle extends RexShuttle { + + private FilterSelectivityEstimator selectivityEstimator; + private boolean modified; + + private RexSortPredicatesShuttle(RelNode inputRel, RelMetadataQuery mq) { + selectivityEstimator = new FilterSelectivityEstimator(inputRel, mq); + modified = false; + } + + @Override + public RexNode visitCall(final RexCall call) { + switch (call.getKind()) { + case AND: + List newAndOperands = call.getOperands() + .stream() + .map(pred -> new Pair<>(pred, rankingAnd(pred))) + .sorted(Comparator.comparing(Pair::getValue, Comparator.nullsLast(Double::compare))) + .map(Pair::getKey) + .collect(Collectors.toList()); + if (!call.getOperands().equals(newAndOperands)) { + modified = true; + return call.clone(call.getType(), newAndOperands); + } + break; + case OR: + List newOrOperands = call.getOperands() + .stream() + .map(pred -> new Pair<>(pred, rankingOr(pred))) + .sorted(Comparator.comparing(Pair::getValue, Comparator.nullsLast(Double::compare))) + .map(Pair::getKey) + .collect(Collectors.toList()); + if (!call.getOperands().equals(newOrOperands)) { + modified = true; + return call.clone(call.getType(), newOrOperands); + } + break; + } + return call; + } + + /** + * Nodes in an AND clause are sorted by a rank value calculated as: + * rank = (selectivity - 1) / cost per tuple + * The intuition is that more selective/cheaper conditions should be evaluated + * first in the AND clause, since FALSE will end the evaluation. + */ + private Double rankingAnd(RexNode e) { + Double selectivity = selectivityEstimator.estimateSelectivity(e); + if (selectivity == null) { + return null; + } + Double costPerTuple = costPerTuple(e); + if (costPerTuple == null) { + return null; + } + return (selectivity - 1d) / costPerTuple; + } + + /** + * Nodes in an OR clause are sorted by a rank value calculated as: + * rank = (-selectivity) / cost per tuple + * The intuition is that less selective/cheaper conditions should be evaluated + * first in the OR clause, since TRUE will end the evaluation. + */ + private Double rankingOr(RexNode e) { + Double selectivity = selectivityEstimator.estimateSelectivity(e); + if (selectivity == null) { + return null; + } + Double costPerTuple = costPerTuple(e); + if (costPerTuple == null) { + return null; + } + return -selectivity / costPerTuple; + } + + private Double costPerTuple(RexNode e) { + return e.accept(new RexFunctionCost()); + } + + } + + /** + * The cost of a call expression e is computed as: + * cost(e) = functionCost + sum_1..n(byteSize(o_i) + cost(o_i)) + * with the call having operands i in 1..n. + */ + private static class RexFunctionCost extends RexVisitorImpl { + + private RexFunctionCost() { + super(true); + } + + @Override + public Double visitCall(RexCall call) { + if (!deep) { + return null; + } + + Double cost = 0.d; + for (RexNode operand : call.operands) { + Double operandCost = operand.accept(this); + if (operandCost == null) { + return null; + } + cost += operandCost; + Double size = HiveRelMdSize.averageTypeSize(operand.getType()); + if (size == null) { + return null; + } + cost += size; + } + + return cost + functionCost(call); + } + + private static Double functionCost(RexCall call) { + switch (call.getKind()) { + case EQUALS: + case NOT_EQUALS: + case LESS_THAN: + case GREATER_THAN: + case LESS_THAN_OR_EQUAL: + case GREATER_THAN_OR_EQUAL: + case IS_NOT_NULL: + case IS_NULL: + case IS_TRUE: + case IS_NOT_TRUE: + case IS_FALSE: + case IS_NOT_FALSE: + return 1d; + + case BETWEEN: + return 3d; + + case IN: + return 2d * (call.getOperands().size() - 1); + + case AND: + case OR: + return 1d * call.getOperands().size(); + + case CAST: + // This heuristic represents that CAST operation is 8 times more expensive + // than a comparison operation such as EQUALS, NOT_EQUALS, etc. + return 8d; + + default: + // By default, we give this heuristic value to unrecognized functions. + // The idea is that those functions will be more expensive to evaluate + // than the simple functions considered above. + // TODO: Add more functions/improve the heuristic after running additional experiments. + return 32d; + } + } + + @Override + public Double visitInputRef(RexInputRef inputRef) { + return 0d; + } + + @Override + public Double visitFieldAccess(RexFieldAccess fieldAccess) { + return 0d; + } + + @Override + public Double visitLiteral(RexLiteral literal) { + return 0d; + } + + @Override + public Double visitDynamicParam(RexDynamicParam dynamicParam) { + return 0d; + } + + } +} diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/FilterSelectivityEstimator.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/FilterSelectivityEstimator.java index d362e9b17d..6c04f10927 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/FilterSelectivityEstimator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/FilterSelectivityEstimator.java @@ -35,6 +35,7 @@ import org.apache.calcite.rex.RexVisitorImpl; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.sql.type.SqlTypeUtil; import org.apache.calcite.util.ImmutableBitSet; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil; @@ -47,7 +48,7 @@ private final double childCardinality; private final RelMetadataQuery mq; - protected FilterSelectivityEstimator(RelNode childRel, RelMetadataQuery mq) { + public FilterSelectivityEstimator(RelNode childRel, RelMetadataQuery mq) { super(true); this.mq = mq; this.childRel = childRel; @@ -58,6 +59,16 @@ public Double estimateSelectivity(RexNode predicate) { return predicate.accept(this); } + @Override + public Double visitInputRef(RexInputRef inputRef) { + if (inputRef.getType().getSqlTypeName() == SqlTypeName.BOOLEAN) { + // If it is a boolean and we assume uniform distribution, + // it will filter half the rows + return 0.5; + } + return null; + } + @Override public Double visitCall(RexCall call) { if (!deep) { @@ -120,11 +131,14 @@ public Double visitCall(RexCall call) { // present in NDV which may not be correct (Range check can find it) 3) We // assume values in NDV set is uniformly distributed over col values // (account for skewness - histogram). - selectivity = computeFunctionSelectivity(call) * (call.operands.size() - 1); - if (selectivity <= 0.0) { - selectivity = 0.10; - } else if (selectivity >= 1.0) { - selectivity = 1.0; + selectivity = computeFunctionSelectivity(call); + if (selectivity != null) { + selectivity = selectivity * (call.operands.size() - 1); + if (selectivity <= 0.0) { + selectivity = 0.10; + } else if (selectivity >= 1.0) { + selectivity = 1.0; + } } break; } @@ -145,7 +159,11 @@ public Double visitCall(RexCall call) { * @return */ private Double computeNotEqualitySelectivity(RexCall call) { - double tmpNDV = getMaxNDV(call); + Double tmpNDV = getMaxNDV(call); + if (tmpNDV == null) { + // Could not be computed + return null; + } if (tmpNDV > 1) { return (tmpNDV - 1) / tmpNDV; @@ -164,7 +182,12 @@ private Double computeNotEqualitySelectivity(RexCall call) { * @return */ private Double computeFunctionSelectivity(RexCall call) { - return 1 / getMaxNDV(call); + Double tmpNDV = getMaxNDV(call); + if (tmpNDV == null) { + // Could not be computed + return null; + } + return 1 / tmpNDV; } /** @@ -255,13 +278,16 @@ private long getMaxNulls(RexCall call, HiveTableScan t) { } private Double getMaxNDV(RexCall call) { - double tmpNDV; + Double tmpNDV; double maxNDV = 1.0; InputReferencedVisitor irv; for (RexNode op : call.getOperands()) { if (op instanceof RexInputRef) { tmpNDV = HiveRelMdDistinctRowCount.getDistinctRowCount(this.childRel, mq, ((RexInputRef) op).getIndex()); + if (tmpNDV == null) { + return null; + } if (tmpNDV > maxNDV) { maxNDV = tmpNDV; } @@ -271,6 +297,9 @@ private Double getMaxNDV(RexCall call) { for (Integer childProjIndx : irv.inputPosReferenced) { tmpNDV = HiveRelMdDistinctRowCount.getDistinctRowCount(this.childRel, mq, childProjIndx); + if (tmpNDV == null) { + return null; + } if (tmpNDV > maxNDV) { maxNDV = tmpNDV; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdDistinctRowCount.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdDistinctRowCount.java index 80b939a9f6..b2b2f3c2d8 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdDistinctRowCount.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdDistinctRowCount.java @@ -17,11 +17,14 @@ */ package org.apache.hadoop.hive.ql.optimizer.calcite.stats; +import java.util.ArrayList; import java.util.List; import org.apache.calcite.plan.RelOptCost; +import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Join; +import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.rel.core.SemiJoin; import org.apache.calcite.rel.metadata.ChainedRelMetadataProvider; import org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider; @@ -29,9 +32,12 @@ import org.apache.calcite.rel.metadata.RelMdUtil; import org.apache.calcite.rel.metadata.RelMetadataProvider; import org.apache.calcite.rel.metadata.RelMetadataQuery; +import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexUtil; import org.apache.calcite.util.BuiltInMethod; import org.apache.calcite.util.ImmutableBitSet; +import org.apache.calcite.util.NumberUtil; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil; import org.apache.hadoop.hive.ql.optimizer.calcite.cost.HiveCost; import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin; @@ -57,21 +63,7 @@ private HiveRelMdDistinctRowCount() { } - // Catch-all rule when none of the others apply. - @Override - public Double getDistinctRowCount(RelNode rel, RelMetadataQuery mq, ImmutableBitSet groupKey, - RexNode predicate) { - if (rel instanceof HiveTableScan) { - return getDistinctRowCount((HiveTableScan) rel, mq, groupKey, predicate); - } - /* - * For now use Calcite' default formulas for propagating NDVs up the Query - * Tree. - */ - return super.getDistinctRowCount(rel, mq, groupKey, predicate); - } - - private Double getDistinctRowCount(HiveTableScan htRel, RelMetadataQuery mq, ImmutableBitSet groupKey, + public Double getDistinctRowCount(HiveTableScan htRel, RelMetadataQuery mq, ImmutableBitSet groupKey, RexNode predicate) { List projIndxLst = HiveCalciteUtil .translateBitSetToProjIndx(groupKey); @@ -100,7 +92,7 @@ public Double getDistinctRowCount(Join rel, RelMetadataQuery mq, ImmutableBitSet return mq.getDistinctRowCount(hjRel.getLeft(), groupKey, rel.getCluster().getRexBuilder().makeLiteral(true)); } else { - return RelMdUtil.getJoinDistinctRowCount(mq, rel, rel.getJoinType(), + return getJoinDistinctRowCount(mq, rel, rel.getJoinType(), groupKey, predicate, true); } } @@ -108,6 +100,78 @@ public Double getDistinctRowCount(Join rel, RelMetadataQuery mq, ImmutableBitSet return mq.getDistinctRowCount(rel, groupKey, predicate); } + /** + * TODO: This method is a copy of {@link RelMdUtil#getJoinDistinctRowCount}. + * We will remove it once we replace Math.max with a null-safe method in + * Calcite. + * + * Computes the number of distinct rows for a set of keys returned from a + * join. Also known as NDV (number of distinct values). + * + * @param joinRel RelNode representing the join + * @param joinType type of join + * @param groupKey keys that the distinct row count will be computed for + * @param predicate join predicate + * @param useMaxNdv If true use formula max(left NDV, right NDV), + * otherwise use left NDV * right NDV. + * @return number of distinct rows + */ + public static Double getJoinDistinctRowCount(RelMetadataQuery mq, + RelNode joinRel, JoinRelType joinType, ImmutableBitSet groupKey, + RexNode predicate, boolean useMaxNdv) { + Double distRowCount = null; + ImmutableBitSet.Builder leftMask = ImmutableBitSet.builder(); + ImmutableBitSet.Builder rightMask = ImmutableBitSet.builder(); + RelNode left = joinRel.getInputs().get(0); + RelNode right = joinRel.getInputs().get(1); + + RelMdUtil.setLeftRightBitmaps( + groupKey, + leftMask, + rightMask, + left.getRowType().getFieldCount()); + + // determine which filters apply to the left vs right + RexNode leftPred = null; + RexNode rightPred = null; + if (predicate != null) { + final List leftFilters = new ArrayList<>(); + final List rightFilters = new ArrayList<>(); + final List joinFilters = new ArrayList<>(); + final List predList = RelOptUtil.conjunctions(predicate); + + RelOptUtil.classifyFilters( + joinRel, + predList, + joinType, + joinType == JoinRelType.INNER, + !joinType.generatesNullsOnLeft(), + !joinType.generatesNullsOnRight(), + joinFilters, + leftFilters, + rightFilters); + + RexBuilder rexBuilder = joinRel.getCluster().getRexBuilder(); + leftPred = + RexUtil.composeConjunction(rexBuilder, leftFilters, true); + rightPred = + RexUtil.composeConjunction(rexBuilder, rightFilters, true); + } + + Double leftDistRowCount = mq.getDistinctRowCount(left, leftMask.build(), leftPred); + Double rightDistRowCount = mq.getDistinctRowCount(right, rightMask.build(), rightPred); + if (leftDistRowCount != null && rightDistRowCount != null) { + if (useMaxNdv) { + distRowCount = Math.max(leftDistRowCount, rightDistRowCount); + } else { + distRowCount = + NumberUtil.multiply(leftDistRowCount, rightDistRowCount); + } + } + + return RelMdUtil.numDistinctVals(distRowCount, mq.getRowCount(joinRel)); + } + /* * Favor Broad Plans over Deep Plans. */ diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSelectivity.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSelectivity.java index 7e9208229a..f6a6cf4f03 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSelectivity.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSelectivity.java @@ -105,15 +105,27 @@ private Double computeInnerJoinSelectivity(Join j, RelMetadataQuery mq, RexNode // 1. Update Col Stats Map with col stats for columns from left side of // Join which are part of join keys for (Integer ljk : jpi.getProjsFromLeftPartOfJoinKeysInChildSchema()) { - colStatMapBuilder.put(ljk, - HiveRelMdDistinctRowCount.getDistinctRowCount(j.getLeft(), mq, ljk)); + Double ljkDistRowCount = + HiveRelMdDistinctRowCount.getDistinctRowCount(j.getLeft(), mq, ljk); + if (ljkDistRowCount == null) { + // Distinct row count could not be determined, + // return default selectivity + return 1.0; + } + colStatMapBuilder.put(ljk, ljkDistRowCount); } // 2. Update Col Stats Map with col stats for columns from right side of // Join which are part of join keys for (Integer rjk : jpi.getProjsFromRightPartOfJoinKeysInChildSchema()) { - colStatMapBuilder.put(rjk + rightOffSet, - HiveRelMdDistinctRowCount.getDistinctRowCount(j.getRight(), mq, rjk)); + Double rjkDistRowCount = + HiveRelMdDistinctRowCount.getDistinctRowCount(j.getRight(), mq, rjk); + if (rjkDistRowCount == null) { + // Distinct row count could not be determined, + // return default selectivity + return 1.0; + } + colStatMapBuilder.put(rjk + rightOffSet, rjkDistRowCount); } colStatMap = colStatMapBuilder.build(); @@ -125,17 +137,16 @@ private Double computeInnerJoinSelectivity(Join j, RelMetadataQuery mq, RexNode if (noOfPE > 0) { boolean isCorrelatedColumns = j.getCluster().getPlanner().getContext(). unwrap(HiveConfPlannerContext.class).getIsCorrelatedColumns(); - if (noOfPE > 1 && isCorrelatedColumns ){ + if (noOfPE > 1 && isCorrelatedColumns) { ndvEstimate = maxNdvForCorrelatedColumns(peLst, colStatMap); - } - else { + } else { ndvEstimate = exponentialBackoff(peLst, colStatMap); } if (j instanceof SemiJoin) { ndvEstimate = Math.min(mq.getRowCount(j.getLeft()), ndvEstimate); - }else if (j instanceof HiveJoin){ + } else if (j instanceof HiveJoin) { ndvEstimate = Math.min(mq.getRowCount(j.getLeft()) * mq.getRowCount(j.getRight()), ndvEstimate); } else { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSize.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSize.java index c1cd34478d..893cb9975c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSize.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/stats/HiveRelMdSize.java @@ -121,6 +121,10 @@ private HiveRelMdSize() {} // supports all types @Override public Double averageTypeValueSize(RelDataType type) { + return averageTypeSize(type); + } + + public static Double averageTypeSize(RelDataType type) { switch (type.getSqlTypeName()) { case BOOLEAN: case TINYINT: @@ -163,7 +167,7 @@ public Double averageTypeValueSize(RelDataType type) { case ROW: Double average = 0.0; for (RelDataTypeField field : type.getFieldList()) { - average += averageTypeValueSize(field.getType()); + average += averageTypeSize(field.getType()); } return average; default: diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java index aeb30e827f..7c8d7526a6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartitionPruner.java @@ -203,17 +203,17 @@ public static PrunedPartitionList prune(Table tab, ExprNodeDesc prunerExpr, prunerExpr = removeNonPartCols(prunerExpr, extractPartColNames(tab), partColsUsedInFilter); // Remove all parts that are not partition columns. See javadoc for details. ExprNodeDesc compactExpr = compactExpr(prunerExpr.clone()); - String oldFilter = prunerExpr.getExprString(); + String oldFilter = prunerExpr.getExprString(true); if (compactExpr == null || isBooleanExpr(compactExpr)) { if (isFalseExpr(compactExpr)) { - return new PrunedPartitionList(tab, key + compactExpr.getExprString(), + return new PrunedPartitionList(tab, key + compactExpr.getExprString(true), new LinkedHashSet(0), new ArrayList(0), false); } // For null and true values, return every partition return getAllPartsFromCacheOrServer(tab, key, true, prunedPartitionsMap); } - String compactExprString = compactExpr.getExprString(); + String compactExprString = compactExpr.getExprString(true); if (LOG.isDebugEnabled()) { LOG.debug("Filter w/ compacting: " + compactExprString + "; filter w/o compacting: " + oldFilter); @@ -224,8 +224,8 @@ public static PrunedPartitionList prune(Table tab, ExprNodeDesc prunerExpr, return ppList; } - ppList = getPartitionsFromServer(tab, key, (ExprNodeGenericFuncDesc)compactExpr, - conf, alias, partColsUsedInFilter, oldFilter.equals(compactExpr.getExprString())); + ppList = getPartitionsFromServer(tab, key, (ExprNodeGenericFuncDesc) compactExpr, + conf, alias, partColsUsedInFilter, oldFilter.equals(compactExprString)); prunedPartitionsMap.put(key, ppList); return ppList; } @@ -285,7 +285,7 @@ static ExprNodeDesc compactExpr(ExprNodeDesc expr) { } if (!isBooleanExpr(expr)) { throw new IllegalStateException("Unexpected non-boolean ExprNodeConstantDesc: " - + expr.getExprString()); + + expr.getExprString(true)); } return expr; } else if (expr instanceof ExprNodeColumnDesc) { @@ -363,7 +363,7 @@ static ExprNodeDesc compactExpr(ExprNodeDesc expr) { return expr; } else { - throw new IllegalStateException("Unexpected type of ExprNodeDesc: " + expr.getExprString()); + throw new IllegalStateException("Unexpected type of ExprNodeDesc: " + expr.getExprString(true)); } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index e6d510c7fb..7a30239784 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -185,6 +185,7 @@ import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterProjectTSTransposeRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterProjectTransposeRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterSetOpTransposeRule; +import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterSortPredicates; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterSortTransposeRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveInsertExchange4JoinRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveIntersectMergeRule; @@ -1179,7 +1180,22 @@ private void fixUpASTAggregateIncrementalRebuild(ASTNode newAST) throws Semantic throw new SemanticException("OR clause expected below TOK_WHERE in incremental rewriting"); } // We bypass the OR clause and select the first disjunct - ASTNode newCondInUpdate = (ASTNode) whereClauseInUpdate.getChild(0).getChild(0); + int indexUpdate; + int indexInsert; + if (whereClauseInUpdate.getChild(0).getChild(0).getType() == HiveParser.EQUAL || + (whereClauseInUpdate.getChild(0).getChild(0).getType() == HiveParser.KW_AND && + whereClauseInUpdate.getChild(0).getChild(0).getChild(0).getType() == HiveParser.EQUAL)) { + indexUpdate = 0; + indexInsert = 1; + } else if (whereClauseInUpdate.getChild(0).getChild(1).getType() == HiveParser.EQUAL || + (whereClauseInUpdate.getChild(0).getChild(1).getType() == HiveParser.KW_AND && + whereClauseInUpdate.getChild(0).getChild(1).getChild(0).getType() == HiveParser.EQUAL)) { + indexUpdate = 1; + indexInsert = 0; + } else { + throw new SemanticException("Unexpected condition in incremental rewriting"); + } + ASTNode newCondInUpdate = (ASTNode) whereClauseInUpdate.getChild(0).getChild(indexUpdate); ParseDriver.adaptor.setChild(whereClauseInUpdate, 0, newCondInUpdate); // 4.3) Finally, we add SORT clause, this is needed for the UPDATE. // TOK_SORTBY @@ -1216,7 +1232,7 @@ private void fixUpASTAggregateIncrementalRebuild(ASTNode newAST) throws Semantic throw new SemanticException("OR clause expected below TOK_WHERE in incremental rewriting"); } // We bypass the OR clause and select the second disjunct - ASTNode newCondInInsert = (ASTNode) whereClauseInInsert.getChild(0).getChild(1); + ASTNode newCondInInsert = (ASTNode) whereClauseInInsert.getChild(0).getChild(indexInsert); ParseDriver.adaptor.setChild(whereClauseInInsert, 0, newCondInInsert); // 6) Now we set some tree properties related to multi-insert // operation with INSERT/UPDATE @@ -1961,7 +1977,16 @@ public RelNode apply(RelOptCluster cluster, RelOptSchema relOptSchema, SchemaPlu perfLogger.PerfLogEnd(this.getClass().getName(), PerfLogger.OPTIMIZER, "Calcite: Window fixing rule"); } - // 10. Apply Druid transformation rules + // 10. Sort predicates in filter expressions + if (conf.getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_SORT_PREDS_WITH_STATS)) { + perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); + calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, false, mdProvider.getMetadataProvider(), null, + HepMatchOrder.BOTTOM_UP, HiveFilterSortPredicates.INSTANCE); + perfLogger.PerfLogEnd(this.getClass().getName(), PerfLogger.OPTIMIZER, + "Calcite: Sort predicates within filter operators"); + } + + // 11. Apply Druid and JDBC transformation rules perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, false, mdProvider.getMetadataProvider(), null, HepMatchOrder.BOTTOM_UP, @@ -2005,7 +2030,7 @@ public RelNode apply(RelOptCluster cluster, RelOptSchema relOptSchema, SchemaPlu perfLogger.PerfLogEnd(this.getClass().getName(), PerfLogger.OPTIMIZER, "Calcite: JDBC transformation rules"); } - // 11. Run rules to aid in translation from Calcite tree to Hive tree + // 12. Run rules to aid in translation from Calcite tree to Hive tree if (HiveConf.getBoolVar(conf, ConfVars.HIVE_CBO_RETPATH_HIVEOP)) { perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); // 12.1. Merge join into multijoin operators (if possible) @@ -2026,7 +2051,7 @@ public RelNode apply(RelOptCluster cluster, RelOptSchema relOptSchema, SchemaPlu HiveFilterProjectTSTransposeRule.INSTANCE, HiveFilterProjectTSTransposeRule.INSTANCE_DRUID, HiveProjectFilterPullUpConstantsRule.INSTANCE); - // 11.2. Introduce exchange operators below join/multijoin operators + // 12.2. Introduce exchange operators below join/multijoin operators calciteOptimizedPlan = hepPlan(calciteOptimizedPlan, false, mdProvider.getMetadataProvider(), null, HepMatchOrder.BOTTOM_UP, HiveInsertExchange4JoinRule.EXCHANGE_BELOW_JOIN, HiveInsertExchange4JoinRule.EXCHANGE_BELOW_MULTIJOIN); @@ -2190,9 +2215,9 @@ private RelNode applyPreJoinOrderingTransforms(RelNode basePlan, RelMetadataProv perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); basePlan = hepPlan(basePlan, false, mdProvider, executorProvider, - HiveSortLimitRemoveRule.INSTANCE); + HiveSortLimitRemoveRule.INSTANCE); perfLogger.PerfLogEnd(this.getClass().getName(), PerfLogger.OPTIMIZER, - "Calcite: Trying to remove Limit and Order by"); + "Calcite: Trying to remove Limit and Order by"); // 6. Apply Partition Pruning perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); @@ -2203,8 +2228,7 @@ private RelNode applyPreJoinOrderingTransforms(RelNode basePlan, RelMetadataProv // 7. Projection Pruning (this introduces select above TS & hence needs to be run last due to PP) perfLogger.PerfLogBegin(this.getClass().getName(), PerfLogger.OPTIMIZER); HiveRelFieldTrimmer fieldTrimmer = new HiveRelFieldTrimmer(null, - HiveRelFactories.HIVE_BUILDER.create(cluster, null), - profilesCBO.contains(ExtendedCBOProfile.JOIN_REORDERING)); + HiveRelFactories.HIVE_BUILDER.create(cluster, null), true); basePlan = fieldTrimmer.trim(basePlan); perfLogger.PerfLogEnd(this.getClass().getName(), PerfLogger.OPTIMIZER, "Calcite: Prejoin ordering transformation, Projection Pruning"); @@ -3395,7 +3419,7 @@ private boolean genSubQueryRelNode(QB qb, ASTNode node, RelNode srcRel, boolean } catch (SemanticException e) { throw new CalciteSubquerySemanticException(e.getMessage()); } - if(isSubQuery) { + if (isSubQuery) { // since subqueries will later be rewritten into JOINs we want join reordering logic to trigger profilesCBO.add(ExtendedCBOProfile.JOIN_REORDERING); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java index 030bb6152d..409b03f313 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/Explain.java @@ -77,6 +77,4 @@ public boolean in(Level[] levels) { }; Vectorization vectorization() default Vectorization.NON_VECTORIZED; - boolean postProcess() default false; - } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java index fc7327a80c..944fa4ff9b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/FilterDesc.java @@ -111,24 +111,16 @@ public FilterDesc( } @Signature + @Explain(displayName = "predicate") public String getPredicateString() { return PlanUtils.getExprListString(Arrays.asList(predicate)); } + @Explain(displayName = "predicate", explainLevels = { Level.USER }) public String getUserLevelExplainPredicateString() { return PlanUtils.getExprListString(Arrays.asList(predicate), true); } - @Explain(displayName = "predicate", postProcess = true) - public String getPredicateString(boolean postProcess) { - return PlanUtils.getExprListString(Arrays.asList(predicate), false, postProcess); - } - - @Explain(displayName = "predicate", explainLevels = { Level.USER }, postProcess = true) - public String getUserLevelExplainPredicateString(boolean postProcess) { - return PlanUtils.getExprListString(Arrays.asList(predicate), true, postProcess); - } - public org.apache.hadoop.hive.ql.plan.ExprNodeDesc getPredicate() { return predicate; } diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q index 19e363aba7..2a5f749bb6 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q @@ -27,7 +27,7 @@ set hive.optimize.bucketmapjoin.sortedmerge = true; set hive.auto.convert.sortmerge.join.to.mapjoin=false; set hive.auto.convert.sortmerge.join.bigtable.selection.policy = org.apache.hadoop.hive.ql.optimizer.AvgPartitionSizeBasedBigTableSelectorForAutoSMJ; -- disable hash joins -set hive.auto.convert.join.noconditionaltask.size=200; +set hive.auto.convert.join.noconditionaltask.size=1; -- Since size is being used to find the big table, the order of the tables in the join does not matter explain extended select count(*) FROM bucket_small_n12 a JOIN bucket_big_n12 b ON a.key = b.key; diff --git a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out index eced299fb7..6036a755f8 100644 --- a/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out +++ b/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out @@ -104,37 +104,37 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 108 Data size: 61552 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 108 Data size: 16732 Basic stats: PARTIAL Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 103 Data size: 58702 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 88 Data size: 13633 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 103 Data size: 58702 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 88 Data size: 13633 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 103 Data size: 58702 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 88 Data size: 13633 Basic stats: PARTIAL Column stats: NONE value expressions: _col1 (type: string) TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 70 Data size: 40284 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 70 Data size: 10904 Basic stats: PARTIAL Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 67 Data size: 38557 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 57 Data size: 8878 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 67 Data size: 38557 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 57 Data size: 8878 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 67 Data size: 38557 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 57 Data size: 8878 Basic stats: PARTIAL Column stats: NONE value expressions: _col1 (type: string) Reduce Operator Tree: Join Operator @@ -144,14 +144,14 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 - Statistics: Num rows: 113 Data size: 64572 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 96 Data size: 14996 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 113 Data size: 64572 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 96 Data size: 14996 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 113 Data size: 64572 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 96 Data size: 14996 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientnegative/insert_into_with_schema2.q.out b/ql/src/test/results/clientnegative/insert_into_with_schema2.q.out index 4243e51724..ed55b89546 100644 --- a/ql/src/test/results/clientnegative/insert_into_with_schema2.q.out +++ b/ql/src/test/results/clientnegative/insert_into_with_schema2.q.out @@ -30,4 +30,4 @@ POSTHOOK: query: create table target1(x int, y int, z int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:x314n POSTHOOK: Output: x314n@target1 -FAILED: SemanticException 0:0 Expected 3 columns for insclause-0/x314n@target1; select produces 2 columns. Error encountered near token 'source.s2' +FAILED: SemanticException 0:0 Expected 3 columns for insclause-0/x314n@target1; select produces 2 columns. Error encountered near token 'TOK_ALLCOLREF' diff --git a/ql/src/test/results/clientpositive/acid_stats4.q.out b/ql/src/test/results/clientpositive/acid_stats4.q.out index bf8585dc3e..2297f05b61 100644 --- a/ql/src/test/results/clientpositive/acid_stats4.q.out +++ b/ql/src/test/results/clientpositive/acid_stats4.q.out @@ -639,11 +639,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_part - Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key2 (type: int) outputColumnNames: key2 - Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(key2) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out index 7a157a2cf5..447bb3a5d1 100644 --- a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out +++ b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out @@ -126,11 +126,11 @@ STAGE PLANS: TableScan alias: p filterExpr: (c = 1) (type: boolean) - Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: a (type: int) outputColumnNames: a - Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: max(a) minReductionHashAggr: 0.99 @@ -272,11 +272,11 @@ STAGE PLANS: TableScan alias: p filterExpr: (c = 4) (type: boolean) - Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: a (type: int) outputColumnNames: a - Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: max(a) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out index 5edaea2c14..53e1f78c11 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out @@ -127,7 +127,7 @@ STAGE PLANS: filterExpr: (((t = 1Y) and (si = 2S)) or ((t = 2Y) and (si = 3S)) or ((t = 3Y) and (si = 4S)) or ((t = 4Y) and (si = 5S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S)) or ((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 27Y) and (si = 28S)) or ((t = 37Y) and (si = 38S)) or ((t = 47Y) and (si = 48S)) or ((t = 52Y) and (si = 53S))) (type: boolean) Statistics: Num rows: 2098 Data size: 16744 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 1Y) and (si = 2S)) or ((t = 27Y) and (si = 28S)) or ((t = 2Y) and (si = 3S)) or ((t = 37Y) and (si = 38S)) or ((t = 3Y) and (si = 4S)) or ((t = 47Y) and (si = 48S)) or ((t = 4Y) and (si = 5S)) or ((t = 52Y) and (si = 53S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S))) (type: boolean) + predicate: (((t = 1Y) and (si = 2S)) or ((t = 2Y) and (si = 3S)) or ((t = 3Y) and (si = 4S)) or ((t = 4Y) and (si = 5S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S)) or ((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 27Y) and (si = 28S)) or ((t = 37Y) and (si = 38S)) or ((t = 47Y) and (si = 48S)) or ((t = 52Y) and (si = 53S))) (type: boolean) Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: COMPLETE @@ -223,7 +223,7 @@ STAGE PLANS: filterExpr: (((t = 1Y) and (si = 2S)) or ((t = 2Y) and (si = 3S)) or ((t = 3Y) and (si = 4S)) or ((t = 4Y) and (si = 5S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S)) or ((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 27Y) and (si = 28S)) or ((t = 37Y) and (si = 38S)) or ((t = 47Y) and (si = 48S)) or ((t = 52Y) and (si = 53S))) (type: boolean) Statistics: Num rows: 2098 Data size: 211174 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 1Y) and (si = 2S)) or ((t = 27Y) and (si = 28S)) or ((t = 2Y) and (si = 3S)) or ((t = 37Y) and (si = 38S)) or ((t = 3Y) and (si = 4S)) or ((t = 47Y) and (si = 48S)) or ((t = 4Y) and (si = 5S)) or ((t = 52Y) and (si = 53S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S))) (type: boolean) + predicate: (((t = 1Y) and (si = 2S)) or ((t = 2Y) and (si = 3S)) or ((t = 3Y) and (si = 4S)) or ((t = 4Y) and (si = 5S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S)) or ((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or ((t = 17Y) and (si = 18S)) or ((t = 27Y) and (si = 28S)) or ((t = 37Y) and (si = 38S)) or ((t = 47Y) and (si = 48S)) or ((t = 52Y) and (si = 53S))) (type: boolean) Statistics: Num rows: 2098 Data size: 211174 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 2098 Data size: 211174 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out index cce87c4b93..64b97ee5aa 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out @@ -1299,7 +1299,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: ss - filterExpr: (ss_store_sk is not null and ss_addr_sk is not null) (type: boolean) + filterExpr: (ss_addr_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 7664 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (ss_addr_sk is not null and ss_store_sk is not null) (type: boolean) @@ -1380,14 +1380,14 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col2 - Statistics: Num rows: 241 Data size: 964 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 223 Data size: 892 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col2 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 241 Data size: 964 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 223 Data size: 892 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 241 Data size: 964 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 223 Data size: 892 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out b/ql/src/test/results/clientpositive/annotate_stats_part.q.out index 1b98811942..05bfa34f92 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out @@ -58,11 +58,11 @@ STAGE PLANS: Processor Tree: TableScan alias: loc_orc_n4 - Statistics: Num rows: 1 Data size: 380 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 380 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: insert overwrite table loc_orc_n4 partition(year) select * from loc_staging_n4 @@ -102,11 +102,11 @@ STAGE PLANS: Processor Tree: TableScan alias: loc_orc_n4 - Statistics: Num rows: 20 Data size: 15670 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 20 Data size: 7208 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 20 Data size: 15670 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 20 Data size: 7208 Basic stats: PARTIAL Column stats: PARTIAL ListSink PREHOOK: query: analyze table loc_orc_n4 partition(year='2001') compute statistics @@ -140,11 +140,11 @@ STAGE PLANS: TableScan alias: loc_orc_n4 filterExpr: (year = '__HIVE_DEFAULT_PARTITION__') (type: boolean) - Statistics: Num rows: 9 Data size: 5364 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 9 Data size: 1764 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), '__HIVE_DEFAULT_PARTITION__' (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 9 Data size: 5364 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 9 Data size: 1764 Basic stats: PARTIAL Column stats: NONE ListSink PREHOOK: query: explain select * from loc_orc_n4 @@ -169,11 +169,11 @@ STAGE PLANS: Processor Tree: TableScan alias: loc_orc_n4 - Statistics: Num rows: 16 Data size: 10358 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 16 Data size: 6080 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 16 Data size: 10358 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 16 Data size: 6080 Basic stats: PARTIAL Column stats: PARTIAL ListSink PREHOOK: query: explain select * from loc_orc_n4 where year='2001' @@ -197,11 +197,11 @@ STAGE PLANS: TableScan alias: loc_orc_n4 filterExpr: (year = '2001') (type: boolean) - Statistics: Num rows: 7 Data size: 2050 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 1372 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), '2001' (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 7 Data size: 2050 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 1372 Basic stats: COMPLETE Column stats: NONE ListSink PREHOOK: query: analyze table loc_orc_n4 partition(year) compute statistics @@ -237,11 +237,11 @@ STAGE PLANS: TableScan alias: loc_orc_n4 filterExpr: (year = '__HIVE_DEFAULT_PARTITION__') (type: boolean) - Statistics: Num rows: 1 Data size: 292 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 196 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), '__HIVE_DEFAULT_PARTITION__' (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 292 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 196 Basic stats: COMPLETE Column stats: NONE ListSink PREHOOK: query: explain select * from loc_orc_n4 @@ -266,7 +266,7 @@ STAGE PLANS: Processor Tree: TableScan alias: loc_orc_n4 - Statistics: Num rows: 8 Data size: 3814 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 8 Data size: 3040 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -296,7 +296,7 @@ STAGE PLANS: TableScan alias: loc_orc_n4 filterExpr: (year) IN ('2001', '__HIVE_DEFAULT_PARTITION__') (type: boolean) - Statistics: Num rows: 8 Data size: 3814 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 8 Data size: 3040 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: state (type: string), locid (type: int), zip (type: bigint), year (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -367,11 +367,11 @@ STAGE PLANS: Processor Tree: TableScan alias: loc_orc_n4 - Statistics: Num rows: 8 Data size: 838 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 8 Data size: 64 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: zip (type: bigint) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 838 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 8 Data size: 64 Basic stats: COMPLETE Column stats: NONE ListSink PREHOOK: query: explain select state from loc_orc_n4 @@ -510,11 +510,11 @@ STAGE PLANS: TableScan alias: loc_orc_n4 filterExpr: (year <> '2001') (type: boolean) - Statistics: Num rows: 1 Data size: 284 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: state (type: string), locid (type: int) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 284 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE ListSink PREHOOK: query: explain select * from loc_orc_n4 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out index 121a10384b..0bbfec6250 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out @@ -829,11 +829,11 @@ STAGE PLANS: TableScan alias: alter5 filterExpr: (dt = 'a') (type: boolean) - Statistics: Num rows: 49 Data size: 27892 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 49 Data size: 7544 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: col1 (type: string), 'a' (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 49 Data size: 27892 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 49 Data size: 7544 Basic stats: PARTIAL Column stats: NONE ListSink PREHOOK: query: drop table src_stat_part diff --git a/ql/src/test/results/clientpositive/auto_join14.q.out b/ql/src/test/results/clientpositive/auto_join14.q.out index 176f2f2fc8..9ddc3c7977 100644 --- a/ql/src/test/results/clientpositive/auto_join14.q.out +++ b/ql/src/test/results/clientpositive/auto_join14.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) > 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) > 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (UDFToDouble(key) > 100.0D) (type: boolean) diff --git a/ql/src/test/results/clientpositive/auto_join2.q.out b/ql/src/test/results/clientpositive/auto_join2.q.out index 25ee73fb83..3ed97916b9 100644 --- a/ql/src/test/results/clientpositive/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/auto_join2.q.out @@ -42,7 +42,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/auto_join20.q.out b/ql/src/test/results/clientpositive/auto_join20.q.out index 733f51b054..08ca69edc4 100644 --- a/ql/src/test/results/clientpositive/auto_join20.q.out +++ b/ql/src/test/results/clientpositive/auto_join20.q.out @@ -274,7 +274,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: diff --git a/ql/src/test/results/clientpositive/auto_join29.q.out b/ql/src/test/results/clientpositive/auto_join29.q.out index 5f10d5f9fe..6210e9c819 100644 --- a/ql/src/test/results/clientpositive/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/auto_join29.q.out @@ -2688,7 +2688,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: @@ -2805,7 +2805,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: @@ -3764,7 +3764,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: diff --git a/ql/src/test/results/clientpositive/auto_join32.q.out b/ql/src/test/results/clientpositive/auto_join32.q.out index cda6c7ad5e..4ef5c67dc5 100644 --- a/ql/src/test/results/clientpositive/auto_join32.q.out +++ b/ql/src/test/results/clientpositive/auto_join32.q.out @@ -436,14 +436,14 @@ STAGE PLANS: TableScan alias: s filterExpr: ((p = 'bar') and name is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((p = 'bar') and name is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: name (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Sorted Merge Bucket Map Join Operator condition map: Inner Join 0 to 1 diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out b/ql/src/test/results/clientpositive/auto_join4.q.out index eaf708374a..86bfffa580 100644 --- a/ql/src/test/results/clientpositive/auto_join4.q.out +++ b/ql/src/test/results/clientpositive/auto_join4.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -80,7 +80,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out b/ql/src/test/results/clientpositive/auto_join5.q.out index 8c6c31c857..b2884aa172 100644 --- a/ql/src/test/results/clientpositive/auto_join5.q.out +++ b/ql/src/test/results/clientpositive/auto_join5.q.out @@ -80,7 +80,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/auto_join6.q.out b/ql/src/test/results/clientpositive/auto_join6.q.out index 977236f454..e48c8392a8 100644 --- a/ql/src/test/results/clientpositive/auto_join6.q.out +++ b/ql/src/test/results/clientpositive/auto_join6.q.out @@ -55,7 +55,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out b/ql/src/test/results/clientpositive/auto_join7.q.out index aad848ffce..690d42690c 100644 --- a/ql/src/test/results/clientpositive/auto_join7.q.out +++ b/ql/src/test/results/clientpositive/auto_join7.q.out @@ -67,7 +67,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -125,7 +125,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out index b2f8543572..61a92de7c1 100644 --- a/ql/src/test/results/clientpositive/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/auto_join8.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -80,7 +80,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out index 055064d09a..d9c7720da5 100644 --- a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -121,7 +121,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (cityid is not null and date is not null and dealid is not null and userid is not null) (type: boolean) + predicate: (date is not null and dealid is not null and cityid is not null and userid is not null) (type: boolean) Statistics: Num rows: 1 Data size: 106 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: dealid (type: int), date (type: string), cityid (type: int), userid (type: int) diff --git a/ql/src/test/results/clientpositive/auto_join_stats.q.out b/ql/src/test/results/clientpositive/auto_join_stats.q.out index 06448f437b..515ccb09f5 100644 --- a/ql/src/test/results/clientpositive/auto_join_stats.q.out +++ b/ql/src/test/results/clientpositive/auto_join_stats.q.out @@ -60,7 +60,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -167,7 +167,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -186,7 +186,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -218,7 +218,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -235,7 +235,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -345,7 +345,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -364,7 +364,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -479,7 +479,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -498,7 +498,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -530,7 +530,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -547,7 +547,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/auto_join_stats2.q.out b/ql/src/test/results/clientpositive/auto_join_stats2.q.out index 8eb4b2e765..235a2bacc5 100644 --- a/ql/src/test/results/clientpositive/auto_join_stats2.q.out +++ b/ql/src/test/results/clientpositive/auto_join_stats2.q.out @@ -63,7 +63,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -82,7 +82,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -218,7 +218,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -253,7 +253,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out index 74ef098cf6..e9753db950 100644 --- a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out @@ -192,7 +192,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) @@ -429,7 +429,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out index e374b5999c..d902155a7e 100644 --- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out +++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_10.q.out @@ -89,7 +89,7 @@ STAGE PLANS: filterExpr: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 6688 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (pageid is not null and postid is not null and type is not null and userid is not null) (type: boolean) + predicate: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 6688 Basic stats: PARTIAL Column stats: NONE Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out index 22c653171c..8006d5c5b5 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out @@ -132,7 +132,7 @@ FROM `default`.`srcbucket_mapjoin_part_n19` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -201,16 +201,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -222,17 +222,17 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -241,17 +241,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -282,7 +282,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -594,7 +594,7 @@ FROM `default`.`srcbucket_mapjoin_part_n19` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -663,16 +663,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -684,17 +684,17 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -703,17 +703,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -744,7 +744,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out index 38ed1237c8..23d704a3ae 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n12` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n10` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -184,17 +184,17 @@ STAGE PLANS: $hdt$_1:b TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -207,16 +207,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -225,17 +225,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -266,7 +266,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -578,7 +578,7 @@ FROM `default`.`srcbucket_mapjoin_part_n12` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n10` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -646,17 +646,17 @@ STAGE PLANS: $hdt$_1:b TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -669,16 +669,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -687,17 +687,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -728,7 +728,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out index 1795b891d4..5d59a53bd3 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n4` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n3` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -185,16 +185,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -206,17 +206,17 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -225,17 +225,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -266,7 +266,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -578,7 +578,7 @@ FROM `default`.`srcbucket_mapjoin_part_n4` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n3` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-6 is a root stage Stage-5 depends on stages: Stage-6 @@ -647,16 +647,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE HashTable Sink Operator keys: 0 _col0 (type: int) @@ -668,17 +668,17 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -687,17 +687,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -728,7 +728,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/cbo_const.q.out b/ql/src/test/results/clientpositive/cbo_const.q.out index 5c6b76e098..a5409c5d62 100644 --- a/ql/src/test/results/clientpositive/cbo_const.q.out +++ b/ql/src/test/results/clientpositive/cbo_const.q.out @@ -272,7 +272,7 @@ STAGE PLANS: filterExpr: ((ds = '2008-04-08') and (UDFToDouble(hr) = 14.0D) and value is not null) (type: boolean) Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hr) = 14.0D) and (ds = '2008-04-08') and value is not null) (type: boolean) + predicate: ((ds = '2008-04-08') and (UDFToDouble(hr) = 14.0D) and value is not null) (type: boolean) Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) diff --git a/ql/src/test/results/clientpositive/cbo_input26.q.out b/ql/src/test/results/clientpositive/cbo_input26.q.out index 0d7ddd34a4..480edcba94 100644 --- a/ql/src/test/results/clientpositive/cbo_input26.q.out +++ b/ql/src/test/results/clientpositive/cbo_input26.q.out @@ -67,28 +67,28 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 6 Data size: 1774 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1574 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan Union - Statistics: Num rows: 6 Data size: 1774 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1574 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -100,20 +100,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Execution mode: vectorized @@ -121,14 +121,14 @@ STAGE PLANS: Select Operator expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '14' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 454 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 254 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: @@ -233,28 +233,28 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 6 Data size: 1135 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: '2008-04-08' (type: string), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan Union - Statistics: Num rows: 6 Data size: 1135 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: '2008-04-08' (type: string), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -266,20 +266,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string) Execution mode: vectorized @@ -287,14 +287,14 @@ STAGE PLANS: Select Operator expressions: VALUE._col0 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), '14' (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 270 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 170 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: @@ -399,28 +399,28 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 6 Data size: 1135 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: '2008-04-08' (type: string), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan Union - Statistics: Num rows: 6 Data size: 1135 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1035 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: '2008-04-08' (type: string), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1602 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -432,20 +432,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 452 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string) Execution mode: vectorized @@ -453,14 +453,14 @@ STAGE PLANS: Select Operator expressions: VALUE._col0 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), '14' (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 270 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 170 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: @@ -564,28 +564,28 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 6 Data size: 1258 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1058 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), '2008-04-08' (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2772 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2772 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan Union - Statistics: Num rows: 6 Data size: 1258 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1058 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), '2008-04-08' (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 6 Data size: 2772 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 2772 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1632 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -597,20 +597,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Execution mode: vectorized @@ -618,10 +618,10 @@ STAGE PLANS: Select Operator expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out index 684155fcf2..605f1aec22 100644 --- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out @@ -63,7 +63,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -377,7 +377,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out b/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out index 96ac1255d0..94590f15d4 100644 --- a/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out +++ b/ql/src/test/results/clientpositive/cbo_rp_simple_select.q.out @@ -932,7 +932,7 @@ STAGE PLANS: filterExpr: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_int = (2 * c_int)) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) @@ -978,7 +978,7 @@ STAGE PLANS: filterExpr: (c_int is not null or (c_int = 0)) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_int = 0) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = 0)) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) diff --git a/ql/src/test/results/clientpositive/cbo_simple_select.q.out b/ql/src/test/results/clientpositive/cbo_simple_select.q.out index 8beaecfcb1..bd84e0d421 100644 --- a/ql/src/test/results/clientpositive/cbo_simple_select.q.out +++ b/ql/src/test/results/clientpositive/cbo_simple_select.q.out @@ -932,7 +932,7 @@ STAGE PLANS: filterExpr: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_int = (2 * c_int)) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) @@ -978,7 +978,7 @@ STAGE PLANS: filterExpr: (c_int is not null or (c_int = 0)) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_int = 0) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = 0)) (type: boolean) Statistics: Num rows: 20 Data size: 7138 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) diff --git a/ql/src/test/results/clientpositive/cbo_union_view.q.out b/ql/src/test/results/clientpositive/cbo_union_view.q.out index 71fb4e650d..4d2e28ca04 100644 --- a/ql/src/test/results/clientpositive/cbo_union_view.q.out +++ b/ql/src/test/results/clientpositive/cbo_union_view.q.out @@ -79,23 +79,23 @@ STAGE PLANS: filterExpr: (key = 86) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = 86) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), ds (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 804 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -105,23 +105,23 @@ STAGE PLANS: filterExpr: (key = 86) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = 86) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), ds (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 804 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -131,23 +131,23 @@ STAGE PLANS: filterExpr: (key = 86) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = 86) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), ds (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 804 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 816 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -186,23 +186,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 252 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -212,23 +212,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 252 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -238,23 +238,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 3 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 252 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 3 Data size: 519 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out b/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out index 066614f06f..e9c0d424f0 100644 --- a/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out +++ b/ql/src/test/results/clientpositive/column_pruning_partitioned_view.q.out @@ -39,10 +39,10 @@ STAGE PLANS: alias: lv_table properties: insideView TRUE - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: string), c2 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE ListSink diff --git a/ql/src/test/results/clientpositive/constant_prop_1.q.out b/ql/src/test/results/clientpositive/constant_prop_1.q.out index 5d522dae42..b4d2237755 100644 --- a/ql/src/test/results/clientpositive/constant_prop_1.q.out +++ b/ql/src/test/results/clientpositive/constant_prop_1.q.out @@ -479,7 +479,7 @@ STAGE PLANS: filterExpr: (key is not null and (value = '234')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value = '234') and key is not null) (type: boolean) + predicate: (key is not null and (value = '234')) (type: boolean) Statistics: Num rows: 2 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/constant_prop_3.q.out b/ql/src/test/results/clientpositive/constant_prop_3.q.out index 293d8f8a9d..f91c75b245 100644 --- a/ql/src/test/results/clientpositive/constant_prop_3.q.out +++ b/ql/src/test/results/clientpositive/constant_prop_3.q.out @@ -222,7 +222,7 @@ STAGE PLANS: filterExpr: ((p_size) IN (22, 14, 27, 49, 21, 33, 35, 28) and (p_brand <> 'Brand#34') and p_partkey is not null and (not (p_type like 'ECONOMY BRUSHED%'))) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not (p_type like 'ECONOMY BRUSHED%')) and (p_brand <> 'Brand#34') and (p_size) IN (22, 14, 27, 49, 21, 33, 35, 28) and p_partkey is not null) (type: boolean) + predicate: ((p_size) IN (22, 14, 27, 49, 21, 33, 35, 28) and (p_brand <> 'Brand#34') and p_partkey is not null and (not (p_type like 'ECONOMY BRUSHED%'))) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_brand (type: string), p_type (type: string), p_size (type: int) @@ -284,7 +284,7 @@ STAGE PLANS: outputColumnNames: _col1, _col3, _col4, _col5, _col6, _col7, _col9 Statistics: Num rows: 1 Data size: 196 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col7 >= _col6) or (_col6 = 0L) or _col9 is not null or _col1 is null) and (_col1 is not null or (_col6 = 0L) or _col9 is not null) and (_col9 is null or (_col6 = 0L))) (type: boolean) + predicate: ((_col9 is null or (_col6 = 0L)) and (_col1 is not null or (_col6 = 0L) or _col9 is not null) and ((_col7 >= _col6) or (_col6 = 0L) or _col9 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: int) diff --git a/ql/src/test/results/clientpositive/constprog_partitioner.q.out b/ql/src/test/results/clientpositive/constprog_partitioner.q.out index 4e497d2e92..e42287c807 100644 --- a/ql/src/test/results/clientpositive/constprog_partitioner.q.out +++ b/ql/src/test/results/clientpositive/constprog_partitioner.q.out @@ -116,7 +116,7 @@ STAGE PLANS: value expressions: _col1 (type: int), _col2 (type: int) TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 9600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) diff --git a/ql/src/test/results/clientpositive/correlated_join_keys.q.out b/ql/src/test/results/clientpositive/correlated_join_keys.q.out index 34aa35d081..c766e84c69 100644 --- a/ql/src/test/results/clientpositive/correlated_join_keys.q.out +++ b/ql/src/test/results/clientpositive/correlated_join_keys.q.out @@ -90,7 +90,7 @@ STAGE PLANS: filterExpr: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ca_state is not null and ca_zip is not null) (type: boolean) + predicate: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ca_state (type: string), ca_zip (type: string) @@ -106,7 +106,7 @@ STAGE PLANS: filterExpr: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ca_state is not null and ca_zip is not null) (type: boolean) + predicate: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ca_state (type: string), ca_zip (type: string) @@ -189,7 +189,7 @@ STAGE PLANS: filterExpr: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ca_state is not null and ca_zip is not null) (type: boolean) + predicate: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ca_state (type: string), ca_zip (type: string) @@ -205,7 +205,7 @@ STAGE PLANS: filterExpr: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ca_state is not null and ca_zip is not null) (type: boolean) + predicate: (ca_zip is not null and ca_state is not null) (type: boolean) Statistics: Num rows: 20 Data size: 3500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ca_state (type: string), ca_zip (type: string) diff --git a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out index c8ea187618..315a00f724 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out @@ -431,7 +431,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 200.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -619,7 +619,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 200.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out index 64b784e966..058d4ed68a 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer13.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer13.q.out @@ -74,7 +74,7 @@ STAGE PLANS: filterExpr: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 1028 Data size: 101772 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c1 < 120) and (c2 > 100) and c3 is not null) (type: boolean) + predicate: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 114 Data size: 11286 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), c3 (type: string) diff --git a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out index 37a6c44be2..9751a965c6 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out @@ -34,10 +34,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -131,10 +131,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -239,10 +239,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -259,10 +259,10 @@ STAGE PLANS: value expressions: _col1 (type: bigint) TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -906,10 +906,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -1003,10 +1003,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 26344 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out index ac296db3da..0c2f78fe48 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer9.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer9.q.out @@ -131,7 +131,7 @@ STAGE PLANS: filterExpr: ((c2 > 100) and (c2 < 120)) (type: boolean) Statistics: Num rows: 1028 Data size: 4112 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c2 < 120) and (c2 > 100)) (type: boolean) + predicate: ((c2 > 100) and (c2 < 120)) (type: boolean) Statistics: Num rows: 114 Data size: 456 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -247,7 +247,7 @@ STAGE PLANS: filterExpr: ((c2 > 100) and (c2 < 120)) (type: boolean) Statistics: Num rows: 1028 Data size: 4112 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c2 < 120) and (c2 > 100)) (type: boolean) + predicate: ((c2 > 100) and (c2 < 120)) (type: boolean) Statistics: Num rows: 114 Data size: 456 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -464,7 +464,7 @@ STAGE PLANS: filterExpr: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 1028 Data size: 101772 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c1 < 120) and (c2 > 100) and c3 is not null) (type: boolean) + predicate: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 114 Data size: 11286 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), c3 (type: string) @@ -584,7 +584,7 @@ STAGE PLANS: filterExpr: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 1028 Data size: 101772 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c1 < 120) and (c2 > 100) and c3 is not null) (type: boolean) + predicate: ((c2 > 100) and (c1 < 120) and c3 is not null) (type: boolean) Statistics: Num rows: 114 Data size: 11286 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), c3 (type: string) diff --git a/ql/src/test/results/clientpositive/druid/druid_timeseries.q.out b/ql/src/test/results/clientpositive/druid/druid_timeseries.q.out index b6bc199de2..beb4618287 100644 --- a/ql/src/test/results/clientpositive/druid/druid_timeseries.q.out +++ b/ql/src/test/results/clientpositive/druid/druid_timeseries.q.out @@ -31,7 +31,7 @@ STAGE PLANS: properties: druid.fieldNames $f0 druid.fieldTypes bigint - druid.query.json {"queryType":"timeseries","dataSource":"wikipedia","descending":false,"granularity":"all","filter":{"type":"or","fields":[{"type":"bound","dimension":"__time","lower":"2010-01-01T00:00:00.000Z","lowerStrict":false,"upper":"2012-03-01T00:00:00.000Z","upperStrict":false,"ordering":"lexicographic","extractionFn":{"type":"timeFormat","format":"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'","timeZone":"UTC"}},{"type":"bound","dimension":"added","upper":"0.0","upperStrict":false,"ordering":"numeric"}]},"aggregations":[{"type":"count","name":"$f0"}],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":false}} + druid.query.json {"queryType":"timeseries","dataSource":"wikipedia","descending":false,"granularity":"all","filter":{"type":"or","fields":[{"type":"bound","dimension":"added","upper":"0.0","upperStrict":false,"ordering":"numeric"},{"type":"bound","dimension":"__time","lower":"2010-01-01T00:00:00.000Z","lowerStrict":false,"upper":"2012-03-01T00:00:00.000Z","upperStrict":false,"ordering":"lexicographic","extractionFn":{"type":"timeFormat","format":"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'","timeZone":"UTC"}}]},"aggregations":[{"type":"count","name":"$f0"}],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":false}} druid.query.type timeseries Select Operator expressions: $f0 (type: bigint) diff --git a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out index a094f323c1..902b4c954e 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_expressions.q.out @@ -114,7 +114,7 @@ STAGE PLANS: properties: druid.fieldNames $f0 druid.fieldTypes bigint - druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":"all","filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[{"type":"count","name":"$f0"}],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":false}} + druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":"all","filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[{"type":"count","name":"$f0"}],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":false}} druid.query.type timeseries Select Operator expressions: $f0 (type: bigint) diff --git a/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out b/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out index 7ae55e966b..281cb53540 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_extractTime.q.out @@ -36,7 +36,7 @@ STAGE PLANS: properties: druid.fieldNames extract_second druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_second","extractionFn":{"type":"timeFormat","format":"s","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_second","extractionFn":{"type":"timeFormat","format":"s","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_second (type: int) @@ -82,7 +82,7 @@ STAGE PLANS: properties: druid.fieldNames extract_minute druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_minute","extractionFn":{"type":"timeFormat","format":"m","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_minute","extractionFn":{"type":"timeFormat","format":"m","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_minute (type: int) @@ -128,7 +128,7 @@ STAGE PLANS: properties: druid.fieldNames extract_hour druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_hour","extractionFn":{"type":"timeFormat","format":"H","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_hour","extractionFn":{"type":"timeFormat","format":"H","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_hour (type: int) @@ -173,7 +173,7 @@ STAGE PLANS: properties: druid.fieldNames extract_day druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_day","extractionFn":{"type":"timeFormat","format":"d","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_day","extractionFn":{"type":"timeFormat","format":"d","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_day (type: int) @@ -218,7 +218,7 @@ STAGE PLANS: properties: druid.fieldNames extract_week druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_week","extractionFn":{"type":"timeFormat","format":"w","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_week","extractionFn":{"type":"timeFormat","format":"w","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_week (type: int) @@ -263,7 +263,7 @@ STAGE PLANS: properties: druid.fieldNames extract_month druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_month","extractionFn":{"type":"timeFormat","format":"M","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_month","extractionFn":{"type":"timeFormat","format":"M","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_month (type: int) @@ -308,7 +308,7 @@ STAGE PLANS: properties: druid.fieldNames vc druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"default","dimension":"vc","outputName":"vc","outputType":"LONG"}],"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'QUARTER','US/Pacific')","outputType":"LONG"}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"default","dimension":"vc","outputName":"vc","outputType":"LONG"}],"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'QUARTER','US/Pacific')","outputType":"LONG"}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: vc (type: int) @@ -353,7 +353,7 @@ STAGE PLANS: properties: druid.fieldNames extract_year druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_year","extractionFn":{"type":"timeFormat","format":"yyyy","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_year","extractionFn":{"type":"timeFormat","format":"yyyy","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_year (type: int) @@ -464,7 +464,7 @@ STAGE PLANS: properties: druid.fieldNames vc druid.fieldTypes int - druid.query.json {"queryType":"scan","dataSource":"default.druid_table_alltypesorc","intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'HOUR','US/Pacific')","outputType":"LONG"}],"columns":["vc"],"resultFormat":"compactedList","limit":1} + druid.query.json {"queryType":"scan","dataSource":"default.druid_table_alltypesorc","intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'HOUR','US/Pacific')","outputType":"LONG"}],"columns":["vc"],"resultFormat":"compactedList","limit":1} druid.query.type scan Select Operator expressions: vc (type: int) diff --git a/ql/src/test/results/clientpositive/druid/druidmini_floorTime.q.out b/ql/src/test/results/clientpositive/druid/druidmini_floorTime.q.out index 685f85ed37..aced1367d2 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_floorTime.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_floorTime.q.out @@ -37,7 +37,7 @@ STAGE PLANS: properties: druid.fieldNames timestamp druid.fieldTypes timestamp with local time zone - druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1S","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} + druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1S","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} druid.query.type timeseries Select Operator expressions: timestamp (type: timestamp with local time zone) @@ -83,7 +83,7 @@ STAGE PLANS: properties: druid.fieldNames timestamp druid.fieldTypes timestamp with local time zone - druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1M","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} + druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1M","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} druid.query.type timeseries Select Operator expressions: timestamp (type: timestamp with local time zone) @@ -129,7 +129,7 @@ STAGE PLANS: properties: druid.fieldNames timestamp druid.fieldTypes timestamp with local time zone - druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1H","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} + druid.query.json {"queryType":"timeseries","dataSource":"default.druid_table_alltypesorc","descending":false,"granularity":{"type":"period","period":"PT1H","timeZone":"US/Pacific"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"context":{"skipEmptyBuckets":true}} druid.query.type timeseries Select Operator expressions: timestamp (type: timestamp with local time zone) @@ -174,7 +174,7 @@ STAGE PLANS: properties: druid.fieldNames extract_day druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_day","extractionFn":{"type":"timeFormat","format":"d","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_day","extractionFn":{"type":"timeFormat","format":"d","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_day (type: int) @@ -219,7 +219,7 @@ STAGE PLANS: properties: druid.fieldNames extract_week druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_week","extractionFn":{"type":"timeFormat","format":"w","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_week","extractionFn":{"type":"timeFormat","format":"w","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_week (type: int) @@ -264,7 +264,7 @@ STAGE PLANS: properties: druid.fieldNames extract_month druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_month","extractionFn":{"type":"timeFormat","format":"M","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_month","extractionFn":{"type":"timeFormat","format":"M","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_month (type: int) @@ -309,7 +309,7 @@ STAGE PLANS: properties: druid.fieldNames vc druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"default","dimension":"vc","outputName":"vc","outputType":"LONG"}],"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'QUARTER','US/Pacific')","outputType":"LONG"}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"default","dimension":"vc","outputName":"vc","outputType":"LONG"}],"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'QUARTER','US/Pacific')","outputType":"LONG"}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: vc (type: int) @@ -354,7 +354,7 @@ STAGE PLANS: properties: druid.fieldNames extract_year druid.fieldTypes int - druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_year","extractionFn":{"type":"timeFormat","format":"yyyy","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} + druid.query.json {"queryType":"groupBy","dataSource":"default.druid_table_alltypesorc","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract_year","extractionFn":{"type":"timeFormat","format":"yyyy","timeZone":"US/Pacific","locale":"en-US"}}],"limitSpec":{"type":"default"},"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"aggregations":[],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]} druid.query.type groupBy Select Operator expressions: extract_year (type: int) @@ -465,7 +465,7 @@ STAGE PLANS: properties: druid.fieldNames vc druid.fieldTypes int - druid.query.json {"queryType":"scan","dataSource":"default.druid_table_alltypesorc","intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"filter":{"type":"and","fields":[{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"}]},"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'HOUR','US/Pacific')","outputType":"LONG"}],"columns":["vc"],"resultFormat":"compactedList","limit":1} + druid.query.json {"queryType":"scan","dataSource":"default.druid_table_alltypesorc","intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"filter":{"type":"and","fields":[{"type":"expression","expression":"(sqrt(abs(\"ctinyint\")) > 3)"},{"type":"expression","expression":"((pow(\"cfloat\",2) * pow(\"csmallint\",3)) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) > 1)"},{"type":"expression","expression":"(strlen(CAST(\"ctinyint\", 'STRING')) < 10)"}]},"virtualColumns":[{"type":"expression","name":"vc","expression":"timestamp_extract(\"__time\",'HOUR','US/Pacific')","outputType":"LONG"}],"columns":["vc"],"resultFormat":"compactedList","limit":1} druid.query.type scan Select Operator expressions: vc (type: int) diff --git a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out index 194057195e..96374bb565 100644 --- a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out +++ b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out @@ -388,7 +388,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 7 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: double) @@ -495,10 +495,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: cmv_basetable_n2 - filterExpr: ((ROW__ID.writeid > 1L) and (a = 3)) (type: boolean) + filterExpr: ((a = 3) and (ROW__ID.writeid > 1L)) (type: boolean) Statistics: Num rows: 7 Data size: 1652 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (a = 3)) (type: boolean) + predicate: ((a = 3) and (ROW__ID.writeid > 1L)) (type: boolean) Statistics: Num rows: 1 Data size: 236 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( t AS timestamp with local time zone) (type: timestamp with local time zone), 3 (type: int), b (type: varchar(256)), c (type: double), userid (type: varchar(256)) diff --git a/ql/src/test/results/clientpositive/except_all.q.out b/ql/src/test/results/clientpositive/except_all.q.out index da862bcb2e..6aa7f8e311 100644 --- a/ql/src/test/results/clientpositive/except_all.q.out +++ b/ql/src/test/results/clientpositive/except_all.q.out @@ -609,7 +609,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 125 Data size: 24250 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 20 Data size: 3880 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -683,7 +683,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 135 Data size: 26190 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 22 Data size: 4268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -950,7 +950,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col1 * 2L) = _col2) and (_col1 > 0L)) (type: boolean) + predicate: ((_col1 > 0L) and ((_col1 * 2L) = _col2)) (type: boolean) Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out b/ql/src/test/results/clientpositive/explain_logical.q.out index 248a6f21d9..80c2f23fd3 100644 --- a/ql/src/test/results/clientpositive/explain_logical.q.out +++ b/ql/src/test/results/clientpositive/explain_logical.q.out @@ -575,14 +575,14 @@ srcpart filterExpr: (ds = '10') (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator (FIL_4) predicate: (ds = '10') (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator (SEL_2) expressions: key (type: string), value (type: string), '10' (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 638 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 438 Basic stats: COMPLETE Column stats: COMPLETE ListSink (LIST_SINK_5) PREHOOK: query: EXPLAIN LOGICAL SELECT s1.key, s1.cnt, s2.value FROM (SELECT key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src s2 ON (s1.key = s2.key) ORDER BY s1.key diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out index 75965439b5..af703f148a 100644 --- a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out +++ b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out @@ -319,7 +319,7 @@ STAGE PLANS: filterExpr: ((c_int = 1) and (UDFToDouble(key) = 1.0D)) (type: boolean) Statistics: Num rows: 20 Data size: 1767 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) = 1.0D) and (c_int = 1)) (type: boolean) + predicate: ((c_int = 1) and (UDFToDouble(key) = 1.0D)) (type: boolean) Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), c_float (type: float) @@ -446,7 +446,7 @@ STAGE PLANS: filterExpr: ((value) IN ('2008-04-10', '2008-04-08') and (value <> '') and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value <> '') and (value) IN ('2008-04-10', '2008-04-08') and key is not null) (type: boolean) + predicate: ((value) IN ('2008-04-10', '2008-04-08') and (value <> '') and key is not null) (type: boolean) Statistics: Num rows: 3 Data size: 534 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), (value = '2008-04-10') (type: boolean), (value = '2008-04-08') (type: boolean) diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out b/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out index c3eebcd567..f8743ab5fa 100644 --- a/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out +++ b/ql/src/test/results/clientpositive/filter_cond_pushdown_HIVE_15647.q.out @@ -56,7 +56,7 @@ STAGE PLANS: filterExpr: (store_id is not null and salad_bar) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (salad_bar and store_id is not null) (type: boolean) + predicate: (store_id is not null and salad_bar) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: store_id (type: int) @@ -155,7 +155,7 @@ STAGE PLANS: filterExpr: (store_id is not null and salad_bar) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (salad_bar and store_id is not null) (type: boolean) + predicate: (store_id is not null and salad_bar) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: store_id (type: int) @@ -254,7 +254,7 @@ STAGE PLANS: filterExpr: (store_id is not null and (salad_bar = true)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((salad_bar = true) and store_id is not null) (type: boolean) + predicate: (store_id is not null and (salad_bar = true)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: store_id (type: int) @@ -341,7 +341,7 @@ STAGE PLANS: filterExpr: (store_id is not null and (store_number > customer_id)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((store_number > customer_id) and store_id is not null) (type: boolean) + predicate: (store_id is not null and (store_number > customer_id)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: store_id (type: int) @@ -353,7 +353,7 @@ STAGE PLANS: filterExpr: (store_id is not null and (salad_bar = false)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((salad_bar = false) and store_id is not null) (type: boolean) + predicate: (store_id is not null and (salad_bar = false)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: store_id (type: int) diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out index 259696da91..9fb11d6236 100644 --- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -37,13 +37,13 @@ POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08 OPTIMIZED SQL: SELECT `t2`.`key`, `t0`.`value` FROM (SELECT `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '') AS `t0` +WHERE `value` <> '' AND `ds` = '2008-04-08') AS `t0` INNER JOIN ((SELECT `key` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` INNER JOIN (SELECT `key`, `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '' AND `key` IS NOT NULL) AS `t4` ON `t2`.`key` = `t4`.`key`) ON `t0`.`value` = `t4`.`value` +WHERE `key` IS NOT NULL AND `value` <> '' AND `ds` = '2008-04-08') AS `t4` ON `t2`.`key` = `t4`.`key`) ON `t0`.`value` = `t4`.`value` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -55,7 +55,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: f - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 25 Data size: 64 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -76,12 +76,12 @@ STAGE PLANS: auto parallelism: false TableScan alias: m - filterExpr: ((value <> '') and key is not null) (type: boolean) + filterExpr: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 25 Data size: 2289 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((value <> '') and key is not null) (type: boolean) + predicate: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 15 Data size: 1375 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -158,7 +158,7 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col0, _col2 - Statistics: Num rows: 25 Data size: 2305 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 15 Data size: 1375 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 @@ -188,13 +188,13 @@ STAGE PLANS: null sort order: a sort order: + Map-reduce partition columns: _col2 (type: string) - Statistics: Num rows: 25 Data size: 2305 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 15 Data size: 1375 Basic stats: COMPLETE Column stats: COMPLETE tag: 0 value expressions: _col0 (type: int) auto parallelism: false TableScan alias: g - filterExpr: ((ds = '2008-04-08') and (value <> '')) (type: boolean) + filterExpr: ((value <> '') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 25 Data size: 2225 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -298,17 +298,17 @@ STAGE PLANS: 0 _col2 (type: string) 1 _col0 (type: string) outputColumnNames: _col0, _col3 - Statistics: Num rows: 32 Data size: 2956 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 19 Data size: 1747 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col3 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 32 Data size: 2956 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 19 Data size: 1747 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 32 Data size: 2956 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 19 Data size: 1747 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/filter_numeric.q.out b/ql/src/test/results/clientpositive/filter_numeric.q.out index 0bd100f945..2b3c586874 100644 --- a/ql/src/test/results/clientpositive/filter_numeric.q.out +++ b/ql/src/test/results/clientpositive/filter_numeric.q.out @@ -43,14 +43,14 @@ STAGE PLANS: TableScan alias: partint filterExpr: (hr < 11) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (hr < 11) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), hr (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: select key, value, hr from partint where hr < 11 diff --git a/ql/src/test/results/clientpositive/flatten_and_or.q.out b/ql/src/test/results/clientpositive/flatten_and_or.q.out index 8109eae3a2..f39a1a1c33 100644 --- a/ql/src/test/results/clientpositive/flatten_and_or.q.out +++ b/ql/src/test/results/clientpositive/flatten_and_or.q.out @@ -49,7 +49,7 @@ STAGE PLANS: filterExpr: (((key = '0') and (value = '8')) or ((key = '1') and (value = '5')) or ((key = '2') and (value = '6')) or ((key = '3') and (value = '8')) or ((key = '4') and (value = '1')) or ((key = '5') and (value = '6')) or ((key = '6') and (value = '1')) or ((key = '7') and (value = '1')) or ((key = '8') and (value = '1')) or ((key = '9') and (value = '1')) or ((key = '10') and (value = '3'))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = '0') and (value = '8')) or ((key = '1') and (value = '5')) or ((key = '10') and (value = '3')) or ((key = '2') and (value = '6')) or ((key = '3') and (value = '8')) or ((key = '4') and (value = '1')) or ((key = '5') and (value = '6')) or ((key = '6') and (value = '1')) or ((key = '7') and (value = '1')) or ((key = '8') and (value = '1')) or ((key = '9') and (value = '1'))) (type: boolean) + predicate: (((key = '0') and (value = '8')) or ((key = '1') and (value = '5')) or ((key = '2') and (value = '6')) or ((key = '3') and (value = '8')) or ((key = '4') and (value = '1')) or ((key = '5') and (value = '6')) or ((key = '6') and (value = '1')) or ((key = '7') and (value = '1')) or ((key = '8') and (value = '1')) or ((key = '9') and (value = '1')) or ((key = '10') and (value = '3'))) (type: boolean) Statistics: Num rows: 11 Data size: 1958 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out index 2b87d3b26f..006b51e2f9 100644 --- a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out +++ b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out @@ -44,10 +44,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((DATE'1996-03-30' = to_date(CAST( l_shipdate AS TIMESTAMP))) and (l_shipmode = 'RAIL')) (type: boolean) + filterExpr: ((l_shipmode = 'RAIL') and (DATE'1996-03-30' = to_date(CAST( l_shipdate AS TIMESTAMP)))) (type: boolean) Statistics: Num rows: 100 Data size: 19000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((DATE'1996-03-30' = to_date(CAST( l_shipdate AS TIMESTAMP))) and (l_shipmode = 'RAIL')) (type: boolean) + predicate: ((l_shipmode = 'RAIL') and (DATE'1996-03-30' = to_date(CAST( l_shipdate AS TIMESTAMP)))) (type: boolean) Statistics: Num rows: 7 Data size: 1330 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: l_orderkey (type: int), (UDFToDouble(l_partkey) / 1000000.0D) (type: double) diff --git a/ql/src/test/results/clientpositive/fold_to_null.q.out b/ql/src/test/results/clientpositive/fold_to_null.q.out index 5104400a1a..4b6f48052c 100644 --- a/ql/src/test/results/clientpositive/fold_to_null.q.out +++ b/ql/src/test/results/clientpositive/fold_to_null.q.out @@ -164,7 +164,7 @@ STAGE PLANS: filterExpr: ((a > 5) and ((a * a) < 101)) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((a * a) < 101) and (a > 5)) (type: boolean) + predicate: ((a > 5) and ((a * a) < 101)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int) @@ -180,7 +180,7 @@ STAGE PLANS: filterExpr: ((b > 5) and ((b * b) < 101)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((b * b) < 101) and (b > 5)) (type: boolean) + predicate: ((b > 5) and ((b * b) < 101)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: b (type: int) @@ -221,7 +221,7 @@ STAGE PLANS: filterExpr: ((c > 5) and ((c * c) < 101)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((c * c) < 101) and (c > 5)) (type: boolean) + predicate: ((c > 5) and ((c * c) < 101)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c (type: int) diff --git a/ql/src/test/results/clientpositive/folder_predicate.q.out b/ql/src/test/results/clientpositive/folder_predicate.q.out index 92e7f799ae..5fe3341ef9 100644 --- a/ql/src/test/results/clientpositive/folder_predicate.q.out +++ b/ql/src/test/results/clientpositive/folder_predicate.q.out @@ -39,7 +39,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: predicate_fold_tb - filterExpr: (value is null or (value <> 3)) (type: boolean) + filterExpr: ((value <> 3) or value is null) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((value <> 3) or value is null) (type: boolean) @@ -99,7 +99,7 @@ STAGE PLANS: filterExpr: (value is null or (value < 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value < 3) or value is null) (type: boolean) + predicate: (value is null or (value < 3)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) @@ -154,7 +154,7 @@ STAGE PLANS: filterExpr: (value is null or (value > 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value > 3) or value is null) (type: boolean) + predicate: (value is null or (value > 3)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) @@ -209,7 +209,7 @@ STAGE PLANS: filterExpr: (value is null or (value <= 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value <= 3) or value is null) (type: boolean) + predicate: (value is null or (value <= 3)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) @@ -265,7 +265,7 @@ STAGE PLANS: filterExpr: (value is null or (value >= 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value >= 3) or value is null) (type: boolean) + predicate: (value is null or (value >= 3)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) @@ -321,7 +321,7 @@ STAGE PLANS: filterExpr: (value is null or (value = 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value = 3) or value is null) (type: boolean) + predicate: (value is null or (value = 3)) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) @@ -375,7 +375,7 @@ STAGE PLANS: filterExpr: (value is null or (value <= 1) or (value > 3)) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value <= 1) or (value > 3) or value is null) (type: boolean) + predicate: (value is null or (value <= 1) or (value > 3)) (type: boolean) Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: int) diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out index 3d270ec485..db3fd7c926 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out @@ -334,7 +334,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((grouping(_col2, 0L) = 1L) or (grouping(_col2, 1L) = 1L)) (type: boolean) + predicate: ((grouping(_col2, 1L) = 1L) or (grouping(_col2, 0L) = 1L)) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: int), (grouping(_col2, 1L) + grouping(_col2, 0L)) (type: bigint), CASE WHEN (((grouping(_col2, 1L) + grouping(_col2, 0L)) = 1L)) THEN (_col0) ELSE (null) END (type: int) @@ -707,7 +707,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 4 Data size: 32 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((grouping(_col2, 0L) = 1) or (grouping(_col2, 1L) = 1)) (type: boolean) + predicate: ((grouping(_col2, 1L) = 1) or (grouping(_col2, 0L) = 1)) (type: boolean) Statistics: Num rows: 4 Data size: 32 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint) diff --git a/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out b/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out index 658669320b..00a6628621 100644 --- a/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out +++ b/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out @@ -60,7 +60,7 @@ STAGE PLANS: filterExpr: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200))) or (((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450)))) (type: boolean) + predicate: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 5 Data size: 890 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -73,7 +73,7 @@ STAGE PLANS: Forward Statistics: Num rows: 5 Data size: 890 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200)) and ((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300')) and ((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200))) (type: boolean) Statistics: Num rows: 3 Data size: 534 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -110,7 +110,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: (((KEY._col0 = 400) or (KEY._col0 = 450)) and ((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500')) and ((KEY._col0 = 400) or (KEY._col0 = 450))) (type: boolean) Statistics: Num rows: 2 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -324,7 +324,7 @@ STAGE PLANS: filterExpr: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 500) and value is not null))) (type: boolean) + predicate: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: value (type: string) @@ -374,7 +374,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean) + predicate: (((VALUE._col0 + VALUE._col0) = 400) or (((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -587,7 +587,7 @@ STAGE PLANS: alias: src Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200))) or (((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450)))) (type: boolean) + predicate: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 5 Data size: 890 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -600,7 +600,7 @@ STAGE PLANS: Forward Statistics: Num rows: 5 Data size: 890 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200)) and ((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300')) and ((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200))) (type: boolean) Statistics: Num rows: 3 Data size: 534 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -637,7 +637,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: (((KEY._col0 = 400) or (KEY._col0 = 450)) and ((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500')) and ((KEY._col0 = 400) or (KEY._col0 = 450))) (type: boolean) Statistics: Num rows: 2 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -850,7 +850,7 @@ STAGE PLANS: alias: src Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 500) and value is not null))) (type: boolean) + predicate: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: value (type: string) @@ -900,7 +900,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean) + predicate: (((VALUE._col0 + VALUE._col0) = 400) or (((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/groupby_position.q.out b/ql/src/test/results/clientpositive/groupby_position.q.out index 03040a3a70..9c6659377d 100644 --- a/ql/src/test/results/clientpositive/groupby_position.q.out +++ b/ql/src/test/results/clientpositive/groupby_position.q.out @@ -846,7 +846,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/groupby_sort_6.q.out b/ql/src/test/results/clientpositive/groupby_sort_6.q.out index fd960697d9..eee2ffa8e8 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_6.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_6.q.out @@ -43,29 +43,29 @@ STAGE PLANS: TableScan alias: t1_n61 filterExpr: (ds = '1') (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (ds = '1') (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) outputColumnNames: key - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: key (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE tag: -1 value expressions: _col1 (type: bigint) auto parallelism: false @@ -77,17 +77,17 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int), UDFToInteger(_col1) (type: int) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -118,13 +118,13 @@ STAGE PLANS: Select Operator expressions: _col0 (type: int), _col1 (type: int) outputColumnNames: key, cnt - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(cnt, 'hll') minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 @@ -191,7 +191,7 @@ STAGE PLANS: Reduce Output Operator null sort order: sort order: - Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: COMPLETE tag: -1 value expressions: _col0 (type: struct), _col1 (type: struct) auto parallelism: false @@ -229,13 +229,13 @@ STAGE PLANS: aggregations: compute_stats(VALUE._col0), compute_stats(VALUE._col1) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -311,29 +311,29 @@ STAGE PLANS: TableScan alias: t1_n61 filterExpr: (ds = '1') (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (ds = '1') (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) outputColumnNames: key - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: key (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE tag: -1 value expressions: _col1 (type: bigint) auto parallelism: false @@ -345,17 +345,17 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int), UDFToInteger(_col1) (type: int) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -386,13 +386,13 @@ STAGE PLANS: Select Operator expressions: _col0 (type: int), _col1 (type: int) outputColumnNames: key, cnt - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(cnt, 'hll') minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 @@ -459,7 +459,7 @@ STAGE PLANS: Reduce Output Operator null sort order: sort order: - Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 848 Basic stats: COMPLETE Column stats: COMPLETE tag: -1 value expressions: _col0 (type: struct), _col1 (type: struct) auto parallelism: false @@ -497,13 +497,13 @@ STAGE PLANS: aggregations: compute_stats(VALUE._col0), compute_stats(VALUE._col1) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -572,25 +572,25 @@ STAGE PLANS: TableScan alias: t1_n61 filterExpr: (ds = '2') (type: boolean) - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE GatherStats: false Select Operator expressions: key (type: string) outputColumnNames: key - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() keys: key (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE tag: -1 value expressions: _col1 (type: bigint) auto parallelism: false @@ -654,17 +654,17 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int), UDFToInteger(_col1) (type: int) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -695,7 +695,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: int), _col1 (type: int) outputColumnNames: key, cnt - Statistics: Num rows: 1 Data size: 484 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 184 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(cnt, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/groupby_sort_7.q.out b/ql/src/test/results/clientpositive/groupby_sort_7.q.out index d9f9f1a153..a28d2631ab 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_7.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_7.q.out @@ -68,24 +68,24 @@ STAGE PLANS: TableScan alias: t1_n104 filterExpr: (ds = '1') (type: boolean) - Statistics: Num rows: 6 Data size: 2232 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 2208 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) outputColumnNames: key, val - Statistics: Num rows: 6 Data size: 2232 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 2208 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() keys: key (type: string), val (type: string) mode: final outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col2) (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -94,7 +94,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: int) outputColumnNames: key, val, cnt - Statistics: Num rows: 3 Data size: 1116 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(val, 'hll'), compute_stats(cnt, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/groupby_sort_8.q.out b/ql/src/test/results/clientpositive/groupby_sort_8.q.out index 12fa830590..d7b17b9a41 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_8.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_8.q.out @@ -51,11 +51,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1_n45 - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: key - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(DISTINCT key) bucketGroup: true @@ -63,11 +63,11 @@ STAGE PLANS: minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Reduce Operator Tree: Group By Operator diff --git a/ql/src/test/results/clientpositive/groupby_sort_9.q.out b/ql/src/test/results/clientpositive/groupby_sort_9.q.out index f1381f3c17..eaa3771fed 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_9.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_9.q.out @@ -65,11 +65,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1_n96 - Statistics: Num rows: 12 Data size: 2256 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: key - Statistics: Num rows: 12 Data size: 2256 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() bucketGroup: true @@ -77,12 +77,12 @@ STAGE PLANS: minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 12 Data size: 2256 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 12 Data size: 2256 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Execution mode: vectorized Reduce Operator Tree: @@ -91,10 +91,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/having2.q.out b/ql/src/test/results/clientpositive/having2.q.out index 967fb44164..95084571e3 100644 --- a/ql/src/test/results/clientpositive/having2.q.out +++ b/ql/src/test/results/clientpositive/having2.q.out @@ -161,7 +161,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col1 <= 4074689.000000041D) and (_col3 <= 822L)) (type: boolean) + predicate: ((_col3 <= 822L) and (_col1 <= 4074689.000000041D)) (type: boolean) Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: double), _col2 (type: double) @@ -331,7 +331,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 550 Data size: 97900 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: sum(_col2), sum(_col0), count(_col0), count(_col4) + aggregations: sum(_col2), count(_col4), sum(_col0), count(_col0) keys: _col1 (type: string) minReductionHashAggr: 0.99 mode: hash @@ -353,17 +353,17 @@ STAGE PLANS: sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 550 Data size: 97900 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: double), _col2 (type: double), _col3 (type: bigint), _col4 (type: bigint) + value expressions: _col1 (type: double), _col2 (type: bigint), _col3 (type: double), _col4 (type: bigint) Execution mode: vectorized Reduce Operator Tree: Group By Operator - aggregations: sum(VALUE._col0), sum(VALUE._col1), count(VALUE._col2), count(VALUE._col3) + aggregations: sum(VALUE._col0), count(VALUE._col1), sum(VALUE._col2), count(VALUE._col3) keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3, _col4 Statistics: Num rows: 275 Data size: 48950 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col2 / _col3) <= 822.0D) and (_col1 <= 4074689.000000041D) and (_col4 > 4L)) (type: boolean) + predicate: ((_col1 <= 4074689.000000041D) and (_col2 > 4L) and ((_col3 / _col4) <= 822.0D)) (type: boolean) Statistics: Num rows: 10 Data size: 1780 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -496,7 +496,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3, _col4, _col5 Statistics: Num rows: 275 Data size: 48950 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 / _col4) <= 822.0D) and (_col2 <= 4074689.000000041D) and (_col5 > 4L)) (type: boolean) + predicate: ((_col2 <= 4074689.000000041D) and (_col5 > 4L) and ((_col3 / _col4) <= 822.0D)) (type: boolean) Statistics: Num rows: 10 Data size: 1780 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string) @@ -629,7 +629,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3, _col4, _col5 Statistics: Num rows: 275 Data size: 48950 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 / _col4) <= 822.0D) and (_col2 <= 4074689.000000041D) and (_col5 > 4L)) (type: boolean) + predicate: ((_col2 <= 4074689.000000041D) and (_col5 > 4L) and ((_col3 / _col4) <= 822.0D)) (type: boolean) Statistics: Num rows: 10 Data size: 1780 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out b/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out index 73f99d2a4a..1176c7c0d4 100644 --- a/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out +++ b/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out @@ -39,7 +39,7 @@ STAGE PLANS: filterExpr: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key = '105') and (value = 'val_105')) (type: boolean) + predicate: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/infer_const_type.q.out b/ql/src/test/results/clientpositive/infer_const_type.q.out index bbdb5be8ca..9e48dbe40a 100644 --- a/ql/src/test/results/clientpositive/infer_const_type.q.out +++ b/ql/src/test/results/clientpositive/infer_const_type.q.out @@ -64,7 +64,7 @@ STAGE PLANS: filterExpr: ((ti = 127Y) and (si = 32767S) and (i = 12345) and (bi = -12345L) and (fl = 906.0) and (db = -307.0D) and (UDFToDouble(str) = 1234.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(str) = 1234.0D) and (bi = -12345L) and (db = -307.0D) and (fl = 906.0) and (i = 12345) and (si = 32767S) and (ti = 127Y)) (type: boolean) + predicate: ((ti = 127Y) and (si = 32767S) and (i = 12345) and (bi = -12345L) and (fl = 906.0) and (db = -307.0D) and (UDFToDouble(str) = 1234.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: 127Y (type: tinyint), 32767S (type: smallint), 12345 (type: int), -12345L (type: bigint), 906.0 (type: float), -307.0D (type: double), str (type: string) @@ -205,10 +205,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: infertypes - filterExpr: ((ti = 127Y) or (CAST( si AS decimal(5,0)) = 327) or (i = -100)) (type: boolean) + filterExpr: ((ti = 127Y) or (i = -100) or (CAST( si AS decimal(5,0)) = 327)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((CAST( si AS decimal(5,0)) = 327) or (i = -100) or (ti = 127Y)) (type: boolean) + predicate: ((ti = 127Y) or (i = -100) or (CAST( si AS decimal(5,0)) = 327)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ti (type: tinyint), si (type: smallint), i (type: int), bi (type: bigint), fl (type: float), db (type: double), str (type: string) @@ -271,7 +271,7 @@ STAGE PLANS: filterExpr: ((ti < 127Y) and (i > 100) and (UDFToDouble(str) = 1.57D)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(str) = 1.57D) and (i > 100) and (ti < 127Y)) (type: boolean) + predicate: ((ti < 127Y) and (i > 100) and (UDFToDouble(str) = 1.57D)) (type: boolean) Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ti (type: tinyint), si (type: smallint), i (type: int), bi (type: bigint), fl (type: float), db (type: double), str (type: string) diff --git a/ql/src/test/results/clientpositive/input12.q.out b/ql/src/test/results/clientpositive/input12.q.out index a2a9995b18..4f640b8581 100644 --- a/ql/src/test/results/clientpositive/input12.q.out +++ b/ql/src/test/results/clientpositive/input12.q.out @@ -95,7 +95,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 864 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 200) and (key >= 100)) (type: boolean) + predicate: ((key >= 100) and (key < 200)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/input13.q.out b/ql/src/test/results/clientpositive/input13.q.out index 00f7bc2be5..5199b31655 100644 --- a/ql/src/test/results/clientpositive/input13.q.out +++ b/ql/src/test/results/clientpositive/input13.q.out @@ -100,7 +100,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 864 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 200) and (key >= 100)) (type: boolean) + predicate: ((key >= 100) and (key < 200)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string) @@ -131,7 +131,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((key < 300) and (key >= 200)) (type: boolean) + predicate: ((key >= 200) and (key < 300)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int) diff --git a/ql/src/test/results/clientpositive/input23.q.out b/ql/src/test/results/clientpositive/input23.q.out index e9e65dc96d..396f2c1c9b 100644 --- a/ql/src/test/results/clientpositive/input23.q.out +++ b/ql/src/test/results/clientpositive/input23.q.out @@ -46,20 +46,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator null sort order: sort order: - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE tag: 1 value expressions: _col0 (type: string), _col1 (type: string) auto parallelism: false @@ -126,20 +126,20 @@ STAGE PLANS: 0 1 outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 500 Data size: 273000 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 500 Data size: 173000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), '11' (type: string), _col2 (type: string), _col3 (type: string), '2008-04-08' (type: string), '14' (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 500 Data size: 453000 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 500 Data size: 353000 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4530 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 3530 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 5 Data size: 4530 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 3530 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/input26.q.out b/ql/src/test/results/clientpositive/input26.q.out index 9d7a93ee02..fb68f151cb 100644 --- a/ql/src/test/results/clientpositive/input26.q.out +++ b/ql/src/test/results/clientpositive/input26.q.out @@ -67,28 +67,28 @@ STAGE PLANS: Map Operator Tree: TableScan Union - Statistics: Num rows: 6 Data size: 1774 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1574 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan Union - Statistics: Num rows: 6 Data size: 1774 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 1574 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 3288 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 2148 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -100,20 +100,20 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((ds = '2008-04-08') and (hr = '14')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: string) Execution mode: vectorized @@ -121,14 +121,14 @@ STAGE PLANS: Select Operator expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Limit Number of rows: 5 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '14' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 454 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 254 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: diff --git a/ql/src/test/results/clientpositive/input42.q.out b/ql/src/test/results/clientpositive/input42.q.out index 27917f77f8..9b17445f55 100644 --- a/ql/src/test/results/clientpositive/input42.q.out +++ b/ql/src/test/results/clientpositive/input42.q.out @@ -1157,7 +1157,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `key` < 200 +WHERE `key` < 200 AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1168,7 +1168,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) < 200.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) < 200.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/input_part2.q.out b/ql/src/test/results/clientpositive/input_part2.q.out index ea30e6ab66..b187bc2bec 100644 --- a/ql/src/test/results/clientpositive/input_part2.q.out +++ b/ql/src/test/results/clientpositive/input_part2.q.out @@ -57,7 +57,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key < 100)) (type: boolean) + predicate: ((key < 100) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 333 Data size: 90576 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string), '12' (type: string), '2008-04-08' (type: string) @@ -115,7 +115,7 @@ STAGE PLANS: auto parallelism: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-09') and (key < 100)) (type: boolean) + predicate: ((key < 100) and (ds = '2008-04-09')) (type: boolean) Statistics: Num rows: 333 Data size: 90576 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string), '12' (type: string), '2008-04-09' (type: string) diff --git a/ql/src/test/results/clientpositive/input_part4.q.out b/ql/src/test/results/clientpositive/input_part4.q.out index 826703fdd9..507d901237 100644 --- a/ql/src/test/results/clientpositive/input_part4.q.out +++ b/ql/src/test/results/clientpositive/input_part4.q.out @@ -19,14 +19,14 @@ STAGE PLANS: TableScan alias: x filterExpr: ((ds = '2008-04-08') and (UDFToDouble(hr) = 15.0D)) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hr) = 15.0D) and (ds = '2008-04-08')) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((ds = '2008-04-08') and (UDFToDouble(hr) = 15.0D)) (type: boolean) + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 1 Data size: 646 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 446 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: SELECT x.* FROM SRCPART x WHERE x.ds = '2008-04-08' and x.hr = 15 diff --git a/ql/src/test/results/clientpositive/input_part5.q.out b/ql/src/test/results/clientpositive/input_part5.q.out index 2265a630e3..f8fb93c032 100644 --- a/ql/src/test/results/clientpositive/input_part5.q.out +++ b/ql/src/test/results/clientpositive/input_part5.q.out @@ -38,7 +38,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) < 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) < 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (UDFToDouble(key) < 100.0D) (type: boolean) diff --git a/ql/src/test/results/clientpositive/input_testxpath4.q.out b/ql/src/test/results/clientpositive/input_testxpath4.q.out index 0b1b81e852..a60534df41 100644 --- a/ql/src/test/results/clientpositive/input_testxpath4.q.out +++ b/ql/src/test/results/clientpositive/input_testxpath4.q.out @@ -28,7 +28,7 @@ STAGE PLANS: alias: src_thrift Statistics: Num rows: 11 Data size: 38280 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (lintstring is not null and lintstring.myint is not null and mstringstring['key_9'] is not null) (type: boolean) + predicate: (mstringstring['key_9'] is not null and lintstring.myint is not null and lintstring is not null) (type: boolean) Statistics: Num rows: 11 Data size: 38280 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array) @@ -105,7 +105,7 @@ STAGE PLANS: filterExpr: (mstringstring['key_9'] is not null and lintstring.myint is not null and lintstring is not null) (type: boolean) Statistics: Num rows: 11 Data size: 38280 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (lintstring is not null and lintstring.myint is not null and mstringstring['key_9'] is not null) (type: boolean) + predicate: (mstringstring['key_9'] is not null and lintstring.myint is not null and lintstring is not null) (type: boolean) Statistics: Num rows: 11 Data size: 38280 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: mstringstring['key_9'] (type: string), lintstring.myint (type: array) diff --git a/ql/src/test/results/clientpositive/insert1.q.out b/ql/src/test/results/clientpositive/insert1.q.out index 669d39aa08..93a3402367 100644 --- a/ql/src/test/results/clientpositive/insert1.q.out +++ b/ql/src/test/results/clientpositive/insert1.q.out @@ -608,7 +608,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 1052 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out b/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out index b2552546b3..fb375f1cb5 100644 --- a/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out +++ b/ql/src/test/results/clientpositive/insert2_overwrite_partitions.q.out @@ -68,28 +68,28 @@ STAGE PLANS: TableScan alias: sourcetable filterExpr: (ds = '2011-11-11') (type: boolean) - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: one (type: string), two (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: -- - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE TopN Hash Memory Usage: 0.1 Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -98,14 +98,14 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-11-11' (type: string) outputColumnNames: one, two, ds - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(one, 'hll'), compute_stats(two, 'hll') keys: ds (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false table: @@ -141,7 +141,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE value expressions: _col1 (type: struct), _col2 (type: struct) Execution mode: vectorized Reduce Operator Tree: @@ -150,14 +150,14 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col1 (type: struct), _col2 (type: struct), _col0 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -217,28 +217,28 @@ STAGE PLANS: TableScan alias: sourcetable filterExpr: (ds = '2011-11-11') (type: boolean) - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: one (type: string), two (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: -- - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE TopN Hash Memory Usage: 0.1 Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 124 Data size: 104072 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 124 Data size: 40480 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -247,14 +247,14 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-11-11' (type: string) outputColumnNames: one, two, ds - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(one, 'hll'), compute_stats(two, 'hll') keys: ds (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false table: @@ -290,7 +290,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 4195 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1630 Basic stats: PARTIAL Column stats: NONE value expressions: _col1 (type: struct), _col2 (type: struct) Execution mode: vectorized Reduce Operator Tree: @@ -299,14 +299,14 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col1 (type: struct), _col2 (type: struct), _col0 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 1678 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 652 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/interval_3.q.out b/ql/src/test/results/clientpositive/interval_3.q.out index ba146df260..221d10e41c 100644 --- a/ql/src/test/results/clientpositive/interval_3.q.out +++ b/ql/src/test/results/clientpositive/interval_3.q.out @@ -191,7 +191,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4 Statistics: Num rows: 1 Data size: 373 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col3 > _col1) and (_col4 < _col2)) (type: boolean) + predicate: ((_col4 < _col2) and (_col3 > _col1)) (type: boolean) Statistics: Num rows: 1 Data size: 373 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/join14.q.out b/ql/src/test/results/clientpositive/join14.q.out index 64c0441e17..dfe54f182a 100644 --- a/ql/src/test/results/clientpositive/join14.q.out +++ b/ql/src/test/results/clientpositive/join14.q.out @@ -52,7 +52,7 @@ STAGE PLANS: Statistics: Num rows: 166 Data size: 14442 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) > 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) > 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (UDFToDouble(key) > 100.0D) (type: boolean) diff --git a/ql/src/test/results/clientpositive/join19.q.out b/ql/src/test/results/clientpositive/join19.q.out index bf11e5c3ba..b347fccfaa 100644 --- a/ql/src/test/results/clientpositive/join19.q.out +++ b/ql/src/test/results/clientpositive/join19.q.out @@ -139,7 +139,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null and object is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and object is not null and subject is not null) (type: boolean) + predicate: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null and object is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: subject (type: string), object (type: string) @@ -280,7 +280,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is not null) (type: boolean) + predicate: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: subject (type: string) @@ -332,7 +332,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is not null) (type: boolean) + predicate: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: subject (type: string) diff --git a/ql/src/test/results/clientpositive/join2.q.out b/ql/src/test/results/clientpositive/join2.q.out index 5d4ba816f8..71fa8f0b38 100644 --- a/ql/src/test/results/clientpositive/join2.q.out +++ b/ql/src/test/results/clientpositive/join2.q.out @@ -33,7 +33,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/join20.q.out b/ql/src/test/results/clientpositive/join20.q.out index 8b17f8a842..75fd7fbd7d 100644 --- a/ql/src/test/results/clientpositive/join20.q.out +++ b/ql/src/test/results/clientpositive/join20.q.out @@ -717,7 +717,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out index 40c22d5ccb..b8fd984b83 100644 --- a/ql/src/test/results/clientpositive/join34.q.out +++ b/ql/src/test/results/clientpositive/join34.q.out @@ -35,11 +35,11 @@ POSTHOOK: Output: default@dest_j1_n1 OPTIMIZED SQL: SELECT `t5`.`key`, `t5`.`value`, `t3`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` < 20 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` < 20 UNION ALL SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 100 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100) AS `t3` +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` > 100) AS `t3` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` IS NOT NULL) AS `t5` ON `t3`.`key` = `t5`.`key` @@ -83,12 +83,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 26344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -172,12 +172,12 @@ STAGE PLANS: MultiFileSpray: false TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 26344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out index f9485b307a..5f91f28ad6 100644 --- a/ql/src/test/results/clientpositive/join35.q.out +++ b/ql/src/test/results/clientpositive/join35.q.out @@ -35,12 +35,12 @@ POSTHOOK: Output: default@dest_j1_n24 OPTIMIZED SQL: SELECT `t5`.`key`, `t5`.`value`, `t3`.`$f1` AS `cnt` FROM (SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` < 20 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` < 20 GROUP BY `key` UNION ALL SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` > 100 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` > 100 GROUP BY `key`) AS `t3` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` @@ -60,12 +60,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -564,12 +564,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 12876 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/join4.q.out b/ql/src/test/results/clientpositive/join4.q.out index be98483b86..c40bd14ee0 100644 --- a/ql/src/test/results/clientpositive/join4.q.out +++ b/ql/src/test/results/clientpositive/join4.q.out @@ -55,7 +55,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join40.q.out b/ql/src/test/results/clientpositive/join40.q.out index 5f6263c3b1..fe2a78c3ae 100644 --- a/ql/src/test/results/clientpositive/join40.q.out +++ b/ql/src/test/results/clientpositive/join40.q.out @@ -2480,7 +2480,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/join42.q.out b/ql/src/test/results/clientpositive/join42.q.out index e29a9a62a6..890811da0b 100644 --- a/ql/src/test/results/clientpositive/join42.q.out +++ b/ql/src/test/results/clientpositive/join42.q.out @@ -313,10 +313,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acct - filterExpr: (aid is not null and brn is not null) (type: boolean) + filterExpr: (brn is not null and aid is not null) (type: boolean) Statistics: Num rows: 3 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (aid is not null and brn is not null) (type: boolean) + predicate: (brn is not null and aid is not null) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: aid (type: int), acc_n (type: int), brn (type: int) diff --git a/ql/src/test/results/clientpositive/join45.q.out b/ql/src/test/results/clientpositive/join45.q.out index 826412da1c..1bade2b6aa 100644 --- a/ql/src/test/results/clientpositive/join45.q.out +++ b/ql/src/test/results/clientpositive/join45.q.out @@ -615,7 +615,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 Statistics: Num rows: 12500 Data size: 4612500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 + _col5) <= 102.0D) or ((_col2 + _col5) >= 100.0D)) (type: boolean) + predicate: (((_col2 + _col5) >= 100.0D) or ((_col2 + _col5) <= 102.0D)) (type: boolean) Statistics: Num rows: 8332 Data size: 3074508 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string), _col4 (type: string) @@ -1824,7 +1824,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, _col26, _col27, _col28, _col29, _col30 Statistics: Num rows: 720000 Data size: 1320479175 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col0 = _col25) or ((_col29 = _col17) and _col6)) and ((_col13 = _col25) or ((_col28 = _col16) and (_col14 = _col26))) and ((_col7 = _col25) or ((_col8 = _col26) and (_col27 = _col21)))) (type: boolean) + predicate: (((_col7 = _col25) or ((_col8 = _col26) and (_col27 = _col21))) and ((_col13 = _col25) or ((_col28 = _col16) and (_col14 = _col26))) and ((_col0 = _col25) or ((_col29 = _col17) and _col6))) (type: boolean) Statistics: Num rows: 303750 Data size: 557077500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col19 (type: string), _col20 (type: string), _col21 (type: int), _col22 (type: float), _col23 (type: boolean), _col24 (type: string), _col25 (type: string), _col26 (type: string), _col27 (type: int), _col28 (type: float), _col29 (type: boolean), _col30 (type: string), _col7 (type: string), _col8 (type: string), _col9 (type: int), _col10 (type: float), _col11 (type: boolean), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col15 (type: int), _col16 (type: float), _col17 (type: boolean), _col18 (type: string), _col0 (type: string), _col1 (type: string), _col2 (type: int), _col3 (type: float), _col4 (type: boolean), _col5 (type: string) diff --git a/ql/src/test/results/clientpositive/join46.q.out b/ql/src/test/results/clientpositive/join46.q.out index 3649968328..c7ae1eb11e 100644 --- a/ql/src/test/results/clientpositive/join46.q.out +++ b/ql/src/test/results/clientpositive/join46.q.out @@ -182,10 +182,10 @@ STAGE PLANS: value expressions: _col0 (type: int), _col2 (type: string), _col3 (type: boolean) TableScan alias: test2_n0 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/join5.q.out b/ql/src/test/results/clientpositive/join5.q.out index 89541834df..e02aff9f7d 100644 --- a/ql/src/test/results/clientpositive/join5.q.out +++ b/ql/src/test/results/clientpositive/join5.q.out @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join6.q.out b/ql/src/test/results/clientpositive/join6.q.out index e3fd95b348..64a83e98c0 100644 --- a/ql/src/test/results/clientpositive/join6.q.out +++ b/ql/src/test/results/clientpositive/join6.q.out @@ -55,7 +55,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join7.q.out b/ql/src/test/results/clientpositive/join7.q.out index 75a23b4e6f..d4fddfa537 100644 --- a/ql/src/test/results/clientpositive/join7.q.out +++ b/ql/src/test/results/clientpositive/join7.q.out @@ -66,7 +66,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -126,7 +126,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join8.q.out b/ql/src/test/results/clientpositive/join8.q.out index 3efb3c5d5d..4c04a45c94 100644 --- a/ql/src/test/results/clientpositive/join8.q.out +++ b/ql/src/test/results/clientpositive/join8.q.out @@ -55,7 +55,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join_hive_626.q.out b/ql/src/test/results/clientpositive/join_hive_626.q.out index 1b4ef9e941..04279a686b 100644 --- a/ql/src/test/results/clientpositive/join_hive_626.q.out +++ b/ql/src/test/results/clientpositive/join_hive_626.q.out @@ -86,7 +86,7 @@ STAGE PLANS: filterExpr: (foo_id is not null and bar_id is not null) (type: boolean) Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (bar_id is not null and foo_id is not null) (type: boolean) + predicate: (foo_id is not null and bar_id is not null) (type: boolean) Statistics: Num rows: 1 Data size: 192 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: bar_id (type: int), foo_id (type: int), bar_name (type: string) diff --git a/ql/src/test/results/clientpositive/join_parse.q.out b/ql/src/test/results/clientpositive/join_parse.q.out index 99ad9015ee..aba4cb5056 100644 --- a/ql/src/test/results/clientpositive/join_parse.q.out +++ b/ql/src/test/results/clientpositive/join_parse.q.out @@ -533,7 +533,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/join_reorder2.q.out b/ql/src/test/results/clientpositive/join_reorder2.q.out index 927ae7a75f..540694c8d1 100644 --- a/ql/src/test/results/clientpositive/join_reorder2.q.out +++ b/ql/src/test/results/clientpositive/join_reorder2.q.out @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -296,7 +296,7 @@ STAGE PLANS: filterExpr: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/join_reorder3.q.out b/ql/src/test/results/clientpositive/join_reorder3.q.out index fc35b69ecc..8e419e55a0 100644 --- a/ql/src/test/results/clientpositive/join_reorder3.q.out +++ b/ql/src/test/results/clientpositive/join_reorder3.q.out @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -296,7 +296,7 @@ STAGE PLANS: filterExpr: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/join_vc.q.out b/ql/src/test/results/clientpositive/join_vc.q.out index d875fda372..9d8141aef6 100644 --- a/ql/src/test/results/clientpositive/join_vc.q.out +++ b/ql/src/test/results/clientpositive/join_vc.q.out @@ -16,22 +16,6 @@ STAGE PLANS: Stage: Stage-1 Map Reduce Map Operator Tree: - TableScan - alias: t1 - filterExpr: key is not null (type: boolean) - Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE - Filter Operator - predicate: key is not null (type: boolean) - Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: key (type: string) - outputColumnNames: _col0 - Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - sort order: + - Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: t2 filterExpr: (key is not null and value is not null) (type: boolean) @@ -49,6 +33,22 @@ STAGE PLANS: Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: string) + TableScan + alias: t1 + filterExpr: key is not null (type: boolean) + Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE + Filter Operator + predicate: key is not null (type: boolean) + Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: key (type: string) + outputColumnNames: _col0 + Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Operator Tree: Join Operator condition map: @@ -56,7 +56,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - outputColumnNames: _col2 + outputColumnNames: _col1 Statistics: Num rows: 791 Data size: 71981 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -70,9 +70,9 @@ STAGE PLANS: Map Operator Tree: TableScan Reduce Output Operator - key expressions: _col2 (type: string) + key expressions: _col1 (type: string) sort order: + - Map-reduce partition columns: _col2 (type: string) + Map-reduce partition columns: _col1 (type: string) Statistics: Num rows: 791 Data size: 71981 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: t3 @@ -96,7 +96,7 @@ STAGE PLANS: condition map: Inner Join 0 to 1 keys: - 0 _col2 (type: string) + 0 _col1 (type: string) 1 _col1 (type: string) outputColumnNames: _col3, _col4, _col5 Statistics: Num rows: 1288 Data size: 239568 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/join_view.q.out b/ql/src/test/results/clientpositive/join_view.q.out index 6789b0ac77..7d7277de3e 100644 --- a/ql/src/test/results/clientpositive/join_view.q.out +++ b/ql/src/test/results/clientpositive/join_view.q.out @@ -63,34 +63,34 @@ STAGE PLANS: filterExpr: (ds = '2011-09-01') (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (ds = '2011-09-01') (type: boolean) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: bar (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: string) TableScan alias: invites2 filterExpr: (ds = '2011-09-01') (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (ds = '2011-09-01') (type: boolean) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: foo (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE value expressions: _col0 (type: int) Reduce Operator Tree: Join Operator @@ -100,14 +100,14 @@ STAGE PLANS: 0 1 outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 85 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: int), '2011-09-01' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 85 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 85 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/keep_uniform.q.out b/ql/src/test/results/clientpositive/keep_uniform.q.out index 8d82c60a73..9d02932b95 100644 --- a/ql/src/test/results/clientpositive/keep_uniform.q.out +++ b/ql/src/test/results/clientpositive/keep_uniform.q.out @@ -452,7 +452,7 @@ STAGE PLANS: filterExpr: (ws_order_number is not null and ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 240 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) (type: boolean) + predicate: (ws_order_number is not null and ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 240 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_ship_date_sk (type: int), ws_ship_addr_sk (type: int), ws_web_site_sk (type: int), ws_order_number (type: int), ws_ext_ship_cost (type: decimal(7,2)), ws_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out index 00212385ed..3e05a866ea 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out @@ -421,7 +421,7 @@ POSTHOOK: Input: default@list_bucketing_dynamic_part_n0@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value` FROM `default`.`list_bucketing_dynamic_part_n0` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' +WHERE `key` = '484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -432,7 +432,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: list_bucketing_dynamic_part_n0 - filterExpr: ((ds = '2008-04-08') and (hr = '11') and (key = '484')) (type: boolean) + filterExpr: ((key = '484') and (ds = '2008-04-08') and (hr = '11')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out index f7d2368438..a5ffb418a2 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out @@ -299,7 +299,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n3@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, CAST('val_466' AS STRING) AS `value` FROM `default`.`list_bucketing_static_part_n3` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `value` = 'val_466' +WHERE `value` = 'val_466' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -310,7 +310,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: list_bucketing_static_part_n3 - filterExpr: ((ds = '2008-04-08') and (hr = '11') and (value = 'val_466')) (type: boolean) + filterExpr: ((value = 'val_466') and (ds = '2008-04-08') and (hr = '11')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out index eea4ccbd92..045b81db71 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out @@ -307,7 +307,7 @@ POSTHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `col1`, CAST('466' AS STRING) AS `col2`, `col3`, CAST('val_466' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS `ds`, CAST('11' AS STRING) AS `hr` FROM `default`.`list_bucketing_mul_col_n0` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `col2` = '466' AND `col4` = 'val_466' +WHERE `col2` = '466' AND `col4` = 'val_466' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -444,7 +444,7 @@ POSTHOOK: Input: default@list_bucketing_mul_col_n0@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `col1`, CAST('382' AS STRING) AS `col2`, `col3`, CAST('val_382' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS `ds`, CAST('11' AS STRING) AS `hr` FROM `default`.`list_bucketing_mul_col_n0` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `col2` = '382' AND `col4` = 'val_382' +WHERE `col2` = '382' AND `col4` = 'val_382' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out index 9371b0044d..6d1ae67339 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out @@ -307,7 +307,7 @@ POSTHOOK: Input: default@list_bucketing_mul_col@ds=2008-04-08/hr=2013-01-23+18%3 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `col1`, CAST('466' AS STRING) AS `col2`, `col3`, CAST('val_466' AS STRING) AS `col4`, `col5`, CAST('2008-04-08' AS STRING) AS `ds`, CAST('2013-01-23+18:00:99' AS STRING) AS `hr` FROM `default`.`list_bucketing_mul_col` -WHERE `ds` = '2008-04-08' AND `hr` = '2013-01-23+18:00:99' AND `col2` = '466' AND `col4` = 'val_466' +WHERE `col2` = '466' AND `col4` = 'val_466' AND `ds` = '2008-04-08' AND `hr` = '2013-01-23+18:00:99' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out index 3ccc584436..a8d414b371 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out @@ -378,7 +378,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) AS `$f3` FROM `default`.`list_bucketing_static_part_n4` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out index 642158a779..be21d65844 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out @@ -370,7 +370,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n1@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value` FROM `default`.`list_bucketing_static_part_n1` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' +WHERE `key` = '484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -381,7 +381,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: list_bucketing_static_part_n1 - filterExpr: ((ds = '2008-04-08') and (hr = '11') and (key = '484')) (type: boolean) + filterExpr: ((key = '484') and (ds = '2008-04-08') and (hr = '11')) (type: boolean) Statistics: Num rows: 1000 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out index 38b5a0730d..f9e1c29ea5 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out @@ -830,7 +830,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n2@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) AS `$f3` FROM `default`.`list_bucketing_static_part_n2` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out index bc6a3a30b2..43db28e8c4 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out @@ -428,7 +428,7 @@ POSTHOOK: Input: default@list_bucketing_dynamic_part_n1@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('103' AS STRING) AS `key`, CAST('val_103' AS STRING) AS `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM `default`.`list_bucketing_dynamic_part_n1` -WHERE `ds` = '2008-04-08' AND `key` = '103' AND `value` = 'val_103' +WHERE `key` = '103' AND `value` = 'val_103' AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out index 2446e4605c..a95245fd2b 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out @@ -830,7 +830,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n0@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) AS `$f3` FROM `default`.`list_bucketing_static_part_n0` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out index 32e4201ab0..9eab039907 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out @@ -88,7 +88,7 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0` FROM `default`.`fact_daily` -WHERE `ds` = '1' AND `hr` = '4' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -217,7 +217,7 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('238' AS STRING) AS `$f0`, CAST('val_238' AS STRING) AS `$f1` FROM `default`.`fact_daily` -WHERE `ds` = '1' AND `hr` = '4' AND `key` = '238' AND `value` = 'val_238' +WHERE `key` = '238' AND `value` = 'val_238' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -347,7 +347,7 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` FROM `default`.`fact_daily` -WHERE `ds` = '1' AND `hr` = '4' AND `value` = '3' +WHERE `value` = '3' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -358,7 +358,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily - filterExpr: ((ds = '1') and (hr = '4') and (value = '3')) (type: boolean) + filterExpr: ((value = '3') and (ds = '1') and (hr = '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -475,7 +475,7 @@ POSTHOOK: Input: default@fact_daily@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('495' AS STRING) AS `key`, `value` FROM `default`.`fact_daily` -WHERE `ds` = '1' AND `hr` = '4' AND `key` = '495' +WHERE `key` = '495' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -486,7 +486,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily - filterExpr: ((ds = '1') and (hr = '4') and (key = '495')) (type: boolean) + filterExpr: ((key = '495') and (ds = '1') and (hr = '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out index 04ddcfef71..cd0cead404 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out @@ -88,7 +88,7 @@ POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, CAST('val_484' AS STRING) AS `value` FROM `default`.`fact_daily_n2` -WHERE `ds` = '1' AND `hr` = '4' AND `value` = 'val_484' +WHERE `value` = 'val_484' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -99,7 +99,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n2 - filterExpr: ((ds = '1') and (hr = '4') and (value = 'val_484')) (type: boolean) + filterExpr: ((value = 'val_484') and (ds = '1') and (hr = '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -267,7 +267,7 @@ POSTHOOK: Input: default@fact_daily_n2@ds=1/hr=4 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('406' AS STRING) AS `$f0` FROM `default`.`fact_daily_n2` -WHERE `ds` = '1' AND `hr` = '4' AND `key` = '406' +WHERE `key` = '406' AND `ds` = '1' AND `hr` = '4' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -278,7 +278,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n2 - filterExpr: ((ds = '1') and (hr = '4') and (key = '406')) (type: boolean) + filterExpr: ((key = '406') and (ds = '1') and (hr = '4')) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out index a533726387..6bc392db6e 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out @@ -198,7 +198,7 @@ POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('145' AS STRING) AS `key`, `value`, CAST('1' AS STRING) AS `ds`, CAST('1' AS STRING) AS `hr` FROM `default`.`fact_daily_n3` -WHERE `ds` = '1' AND `hr` = '1' AND `key` = '145' +WHERE `key` = '145' AND `ds` = '1' AND `hr` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -209,7 +209,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n3 - filterExpr: ((ds = '1') and (hr = '1') and (key = '145')) (type: boolean) + filterExpr: ((key = '145') and (ds = '1') and (hr = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -361,7 +361,7 @@ POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=2 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS STRING) AS `$f1`, CAST('1' AS STRING) AS `$f2`, CAST('2' AS STRING) AS `$f3` FROM `default`.`fact_daily_n3` -WHERE `ds` = '1' AND `hr` = '2' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '1' AND `hr` = '2' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -492,7 +492,7 @@ POSTHOOK: Input: default@fact_daily_n3@ds=1/hr=3 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('327' AS STRING) AS `$f0`, CAST('val_327' AS STRING) AS `$f1`, CAST('1' AS STRING) AS `$f2`, CAST('3' AS STRING) AS `$f3` FROM `default`.`fact_daily_n3` -WHERE `ds` = '1' AND `hr` = '3' AND `key` = '327' AND `value` = 'val_327' +WHERE `key` = '327' AND `value` = 'val_327' AND `ds` = '1' AND `hr` = '3' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out index 9ad2eb7510..22e2d727b3 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out @@ -139,7 +139,7 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST(484 AS INTEGER) AS `$f0` FROM `default`.`fact_daily_n4` -WHERE `ds` = '1' AND `x` = 484 +WHERE `x` = 484 AND `ds` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -150,23 +150,23 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n4 - filterExpr: ((ds = '1') and (x = 484)) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + filterExpr: ((x = 484) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 484) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 484 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -265,7 +265,7 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST(495 AS INTEGER) AS `$f0` FROM `default`.`fact_daily_n4` -WHERE `ds` = '1' AND `x` = 495 +WHERE `x` = 495 AND `ds` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -276,23 +276,23 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n4 - filterExpr: ((ds = '1') and (x = 495)) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + filterExpr: ((x = 495) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 495) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 495 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -391,7 +391,7 @@ POSTHOOK: Input: default@fact_daily_n4@ds=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `$f0` FROM `default`.`fact_daily_n4` -WHERE `ds` = '1' AND `x` = 1 +WHERE `x` = 1 AND `ds` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -402,23 +402,23 @@ STAGE PLANS: Map Operator Tree: TableScan alias: fact_daily_n4 - filterExpr: ((ds = '1') and (x = 1)) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + filterExpr: ((x = 1) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 1) (type: boolean) - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 1 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 84 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out index 9781899c16..c398393b88 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out @@ -154,22 +154,22 @@ STAGE PLANS: TableScan alias: fact_daily_n5 filterExpr: ((ds = '1') and (x = 484)) (type: boolean) - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 484) (type: boolean) - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 484 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -280,22 +280,22 @@ STAGE PLANS: TableScan alias: fact_daily_n5 filterExpr: ((ds = '1') and (x = 484)) (type: boolean) - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 484) (type: boolean) - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 484 (type: int), y (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -407,29 +407,29 @@ STAGE PLANS: TableScan alias: fact_daily_n5 filterExpr: ((ds = '1') and (x = 484)) (type: boolean) - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 484) (type: boolean) - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: y (type: string) outputColumnNames: y - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() keys: y (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE tag: -1 value expressions: _col1 (type: bigint) auto parallelism: false @@ -492,13 +492,13 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 428 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 188 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -558,27 +558,27 @@ STAGE PLANS: TableScan alias: fact_daily_n5 filterExpr: ((ds = '1') and (x = 484)) (type: boolean) - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x = 484) (type: boolean) - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() keys: true (type: boolean) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: boolean) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: boolean) - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE tag: -1 value expressions: _col1 (type: bigint) auto parallelism: false @@ -641,17 +641,17 @@ STAGE PLANS: keys: KEY._col0 (type: boolean) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: 484 (type: int), _col1 (type: bigint) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 244 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 4 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out index d3fb332dbc..a36794280f 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out @@ -174,22 +174,22 @@ STAGE PLANS: TableScan alias: fact_daily_n0 filterExpr: ((ds = '1') and (x <> 86)) (type: boolean) - Statistics: Num rows: 2 Data size: 1178 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 8 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: (x <> 86) (type: boolean) - Statistics: Num rows: 2 Data size: 1178 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 8 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: x (type: int) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1178 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 8 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 2 Data size: 1178 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 8 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat 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 d5e852fe16..c9f74aa4fc 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 @@ -432,19 +432,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over10k_orc_bucketed - filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: boolean) + filterExpr: ((t < 100Y) and (b = 4294967363L)) (type: boolean) Statistics: Num rows: 2098 Data size: 41920 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((b = 4294967363L) and (t < 100Y)) (type: boolean) - Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((t < 100Y) and (b = 4294967363L)) (type: boolean) + Statistics: Num rows: 3 Data size: 60 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), i (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) sort order: +++ - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: vectorized, llap LLAP IO: may be used (ACID table) Reducer 2 @@ -453,10 +453,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -506,19 +506,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over10k_orc_bucketed - filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: boolean) + filterExpr: ((t < 100Y) and (b = 4294967363L)) (type: boolean) Statistics: Num rows: 2098 Data size: 41920 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((b = 4294967363L) and (t < 100Y)) (type: boolean) - Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((t < 100Y) and (b = 4294967363L)) (type: boolean) + Statistics: Num rows: 3 Data size: 60 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ROW__ID (type: struct), t (type: tinyint), si (type: smallint), i (type: int) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: tinyint), _col2 (type: smallint), _col3 (type: int) Execution mode: vectorized, llap LLAP IO: may be used (ACID table) @@ -528,10 +528,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/llap/auto_join29.q.out b/ql/src/test/results/clientpositive/llap/auto_join29.q.out index f7ae23b906..b5f16f3eba 100644 --- a/ql/src/test/results/clientpositive/llap/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_join29.q.out @@ -2548,7 +2548,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: @@ -2674,7 +2674,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: @@ -3576,7 +3576,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out index e212a028d1..30914df7bc 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out @@ -143,16 +143,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -211,16 +211,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -228,7 +228,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -442,16 +442,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -510,16 +510,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -527,7 +527,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -741,16 +741,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -809,16 +809,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -826,7 +826,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out index 7ca07b9f41..e50941e5c2 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out @@ -142,22 +142,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE tag: 0 auto parallelism: true Execution mode: vectorized, llap @@ -222,22 +222,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE tag: 1 auto parallelism: true Execution mode: vectorized, llap @@ -359,7 +359,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -468,16 +468,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 1508 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 368 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -536,16 +536,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -553,7 +553,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out index ae19cfbd8c..32d617f61c 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out @@ -227,19 +227,19 @@ STAGE PLANS: TableScan alias: bucket_small_n17 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 236 Data size: 45636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 236 Data size: 43392 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: bigint), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + Map-reduce partition columns: _col0 (type: bigint) - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) Execution mode: vectorized, llap LLAP IO: no inputs @@ -253,14 +253,14 @@ STAGE PLANS: 0 _col0 (type: bigint) 1 _col0 (type: bigint) outputColumnNames: _col0, _col1, _col3 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: bigint), _col1 (type: string), _col3 (type: string), 'day1' (type: string), 1 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -378,14 +378,14 @@ STAGE PLANS: TableScan alias: bucket_small_n17 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 236 Data size: 45636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 236 Data size: 43392 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: bigint), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Map Operator Tree: TableScan alias: bucket_big_n17 @@ -402,14 +402,14 @@ STAGE PLANS: 0 _col0 (type: bigint) 1 _col0 (type: bigint) outputColumnNames: _col0, _col1, _col3 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: bigint), _col1 (type: string), _col3 (type: string), 'day1' (type: string), 1 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -637,14 +637,14 @@ STAGE PLANS: TableScan alias: bucket_small_n17 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 236 Data size: 45636 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 236 Data size: 43392 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: bigint), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 225 Data size: 43508 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 225 Data size: 41369 Basic stats: COMPLETE Column stats: NONE Map Operator Tree: TableScan alias: bucket_big_n17 @@ -661,14 +661,14 @@ STAGE PLANS: 0 _col0 (type: bigint) 1 _col0 (type: bigint) outputColumnNames: _col0, _col1, _col3 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: bigint), _col1 (type: string), _col3 (type: string), 'day1' (type: string), 1 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 247 Data size: 47858 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 247 Data size: 45505 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out index 006bf58ab9..8ef914b8c0 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out @@ -125,16 +125,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -193,16 +193,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 112 Data size: 18400 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -210,7 +210,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 108 Data size: 17890 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -424,16 +424,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 2996 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -492,16 +492,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 112 Data size: 18400 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -509,7 +509,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 108 Data size: 17890 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out index bf3daeaf21..f322641075 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out @@ -125,16 +125,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -243,16 +243,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 120 Data size: 19688 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -260,7 +260,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 125 Data size: 82847 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 116 Data size: 19130 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -424,16 +424,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -542,16 +542,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 120 Data size: 19688 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -559,7 +559,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 125 Data size: 82847 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 116 Data size: 19130 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -723,16 +723,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -841,16 +841,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 120 Data size: 19688 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 106 Data size: 17391 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -858,7 +858,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 125 Data size: 82847 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 116 Data size: 19130 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out index 3648092b13..90186c7653 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out @@ -141,16 +141,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -259,16 +259,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 56 Data size: 9384 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -276,7 +276,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 59 Data size: 39903 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 55 Data size: 9215 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -440,16 +440,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -558,16 +558,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 56 Data size: 9384 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -575,7 +575,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 59 Data size: 39903 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 55 Data size: 9215 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -739,16 +739,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -857,16 +857,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 56 Data size: 9384 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 50 Data size: 8378 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -874,7 +874,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 59 Data size: 39903 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 55 Data size: 9215 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_6.q.out index ad664c1b2f..bbe673e838 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_6.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_6.q.out @@ -576,7 +576,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -588,7 +588,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), UDFToDouble(key) (type: double) @@ -1170,7 +1170,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -1182,7 +1182,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out index 9b1eb56d85..16a25de6a5 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out @@ -160,16 +160,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -278,16 +278,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 112 Data size: 18400 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -295,7 +295,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 108 Data size: 17890 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -513,16 +513,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -631,16 +631,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 112 Data size: 18400 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -648,7 +648,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 108 Data size: 17890 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -866,16 +866,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 8 Data size: 1472 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 8 Data size: 5992 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 7 Data size: 1288 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -984,16 +984,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 112 Data size: 18400 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 16264 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -1001,7 +1001,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 108 Data size: 17890 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out index a13d2a382a..9d0f2ff4e7 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out @@ -160,16 +160,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -278,16 +278,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -295,7 +295,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 1 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -513,16 +513,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -631,16 +631,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -648,7 +648,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -866,16 +866,16 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 4 Data size: 3016 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 4 Data size: 736 Basic stats: PARTIAL Column stats: NONE Path -> Alias: #### A masked pattern was here #### Path -> Partition: @@ -984,16 +984,16 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 240 Data size: 39008 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 211 Data size: 34294 Basic stats: PARTIAL Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 @@ -1001,7 +1001,7 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) Position of Big Table: 0 - Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 232 Data size: 37723 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out index 91f29de701..aadd8e2868 100644 --- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out @@ -1947,14 +1947,14 @@ STAGE PLANS: TableScan alias: big filterExpr: i is not null (type: boolean) - Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: i is not null (type: boolean) - Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i (type: int) outputColumnNames: _col0 - Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -1964,10 +1964,10 @@ STAGE PLANS: outputColumnNames: _col0, _col1 input vertices: 0 Map 1 - Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 44 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 44 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -2390,22 +2390,22 @@ STAGE PLANS: TableScan alias: my_fact filterExpr: ((fiscal_year = '2015') and (UDFToDouble(accounting_period) = 10.0D) and join_col is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(accounting_period) = 10.0D) and (fiscal_year = '2015') and join_col is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((fiscal_year = '2015') and (UDFToDouble(accounting_period) = 10.0D) and join_col is not null) (type: boolean) + Statistics: Num rows: 1 Data size: 536 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: bucket_col (type: string), join_col (type: string), accounting_period (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col1 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col1 (type: string) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE tag: 0 value expressions: _col0 (type: string), _col2 (type: string) auto parallelism: true diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out index 4309f21867..9cf6a462f8 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out @@ -62,22 +62,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -88,22 +88,22 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -121,17 +121,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -209,22 +209,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -235,22 +235,22 @@ STAGE PLANS: TableScan alias: b filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((ds = '2008-04-08') and key is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -268,17 +268,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -432,7 +432,7 @@ FROM `default`.`srcbucket_mapjoin_n1` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n1` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -532,22 +532,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -619,17 +619,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -660,7 +660,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -875,7 +875,7 @@ FROM `default`.`srcbucket_mapjoin_n1` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n1` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -975,22 +975,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -1062,17 +1062,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -1103,7 +1103,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out index d5484a9e13..2747cfdab2 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n6` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n5` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -137,22 +137,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -217,22 +217,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -304,17 +304,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -345,7 +345,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -566,7 +566,7 @@ FROM `default`.`srcbucket_mapjoin_part_n6` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n5` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -587,22 +587,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -667,22 +667,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -754,17 +754,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 0 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -795,7 +795,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -1056,22 +1056,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -1136,22 +1136,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 156 Data size: 89440 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 156 Data size: 24064 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85426 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 127 Data size: 19590 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 149 Data size: 85426 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 127 Data size: 19590 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 149 Data size: 85426 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 127 Data size: 19590 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -1273,17 +1273,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 139 Data size: 21549 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 139 Data size: 21549 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 139 Data size: 21549 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -1314,7 +1314,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 139 Data size: 21549 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out index a0fca8debb..cc3d33b3f7 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out @@ -137,10 +137,10 @@ POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n11` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n13` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -161,22 +161,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -241,22 +241,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -328,17 +328,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -369,7 +369,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -587,10 +587,10 @@ POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n11` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n13` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -611,22 +611,22 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 78 Data size: 44908 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 78 Data size: 12220 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 75 Data size: 43180 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 64 Data size: 10026 Basic stats: PARTIAL Column stats: NONE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -691,22 +691,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -778,17 +778,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -819,7 +819,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out index 3772157662..d4f89bbb33 100644 --- a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out @@ -42,22 +42,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = 1) (type: boolean) buckets included: [13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 1) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -111,22 +111,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = 16) (type: boolean) buckets included: [3,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 16) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 16 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -180,22 +180,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = 17) (type: boolean) buckets included: [12,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 17) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 17 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -249,22 +249,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = 17) (type: boolean) buckets included: [12,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 17) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 17 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -318,22 +318,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = 11) (type: boolean) buckets included: [5,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 11) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 11 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -387,22 +387,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key = 1) and (ds = '2008-04-08')) (type: boolean) buckets included: [13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key = 1)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 1) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), value (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -456,22 +456,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key = 1) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) buckets included: [13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key = 1) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 1) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -525,22 +525,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((value = 'One') and (key = 1) and (ds = '2008-04-08')) (type: boolean) buckets included: [13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key = 1) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((value = 'One') and (key = 1) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -594,22 +594,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key) IN (2, 3) (type: boolean) buckets included: [4,6,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key) IN (2, 3) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -663,22 +663,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08')) (type: boolean) buckets included: [4,6,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (2, 3)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (2, 3) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -732,22 +732,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) buckets included: [4,6,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (2, 3) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (2, 3) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -801,22 +801,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) buckets included: [4,6,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (2, 3) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (2, 3) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -870,22 +870,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (1, 2) and (ds = '2008-04-08')) (type: boolean) buckets included: [4,13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (1, 2)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (1, 2) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -939,22 +939,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (1, 2) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) buckets included: [4,13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (1, 2) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (1, 2) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1008,22 +1008,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key = -15) (type: boolean) buckets included: [6,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = -15) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: -15 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1077,22 +1077,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) (type: boolean) buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1146,22 +1146,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08')) (type: boolean) buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1215,22 +1215,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1284,22 +1284,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), 'One' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 185 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 181 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1337,7 +1337,7 @@ POSTHOOK: Input: default@srcbucket_pruned #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`srcbucket_pruned` -WHERE `key` = 1 AND `ds` = '2008-04-08' OR `key` = 2 +WHERE `key` = 2 OR `key` = 1 AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1351,23 +1351,23 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcbucket_pruned - filterExpr: (((key = 1) and (ds = '2008-04-08')) or (key = 2)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + filterExpr: ((key = 2) or ((key = 1) and (ds = '2008-04-08'))) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (((key = 1) and (ds = '2008-04-08')) or (key = 2)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 2) or ((key = 1) and (ds = '2008-04-08'))) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1421,22 +1421,22 @@ STAGE PLANS: alias: srcbucket_pruned filterExpr: ((value) IN ('One', 'Two') and (key = 1) and (ds = '2008-04-08')) (type: boolean) buckets included: [13,] of 16 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key = 1) and (value) IN ('One', 'Two')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((value) IN ('One', 'Two') and (key = 1) and (ds = '2008-04-08')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), value (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1489,22 +1489,22 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key = 1) or (value = 'One') or ((key = 2) and (value = 'Two'))) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (((key = 2) and (value = 'Two')) or (key = 1) or (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 1) or (value = 'One') or ((key = 2) and (value = 'Two'))) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1624,22 +1624,22 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key = 1) or (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((key = 1) or (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1692,22 +1692,22 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (1, 2) or (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((key) IN (1, 2) or (value = 'One')) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1760,22 +1760,22 @@ STAGE PLANS: TableScan alias: srcbucket_unpruned filterExpr: (key) IN (3, 5) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key) IN (3, 5) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -1828,22 +1828,22 @@ STAGE PLANS: TableScan alias: srcbucket_unpruned filterExpr: (key = 1) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (key = 1) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 1 (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 272 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out index 82554822b9..07b0b63d3e 100644 --- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out @@ -551,27 +551,27 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test_table2_n19 - filterExpr: ((key) IN (0, 5) and (key < 8)) (type: boolean) + filterExpr: ((key < 8) and (key) IN (0, 5)) (type: boolean) Statistics: Num rows: 84 Data size: 7896 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((key < 8) and (key) IN (0, 5)) (type: boolean) - Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE Map Operator Tree: TableScan alias: test_table1_n20 - filterExpr: ((key) IN (0, 5) and (key < 8)) (type: boolean) + filterExpr: ((key < 8) and (key) IN (0, 5)) (type: boolean) Statistics: Num rows: 10 Data size: 930 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((key < 8) and (key) IN (0, 5)) (type: boolean) - Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Merge Join Operator condition map: Inner Join 0 to 1 @@ -579,16 +579,16 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 - Statistics: Num rows: 1 Data size: 183 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 549 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), concat(_col1, _col3) (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 564 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 564 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: string) Execution mode: llap Reducer 2 @@ -597,10 +597,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 564 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 564 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -609,11 +609,11 @@ STAGE PLANS: Select Operator expressions: _col0 (type: int), _col1 (type: string), '1' (type: string) outputColumnNames: key, value, ds - Statistics: Num rows: 1 Data size: 273 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 819 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string) - minReductionHashAggr: 0.0 + minReductionHashAggr: 0.6666666 mode: hash outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1 Data size: 949 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out b/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out index 3aa929d13c..8f0ba6c077 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out @@ -880,7 +880,7 @@ STAGE PLANS: alias: cbo_t2 filterExpr: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Filter Operator - predicate: ((c_int = (2 * c_int)) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 @@ -910,7 +910,7 @@ STAGE PLANS: alias: cbo_t2 filterExpr: (c_int is not null or (c_int = 0)) (type: boolean) Filter Operator - predicate: ((c_int = 0) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = 0)) (type: boolean) Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 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 20b99eb332..883d51b6c0 100644 --- a/ql/src/test/results/clientpositive/llap/check_constraint.q.out +++ b/ql/src/test/results/clientpositive/llap/check_constraint.q.out @@ -1913,7 +1913,7 @@ STAGE PLANS: 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) Filter Operator - predicate: ((key < 20) and (key > 10) and enforce_constraint(value is not null)) (type: boolean) + 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 Select Operator expressions: key (type: string), value (type: string) @@ -2332,7 +2332,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -2344,7 +2344,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) and enforce_constraint(((_col0 > 0) and ((_col0 < 100) or (_col0 = 5))) is not false)) (type: boolean) + predicate: ((_col6 < 3) and (_col6 >= 5) and enforce_constraint(((_col0 > 0) and ((_col0 < 100) or (_col0 = 5))) is not false) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -2357,7 +2357,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col3 (type: string) Filter Operator - predicate: (_col0 is null and enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false))) (type: boolean) + predicate: (enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false)) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -2533,7 +2533,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -2545,7 +2545,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) and enforce_constraint(((_col0 > 0) and ((_col0 < 100) or (_col0 = 5))) is not false)) (type: boolean) + predicate: ((_col6 < 3) and (_col6 >= 5) and enforce_constraint(((_col0 > 0) and ((_col0 < 100) or (_col0 = 5))) is not false) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -2578,7 +2578,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false))) (type: boolean) + predicate: (enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false)) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -2782,7 +2782,7 @@ STAGE PLANS: outputColumnNames: _col0, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -2814,7 +2814,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false))) (type: boolean) + predicate: (enforce_constraint((_col7 is not null and ((_col6 > 0) and ((_col6 < 100) or (_col6 = 5))) is not false)) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out index 697e45f666..2adabfbfa5 100644 --- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out +++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out @@ -754,11 +754,11 @@ STAGE PLANS: TableScan alias: calendarp filterExpr: (p = 1) (type: boolean) - Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: year (type: int) outputColumnNames: year - Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: max(year) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/constprog_semijoin.q.out b/ql/src/test/results/clientpositive/llap/constprog_semijoin.q.out index ea46b723b4..da8cae3e77 100644 --- a/ql/src/test/results/clientpositive/llap/constprog_semijoin.q.out +++ b/ql/src/test/results/clientpositive/llap/constprog_semijoin.q.out @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_50] (rows=2 width=99) Output:["_col0","_col2"] Filter Operator [FIL_49] (rows=2 width=99) - predicate:((val = 't1val01') and dimid is not null and id is not null) + predicate:((val = 't1val01') and id is not null and dimid is not null) TableScan [TS_0] (rows=10 width=99) default@table1_n10,table1_n10,Tbl:COMPLETE,Col:COMPLETE,Output:["id","val","dimid"] <-Map 4 [SIMPLE_EDGE] vectorized, llap diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out index 07f35c749d..4e3167252c 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out @@ -2614,7 +2614,7 @@ STAGE PLANS: filterExpr: (col5679 is not null and col23455 is not null and col7890 is not null) (type: boolean) Statistics: Num rows: 16065311 Data size: 133252823710 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (col23455 is not null and col5679 is not null and col7890 is not null) (type: boolean) + predicate: (col5679 is not null and col23455 is not null and col7890 is not null) (type: boolean) Statistics: Num rows: 13655516 Data size: 113264913839 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out index 88bc0be9e0..52540a7eb6 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out @@ -1260,7 +1260,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -1421,7 +1421,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -2710,7 +2710,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08')) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -2842,7 +2842,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -5003,7 +5003,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -6658,10 +6658,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_date_hour_n0 - filterExpr: ((date) IN ('2008-04-08', '2008-04-09') and (UDFToDouble(hour) = 11.0D) and ds is not null and UDFToDouble(hr) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and UDFToDouble(hr) is not null and ds is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), UDFToDouble(hr) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out index 8d0b44598b..0c4dc21527 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out @@ -178,7 +178,7 @@ STAGE PLANS: TableScan alias: agg filterExpr: dim_shops_id is not null (type: boolean) - Statistics: Num rows: 9 Data size: 1071 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 9 Data size: 1044 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: amount (type: decimal(10,0)), dim_shops_id (type: int) outputColumnNames: _col0, _col1 @@ -361,7 +361,7 @@ STAGE PLANS: TableScan alias: agg filterExpr: dim_shops_id is not null (type: boolean) - Statistics: Num rows: 9 Data size: 1071 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 9 Data size: 1044 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: amount (type: decimal(10,0)), dim_shops_id (type: int) outputColumnNames: _col0, _col1 @@ -643,14 +643,14 @@ STAGE PLANS: TableScan alias: agg filterExpr: (dim_shops_id = 1) (type: boolean) - Statistics: Num rows: 3 Data size: 345 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 336 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: amount (type: decimal(10,0)) outputColumnNames: _col0 - Statistics: Num rows: 3 Data size: 345 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 336 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 3 Data size: 345 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 336 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: decimal(10,0)) Execution mode: llap LLAP IO: no inputs @@ -680,10 +680,10 @@ STAGE PLANS: 0 1 outputColumnNames: _col0 - Statistics: Num rows: 9 Data size: 1080 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9 Data size: 1053 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 9 Data size: 1080 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9 Data size: 1053 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -768,7 +768,7 @@ STAGE PLANS: TableScan alias: agg filterExpr: dim_shops_id is not null (type: boolean) - Statistics: Num rows: 9 Data size: 1071 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 9 Data size: 1044 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: amount (type: decimal(10,0)), dim_shops_id (type: int) outputColumnNames: _col0, _col1 diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out index 0143e62c7f..f87e315a98 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out @@ -320,7 +320,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -802,7 +802,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -856,7 +856,7 @@ STAGE PLANS: filterExpr: (cstring is not null and (cstring BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cstring BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter))) and cstring is not null) (type: boolean) + predicate: (cstring is not null and (cstring BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 9174 Data size: 643900 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring (type: string) @@ -1136,7 +1136,7 @@ STAGE PLANS: filterExpr: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter))) and key is not null and value is not null) (type: boolean) + predicate: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1475,7 +1475,7 @@ STAGE PLANS: filterExpr: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter))) and key is not null and value is not null) (type: boolean) + predicate: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1530,7 +1530,7 @@ STAGE PLANS: filterExpr: (cstring is not null and (cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter)))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter))) and cstring is not null) (type: boolean) + predicate: (cstring is not null and (cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter)))) (type: boolean) Statistics: Num rows: 9174 Data size: 643900 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring (type: string) @@ -1709,7 +1709,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -2326,7 +2326,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n3_key1_min) AND DynamicValue(RS_7_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -2805,7 +2805,7 @@ STAGE PLANS: filterExpr: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter))) and key is not null and value is not null) (type: boolean) + predicate: (key is not null and value is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n3_key1_min) AND DynamicValue(RS_10_srcpart_small_n3_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n3_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 356000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -2883,7 +2883,7 @@ STAGE PLANS: filterExpr: (cstring is not null and (cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter)))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter))) and cstring is not null) (type: boolean) + predicate: (cstring is not null and (cstring BETWEEN DynamicValue(RS_12_srcpart_date_n7_value_min) AND DynamicValue(RS_12_srcpart_date_n7_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n7_value_bloom_filter)))) (type: boolean) Statistics: Num rows: 9174 Data size: 643900 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring (type: string) @@ -3578,7 +3578,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 5420 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 5420 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string), ds (type: string) @@ -3779,7 +3779,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 5420 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_10_srcpart_small10_key1_min) AND DynamicValue(RS_10_srcpart_small10_key1_max) and in_bloom_filter(key1, DynamicValue(RS_10_srcpart_small10_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 5420 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_2.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_2.q.out index 96d3ccc510..7455358479 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_2.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_2.q.out @@ -99,7 +99,7 @@ STAGE PLANS: filterExpr: (bigint_col_7 is not null and decimal2016_col_26 is not null and tinyint_col_3 is not null and timestamp_col_9 is not null and (decimal2016_col_26 BETWEEN DynamicValue(RS_17_t2_decimal2709_col_9_min) AND DynamicValue(RS_17_t2_decimal2709_col_9_max) and in_bloom_filter(decimal2016_col_26, DynamicValue(RS_17_t2_decimal2709_col_9_bloom_filter))) and (tinyint_col_3 BETWEEN DynamicValue(RS_17_t2_tinyint_col_20_min) AND DynamicValue(RS_17_t2_tinyint_col_20_max) and in_bloom_filter(tinyint_col_3, DynamicValue(RS_17_t2_tinyint_col_20_bloom_filter))) and (bigint_col_7 BETWEEN DynamicValue(RS_17_t2_tinyint_col_15_min) AND DynamicValue(RS_17_t2_tinyint_col_15_max) and in_bloom_filter(bigint_col_7, DynamicValue(RS_17_t2_tinyint_col_15_bloom_filter))) and (timestamp_col_9 BETWEEN DynamicValue(RS_22_tt2_timestamp_col_18_min) AND DynamicValue(RS_22_tt2_timestamp_col_18_max) and in_bloom_filter(timestamp_col_9, DynamicValue(RS_22_tt2_timestamp_col_18_bloom_filter)))) (type: boolean) Statistics: Num rows: 1 Data size: 164 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((bigint_col_7 BETWEEN DynamicValue(RS_17_t2_tinyint_col_15_min) AND DynamicValue(RS_17_t2_tinyint_col_15_max) and in_bloom_filter(bigint_col_7, DynamicValue(RS_17_t2_tinyint_col_15_bloom_filter))) and (decimal2016_col_26 BETWEEN DynamicValue(RS_17_t2_decimal2709_col_9_min) AND DynamicValue(RS_17_t2_decimal2709_col_9_max) and in_bloom_filter(decimal2016_col_26, DynamicValue(RS_17_t2_decimal2709_col_9_bloom_filter))) and (timestamp_col_9 BETWEEN DynamicValue(RS_22_tt2_timestamp_col_18_min) AND DynamicValue(RS_22_tt2_timestamp_col_18_max) and in_bloom_filter(timestamp_col_9, DynamicValue(RS_22_tt2_timestamp_col_18_bloom_filter))) and (tinyint_col_3 BETWEEN DynamicValue(RS_17_t2_tinyint_col_20_min) AND DynamicValue(RS_17_t2_tinyint_col_20_max) and in_bloom_filter(tinyint_col_3, DynamicValue(RS_17_t2_tinyint_col_20_bloom_filter))) and bigint_col_7 is not null and decimal2016_col_26 is not null and timestamp_col_9 is not null and tinyint_col_3 is not null) (type: boolean) + predicate: (bigint_col_7 is not null and decimal2016_col_26 is not null and tinyint_col_3 is not null and timestamp_col_9 is not null and (decimal2016_col_26 BETWEEN DynamicValue(RS_17_t2_decimal2709_col_9_min) AND DynamicValue(RS_17_t2_decimal2709_col_9_max) and in_bloom_filter(decimal2016_col_26, DynamicValue(RS_17_t2_decimal2709_col_9_bloom_filter))) and (tinyint_col_3 BETWEEN DynamicValue(RS_17_t2_tinyint_col_20_min) AND DynamicValue(RS_17_t2_tinyint_col_20_max) and in_bloom_filter(tinyint_col_3, DynamicValue(RS_17_t2_tinyint_col_20_bloom_filter))) and (bigint_col_7 BETWEEN DynamicValue(RS_17_t2_tinyint_col_15_min) AND DynamicValue(RS_17_t2_tinyint_col_15_max) and in_bloom_filter(bigint_col_7, DynamicValue(RS_17_t2_tinyint_col_15_bloom_filter))) and (timestamp_col_9 BETWEEN DynamicValue(RS_22_tt2_timestamp_col_18_min) AND DynamicValue(RS_22_tt2_timestamp_col_18_max) and in_bloom_filter(timestamp_col_9, DynamicValue(RS_22_tt2_timestamp_col_18_bloom_filter)))) (type: boolean) Statistics: Num rows: 1 Data size: 164 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: bigint_col_7 (type: bigint), decimal2016_col_26 (type: decimal(20,16)), tinyint_col_3 (type: tinyint), timestamp_col_9 (type: timestamp) @@ -154,7 +154,7 @@ STAGE PLANS: filterExpr: (UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null and UDFToInteger(smallint_col_19) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 124 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToInteger(smallint_col_19) is not null and UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) (type: boolean) + predicate: (UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null and UDFToInteger(smallint_col_19) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 124 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: tinyint_col_15 (type: tinyint), decimal2709_col_9 (type: decimal(27,9)), tinyint_col_20 (type: tinyint), smallint_col_19 (type: smallint) @@ -217,7 +217,7 @@ STAGE PLANS: filterExpr: (timestamp_col_18 is not null and decimal1911_col_16 is not null and (decimal1911_col_16 BETWEEN DynamicValue(RS_13_tt1_decimal2612_col_77_min) AND DynamicValue(RS_13_tt1_decimal2612_col_77_max) and in_bloom_filter(decimal1911_col_16, DynamicValue(RS_13_tt1_decimal2612_col_77_bloom_filter)))) (type: boolean) Statistics: Num rows: 1 Data size: 152 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((decimal1911_col_16 BETWEEN DynamicValue(RS_13_tt1_decimal2612_col_77_min) AND DynamicValue(RS_13_tt1_decimal2612_col_77_max) and in_bloom_filter(decimal1911_col_16, DynamicValue(RS_13_tt1_decimal2612_col_77_bloom_filter))) and decimal1911_col_16 is not null and timestamp_col_18 is not null) (type: boolean) + predicate: (timestamp_col_18 is not null and decimal1911_col_16 is not null and (decimal1911_col_16 BETWEEN DynamicValue(RS_13_tt1_decimal2612_col_77_min) AND DynamicValue(RS_13_tt1_decimal2612_col_77_max) and in_bloom_filter(decimal1911_col_16, DynamicValue(RS_13_tt1_decimal2612_col_77_bloom_filter)))) (type: boolean) Statistics: Num rows: 1 Data size: 152 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal1911_col_16 (type: decimal(19,11)), timestamp_col_18 (type: timestamp) @@ -606,7 +606,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) < 0.0D) and value is not null and (value BETWEEN DynamicValue(RS_21_x__col1_min) AND DynamicValue(RS_21_x__col1_max) and in_bloom_filter(value, DynamicValue(RS_21_x__col1_bloom_filter)))) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 0.0D) and (value BETWEEN DynamicValue(RS_21_x__col1_min) AND DynamicValue(RS_21_x__col1_max) and in_bloom_filter(value, DynamicValue(RS_21_x__col1_bloom_filter))) and value is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 0.0D) and value is not null and (value BETWEEN DynamicValue(RS_21_x__col1_min) AND DynamicValue(RS_21_x__col1_max) and in_bloom_filter(value, DynamicValue(RS_21_x__col1_bloom_filter)))) (type: boolean) Statistics: Num rows: 8 Data size: 1400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) 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 65cfac1b8d..c62c81bb82 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 @@ -118,7 +118,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col6 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean) + predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct) @@ -130,7 +130,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean) + predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct), _col0 (type: int) @@ -653,7 +653,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col6 Statistics: Num rows: 2 Data size: 17 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean) + predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct) @@ -665,7 +665,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean) + predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct), _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_4.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_4.q.out index dc1d393ee9..e2bfadae0f 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_4.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_4.q.out @@ -326,7 +326,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n0_key1_min) AND DynamicValue(RS_7_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n0_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n0_key1_min) AND DynamicValue(RS_7_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n0_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n0_key1_min) AND DynamicValue(RS_7_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n0_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -472,7 +472,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_13_srcpart_small_n0_key1_min) AND DynamicValue(RS_13_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_13_srcpart_small_n0_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_13_srcpart_small_n0_key1_min) AND DynamicValue(RS_13_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_13_srcpart_small_n0_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_13_srcpart_small_n0_key1_min) AND DynamicValue(RS_13_srcpart_small_n0_key1_max) and in_bloom_filter(key, DynamicValue(RS_13_srcpart_small_n0_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -883,7 +883,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_10_srcpart_medium_n0_key2_min) AND DynamicValue(RS_10_srcpart_medium_n0_key2_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_medium_n0_key2_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_10_srcpart_medium_n0_key2_min) AND DynamicValue(RS_10_srcpart_medium_n0_key2_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_medium_n0_key2_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_10_srcpart_medium_n0_key2_min) AND DynamicValue(RS_10_srcpart_medium_n0_key2_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_medium_n0_key2_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_on_aggcol.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_on_aggcol.q.out index 9f2af56f42..a3a3c91042 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_on_aggcol.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_on_aggcol.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: (eventid is not null and (eventid BETWEEN DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_min) AND DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_max) and in_bloom_filter(eventid, DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((eventid BETWEEN DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_min) AND DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_max) and in_bloom_filter(eventid, DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_bloom_filter))) and eventid is not null) (type: boolean) + predicate: (eventid is not null and (eventid BETWEEN DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_min) AND DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_max) and in_bloom_filter(eventid, DynamicValue(RS_11_dynamic_semijoin_reduction_on_aggcol__col1_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: outcome (type: string), eventid (type: int) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw.q.out index 3b460c80d5..3d706f78f7 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw.q.out @@ -227,7 +227,7 @@ STAGE PLANS: filterExpr: (cstring is not null and (cstring BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cstring BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter))) and cstring is not null) (type: boolean) + predicate: (cstring is not null and (cstring BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 9174 Data size: 643900 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring (type: string) @@ -247,7 +247,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_26_srcpart_small_n2_key1_min) AND DynamicValue(RS_26_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_26_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -267,7 +267,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_19_srcpart_small_n2_key1_min) AND DynamicValue(RS_19_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_19_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_19_srcpart_small_n2_key1_min) AND DynamicValue(RS_19_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_19_srcpart_small_n2_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_19_srcpart_small_n2_key1_min) AND DynamicValue(RS_19_srcpart_small_n2_key1_max) and in_bloom_filter(key, DynamicValue(RS_19_srcpart_small_n2_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw2.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw2.q.out index 408a7ff19d..fd47c1e7e5 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw2.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_sw2.q.out @@ -211,7 +211,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -285,7 +285,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 1740 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_12_alltypesorc_int_n0_cstring_min) AND DynamicValue(RS_12_alltypesorc_int_n0_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_12_alltypesorc_int_n0_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 20 Data size: 1740 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out index f0e59efdfd..1c8eb7eff7 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out @@ -203,7 +203,7 @@ Stage-0 Select Operator [SEL_2] (rows=2000 width=87) Output:["_col0"] Filter Operator [FIL_17] (rows=2000 width=87) - predicate:((key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter))) and key is not null) + predicate:(key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter)))) TableScan [TS_0] (rows=2000 width=87) default@srcpart_date_n9,srcpart_date_n9,Tbl:COMPLETE,Col:COMPLETE,Output:["key"] <-Reducer 5 [BROADCAST_EDGE] llap @@ -462,7 +462,7 @@ Stage-0 Select Operator [SEL_8] (rows=9174 width=70) Output:["_col0"] Filter Operator [FIL_28] (rows=9174 width=70) - predicate:((cstring BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter))) and cstring is not null) + predicate:(cstring is not null and (cstring BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(cstring, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter)))) TableScan [TS_6] (rows=12288 width=70) default@alltypesorc_int_n2,alltypesorc_int_n2,Tbl:COMPLETE,Col:COMPLETE,Output:["cstring"] <-Reducer 6 [BROADCAST_EDGE] llap @@ -496,7 +496,7 @@ Stage-0 Select Operator [SEL_2] (rows=2000 width=87) Output:["_col0"] Filter Operator [FIL_26] (rows=2000 width=87) - predicate:((key BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter))) and key is not null) + predicate:(key is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter)))) TableScan [TS_0] (rows=2000 width=87) default@srcpart_date_n9,srcpart_date_n9,Tbl:COMPLETE,Col:COMPLETE,Output:["key"] <-Reducer 6 [BROADCAST_EDGE] llap @@ -655,7 +655,7 @@ Stage-0 Select Operator [SEL_2] (rows=2000 width=178) Output:["_col0","_col1"] Filter Operator [FIL_17] (rows=2000 width=178) - predicate:((key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter))) and key is not null and value is not null) + predicate:(key is not null and value is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter)))) TableScan [TS_0] (rows=2000 width=178) default@srcpart_date_n9,srcpart_date_n9,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"] <-Reducer 5 [BROADCAST_EDGE] llap @@ -849,7 +849,7 @@ Stage-0 Select Operator [SEL_2] (rows=2000 width=178) Output:["_col0","_col1"] Filter Operator [FIL_26] (rows=2000 width=178) - predicate:((key BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter))) and key is not null and value is not null) + predicate:(key is not null and value is not null and (key BETWEEN DynamicValue(RS_10_srcpart_small_n4_key1_min) AND DynamicValue(RS_10_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_10_srcpart_small_n4_key1_bloom_filter)))) TableScan [TS_0] (rows=2000 width=178) default@srcpart_date_n9,srcpart_date_n9,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"] <-Reducer 7 [BROADCAST_EDGE] llap @@ -869,7 +869,7 @@ Stage-0 Select Operator [SEL_8] (rows=9174 width=70) Output:["_col0"] Filter Operator [FIL_28] (rows=9174 width=70) - predicate:((cstring BETWEEN DynamicValue(RS_12_srcpart_date_n9_value_min) AND DynamicValue(RS_12_srcpart_date_n9_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n9_value_bloom_filter))) and cstring is not null) + predicate:(cstring is not null and (cstring BETWEEN DynamicValue(RS_12_srcpart_date_n9_value_min) AND DynamicValue(RS_12_srcpart_date_n9_value_max) and in_bloom_filter(cstring, DynamicValue(RS_12_srcpart_date_n9_value_bloom_filter)))) TableScan [TS_6] (rows=12288 width=70) default@alltypesorc_int_n2,alltypesorc_int_n2,Tbl:COMPLETE,Col:COMPLETE,Output:["cstring"] <-Reducer 5 [BROADCAST_EDGE] llap @@ -954,7 +954,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n4_key1_min) AND DynamicValue(RS_7_srcpart_small_n4_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n4_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) 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 180efb723d..53932ebcf5 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 @@ -181,7 +181,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -313,7 +313,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -449,7 +449,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -529,7 +529,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -679,7 +679,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -811,7 +811,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -947,7 +947,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1027,7 +1027,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1562,7 +1562,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1682,7 +1682,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1835,7 +1835,7 @@ STAGE PLANS: Number of rows: 10 Statistics: Num rows: 10 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 = 27Y) or _col0 is null) (type: boolean) + predicate: (_col0 is null or (_col0 = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col0 (type: tinyint) @@ -1952,7 +1952,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -2078,7 +2078,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -2512,7 +2512,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -2630,7 +2630,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) 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 37a3652ee9..68794d2d7e 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 @@ -137,7 +137,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -257,7 +257,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -393,7 +393,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -473,7 +473,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -622,7 +622,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -742,7 +742,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -878,7 +878,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -958,7 +958,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1493,7 +1493,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1613,7 +1613,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1766,7 +1766,7 @@ STAGE PLANS: Number of rows: 10 Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = 27Y) or _col0 is null) (type: boolean) + predicate: (_col0 is null or (_col0 = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col0 (type: tinyint) @@ -1883,7 +1883,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -2009,7 +2009,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -2443,7 +2443,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -2561,7 +2561,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -3536,7 +3536,7 @@ STAGE PLANS: filterExpr: ((t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s = 'foo') and (t = 27Y)) (type: boolean) + predicate: ((t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), b (type: bigint), f (type: float), 'foo' (type: string), 27Y (type: tinyint), i (type: int) @@ -3655,7 +3655,7 @@ STAGE PLANS: filterExpr: ((i = 100) and (t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i = 100) and (s = 'foo') and (t = 27Y)) (type: boolean) + predicate: ((i = 100) and (t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 208 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), b (type: bigint), f (type: float), 'foo' (type: string), 27Y (type: tinyint), 100 (type: int) @@ -4152,7 +4152,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: (t is null or (t > 27Y)) (type: boolean) + filterExpr: ((t > 27Y) or t is null) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((t > 27Y) or t is null) (type: boolean) @@ -4275,7 +4275,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -4408,7 +4408,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: (t is null or (t > 27Y)) (type: boolean) + filterExpr: ((t > 27Y) or t is null) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((t > 27Y) or t is null) (type: boolean) @@ -4519,7 +4519,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -4694,7 +4694,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: ((s like 'bob%') and (i > 1)) (type: boolean) + filterExpr: ((i > 1) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 105949 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((i > 1) and (s like 'bob%')) (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out index c4f018b55f..c6f3852c92 100644 --- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out +++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out @@ -96,7 +96,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: ss_sold_date_sk (type: int), ss_net_paid_inc_tax (type: float), ss_net_profit (type: float) @@ -369,7 +369,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_net_paid_inc_tax (type: float), ss_net_profit (type: float), ss_sold_date_sk (type: int) @@ -636,7 +636,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: ss_sold_date_sk (type: int), ss_net_paid_inc_tax (type: float), ss_net_profit (type: float) @@ -905,7 +905,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_net_paid_inc_tax (type: float), ss_net_profit (type: float), ss_sold_date_sk (type: int) @@ -1223,7 +1223,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 24 Data size: 288 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 8 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: ss_sold_date_sk (type: int), ss_net_paid_inc_tax (type: float), ss_net_profit (type: float) @@ -1492,7 +1492,7 @@ STAGE PLANS: filterExpr: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 24 Data size: 288 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ss_sold_date_sk <= 2452638) and (ss_sold_date_sk >= 2452617)) (type: boolean) + predicate: ((ss_sold_date_sk >= 2452617) and (ss_sold_date_sk <= 2452638)) (type: boolean) Statistics: Num rows: 8 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_net_paid_inc_tax (type: float), ss_net_profit (type: float), ss_sold_date_sk (type: int) 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 f080a674ed..2e0ed4565b 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 @@ -2179,7 +2179,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10) and enforce_constraint(value is not null)) (type: boolean) + 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 Select Operator expressions: key (type: string), value (type: string) @@ -2365,7 +2365,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10) and enforce_constraint(value is not null)) (type: boolean) + 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 Select Operator expressions: key (type: string), value (type: string) @@ -3527,7 +3527,7 @@ STAGE PLANS: 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) Filter Operator - predicate: ((key < 20) and (key > 10) and enforce_constraint(value is not null)) (type: boolean) + 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 Select Operator expressions: key (type: string), value (type: string) @@ -4075,7 +4075,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 1417 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: struct), _col3 (type: struct), _col4 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10) and enforce_constraint(value is not null)) (type: boolean) + 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 Select Operator expressions: key (type: string), value (type: string) @@ -4307,7 +4307,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -4319,7 +4319,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) and enforce_constraint(_col0 is not null)) (type: boolean) + predicate: ((_col6 < 3) and (_col6 >= 5) and enforce_constraint(_col0 is not null) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -4332,7 +4332,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col3 (type: string) Filter Operator - predicate: (_col0 is null and enforce_constraint(_col6 is not null)) (type: boolean) + predicate: (enforce_constraint(_col6 is not null) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -4558,7 +4558,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -4570,7 +4570,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) and enforce_constraint(_col0 is not null)) (type: boolean) + predicate: ((_col6 < 3) and (_col6 >= 5) and enforce_constraint(_col0 is not null) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -4603,7 +4603,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint(_col6 is not null)) (type: boolean) + predicate: (enforce_constraint(_col6 is not null) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -4860,7 +4860,7 @@ STAGE PLANS: outputColumnNames: _col0, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) @@ -4892,7 +4892,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint(_col6 is not null)) (type: boolean) + predicate: (enforce_constraint(_col6 is not null) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -5118,7 +5118,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3) and enforce_constraint(_col0 is not null)) (type: boolean) + predicate: ((_col6 < 3) and enforce_constraint(_col0 is not null) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -5151,7 +5151,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint(_col6 is not null)) (type: boolean) + predicate: (enforce_constraint(_col6 is not null) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col6 (type: int), _col7 (type: string), _col8 (type: string) @@ -5376,7 +5376,7 @@ STAGE PLANS: outputColumnNames: _col0, _col5, _col6 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean) + predicate: ((_col6 < 5) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col5 (type: struct) diff --git a/ql/src/test/results/clientpositive/llap/except_distinct.q.out b/ql/src/test/results/clientpositive/llap/except_distinct.q.out index bba1a8d6b0..c942db0159 100644 --- a/ql/src/test/results/clientpositive/llap/except_distinct.q.out +++ b/ql/src/test/results/clientpositive/llap/except_distinct.q.out @@ -311,7 +311,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 250 Data size: 48500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -557,7 +557,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 250 Data size: 48500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -600,7 +600,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 145 Data size: 28130 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 24 Data size: 4656 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -643,7 +643,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 137 Data size: 26578 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 22 Data size: 4268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -820,7 +820,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col1 * 2L) = _col2) and (_col1 > 0L)) (type: boolean) + predicate: ((_col1 > 0L) and ((_col1 * 2L) = _col2)) (type: boolean) Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out index b760dbf850..5aea1fafaa 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out @@ -489,7 +489,7 @@ Stage-0 Group By Operator [GBY_6] (rows=2 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_38] (rows=5 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 9 [SIMPLE_EDGE] llap @@ -505,7 +505,7 @@ Stage-0 Group By Operator [GBY_13] (rows=2 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_39] (rows=5 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -585,7 +585,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_38] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 9 [SIMPLE_EDGE] llap @@ -601,7 +601,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_39] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -674,7 +674,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_35] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [SIMPLE_EDGE] llap @@ -690,7 +690,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_36] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -768,7 +768,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_37] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 9 [SIMPLE_EDGE] llap @@ -784,7 +784,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_38] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -857,7 +857,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_35] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [SIMPLE_EDGE] llap @@ -873,7 +873,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_36] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1373,7 +1373,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_22] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [SIMPLE_EDGE] llap @@ -1382,7 +1382,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=89) Output:["_col0","_col1"] Filter Operator [FIL_23] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1438,7 +1438,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_22] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [SIMPLE_EDGE] llap @@ -1447,7 +1447,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=89) Output:["_col0","_col1"] Filter Operator [FIL_23] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1705,7 +1705,7 @@ Stage-0 Top N Key Operator [TNK_55] (rows=6 width=93) keys:key, c_int, c_float,sort order:+++,top n:5 Filter Operator [FIL_53] (rows=6 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0)) TableScan [TS_13] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 3 [SIMPLE_EDGE] llap @@ -1729,7 +1729,7 @@ Stage-0 Group By Operator [GBY_3] (rows=3 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_51] (rows=6 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0)) TableScan [TS_0] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1768,7 +1768,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1"] Filter Operator [FIL_15] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 3 [SIMPLE_EDGE] llap @@ -1837,7 +1837,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_26] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [SIMPLE_EDGE] llap @@ -1848,7 +1848,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=85) Output:["_col0"] Filter Operator [FIL_27] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1932,7 +1932,7 @@ Stage-0 Group By Operator [GBY_3] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_42] (rows=1 width=93) - predicate:((((c_int + 1) + 1) >= 0) and (((c_int + 1) > 0) or UDFToDouble(key) is not null) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (UDFToDouble(key) > 0.0D) and (c_float > 0.0)) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (((c_int + 1) + 1) >= 0) and (UDFToDouble(key) > 0.0D) and ((c_int > 0) or c_float is not null) and (((c_int + 1) > 0) or UDFToDouble(key) is not null)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [SIMPLE_EDGE] llap @@ -1950,7 +1950,7 @@ Stage-0 Group By Operator [GBY_12] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_43] (rows=1 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (UDFToDouble(key) > 0.0D) and (c_float > 0.0)) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (UDFToDouble(key) > 0.0D) and ((c_int > 0) or c_float is not null)) TableScan [TS_9] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -2413,7 +2413,7 @@ Stage-0 Select Operator [SEL_2] (rows=14 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_27] (rows=14 width=16) - predicate:((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) + predicate:((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) TableScan [TS_0] (rows=100 width=16) default@lineitem,li,Tbl:COMPLETE,Col:COMPLETE,Output:["l_orderkey","l_partkey","l_suppkey","l_linenumber"] <-Map 4 [SIMPLE_EDGE] llap @@ -2626,7 +2626,7 @@ Stage-0 Select Operator [SEL_24] (rows=631 width=178) Output:["_col0","_col1"] Filter Operator [FIL_23] (rows=631 width=194) - predicate:(((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) + predicate:((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) Select Operator [SEL_22] (rows=631 width=194) Output:["_col0","_col1","_col2","_col3","_col5"] Merge Join Operator [MERGEJOIN_37] (rows=631 width=194) @@ -2707,7 +2707,7 @@ Stage-0 Select Operator [SEL_23] (rows=38 width=223) Output:["_col0","_col1","_col2"] Filter Operator [FIL_22] (rows=38 width=234) - predicate:(((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) + predicate:((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) Merge Join Operator [MERGEJOIN_45] (rows=38 width=234) Conds:RS_19._col0, _col1=RS_20._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col4","_col5","_col8"] <-Reducer 2 [SIMPLE_EDGE] llap @@ -2796,7 +2796,7 @@ Stage-0 Select Operator [SEL_31] (rows=27 width=125) Output:["_col0","_col1"] Filter Operator [FIL_30] (rows=27 width=141) - predicate:(((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) + predicate:((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) Select Operator [SEL_29] (rows=27 width=141) Output:["_col0","_col1","_col2","_col3","_col5"] Merge Join Operator [MERGEJOIN_40] (rows=27 width=141) @@ -2827,7 +2827,7 @@ Stage-0 Select Operator [SEL_10] (rows=1 width=12) Output:["_col0","_col1"] Filter Operator [FIL_9] (rows=1 width=16) - predicate:(UDFToDouble(_col0) is not null and _col1 is not null) + predicate:(_col1 is not null and UDFToDouble(_col0) is not null) Please refer to the previous Group By Operator [GBY_7] <-Map 1 [SIMPLE_EDGE] llap SHUFFLE [RS_23] @@ -2885,7 +2885,7 @@ Stage-0 Select Operator [SEL_33] (rows=7 width=106) Output:["_col0","_col1"] Filter Operator [FIL_32] (rows=7 width=114) - predicate:(((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) + predicate:((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) Merge Join Operator [MERGEJOIN_48] (rows=7 width=114) Conds:RS_29._col0, _col1=RS_30._col0, _col1(Left Outer),Output:["_col0","_col1","_col3","_col4","_col7"] <-Reducer 3 [SIMPLE_EDGE] llap @@ -4587,13 +4587,13 @@ Stage-0 <-Map 3 [SIMPLE_EDGE] llap SHUFFLE [RS_9] PartitionCols:_col0 - Group By Operator [GBY_7] (rows=1 width=124) + Group By Operator [GBY_7] (rows=1 width=4) Output:["_col0"],keys:_col0 - Select Operator [SEL_5] (rows=1 width=124) + Select Operator [SEL_5] (rows=1 width=4) Output:["_col0"] - Filter Operator [FIL_16] (rows=1 width=124) + Filter Operator [FIL_16] (rows=1 width=4) predicate:id is not null - TableScan [TS_3] (rows=1 width=124) + TableScan [TS_3] (rows=1 width=4) default@things_n0,things_n0,Tbl:PARTIAL,Col:NONE,Output:["id"] PREHOOK: query: drop table sales_n0 diff --git a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out index c3fc6ed61e..0aadc2509b 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out @@ -380,7 +380,7 @@ Stage-0 Select Operator [SEL_211] (rows=7 width=443) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_210] (rows=7 width=534) - predicate:((v1 = 'srv1') and k1 is not null and k2 is not null and k3 is not null and v2 is not null and v3 is not null) + predicate:((v1 = 'srv1') and k2 is not null and k3 is not null and v2 is not null and v3 is not null and k1 is not null) TableScan [TS_18] (rows=85 width=534) default@sr,sr,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"] <-Reducer 9 [SIMPLE_EDGE] llap @@ -430,7 +430,7 @@ Stage-0 Select Operator [SEL_202] (rows=7 width=443) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_201] (rows=7 width=534) - predicate:((v3 = 'ssv3') and k1 is not null and k2 is not null and k3 is not null and v1 is not null and v2 is not null) + predicate:((v3 = 'ssv3') and k2 is not null and k3 is not null and k1 is not null and v1 is not null and v2 is not null) TableScan [TS_6] (rows=85 width=534) default@ss_n1,ss_n1,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"] <-Reducer 2 [SIMPLE_EDGE] llap @@ -452,7 +452,7 @@ Stage-0 Select Operator [SEL_190] (rows=170 width=356) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_189] (rows=170 width=356) - predicate:(k1 is not null and v2 is not null and v3 is not null) + predicate:(v2 is not null and v3 is not null and k1 is not null) TableScan [TS_0] (rows=170 width=356) default@cs,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v2","k3","v3"] @@ -1098,7 +1098,7 @@ Stage-0 Select Operator [SEL_197] (rows=170 width=34) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_196] (rows=170 width=34) - predicate:(k1 is not null and v2 is not null and v3 is not null) + predicate:(v2 is not null and v3 is not null and k1 is not null) TableScan [TS_0] (rows=170 width=34) default@cs,cs,Tbl:COMPLETE,Col:NONE,Output:["k1","v2","k3","v3"] <-Select Operator [SEL_200] (rows=500 width=10) @@ -1122,7 +1122,7 @@ Stage-0 Select Operator [SEL_213] (rows=42 width=34) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_212] (rows=42 width=34) - predicate:((v1 = 'srv1') and k1 is not null and k2 is not null and k3 is not null and v2 is not null and v3 is not null) + predicate:((v1 = 'srv1') and k2 is not null and k3 is not null and v2 is not null and v3 is not null and k1 is not null) TableScan [TS_21] (rows=85 width=34) default@sr,sr,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"] <-Select Operator [SEL_216] (rows=500 width=10) @@ -1161,7 +1161,7 @@ Stage-0 Select Operator [SEL_204] (rows=42 width=34) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_203] (rows=42 width=34) - predicate:((v3 = 'ssv3') and k1 is not null and k2 is not null and k3 is not null and v1 is not null and v2 is not null) + predicate:((v3 = 'ssv3') and k2 is not null and k3 is not null and k1 is not null and v1 is not null and v2 is not null) TableScan [TS_9] (rows=85 width=34) default@ss_n1,ss_n1,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"] <-Select Operator [SEL_220] (rows=1000 width=10) diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out index 8de83793ac..a2e11f93e3 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out @@ -51,7 +51,7 @@ Stage-0 Select Operator [SEL_32] (rows=1019 width=251) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_31] (rows=1019 width=251) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=251) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"] @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_34] (rows=1019 width=2) Output:["_col0"] Filter Operator [FIL_33] (rows=1019 width=8) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=8) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"] @@ -220,7 +220,7 @@ Stage-0 Select Operator [SEL_36] (rows=1019 width=2) Output:["_col0"] Filter Operator [FIL_35] (rows=1019 width=8) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=8) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"] @@ -293,7 +293,7 @@ Stage-0 Select Operator [SEL_33] (rows=1365 width=236) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_32] (rows=1365 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"] <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized, llap @@ -378,7 +378,7 @@ Stage-0 Select Operator [SEL_35] (rows=1365 width=236) Output:["_col0"] Filter Operator [FIL_34] (rows=1365 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"] <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized, llap @@ -462,7 +462,7 @@ Stage-0 Select Operator [SEL_37] (rows=1365 width=236) Output:["_col0"] Filter Operator [FIL_36] (rows=1365 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"] <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized, llap diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out index a394f2b44b..8b52f38139 100644 --- a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out +++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out @@ -1483,36 +1483,36 @@ STAGE PLANS: hive.sql.query SELECT "t23"."w_warehouse_sk", "t23"."i_item_sk", CAST(1 AS INTEGER) AS "d_moy", "t23"."mean", "t23"."cov", "t23"."w_warehouse_sk0" AS "w_warehouse_sk1", "t23"."i_item_sk0" AS "i_item_sk1", CAST(2 AS INTEGER) AS "d_moy1", "t23"."mean0" AS "mean1", "t23"."cov0" AS "cov1" FROM (SELECT "t10"."w_warehouse_sk", "t10"."i_item_sk", "t10"."mean", "t10"."cov", "t22"."w_warehouse_sk" AS "w_warehouse_sk0", "t22"."i_item_sk" AS "i_item_sk0", "t22"."mean" AS "mean0", "t22"."cov" AS "cov0" FROM (SELECT "w_warehouse_sk", "i_item_sk", CAST("$f3" AS DOUBLE) / "$f4" AS "mean", CASE WHEN CAST("$f3" AS DOUBLE) / "$f4" = 0 THEN NULL ELSE CAST("$f3" AS DOUBLE) / (CAST("$f3" AS DOUBLE) / "$f4") END AS "cov" -FROM (SELECT "t4"."w_warehouse_name", "t4"."w_warehouse_sk", "t2"."i_item_sk", SUM("t0"."inv_quantity_on_hand") AS "$f3", COUNT("t0"."inv_quantity_on_hand") AS "$f4" +FROM (SELECT "t6"."w_warehouse_name", "t6"."w_warehouse_sk", "t4"."i_item_sk", SUM("t0"."inv_quantity_on_hand") AS "$f3", COUNT("t0"."inv_quantity_on_hand") AS "$f4" FROM (SELECT "inv_date_sk", "inv_item_sk", "inv_warehouse_sk", "inv_quantity_on_hand" FROM "INVENTORY" WHERE "inv_item_sk" IS NOT NULL AND "inv_warehouse_sk" IS NOT NULL AND "inv_date_sk" IS NOT NULL) AS "t0" +INNER JOIN (SELECT "d_date_sk" +FROM "DATE_DIM" +WHERE "d_year" = 2001 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."inv_date_sk" = "t2"."d_date_sk" INNER JOIN (SELECT "i_item_sk" FROM "ITEM" -WHERE "i_item_sk" IS NOT NULL) AS "t2" ON "t0"."inv_item_sk" = "t2"."i_item_sk" +WHERE "i_item_sk" IS NOT NULL) AS "t4" ON "t0"."inv_item_sk" = "t4"."i_item_sk" INNER JOIN (SELECT "w_warehouse_sk", "w_warehouse_name" FROM "WAREHOUSE" -WHERE "w_warehouse_sk" IS NOT NULL) AS "t4" ON "t0"."inv_warehouse_sk" = "t4"."w_warehouse_sk" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 2001 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t6" ON "t0"."inv_date_sk" = "t6"."d_date_sk" -GROUP BY "t2"."i_item_sk", "t4"."w_warehouse_sk", "t4"."w_warehouse_name") AS "t8" +WHERE "w_warehouse_sk" IS NOT NULL) AS "t6" ON "t0"."inv_warehouse_sk" = "t6"."w_warehouse_sk" +GROUP BY "t4"."i_item_sk", "t6"."w_warehouse_sk", "t6"."w_warehouse_name") AS "t8" WHERE CASE WHEN CAST("t8"."$f3" AS DOUBLE) / "t8"."$f4" = 0 THEN FALSE ELSE CAST("t8"."$f3" AS DOUBLE) / (CAST("t8"."$f3" AS DOUBLE) / "t8"."$f4") > 1 END) AS "t10" INNER JOIN (SELECT "w_warehouse_sk", "i_item_sk", CAST("$f3" AS DOUBLE) / "$f4" AS "mean", CASE WHEN CAST("$f3" AS DOUBLE) / "$f4" = 0 THEN NULL ELSE CAST("$f3" AS DOUBLE) / (CAST("$f3" AS DOUBLE) / "$f4") END AS "cov" -FROM (SELECT "t16"."w_warehouse_name", "t16"."w_warehouse_sk", "t14"."i_item_sk", SUM("t12"."inv_quantity_on_hand") AS "$f3", COUNT("t12"."inv_quantity_on_hand") AS "$f4" +FROM (SELECT "t18"."w_warehouse_name", "t18"."w_warehouse_sk", "t16"."i_item_sk", SUM("t12"."inv_quantity_on_hand") AS "$f3", COUNT("t12"."inv_quantity_on_hand") AS "$f4" FROM (SELECT "inv_date_sk", "inv_item_sk", "inv_warehouse_sk", "inv_quantity_on_hand" FROM "INVENTORY" WHERE "inv_item_sk" IS NOT NULL AND "inv_warehouse_sk" IS NOT NULL AND "inv_date_sk" IS NOT NULL) AS "t12" +INNER JOIN (SELECT "d_date_sk" +FROM "DATE_DIM" +WHERE "d_year" = 2001 AND "d_moy" = 2 AND "d_date_sk" IS NOT NULL) AS "t14" ON "t12"."inv_date_sk" = "t14"."d_date_sk" INNER JOIN (SELECT "i_item_sk" FROM "ITEM" -WHERE "i_item_sk" IS NOT NULL) AS "t14" ON "t12"."inv_item_sk" = "t14"."i_item_sk" +WHERE "i_item_sk" IS NOT NULL) AS "t16" ON "t12"."inv_item_sk" = "t16"."i_item_sk" INNER JOIN (SELECT "w_warehouse_sk", "w_warehouse_name" FROM "WAREHOUSE" -WHERE "w_warehouse_sk" IS NOT NULL) AS "t16" ON "t12"."inv_warehouse_sk" = "t16"."w_warehouse_sk" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 2001 AND "d_moy" = 2 AND "d_date_sk" IS NOT NULL) AS "t18" ON "t12"."inv_date_sk" = "t18"."d_date_sk" -GROUP BY "t14"."i_item_sk", "t16"."w_warehouse_sk", "t16"."w_warehouse_name") AS "t20" +WHERE "w_warehouse_sk" IS NOT NULL) AS "t18" ON "t12"."inv_warehouse_sk" = "t18"."w_warehouse_sk" +GROUP BY "t16"."i_item_sk", "t18"."w_warehouse_sk", "t18"."w_warehouse_name") AS "t20" WHERE CASE WHEN CAST("t20"."$f3" AS DOUBLE) / "t20"."$f4" = 0 THEN FALSE ELSE CAST("t20"."$f3" AS DOUBLE) / (CAST("t20"."$f3" AS DOUBLE) / "t20"."$f4") > 1 END) AS "t22" ON "t10"."i_item_sk" = "t22"."i_item_sk" AND "t10"."w_warehouse_sk" = "t22"."w_warehouse_sk" ORDER BY "t10"."w_warehouse_sk", "t10"."i_item_sk", "t10"."mean", "t10"."cov", "t22"."mean", "t22"."cov") AS "t23" hive.sql.query.fieldNames w_warehouse_sk,i_item_sk,d_moy,mean,cov,w_warehouse_sk1,i_item_sk1,d_moy1,mean1,cov1 @@ -1738,16 +1738,16 @@ STAGE PLANS: TableScan alias: c properties: - hive.sql.query SELECT "t0"."c_customer_sk", "t0"."c_customer_id", "t0"."c_current_cdemo_sk", "t0"."c_current_hdemo_sk", "t0"."c_current_addr_sk", "t0"."c_first_shipto_date_sk", "t0"."c_first_sales_date_sk", "t0"."c_salutation", "t0"."c_first_name", "t0"."c_last_name", "t0"."c_preferred_cust_flag", "t0"."c_birth_day", "t0"."c_birth_month", "t0"."c_birth_year", "t0"."c_birth_country", "t0"."c_login", "t0"."c_email_address", "t0"."c_last_review_date", "t2"."ca_address_sk", "t2"."ca_address_id", "t2"."ca_street_number", "t2"."ca_street_name", "t2"."ca_street_type", "t2"."ca_suite_number", "t2"."ca_city", "t2"."ca_county", "t2"."ca_state", "t2"."ca_zip", "t2"."ca_country", "t2"."ca_gmt_offset", "t2"."ca_location_type", "t4"."cd_demo_sk", "t4"."cd_gender", "t4"."cd_marital_status", "t4"."cd_education_status", "t4"."cd_purchase_estimate", "t4"."cd_credit_rating", "t4"."cd_dep_count", "t4"."cd_dep_employed_count", "t4"."cd_dep_college_count" + hive.sql.query SELECT "t0"."c_customer_sk", "t0"."c_customer_id", "t0"."c_current_cdemo_sk", "t0"."c_current_hdemo_sk", "t0"."c_current_addr_sk", "t0"."c_first_shipto_date_sk", "t0"."c_first_sales_date_sk", "t0"."c_salutation", "t0"."c_first_name", "t0"."c_last_name", "t0"."c_preferred_cust_flag", "t0"."c_birth_day", "t0"."c_birth_month", "t0"."c_birth_year", "t0"."c_birth_country", "t0"."c_login", "t0"."c_email_address", "t0"."c_last_review_date", "t4"."ca_address_sk", "t4"."ca_address_id", "t4"."ca_street_number", "t4"."ca_street_name", "t4"."ca_street_type", "t4"."ca_suite_number", "t4"."ca_city", "t4"."ca_county", "t4"."ca_state", "t4"."ca_zip", "t4"."ca_country", "t4"."ca_gmt_offset", "t4"."ca_location_type", "t2"."cd_demo_sk", "t2"."cd_gender", "t2"."cd_marital_status", "t2"."cd_education_status", "t2"."cd_purchase_estimate", "t2"."cd_credit_rating", "t2"."cd_dep_count", "t2"."cd_dep_employed_count", "t2"."cd_dep_college_count" FROM (SELECT "c_customer_sk", "c_customer_id", "c_current_cdemo_sk", "c_current_hdemo_sk", "c_current_addr_sk", "c_first_shipto_date_sk", "c_first_sales_date_sk", "c_salutation", "c_first_name", "c_last_name", "c_preferred_cust_flag", "c_birth_day", "c_birth_month", "c_birth_year", "c_birth_country", "c_login", "c_email_address", "c_last_review_date" FROM "CUSTOMER" WHERE "c_current_addr_sk" IS NOT NULL AND "c_current_cdemo_sk" IS NOT NULL AND "c_customer_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "ca_address_sk", "ca_address_id", "ca_street_number", "ca_street_name", "ca_street_type", "ca_suite_number", "ca_city", "ca_county", "ca_state", "ca_zip", "ca_country", "ca_gmt_offset", "ca_location_type" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_state" IN ('CO', 'IL', 'MN') AND "ca_address_sk" IS NOT NULL) AS "t2" ON "t0"."c_current_addr_sk" = "t2"."ca_address_sk" INNER JOIN (SELECT "cd_demo_sk", "cd_gender", "cd_marital_status", "cd_education_status", "cd_purchase_estimate", "cd_credit_rating", "cd_dep_count", "cd_dep_employed_count", "cd_dep_college_count" FROM "CUSTOMER_DEMOGRAPHICS" -WHERE "cd_demo_sk" IS NOT NULL) AS "t4" ON "t0"."c_current_cdemo_sk" = "t4"."cd_demo_sk" +WHERE "cd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."c_current_cdemo_sk" = "t2"."cd_demo_sk" +INNER JOIN (SELECT "ca_address_sk", "ca_address_id", "ca_street_number", "ca_street_name", "ca_street_type", "ca_suite_number", "ca_city", "ca_county", "ca_state", "ca_zip", "ca_country", "ca_gmt_offset", "ca_location_type" +FROM "CUSTOMER_ADDRESS" +WHERE "ca_state" IN ('CO', 'IL', 'MN') AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."c_current_addr_sk" = "t4"."ca_address_sk" hive.sql.query.fieldNames c_customer_sk,c_customer_id,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ca_address_sk,ca_address_id,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count hive.sql.query.fieldTypes int,char(16),int,int,int,int,int,char(10),char(20),char(30),char(1),int,int,int,varchar(20),char(13),char(50),char(10),int,char(16),char(10),varchar(60),char(15),char(10),varchar(60),varchar(30),char(2),char(10),varchar(20),decimal(5,2),char(20),int,char(1),char(1),char(20),int,char(10),int,int,int hive.sql.query.split false @@ -2219,16 +2219,16 @@ STAGE PLANS: TableScan alias: c properties: - hive.sql.query SELECT "t0"."c_customer_sk", "t0"."c_customer_id", "t0"."c_current_cdemo_sk", "t0"."c_current_hdemo_sk", "t0"."c_current_addr_sk", "t0"."c_first_shipto_date_sk", "t0"."c_first_sales_date_sk", "t0"."c_salutation", "t0"."c_first_name", "t0"."c_last_name", "t0"."c_preferred_cust_flag", "t0"."c_birth_day", "t0"."c_birth_month", "t0"."c_birth_year", "t0"."c_birth_country", "t0"."c_login", "t0"."c_email_address", "t0"."c_last_review_date", "t2"."ca_address_sk", "t2"."ca_address_id", "t2"."ca_street_number", "t2"."ca_street_name", "t2"."ca_street_type", "t2"."ca_suite_number", "t2"."ca_city", "t2"."ca_county", "t2"."ca_state", "t2"."ca_zip", "t2"."ca_country", "t2"."ca_gmt_offset", "t2"."ca_location_type", "t4"."cd_demo_sk", "t4"."cd_gender", "t4"."cd_marital_status", "t4"."cd_education_status", "t4"."cd_purchase_estimate", "t4"."cd_credit_rating", "t4"."cd_dep_count", "t4"."cd_dep_employed_count", "t4"."cd_dep_college_count" + hive.sql.query SELECT "t0"."c_customer_sk", "t0"."c_customer_id", "t0"."c_current_cdemo_sk", "t0"."c_current_hdemo_sk", "t0"."c_current_addr_sk", "t0"."c_first_shipto_date_sk", "t0"."c_first_sales_date_sk", "t0"."c_salutation", "t0"."c_first_name", "t0"."c_last_name", "t0"."c_preferred_cust_flag", "t0"."c_birth_day", "t0"."c_birth_month", "t0"."c_birth_year", "t0"."c_birth_country", "t0"."c_login", "t0"."c_email_address", "t0"."c_last_review_date", "t4"."ca_address_sk", "t4"."ca_address_id", "t4"."ca_street_number", "t4"."ca_street_name", "t4"."ca_street_type", "t4"."ca_suite_number", "t4"."ca_city", "t4"."ca_county", "t4"."ca_state", "t4"."ca_zip", "t4"."ca_country", "t4"."ca_gmt_offset", "t4"."ca_location_type", "t2"."cd_demo_sk", "t2"."cd_gender", "t2"."cd_marital_status", "t2"."cd_education_status", "t2"."cd_purchase_estimate", "t2"."cd_credit_rating", "t2"."cd_dep_count", "t2"."cd_dep_employed_count", "t2"."cd_dep_college_count" FROM (SELECT "c_customer_sk", "c_customer_id", "c_current_cdemo_sk", "c_current_hdemo_sk", "c_current_addr_sk", "c_first_shipto_date_sk", "c_first_sales_date_sk", "c_salutation", "c_first_name", "c_last_name", "c_preferred_cust_flag", "c_birth_day", "c_birth_month", "c_birth_year", "c_birth_country", "c_login", "c_email_address", "c_last_review_date" FROM "CUSTOMER" WHERE "c_current_addr_sk" IS NOT NULL AND "c_current_cdemo_sk" IS NOT NULL AND "c_customer_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "ca_address_sk", "ca_address_id", "ca_street_number", "ca_street_name", "ca_street_type", "ca_suite_number", "ca_city", "ca_county", "ca_state", "ca_zip", "ca_country", "ca_gmt_offset", "ca_location_type" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_state" IN ('CO', 'IL', 'MN') AND "ca_address_sk" IS NOT NULL) AS "t2" ON "t0"."c_current_addr_sk" = "t2"."ca_address_sk" INNER JOIN (SELECT "cd_demo_sk", "cd_gender", "cd_marital_status", "cd_education_status", "cd_purchase_estimate", "cd_credit_rating", "cd_dep_count", "cd_dep_employed_count", "cd_dep_college_count" FROM "CUSTOMER_DEMOGRAPHICS" -WHERE "cd_demo_sk" IS NOT NULL) AS "t4" ON "t0"."c_current_cdemo_sk" = "t4"."cd_demo_sk" +WHERE "cd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."c_current_cdemo_sk" = "t2"."cd_demo_sk" +INNER JOIN (SELECT "ca_address_sk", "ca_address_id", "ca_street_number", "ca_street_name", "ca_street_type", "ca_suite_number", "ca_city", "ca_county", "ca_state", "ca_zip", "ca_country", "ca_gmt_offset", "ca_location_type" +FROM "CUSTOMER_ADDRESS" +WHERE "ca_state" IN ('CO', 'IL', 'MN') AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."c_current_addr_sk" = "t4"."ca_address_sk" hive.sql.query.fieldNames c_customer_sk,c_customer_id,c_current_cdemo_sk,c_current_hdemo_sk,c_current_addr_sk,c_first_shipto_date_sk,c_first_sales_date_sk,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address,c_last_review_date,ca_address_sk,ca_address_id,ca_street_number,ca_street_name,ca_street_type,ca_suite_number,ca_city,ca_county,ca_state,ca_zip,ca_country,ca_gmt_offset,ca_location_type,cd_demo_sk,cd_gender,cd_marital_status,cd_education_status,cd_purchase_estimate,cd_credit_rating,cd_dep_count,cd_dep_employed_count,cd_dep_college_count hive.sql.query.fieldTypes int,char(16),int,int,int,int,int,char(10),char(20),char(30),char(1),int,int,int,varchar(20),char(13),char(50),char(10),int,char(16),char(10),varchar(60),char(15),char(10),varchar(60),varchar(30),char(2),char(10),varchar(20),decimal(5,2),char(20),int,char(1),char(1),char(20),int,char(10),int,int,int hive.sql.query.split false @@ -3043,227 +3043,85 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 10 <- Map 13 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 11 <- Reducer 10 (SIMPLE_EDGE), Union 4 (CONTAINS) - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 3 <- Reducer 2 (SIMPLE_EDGE), Union 4 (CONTAINS) - Reducer 5 <- Union 4 (SIMPLE_EDGE) - Reducer 6 <- Reducer 5 (SIMPLE_EDGE) - Reducer 8 <- Map 12 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 9 <- Reducer 8 (SIMPLE_EDGE), Union 4 (CONTAINS) + Map 1 <- Union 2 (CONTAINS) + Map 5 <- Union 2 (CONTAINS) + Map 6 <- Union 2 (CONTAINS) + Reducer 3 <- Union 2 (SIMPLE_EDGE) + Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 Map Operator Tree: TableScan - alias: store_sales - properties: - hive.sql.query SELECT "t0"."ss_sold_date_sk", "t0"."ss_item_sk", "t0"."ss_addr_sk", "t0"."ss_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "ss_sold_date_sk", "ss_item_sk", "ss_addr_sk", "ss_ext_sales_price" -FROM "STORE_SALES" -WHERE "ss_sold_date_sk" IS NOT NULL AND "ss_addr_sk" IS NOT NULL AND "ss_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 2000 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ss_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -8 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."ss_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_item_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."ss_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames ss_sold_date_sk,ss_item_sk,ss_addr_sk,ss_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: ss_ext_sales_price (type: decimal(7,2)), i_item_id (type: char(16)) - outputColumnNames: _col3, _col7 + expressions: i_item_id (type: char(16)), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col7 (type: char(16)) - sort order: + - Map-reduce partition columns: _col7 (type: char(16)) - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) + Group By Operator + aggregations: sum(_col1) + keys: _col0 (type: char(16)) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: char(16)) + sort order: + + Map-reduce partition columns: _col0 (type: char(16)) + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Map 12 + Map 5 Map Operator Tree: TableScan - alias: catalog_sales - properties: - hive.sql.query SELECT "t0"."cs_sold_date_sk", "t0"."cs_bill_addr_sk", "t0"."cs_item_sk", "t0"."cs_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "cs_sold_date_sk", "cs_bill_addr_sk", "cs_item_sk", "cs_ext_sales_price" -FROM "CATALOG_SALES" -WHERE "cs_sold_date_sk" IS NOT NULL AND "cs_bill_addr_sk" IS NOT NULL AND "cs_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 2000 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."cs_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -8 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."cs_bill_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_item_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."cs_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames cs_sold_date_sk,cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: cs_ext_sales_price (type: decimal(7,2)), i_item_id (type: char(16)) - outputColumnNames: _col3, _col7 + expressions: i_item_id (type: char(16)), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col7 (type: char(16)) - sort order: + - Map-reduce partition columns: _col7 (type: char(16)) - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) + Group By Operator + aggregations: sum(_col1) + keys: _col0 (type: char(16)) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: char(16)) + sort order: + + Map-reduce partition columns: _col0 (type: char(16)) + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Map 13 + Map 6 Map Operator Tree: TableScan - alias: web_sales - properties: - hive.sql.query SELECT "t0"."ws_sold_date_sk", "t0"."ws_item_sk", "t0"."ws_bill_addr_sk", "t0"."ws_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_bill_addr_sk", "ws_ext_sales_price" -FROM "WEB_SALES" -WHERE "ws_sold_date_sk" IS NOT NULL AND "ws_bill_addr_sk" IS NOT NULL AND "ws_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 2000 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ws_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -8 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."ws_bill_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_item_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."ws_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames ws_sold_date_sk,ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: ws_ext_sales_price (type: decimal(7,2)), i_item_id (type: char(16)) - outputColumnNames: _col3, _col7 + expressions: i_item_id (type: char(16)), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col7 (type: char(16)) - sort order: + - Map-reduce partition columns: _col7 (type: char(16)) - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) - Execution mode: vectorized, llap - LLAP IO: no inputs - Map 7 - Map Operator Tree: - TableScan - alias: item - properties: - hive.sql.query SELECT "i_item_id" -FROM "ITEM" -WHERE "i_color" IN ('orchid ', 'chiffon ', 'lace ') AND "i_item_id" IS NOT NULL - hive.sql.query.fieldNames i_item_id - hive.sql.query.fieldTypes char(16) - hive.sql.query.split true - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: i_item_id (type: char(16)) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE Group By Operator + aggregations: sum(_col1) keys: _col0 (type: char(16)) minReductionHashAggr: 0.99 mode: hash - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 636 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Reducer 10 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col7 (type: char(16)) - 1 _col0 (type: char(16)) - outputColumnNames: _col3, _col7 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col7 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) - Reducer 11 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: char(16)) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Reducer 2 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col7 (type: char(16)) - 1 _col0 (type: char(16)) - outputColumnNames: _col3, _col7 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col7 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) Reducer 3 Execution mode: vectorized, llap Reduce Operator Tree: @@ -3272,100 +3130,32 @@ WHERE "i_color" IN ('orchid ', 'chiffon ', 'lace keys: KEY._col0 (type: char(16)) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Reducer 5 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: char(16)) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col1 (type: decimal(27,2)) sort order: + - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: char(16)) - Reducer 6 + Reducer 4 Execution mode: vectorized, llap Reduce Operator Tree: Select Operator expressions: VALUE._col0 (type: char(16)), KEY.reducesinkkey0 (type: decimal(27,2)) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Reducer 8 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col7 (type: char(16)) - 1 _col0 (type: char(16)) - outputColumnNames: _col3, _col7 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col7 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) - Reducer 9 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: char(16)) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 233 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: char(16)) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 3 Data size: 699 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Union 4 - Vertex: Union 4 + Union 2 + Vertex: Union 2 Stage: Stage-0 Fetch Operator @@ -3720,179 +3510,260 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 10 <- Map 13 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 11 <- Reducer 10 (SIMPLE_EDGE) - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 3 <- Reducer 2 (SIMPLE_EDGE) - Reducer 4 <- Reducer 3 (ONE_TO_ONE_EDGE), Reducer 9 (ONE_TO_ONE_EDGE) - Reducer 5 <- Reducer 11 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) - Reducer 6 <- Reducer 5 (SIMPLE_EDGE) - Reducer 8 <- Map 12 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 9 <- Reducer 8 (SIMPLE_EDGE) + Reducer 10 <- Reducer 9 (SIMPLE_EDGE) + Reducer 11 <- Map 19 (SIMPLE_EDGE), Reducer 10 (ONE_TO_ONE_EDGE) + Reducer 12 <- Map 18 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE) + Reducer 13 <- Reducer 12 (SIMPLE_EDGE) + Reducer 14 <- Map 20 (SIMPLE_EDGE), Reducer 10 (ONE_TO_ONE_EDGE) + Reducer 15 <- Map 18 (SIMPLE_EDGE), Reducer 14 (SIMPLE_EDGE) + Reducer 16 <- Reducer 15 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 10 (ONE_TO_ONE_EDGE) + Reducer 3 <- Map 18 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) + Reducer 4 <- Reducer 3 (SIMPLE_EDGE) + Reducer 5 <- Reducer 13 (ONE_TO_ONE_EDGE), Reducer 4 (ONE_TO_ONE_EDGE) + Reducer 6 <- Reducer 16 (ONE_TO_ONE_EDGE), Reducer 5 (ONE_TO_ONE_EDGE) + Reducer 7 <- Reducer 6 (SIMPLE_EDGE) + Reducer 9 <- Map 17 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 Map Operator Tree: TableScan - alias: store_returns + alias: date_dim properties: - hive.sql.query SELECT "t0"."sr_returned_date_sk", "t0"."sr_return_time_sk", "t0"."sr_item_sk", "t0"."sr_customer_sk", "t0"."sr_cdemo_sk", "t0"."sr_hdemo_sk", "t0"."sr_addr_sk", "t0"."sr_store_sk", "t0"."sr_reason_sk", "t0"."sr_ticket_number", "t0"."sr_return_quantity", "t0"."sr_return_amt", "t0"."sr_return_tax", "t0"."sr_return_amt_inc_tax", "t0"."sr_fee", "t0"."sr_return_ship_cost", "t0"."sr_refunded_cash", "t0"."sr_reversed_charge", "t0"."sr_store_credit", "t0"."sr_net_loss", "t2"."i_item_sk", "t2"."i_item_id", "t2"."i_rec_start_date", "t2"."i_rec_end_date", "t2"."i_item_desc", "t2"."i_current_price", "t2"."i_wholesale_cost", "t2"."i_brand_id", "t2"."i_brand", "t2"."i_class_id", "t2"."i_class", "t2"."i_category_id", "t2"."i_category", "t2"."i_manufact_id", "t2"."i_manufact", "t2"."i_size", "t2"."i_formulation", "t2"."i_color", "t2"."i_units", "t2"."i_container", "t2"."i_manager_id", "t2"."i_product_name", "t4"."d_date_sk", "t4"."d_date_id", "t4"."d_date", "t4"."d_month_seq", "t4"."d_week_seq", "t4"."d_quarter_seq", "t4"."d_year", "t4"."d_dow", "t4"."d_moy", "t4"."d_dom", "t4"."d_qoy", "t4"."d_fy_year", "t4"."d_fy_quarter_seq", "t4"."d_fy_week_seq", "t4"."d_day_name", "t4"."d_quarter_name", "t4"."d_holiday", "t4"."d_weekend", "t4"."d_following_holiday", "t4"."d_first_dom", "t4"."d_last_dom", "t4"."d_same_day_ly", "t4"."d_same_day_lq", "t4"."d_current_day", "t4"."d_current_week", "t4"."d_current_month", "t4"."d_current_quarter", "t4"."d_current_year" -FROM (SELECT "sr_returned_date_sk", "sr_return_time_sk", "sr_item_sk", "sr_customer_sk", "sr_cdemo_sk", "sr_hdemo_sk", "sr_addr_sk", "sr_store_sk", "sr_reason_sk", "sr_ticket_number", "sr_return_quantity", "sr_return_amt", "sr_return_tax", "sr_return_amt_inc_tax", "sr_fee", "sr_return_ship_cost", "sr_refunded_cash", "sr_reversed_charge", "sr_store_credit", "sr_net_loss" -FROM "STORE_RETURNS" -WHERE "sr_item_sk" IS NOT NULL AND "sr_returned_date_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_item_sk" IS NOT NULL AND "i_item_id" IS NOT NULL) AS "t2" ON "t0"."sr_item_sk" = "t2"."i_item_sk" -INNER JOIN (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" + hive.sql.query SELECT "t0"."d_date_sk", "t0"."d_date_id", "t0"."d_date", "t0"."d_month_seq", "t0"."d_week_seq", "t0"."d_quarter_seq", "t0"."d_year", "t0"."d_dow", "t0"."d_moy", "t0"."d_dom", "t0"."d_qoy", "t0"."d_fy_year", "t0"."d_fy_quarter_seq", "t0"."d_fy_week_seq", "t0"."d_day_name", "t0"."d_quarter_name", "t0"."d_holiday", "t0"."d_weekend", "t0"."d_following_holiday", "t0"."d_first_dom", "t0"."d_last_dom", "t0"."d_same_day_ly", "t0"."d_same_day_lq", "t0"."d_current_day", "t0"."d_current_week", "t0"."d_current_month", "t0"."d_current_quarter", "t0"."d_current_year", "t2"."sr_returned_date_sk", "t2"."sr_return_time_sk", "t2"."sr_item_sk", "t2"."sr_customer_sk", "t2"."sr_cdemo_sk", "t2"."sr_hdemo_sk", "t2"."sr_addr_sk", "t2"."sr_store_sk", "t2"."sr_reason_sk", "t2"."sr_ticket_number", "t2"."sr_return_quantity", "t2"."sr_return_amt", "t2"."sr_return_tax", "t2"."sr_return_amt_inc_tax", "t2"."sr_fee", "t2"."sr_return_ship_cost", "t2"."sr_refunded_cash", "t2"."sr_reversed_charge", "t2"."sr_store_credit", "t2"."sr_net_loss" +FROM (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" FROM "DATE_DIM" -WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t4" ON "t0"."sr_returned_date_sk" = "t4"."d_date_sk" - hive.sql.query.fieldNames sr_returned_date_sk,sr_return_time_sk,sr_item_sk,sr_customer_sk,sr_cdemo_sk,sr_hdemo_sk,sr_addr_sk,sr_store_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_return_tax,sr_return_amt_inc_tax,sr_fee,sr_return_ship_cost,sr_refunded_cash,sr_reversed_charge,sr_store_credit,sr_net_loss,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name,d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year - hive.sql.query.fieldTypes int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50),int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1) +WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t0" +INNER JOIN (SELECT "sr_returned_date_sk", "sr_return_time_sk", "sr_item_sk", "sr_customer_sk", "sr_cdemo_sk", "sr_hdemo_sk", "sr_addr_sk", "sr_store_sk", "sr_reason_sk", "sr_ticket_number", "sr_return_quantity", "sr_return_amt", "sr_return_tax", "sr_return_amt_inc_tax", "sr_fee", "sr_return_ship_cost", "sr_refunded_cash", "sr_reversed_charge", "sr_store_credit", "sr_net_loss" +FROM "STORE_RETURNS" +WHERE "sr_item_sk" IS NOT NULL AND "sr_returned_date_sk" IS NOT NULL) AS "t2" ON "t0"."d_date_sk" = "t2"."sr_returned_date_sk" + hive.sql.query.fieldNames d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year,sr_returned_date_sk,sr_return_time_sk,sr_item_sk,sr_customer_sk,sr_cdemo_sk,sr_hdemo_sk,sr_addr_sk,sr_store_sk,sr_reason_sk,sr_ticket_number,sr_return_quantity,sr_return_amt,sr_return_tax,sr_return_amt_inc_tax,sr_fee,sr_return_ship_cost,sr_refunded_cash,sr_reversed_charge,sr_store_credit,sr_net_loss + hive.sql.query.fieldTypes int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1),int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2) hive.sql.query.split false - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: sr_return_quantity (type: int), i_item_id (type: char(16)), d_date (type: date) - outputColumnNames: _col10, _col21, _col44 - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE + expressions: d_date (type: date), sr_item_sk (type: int), sr_return_quantity (type: int) + outputColumnNames: _col2, _col30, _col38 + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col44 (type: date) + key expressions: _col2 (type: date) sort order: + - Map-reduce partition columns: _col44 (type: date) - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE - value expressions: _col10 (type: int), _col21 (type: char(16)) + Map-reduce partition columns: _col2 (type: date) + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + value expressions: _col30 (type: int), _col38 (type: int) Execution mode: vectorized, llap LLAP IO: no inputs - Map 12 + Map 17 Map Operator Tree: TableScan - alias: catalog_returns + alias: date_dim properties: - hive.sql.query SELECT "t0"."cr_returned_date_sk", "t0"."cr_returned_time_sk", "t0"."cr_item_sk", "t0"."cr_refunded_customer_sk", "t0"."cr_refunded_cdemo_sk", "t0"."cr_refunded_hdemo_sk", "t0"."cr_refunded_addr_sk", "t0"."cr_returning_customer_sk", "t0"."cr_returning_cdemo_sk", "t0"."cr_returning_hdemo_sk", "t0"."cr_returning_addr_sk", "t0"."cr_call_center_sk", "t0"."cr_catalog_page_sk", "t0"."cr_ship_mode_sk", "t0"."cr_warehouse_sk", "t0"."cr_reason_sk", "t0"."cr_order_number", "t0"."cr_return_quantity", "t0"."cr_return_amount", "t0"."cr_return_tax", "t0"."cr_return_amt_inc_tax", "t0"."cr_fee", "t0"."cr_return_ship_cost", "t0"."cr_refunded_cash", "t0"."cr_reversed_charge", "t0"."cr_store_credit", "t0"."cr_net_loss", "t2"."i_item_sk", "t2"."i_item_id", "t2"."i_rec_start_date", "t2"."i_rec_end_date", "t2"."i_item_desc", "t2"."i_current_price", "t2"."i_wholesale_cost", "t2"."i_brand_id", "t2"."i_brand", "t2"."i_class_id", "t2"."i_class", "t2"."i_category_id", "t2"."i_category", "t2"."i_manufact_id", "t2"."i_manufact", "t2"."i_size", "t2"."i_formulation", "t2"."i_color", "t2"."i_units", "t2"."i_container", "t2"."i_manager_id", "t2"."i_product_name", "t4"."d_date_sk", "t4"."d_date_id", "t4"."d_date", "t4"."d_month_seq", "t4"."d_week_seq", "t4"."d_quarter_seq", "t4"."d_year", "t4"."d_dow", "t4"."d_moy", "t4"."d_dom", "t4"."d_qoy", "t4"."d_fy_year", "t4"."d_fy_quarter_seq", "t4"."d_fy_week_seq", "t4"."d_day_name", "t4"."d_quarter_name", "t4"."d_holiday", "t4"."d_weekend", "t4"."d_following_holiday", "t4"."d_first_dom", "t4"."d_last_dom", "t4"."d_same_day_ly", "t4"."d_same_day_lq", "t4"."d_current_day", "t4"."d_current_week", "t4"."d_current_month", "t4"."d_current_quarter", "t4"."d_current_year" -FROM (SELECT "cr_returned_date_sk", "cr_returned_time_sk", "cr_item_sk", "cr_refunded_customer_sk", "cr_refunded_cdemo_sk", "cr_refunded_hdemo_sk", "cr_refunded_addr_sk", "cr_returning_customer_sk", "cr_returning_cdemo_sk", "cr_returning_hdemo_sk", "cr_returning_addr_sk", "cr_call_center_sk", "cr_catalog_page_sk", "cr_ship_mode_sk", "cr_warehouse_sk", "cr_reason_sk", "cr_order_number", "cr_return_quantity", "cr_return_amount", "cr_return_tax", "cr_return_amt_inc_tax", "cr_fee", "cr_return_ship_cost", "cr_refunded_cash", "cr_reversed_charge", "cr_store_credit", "cr_net_loss" -FROM "CATALOG_RETURNS" -WHERE "cr_item_sk" IS NOT NULL AND "cr_returned_date_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_item_sk" IS NOT NULL AND "i_item_id" IS NOT NULL) AS "t2" ON "t0"."cr_item_sk" = "t2"."i_item_sk" -INNER JOIN (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" + hive.sql.query SELECT "d_week_seq" FROM "DATE_DIM" -WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t4" ON "t0"."cr_returned_date_sk" = "t4"."d_date_sk" - hive.sql.query.fieldNames cr_returned_date_sk,cr_returned_time_sk,cr_item_sk,cr_refunded_customer_sk,cr_refunded_cdemo_sk,cr_refunded_hdemo_sk,cr_refunded_addr_sk,cr_returning_customer_sk,cr_returning_cdemo_sk,cr_returning_hdemo_sk,cr_returning_addr_sk,cr_call_center_sk,cr_catalog_page_sk,cr_ship_mode_sk,cr_warehouse_sk,cr_reason_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_return_tax,cr_return_amt_inc_tax,cr_fee,cr_return_ship_cost,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_net_loss,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name,d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year - hive.sql.query.fieldTypes int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50),int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1) - hive.sql.query.split false - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE +WHERE "d_date" IN (DATE '1998-01-02', DATE '1998-10-15', DATE '1998-11-10') AND "d_week_seq" IS NOT NULL + hive.sql.query.fieldNames d_week_seq + hive.sql.query.fieldTypes int + hive.sql.query.split true + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: cr_return_quantity (type: int), i_item_id (type: char(16)), d_date (type: date) - outputColumnNames: _col17, _col28, _col51 - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col51 (type: date) - sort order: + - Map-reduce partition columns: _col51 (type: date) - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE - value expressions: _col17 (type: int), _col28 (type: char(16)) + expressions: d_week_seq (type: int) + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Group By Operator + keys: _col0 (type: int) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + 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 Execution mode: vectorized, llap LLAP IO: no inputs - Map 13 + Map 18 Map Operator Tree: TableScan - alias: web_returns + alias: item properties: - hive.sql.query SELECT "t0"."wr_returned_date_sk", "t0"."wr_returned_time_sk", "t0"."wr_item_sk", "t0"."wr_refunded_customer_sk", "t0"."wr_refunded_cdemo_sk", "t0"."wr_refunded_hdemo_sk", "t0"."wr_refunded_addr_sk", "t0"."wr_returning_customer_sk", "t0"."wr_returning_cdemo_sk", "t0"."wr_returning_hdemo_sk", "t0"."wr_returning_addr_sk", "t0"."wr_web_page_sk", "t0"."wr_reason_sk", "t0"."wr_order_number", "t0"."wr_return_quantity", "t0"."wr_return_amt", "t0"."wr_return_tax", "t0"."wr_return_amt_inc_tax", "t0"."wr_fee", "t0"."wr_return_ship_cost", "t0"."wr_refunded_cash", "t0"."wr_reversed_charge", "t0"."wr_account_credit", "t0"."wr_net_loss", "t2"."i_item_sk", "t2"."i_item_id", "t2"."i_rec_start_date", "t2"."i_rec_end_date", "t2"."i_item_desc", "t2"."i_current_price", "t2"."i_wholesale_cost", "t2"."i_brand_id", "t2"."i_brand", "t2"."i_class_id", "t2"."i_class", "t2"."i_category_id", "t2"."i_category", "t2"."i_manufact_id", "t2"."i_manufact", "t2"."i_size", "t2"."i_formulation", "t2"."i_color", "t2"."i_units", "t2"."i_container", "t2"."i_manager_id", "t2"."i_product_name", "t4"."d_date_sk", "t4"."d_date_id", "t4"."d_date", "t4"."d_month_seq", "t4"."d_week_seq", "t4"."d_quarter_seq", "t4"."d_year", "t4"."d_dow", "t4"."d_moy", "t4"."d_dom", "t4"."d_qoy", "t4"."d_fy_year", "t4"."d_fy_quarter_seq", "t4"."d_fy_week_seq", "t4"."d_day_name", "t4"."d_quarter_name", "t4"."d_holiday", "t4"."d_weekend", "t4"."d_following_holiday", "t4"."d_first_dom", "t4"."d_last_dom", "t4"."d_same_day_ly", "t4"."d_same_day_lq", "t4"."d_current_day", "t4"."d_current_week", "t4"."d_current_month", "t4"."d_current_quarter", "t4"."d_current_year" -FROM (SELECT "wr_returned_date_sk", "wr_returned_time_sk", "wr_item_sk", "wr_refunded_customer_sk", "wr_refunded_cdemo_sk", "wr_refunded_hdemo_sk", "wr_refunded_addr_sk", "wr_returning_customer_sk", "wr_returning_cdemo_sk", "wr_returning_hdemo_sk", "wr_returning_addr_sk", "wr_web_page_sk", "wr_reason_sk", "wr_order_number", "wr_return_quantity", "wr_return_amt", "wr_return_tax", "wr_return_amt_inc_tax", "wr_fee", "wr_return_ship_cost", "wr_refunded_cash", "wr_reversed_charge", "wr_account_credit", "wr_net_loss" -FROM "WEB_RETURNS" -WHERE "wr_item_sk" IS NOT NULL AND "wr_returned_date_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" + hive.sql.query SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" FROM "ITEM" -WHERE "i_item_sk" IS NOT NULL AND "i_item_id" IS NOT NULL) AS "t2" ON "t0"."wr_item_sk" = "t2"."i_item_sk" -INNER JOIN (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" -FROM "DATE_DIM" -WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t4" ON "t0"."wr_returned_date_sk" = "t4"."d_date_sk" - hive.sql.query.fieldNames wr_returned_date_sk,wr_returned_time_sk,wr_item_sk,wr_refunded_customer_sk,wr_refunded_cdemo_sk,wr_refunded_hdemo_sk,wr_refunded_addr_sk,wr_returning_customer_sk,wr_returning_cdemo_sk,wr_returning_hdemo_sk,wr_returning_addr_sk,wr_web_page_sk,wr_reason_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_return_tax,wr_return_amt_inc_tax,wr_fee,wr_return_ship_cost,wr_refunded_cash,wr_reversed_charge,wr_account_credit,wr_net_loss,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name,d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year - hive.sql.query.fieldTypes int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50),int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1) - hive.sql.query.split false - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE +WHERE "i_item_sk" IS NOT NULL AND "i_item_id" IS NOT NULL + hive.sql.query.fieldNames i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name + hive.sql.query.fieldTypes int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) + hive.sql.query.split true + Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: wr_return_quantity (type: int), i_item_id (type: char(16)), d_date (type: date) - outputColumnNames: _col14, _col25, _col48 - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE + expressions: i_item_sk (type: int), i_item_id (type: char(16)) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Map-reduce partition columns: _col0 (type: int) + Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: char(16)) + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Map-reduce partition columns: _col0 (type: int) + Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: char(16)) Reduce Output Operator - key expressions: _col48 (type: date) + key expressions: _col0 (type: int) sort order: + - Map-reduce partition columns: _col48 (type: date) - Statistics: Num rows: 1 Data size: 160 Basic stats: COMPLETE Column stats: NONE - value expressions: _col14 (type: int), _col25 (type: char(16)) + Map-reduce partition columns: _col0 (type: int) + Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: char(16)) Execution mode: vectorized, llap LLAP IO: no inputs - Map 7 + Map 19 Map Operator Tree: TableScan alias: date_dim properties: - hive.sql.query SELECT "t0"."d_date" + hive.sql.query SELECT "t0"."d_date_sk", "t0"."d_date_id", "t0"."d_date", "t0"."d_month_seq", "t0"."d_week_seq", "t0"."d_quarter_seq", "t0"."d_year", "t0"."d_dow", "t0"."d_moy", "t0"."d_dom", "t0"."d_qoy", "t0"."d_fy_year", "t0"."d_fy_quarter_seq", "t0"."d_fy_week_seq", "t0"."d_day_name", "t0"."d_quarter_name", "t0"."d_holiday", "t0"."d_weekend", "t0"."d_following_holiday", "t0"."d_first_dom", "t0"."d_last_dom", "t0"."d_same_day_ly", "t0"."d_same_day_lq", "t0"."d_current_day", "t0"."d_current_week", "t0"."d_current_month", "t0"."d_current_quarter", "t0"."d_current_year", "t2"."wr_returned_date_sk", "t2"."wr_returned_time_sk", "t2"."wr_item_sk", "t2"."wr_refunded_customer_sk", "t2"."wr_refunded_cdemo_sk", "t2"."wr_refunded_hdemo_sk", "t2"."wr_refunded_addr_sk", "t2"."wr_returning_customer_sk", "t2"."wr_returning_cdemo_sk", "t2"."wr_returning_hdemo_sk", "t2"."wr_returning_addr_sk", "t2"."wr_web_page_sk", "t2"."wr_reason_sk", "t2"."wr_order_number", "t2"."wr_return_quantity", "t2"."wr_return_amt", "t2"."wr_return_tax", "t2"."wr_return_amt_inc_tax", "t2"."wr_fee", "t2"."wr_return_ship_cost", "t2"."wr_refunded_cash", "t2"."wr_reversed_charge", "t2"."wr_account_credit", "t2"."wr_net_loss" FROM (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" FROM "DATE_DIM" -WHERE "d_week_seq" IS NOT NULL AND "d_date" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_week_seq" -FROM "DATE_DIM" -WHERE "d_date" IN (DATE '1998-01-02', DATE '1998-10-15', DATE '1998-11-10') AND "d_week_seq" IS NOT NULL -GROUP BY "d_week_seq") AS "t2" ON "t0"."d_week_seq" = "t2"."d_week_seq" - hive.sql.query.fieldNames d_date - hive.sql.query.fieldTypes date +WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t0" +INNER JOIN (SELECT "wr_returned_date_sk", "wr_returned_time_sk", "wr_item_sk", "wr_refunded_customer_sk", "wr_refunded_cdemo_sk", "wr_refunded_hdemo_sk", "wr_refunded_addr_sk", "wr_returning_customer_sk", "wr_returning_cdemo_sk", "wr_returning_hdemo_sk", "wr_returning_addr_sk", "wr_web_page_sk", "wr_reason_sk", "wr_order_number", "wr_return_quantity", "wr_return_amt", "wr_return_tax", "wr_return_amt_inc_tax", "wr_fee", "wr_return_ship_cost", "wr_refunded_cash", "wr_reversed_charge", "wr_account_credit", "wr_net_loss" +FROM "WEB_RETURNS" +WHERE "wr_item_sk" IS NOT NULL AND "wr_returned_date_sk" IS NOT NULL) AS "t2" ON "t0"."d_date_sk" = "t2"."wr_returned_date_sk" + hive.sql.query.fieldNames d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year,wr_returned_date_sk,wr_returned_time_sk,wr_item_sk,wr_refunded_customer_sk,wr_refunded_cdemo_sk,wr_refunded_hdemo_sk,wr_refunded_addr_sk,wr_returning_customer_sk,wr_returning_cdemo_sk,wr_returning_hdemo_sk,wr_returning_addr_sk,wr_web_page_sk,wr_reason_sk,wr_order_number,wr_return_quantity,wr_return_amt,wr_return_tax,wr_return_amt_inc_tax,wr_fee,wr_return_ship_cost,wr_refunded_cash,wr_reversed_charge,wr_account_credit,wr_net_loss + hive.sql.query.fieldTypes int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1),int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2) hive.sql.query.split false - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: d_date (type: date) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE - Group By Operator - keys: _col0 (type: date) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: date) - sort order: + - Map-reduce partition columns: _col0 (type: date) - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: date) - sort order: + - Map-reduce partition columns: _col0 (type: date) - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: date) - sort order: + - Map-reduce partition columns: _col0 (type: date) - Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column stats: NONE + expressions: d_date (type: date), wr_item_sk (type: int), wr_return_quantity (type: int) + outputColumnNames: _col2, _col30, _col42 + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col2 (type: date) + sort order: + + Map-reduce partition columns: _col2 (type: date) + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + value expressions: _col30 (type: int), _col42 (type: int) + Execution mode: vectorized, llap + LLAP IO: no inputs + Map 20 + Map Operator Tree: + TableScan + alias: date_dim + properties: + hive.sql.query SELECT "t0"."d_date_sk", "t0"."d_date_id", "t0"."d_date", "t0"."d_month_seq", "t0"."d_week_seq", "t0"."d_quarter_seq", "t0"."d_year", "t0"."d_dow", "t0"."d_moy", "t0"."d_dom", "t0"."d_qoy", "t0"."d_fy_year", "t0"."d_fy_quarter_seq", "t0"."d_fy_week_seq", "t0"."d_day_name", "t0"."d_quarter_name", "t0"."d_holiday", "t0"."d_weekend", "t0"."d_following_holiday", "t0"."d_first_dom", "t0"."d_last_dom", "t0"."d_same_day_ly", "t0"."d_same_day_lq", "t0"."d_current_day", "t0"."d_current_week", "t0"."d_current_month", "t0"."d_current_quarter", "t0"."d_current_year", "t2"."cr_returned_date_sk", "t2"."cr_returned_time_sk", "t2"."cr_item_sk", "t2"."cr_refunded_customer_sk", "t2"."cr_refunded_cdemo_sk", "t2"."cr_refunded_hdemo_sk", "t2"."cr_refunded_addr_sk", "t2"."cr_returning_customer_sk", "t2"."cr_returning_cdemo_sk", "t2"."cr_returning_hdemo_sk", "t2"."cr_returning_addr_sk", "t2"."cr_call_center_sk", "t2"."cr_catalog_page_sk", "t2"."cr_ship_mode_sk", "t2"."cr_warehouse_sk", "t2"."cr_reason_sk", "t2"."cr_order_number", "t2"."cr_return_quantity", "t2"."cr_return_amount", "t2"."cr_return_tax", "t2"."cr_return_amt_inc_tax", "t2"."cr_fee", "t2"."cr_return_ship_cost", "t2"."cr_refunded_cash", "t2"."cr_reversed_charge", "t2"."cr_store_credit", "t2"."cr_net_loss" +FROM (SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" +FROM "DATE_DIM" +WHERE "d_date" IS NOT NULL AND "d_date_sk" IS NOT NULL) AS "t0" +INNER JOIN (SELECT "cr_returned_date_sk", "cr_returned_time_sk", "cr_item_sk", "cr_refunded_customer_sk", "cr_refunded_cdemo_sk", "cr_refunded_hdemo_sk", "cr_refunded_addr_sk", "cr_returning_customer_sk", "cr_returning_cdemo_sk", "cr_returning_hdemo_sk", "cr_returning_addr_sk", "cr_call_center_sk", "cr_catalog_page_sk", "cr_ship_mode_sk", "cr_warehouse_sk", "cr_reason_sk", "cr_order_number", "cr_return_quantity", "cr_return_amount", "cr_return_tax", "cr_return_amt_inc_tax", "cr_fee", "cr_return_ship_cost", "cr_refunded_cash", "cr_reversed_charge", "cr_store_credit", "cr_net_loss" +FROM "CATALOG_RETURNS" +WHERE "cr_item_sk" IS NOT NULL AND "cr_returned_date_sk" IS NOT NULL) AS "t2" ON "t0"."d_date_sk" = "t2"."cr_returned_date_sk" + hive.sql.query.fieldNames d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year,cr_returned_date_sk,cr_returned_time_sk,cr_item_sk,cr_refunded_customer_sk,cr_refunded_cdemo_sk,cr_refunded_hdemo_sk,cr_refunded_addr_sk,cr_returning_customer_sk,cr_returning_cdemo_sk,cr_returning_hdemo_sk,cr_returning_addr_sk,cr_call_center_sk,cr_catalog_page_sk,cr_ship_mode_sk,cr_warehouse_sk,cr_reason_sk,cr_order_number,cr_return_quantity,cr_return_amount,cr_return_tax,cr_return_amt_inc_tax,cr_fee,cr_return_ship_cost,cr_refunded_cash,cr_reversed_charge,cr_store_credit,cr_net_loss + hive.sql.query.fieldTypes int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1),int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2),decimal(7,2) + hive.sql.query.split false + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: d_date (type: date), cr_item_sk (type: int), cr_return_quantity (type: int) + outputColumnNames: _col2, _col30, _col45 + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col2 (type: date) + sort order: + + Map-reduce partition columns: _col2 (type: date) + Statistics: Num rows: 1 Data size: 64 Basic stats: COMPLETE Column stats: NONE + value expressions: _col30 (type: int), _col45 (type: int) + Execution mode: vectorized, llap + LLAP IO: no inputs + Map 8 + Map Operator Tree: + TableScan + alias: date_dim + properties: + hive.sql.query SELECT "d_date_sk", "d_date_id", "d_date", "d_month_seq", "d_week_seq", "d_quarter_seq", "d_year", "d_dow", "d_moy", "d_dom", "d_qoy", "d_fy_year", "d_fy_quarter_seq", "d_fy_week_seq", "d_day_name", "d_quarter_name", "d_holiday", "d_weekend", "d_following_holiday", "d_first_dom", "d_last_dom", "d_same_day_ly", "d_same_day_lq", "d_current_day", "d_current_week", "d_current_month", "d_current_quarter", "d_current_year" +FROM "DATE_DIM" +WHERE "d_week_seq" IS NOT NULL AND "d_date" IS NOT NULL + hive.sql.query.fieldNames d_date_sk,d_date_id,d_date,d_month_seq,d_week_seq,d_quarter_seq,d_year,d_dow,d_moy,d_dom,d_qoy,d_fy_year,d_fy_quarter_seq,d_fy_week_seq,d_day_name,d_quarter_name,d_holiday,d_weekend,d_following_holiday,d_first_dom,d_last_dom,d_same_day_ly,d_same_day_lq,d_current_day,d_current_week,d_current_month,d_current_quarter,d_current_year + hive.sql.query.fieldTypes int,char(16),date,int,int,int,int,int,int,int,int,int,int,int,char(9),char(6),char(1),char(1),char(1),int,int,int,int,char(1),char(1),char(1),char(1),char(1) + hive.sql.query.split true + Statistics: Num rows: 1 Data size: 60 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: d_date (type: date), d_week_seq (type: int) + outputColumnNames: _col2, _col4 + Statistics: Num rows: 1 Data size: 60 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col4 (type: int) + sort order: + + Map-reduce partition columns: _col4 (type: int) + Statistics: Num rows: 1 Data size: 60 Basic stats: COMPLETE Column stats: NONE + value expressions: _col2 (type: date) Execution mode: vectorized, llap LLAP IO: no inputs Reducer 10 + Execution mode: vectorized, llap + Reduce Operator Tree: + Group By Operator + keys: KEY._col0 (type: date) + mode: mergepartial + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: date) + sort order: + + Map-reduce partition columns: _col0 (type: date) + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: date) + sort order: + + Map-reduce partition columns: _col0 (type: date) + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: date) + sort order: + + Map-reduce partition columns: _col0 (type: date) + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE + Reducer 11 Execution mode: llap Reduce Operator Tree: Merge Join Operator condition map: - Left Semi Join 0 to 1 + Inner Join 0 to 1 keys: - 0 _col48 (type: date) + 0 _col2 (type: date) 1 _col0 (type: date) - outputColumnNames: _col14, _col25 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + outputColumnNames: _col30, _col42 + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col30 (type: int) + sort order: + + Map-reduce partition columns: _col30 (type: int) + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + value expressions: _col42 (type: int) + Reducer 12 + Execution mode: llap + Reduce Operator Tree: + Merge Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col30 (type: int) + 1 _col0 (type: int) + outputColumnNames: _col42, _col54 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: sum(_col14) - keys: _col25 (type: char(16)) + aggregations: sum(_col42) + keys: _col54 (type: char(16)) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) - Reducer 11 + Reducer 13 Execution mode: vectorized, llap Reduce Operator Tree: Group By Operator @@ -3900,42 +3771,59 @@ GROUP BY "d_week_seq") AS "t2" ON "t0"."d_week_seq" = "t2"."d_week_seq" keys: KEY._col0 (type: char(16)) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: char(16)), _col1 (type: bigint), UDFToDouble(_col1) (type: double) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint), _col2 (type: double) - Reducer 2 + Reducer 14 Execution mode: llap Reduce Operator Tree: Merge Join Operator condition map: - Left Semi Join 0 to 1 + Inner Join 0 to 1 keys: - 0 _col44 (type: date) + 0 _col2 (type: date) 1 _col0 (type: date) - outputColumnNames: _col10, _col21 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + outputColumnNames: _col30, _col45 + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col30 (type: int) + sort order: + + Map-reduce partition columns: _col30 (type: int) + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + value expressions: _col45 (type: int) + Reducer 15 + Execution mode: llap + Reduce Operator Tree: + Merge Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col30 (type: int) + 1 _col0 (type: int) + outputColumnNames: _col45, _col57 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: sum(_col10) - keys: _col21 (type: char(16)) + aggregations: sum(_col45) + keys: _col57 (type: char(16)) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) - Reducer 3 + Reducer 16 Execution mode: vectorized, llap Reduce Operator Tree: Group By Operator @@ -3943,18 +3831,78 @@ GROUP BY "d_week_seq") AS "t2" ON "t0"."d_week_seq" = "t2"."d_week_seq" keys: KEY._col0 (type: char(16)) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: char(16)), _col1 (type: bigint), UDFToDouble(_col1) (type: double) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint), _col2 (type: double) + Reducer 2 + Execution mode: llap + Reduce Operator Tree: + Merge Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col2 (type: date) + 1 _col0 (type: date) + outputColumnNames: _col30, _col38 + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col30 (type: int) + sort order: + + Map-reduce partition columns: _col30 (type: int) + Statistics: Num rows: 1 Data size: 70 Basic stats: COMPLETE Column stats: NONE + value expressions: _col38 (type: int) + Reducer 3 + Execution mode: llap + Reduce Operator Tree: + Merge Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col30 (type: int) + 1 _col0 (type: int) + outputColumnNames: _col38, _col50 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + Group By Operator + aggregations: sum(_col38) + keys: _col50 (type: char(16)) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: char(16)) + sort order: + + Map-reduce partition columns: _col0 (type: char(16)) + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: bigint) Reducer 4 + Execution mode: vectorized, llap + Reduce Operator Tree: + Group By Operator + aggregations: sum(VALUE._col0) + keys: KEY._col0 (type: char(16)) + mode: mergepartial + outputColumnNames: _col0, _col1 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: _col0 (type: char(16)), _col1 (type: bigint), UDFToDouble(_col1) (type: double) + outputColumnNames: _col0, _col1, _col2 + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: char(16)) + sort order: + + Map-reduce partition columns: _col0 (type: char(16)) + Statistics: Num rows: 1 Data size: 77 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: bigint), _col2 (type: double) + Reducer 5 Execution mode: llap Reduce Operator Tree: Merge Join Operator @@ -3964,14 +3912,14 @@ GROUP BY "d_week_seq") AS "t2" ON "t0"."d_week_seq" = "t2"."d_week_seq" 0 _col0 (type: char(16)) 1 _col0 (type: char(16)) outputColumnNames: _col0, _col1, _col2, _col4, _col5 - Statistics: Num rows: 1 Data size: 193 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)) sort order: + Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 193 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint), _col2 (type: double), _col4 (type: bigint), _col5 (type: double) - Reducer 5 + Reducer 6 Execution mode: llap Reduce Operator Tree: Merge Join Operator @@ -3981,77 +3929,56 @@ GROUP BY "d_week_seq") AS "t2" ON "t0"."d_week_seq" = "t2"."d_week_seq" 0 _col0 (type: char(16)) 1 _col0 (type: char(16)) outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col7, _col8 - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col0 (type: char(16)), _col1 (type: bigint), (((_col2 / UDFToDouble(((_col1 + _col4) + _col7))) / 3.0D) * 100.0D) (type: double), _col4 (type: bigint), (((_col5 / UDFToDouble(((_col1 + _col4) + _col7))) / 3.0D) * 100.0D) (type: double), _col7 (type: bigint), (((_col8 / UDFToDouble(((_col1 + _col4) + _col7))) / 3.0D) * 100.0D) (type: double), (CAST( ((_col1 + _col4) + _col7) AS decimal(19,0)) / 3) (type: decimal(25,6)) + expressions: _col0 (type: char(16)), _col1 (type: bigint), (((_col2 / UDFToDouble(((_col1 + _col7) + _col4))) / 3.0D) * 100.0D) (type: double), _col7 (type: bigint), (((_col8 / UDFToDouble(((_col1 + _col7) + _col4))) / 3.0D) * 100.0D) (type: double), _col4 (type: bigint), (((_col5 / UDFToDouble(((_col1 + _col7) + _col4))) / 3.0D) * 100.0D) (type: double), (CAST( ((_col1 + _col7) + _col4) AS decimal(19,0)) / 3) (type: decimal(25,6)) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: char(16)), _col1 (type: bigint) sort order: ++ - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE TopN Hash Memory Usage: 0.1 value expressions: _col2 (type: double), _col3 (type: bigint), _col4 (type: double), _col5 (type: bigint), _col6 (type: double), _col7 (type: decimal(25,6)) - Reducer 6 + Reducer 7 Execution mode: vectorized, llap Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: char(16)), KEY.reducesinkkey1 (type: bigint), VALUE._col0 (type: double), VALUE._col1 (type: bigint), VALUE._col2 (type: double), VALUE._col3 (type: bigint), VALUE._col4 (type: double), VALUE._col5 (type: decimal(25,6)) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 92 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Reducer 8 + Reducer 9 Execution mode: llap Reduce Operator Tree: Merge Join Operator condition map: Left Semi Join 0 to 1 keys: - 0 _col51 (type: date) - 1 _col0 (type: date) - outputColumnNames: _col17, _col28 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + 0 _col4 (type: int) + 1 _col0 (type: int) + outputColumnNames: _col2 + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: sum(_col17) - keys: _col28 (type: char(16)) + keys: _col2 (type: date) minReductionHashAggr: 0.99 mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col0 (type: char(16)) + key expressions: _col0 (type: date) sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint) - Reducer 9 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: char(16)) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: _col0 (type: char(16)), _col1 (type: bigint), UDFToDouble(_col1) (type: double) - outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: char(16)) - sort order: + - Map-reduce partition columns: _col0 (type: char(16)) - Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint), _col2 (type: double) + Map-reduce partition columns: _col0 (type: date) + Statistics: Num rows: 1 Data size: 66 Basic stats: COMPLETE Column stats: NONE Stage: Stage-0 Fetch Operator @@ -4230,227 +4157,85 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 10 <- Map 13 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 11 <- Reducer 10 (SIMPLE_EDGE), Union 4 (CONTAINS) - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 3 <- Reducer 2 (SIMPLE_EDGE), Union 4 (CONTAINS) - Reducer 5 <- Union 4 (SIMPLE_EDGE) - Reducer 6 <- Reducer 5 (SIMPLE_EDGE) - Reducer 8 <- Map 12 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE) - Reducer 9 <- Reducer 8 (SIMPLE_EDGE), Union 4 (CONTAINS) + Map 1 <- Union 2 (CONTAINS) + Map 5 <- Union 2 (CONTAINS) + Map 6 <- Union 2 (CONTAINS) + Reducer 3 <- Union 2 (SIMPLE_EDGE) + Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 Map Operator Tree: TableScan - alias: store_sales - properties: - hive.sql.query SELECT "t0"."ss_sold_date_sk", "t0"."ss_item_sk", "t0"."ss_addr_sk", "t0"."ss_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "ss_sold_date_sk", "ss_item_sk", "ss_addr_sk", "ss_ext_sales_price" -FROM "STORE_SALES" -WHERE "ss_sold_date_sk" IS NOT NULL AND "ss_addr_sk" IS NOT NULL AND "ss_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 1999 AND "d_moy" = 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ss_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -6 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."ss_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_manufact_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."ss_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames ss_sold_date_sk,ss_item_sk,ss_addr_sk,ss_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: ss_ext_sales_price (type: decimal(7,2)), i_manufact_id (type: int) - outputColumnNames: _col3, _col19 + expressions: i_manufact_id (type: int), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col19 (type: int) - sort order: + - Map-reduce partition columns: _col19 (type: int) - Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) + Group By Operator + aggregations: sum(_col1) + keys: _col0 (type: int) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Map-reduce partition columns: _col0 (type: int) + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Map 12 + Map 5 Map Operator Tree: TableScan - alias: catalog_sales - properties: - hive.sql.query SELECT "t0"."cs_sold_date_sk", "t0"."cs_bill_addr_sk", "t0"."cs_item_sk", "t0"."cs_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "cs_sold_date_sk", "cs_bill_addr_sk", "cs_item_sk", "cs_ext_sales_price" -FROM "CATALOG_SALES" -WHERE "cs_sold_date_sk" IS NOT NULL AND "cs_bill_addr_sk" IS NOT NULL AND "cs_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 1999 AND "d_moy" = 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."cs_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -6 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."cs_bill_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_manufact_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."cs_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames cs_sold_date_sk,cs_bill_addr_sk,cs_item_sk,cs_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: cs_ext_sales_price (type: decimal(7,2)), i_manufact_id (type: int) - outputColumnNames: _col3, _col19 + expressions: i_manufact_id (type: int), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col19 (type: int) - sort order: + - Map-reduce partition columns: _col19 (type: int) - Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) + Group By Operator + aggregations: sum(_col1) + keys: _col0 (type: int) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Map-reduce partition columns: _col0 (type: int) + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Map 13 + Map 6 Map Operator Tree: TableScan - alias: web_sales - properties: - hive.sql.query SELECT "t0"."ws_sold_date_sk", "t0"."ws_item_sk", "t0"."ws_bill_addr_sk", "t0"."ws_ext_sales_price", "t2"."d_date_sk", "t4"."ca_address_sk", "t6"."i_item_sk", "t6"."i_item_id", "t6"."i_rec_start_date", "t6"."i_rec_end_date", "t6"."i_item_desc", "t6"."i_current_price", "t6"."i_wholesale_cost", "t6"."i_brand_id", "t6"."i_brand", "t6"."i_class_id", "t6"."i_class", "t6"."i_category_id", "t6"."i_category", "t6"."i_manufact_id", "t6"."i_manufact", "t6"."i_size", "t6"."i_formulation", "t6"."i_color", "t6"."i_units", "t6"."i_container", "t6"."i_manager_id", "t6"."i_product_name" -FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_bill_addr_sk", "ws_ext_sales_price" -FROM "WEB_SALES" -WHERE "ws_sold_date_sk" IS NOT NULL AND "ws_bill_addr_sk" IS NOT NULL AND "ws_item_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "d_date_sk" -FROM "DATE_DIM" -WHERE "d_year" = 1999 AND "d_moy" = 3 AND "d_date_sk" IS NOT NULL) AS "t2" ON "t0"."ws_sold_date_sk" = "t2"."d_date_sk" -INNER JOIN (SELECT "ca_address_sk" -FROM "CUSTOMER_ADDRESS" -WHERE "ca_gmt_offset" = -6 AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."ws_bill_addr_sk" = "t4"."ca_address_sk" -INNER JOIN (SELECT "i_item_sk", "i_item_id", "i_rec_start_date", "i_rec_end_date", "i_item_desc", "i_current_price", "i_wholesale_cost", "i_brand_id", "i_brand", "i_class_id", "i_class", "i_category_id", "i_category", "i_manufact_id", "i_manufact", "i_size", "i_formulation", "i_color", "i_units", "i_container", "i_manager_id", "i_product_name" -FROM "ITEM" -WHERE "i_manufact_id" IS NOT NULL AND "i_item_sk" IS NOT NULL) AS "t6" ON "t0"."ws_item_sk" = "t6"."i_item_sk" - hive.sql.query.fieldNames ws_sold_date_sk,ws_item_sk,ws_bill_addr_sk,ws_ext_sales_price,d_date_sk,ca_address_sk,i_item_sk,i_item_id,i_rec_start_date,i_rec_end_date,i_item_desc,i_current_price,i_wholesale_cost,i_brand_id,i_brand,i_class_id,i_class,i_category_id,i_category,i_manufact_id,i_manufact,i_size,i_formulation,i_color,i_units,i_container,i_manager_id,i_product_name - hive.sql.query.fieldTypes int,int,int,decimal(7,2),int,int,int,char(16),date,date,varchar(200),decimal(7,2),decimal(7,2),int,char(50),int,char(50),int,char(50),int,char(50),char(20),char(20),char(20),char(10),char(10),int,char(50) - hive.sql.query.split false + alias: item Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: ws_ext_sales_price (type: decimal(7,2)), i_manufact_id (type: int) - outputColumnNames: _col3, _col19 + expressions: i_manufact_id (type: int), $f1 (type: decimal(17,2)) + outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col19 (type: int) - sort order: + - Map-reduce partition columns: _col19 (type: int) - Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE - value expressions: _col3 (type: decimal(7,2)) - Execution mode: vectorized, llap - LLAP IO: no inputs - Map 7 - Map Operator Tree: - TableScan - alias: item - properties: - hive.sql.query SELECT "i_manufact_id" -FROM "ITEM" -WHERE "i_category" = 'Books ' AND "i_manufact_id" IS NOT NULL - hive.sql.query.fieldNames i_manufact_id - hive.sql.query.fieldTypes int - hive.sql.query.split true - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: i_manufact_id (type: int) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Group By Operator + aggregations: sum(_col1) keys: _col0 (type: int) minReductionHashAggr: 0.99 mode: hash - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - 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 - Reduce Output Operator - 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 + outputColumnNames: _col0, _col1 + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator 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 + Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: decimal(27,2)) Execution mode: vectorized, llap LLAP IO: no inputs - Reducer 10 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col19 (type: int) - 1 _col0 (type: int) - outputColumnNames: _col3, _col19 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col19 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) - Reducer 11 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: int) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Reducer 2 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col19 (type: int) - 1 _col0 (type: int) - outputColumnNames: _col3, _col19 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col19 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) Reducer 3 Execution mode: vectorized, llap Reduce Operator Tree: @@ -4459,100 +4244,32 @@ WHERE "i_category" = 'Books ' AND "i keys: KEY._col0 (type: int) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Reducer 5 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: int) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col1 (type: decimal(27,2)) sort order: + - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: int) - Reducer 6 + Reducer 4 Execution mode: vectorized, llap Reduce Operator Tree: Select Operator expressions: VALUE._col0 (type: int), KEY.reducesinkkey0 (type: decimal(27,2)) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Reducer 8 - Execution mode: llap - Reduce Operator Tree: - Merge Join Operator - condition map: - Left Semi Join 0 to 1 - keys: - 0 _col19 (type: int) - 1 _col0 (type: int) - outputColumnNames: _col3, _col19 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col3) - keys: _col19 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(17,2)) - Reducer 9 - Execution mode: vectorized, llap - Reduce Operator Tree: - Group By Operator - aggregations: sum(VALUE._col0) - keys: KEY._col0 (type: int) - mode: mergepartial - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 127 Basic stats: COMPLETE Column stats: NONE - Group By Operator - aggregations: sum(_col1) - keys: _col0 (type: int) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1 - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: int) - sort order: + - Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 3 Data size: 381 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: decimal(27,2)) - Union 4 - Vertex: Union 4 + Union 2 + Vertex: Union 2 Stage: Stage-0 Fetch Operator @@ -5042,15 +4759,15 @@ STAGE PLANS: FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 8 AND "t_minute" >= 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" >= 30 AND "t_hour" = 8 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5074,15 +4791,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 9 AND "t_minute" >= 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" >= 30 AND "t_hour" = 11 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5106,15 +4823,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 10 AND "t_minute" < 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" < 30 AND "t_hour" = 11 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5138,15 +4855,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 10 AND "t_minute" >= 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" >= 30 AND "t_hour" = 10 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5170,15 +4887,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 11 AND "t_minute" < 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" < 30 AND "t_hour" = 10 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5202,15 +4919,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 11 AND "t_minute" >= 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" >= 30 AND "t_hour" = 9 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5234,15 +4951,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 12 AND "t_minute" < 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" < 30 AND "t_hour" = 9 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5266,15 +4983,15 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s FROM (SELECT "ss_sold_time_sk", "ss_hdemo_sk", "ss_store_sk" FROM "STORE_SALES" WHERE "ss_hdemo_sk" IS NOT NULL AND "ss_sold_time_sk" IS NOT NULL AND "ss_store_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "hd_demo_sk" -FROM "HOUSEHOLD_DEMOGRAPHICS" -WHERE "hd_dep_count" IN (4, 2, 0) AND ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_demo_sk" IS NOT NULL) AS "t2" ON "t0"."ss_hdemo_sk" = "t2"."hd_demo_sk" -INNER JOIN (SELECT "t_time_sk" -FROM "TIME_DIM" -WHERE "t_hour" = 9 AND "t_minute" < 30 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" INNER JOIN (SELECT "s_store_sk" FROM "STORE" -WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_store_sk" = "t6"."s_store_sk" +WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t2" ON "t0"."ss_store_sk" = "t2"."s_store_sk" +INNER JOIN (SELECT "t_time_sk" +FROM "TIME_DIM" +WHERE "t_minute" < 30 AND "t_hour" = 12 AND "t_time_sk" IS NOT NULL) AS "t4" ON "t0"."ss_sold_time_sk" = "t4"."t_time_sk" +INNER JOIN (SELECT "hd_demo_sk" +FROM "HOUSEHOLD_DEMOGRAPHICS" +WHERE ("hd_vehicle_count" <= 5 OR "hd_vehicle_count" <= 2 OR "hd_vehicle_count" <= 3) AND ("hd_dep_count" = 4 AND "hd_vehicle_count" <= 5 OR "hd_dep_count" = 2 AND "hd_vehicle_count" <= 2 OR "hd_dep_count" = 0 AND "hd_vehicle_count" <= 3) AND "hd_dep_count" IN (4, 2, 0) AND "hd_demo_sk" IS NOT NULL) AS "t6" ON "t0"."ss_hdemo_sk" = "t6"."hd_demo_sk" hive.sql.query.fieldNames $f0 hive.sql.query.fieldTypes bigint hive.sql.query.split false @@ -5390,13 +5107,17 @@ WHERE "s_store_name" = 'ese' AND "s_store_sk" IS NOT NULL) AS "t6" ON "t0"."ss_s 1 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7 Statistics: Num rows: 1 Data size: 71 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false + Select Operator + expressions: _col0 (type: bigint), _col7 (type: bigint), _col6 (type: bigint), _col5 (type: bigint), _col4 (type: bigint), _col3 (type: bigint), _col2 (type: bigint), _col1 (type: bigint) + outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7 Statistics: Num rows: 1 Data size: 71 Basic stats: COMPLETE Column stats: NONE - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + File Output Operator + compressed: false + Statistics: Num rows: 1 Data size: 71 Basic stats: COMPLETE Column stats: NONE + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Stage: Stage-0 Fetch Operator @@ -5831,31 +5552,33 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: web_sales + alias: web_returns properties: - hive.sql.query SELECT "t12"."r_reason_desc", SUM("t0"."ws_quantity") AS "$f1", COUNT("t0"."ws_quantity") AS "$f2", SUM("t2"."wr_refunded_cash") AS "$f3", COUNT("t2"."wr_refunded_cash") AS "$f4", SUM("t2"."wr_fee") AS "$f5", COUNT("t2"."wr_fee") AS "$f6" -FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_order_number", "ws_quantity", "ws_net_profit" BETWEEN 100 AND 200 AS "BETWEEN", "ws_net_profit" BETWEEN 150 AND 300 AS "BETWEEN5", "ws_net_profit" BETWEEN 50 AND 250 AS "BETWEEN6", "ws_sales_price" BETWEEN 100 AND 150 AS "BETWEEN7", "ws_sales_price" BETWEEN 50 AND 100 AS "BETWEEN8", "ws_sales_price" BETWEEN 150 AND 200 AS "BETWEEN9" -FROM "WEB_SALES" -WHERE (100 <= "ws_sales_price" OR "ws_sales_price" <= 150 OR 50 <= "ws_sales_price" OR "ws_sales_price" <= 100 OR 150 <= "ws_sales_price" OR "ws_sales_price" <= 200) AND (100 <= "ws_net_profit" OR "ws_net_profit" <= 200 OR 150 <= "ws_net_profit" OR "ws_net_profit" <= 300 OR 50 <= "ws_net_profit" OR "ws_net_profit" <= 250) AND "ws_item_sk" IS NOT NULL AND "ws_order_number" IS NOT NULL AND "ws_sold_date_sk" IS NOT NULL) AS "t0" -INNER JOIN (SELECT "wr_item_sk", "wr_refunded_cdemo_sk", "wr_refunded_addr_sk", "wr_returning_cdemo_sk", "wr_reason_sk", "wr_order_number", "wr_fee", "wr_refunded_cash" + hive.sql.query SELECT "t2"."r_reason_desc", SUM("t9"."ws_quantity") AS "$f1", COUNT("t9"."ws_quantity") AS "$f2", SUM("t0"."wr_refunded_cash") AS "$f3", COUNT("t0"."wr_refunded_cash") AS "$f4", SUM("t0"."wr_fee") AS "$f5", COUNT("t0"."wr_fee") AS "$f6" +FROM (SELECT "wr_item_sk", "wr_refunded_cdemo_sk", "wr_refunded_addr_sk", "wr_returning_cdemo_sk", "wr_reason_sk", "wr_order_number", "wr_fee", "wr_refunded_cash" FROM "WEB_RETURNS" -WHERE "wr_item_sk" IS NOT NULL AND "wr_order_number" IS NOT NULL AND "wr_refunded_cdemo_sk" IS NOT NULL AND "wr_returning_cdemo_sk" IS NOT NULL AND "wr_refunded_addr_sk" IS NOT NULL AND "wr_reason_sk" IS NOT NULL) AS "t2" ON "t0"."ws_item_sk" = "t2"."wr_item_sk" AND "t0"."ws_order_number" = "t2"."wr_order_number" -INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status", "cd_marital_status" = 'M' AS "=", "cd_education_status" = 'Advanced Degree ' AS "=4", "cd_marital_status" = 'S' AS "=5", "cd_education_status" = 'College ' AS "=6", "cd_marital_status" = 'W' AS "=7", "cd_education_status" = '2 yr Degree ' AS "=8" -FROM "CUSTOMER_DEMOGRAPHICS" -WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('Advanced Degree ', 'College ', '2 yr Degree ') AND "cd_demo_sk" IS NOT NULL) AS "t4" ON "t2"."wr_refunded_cdemo_sk" = "t4"."cd_demo_sk" AND ("t4"."=" AND "t4"."=4" AND "t0"."BETWEEN7" OR "t4"."=5" AND "t4"."=6" AND "t0"."BETWEEN8" OR "t4"."=7" AND "t4"."=8" AND "t0"."BETWEEN9") -INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status" -FROM "CUSTOMER_DEMOGRAPHICS" -WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('Advanced Degree ', 'College ', '2 yr Degree ') AND "cd_demo_sk" IS NOT NULL) AS "t6" ON "t2"."wr_returning_cdemo_sk" = "t6"."cd_demo_sk" AND "t4"."cd_marital_status" = "t6"."cd_marital_status" AND "t4"."cd_education_status" = "t6"."cd_education_status" +WHERE "wr_item_sk" IS NOT NULL AND "wr_order_number" IS NOT NULL AND "wr_refunded_cdemo_sk" IS NOT NULL AND "wr_returning_cdemo_sk" IS NOT NULL AND "wr_refunded_addr_sk" IS NOT NULL AND "wr_reason_sk" IS NOT NULL) AS "t0" +INNER JOIN (SELECT "r_reason_sk", "r_reason_desc" +FROM "REASON" +WHERE "r_reason_sk" IS NOT NULL) AS "t2" ON "t0"."wr_reason_sk" = "t2"."r_reason_sk" INNER JOIN (SELECT "ca_address_sk", "ca_state" IN ('IN', 'OH', 'NJ') AS "IN", "ca_state" IN ('WI', 'CT', 'KY') AS "IN2", "ca_state" IN ('LA', 'IA', 'AR') AS "IN3" FROM "CUSTOMER_ADDRESS" -WHERE "ca_state" IN ('IN', 'OH', 'NJ', 'WI', 'CT', 'KY', 'LA', 'IA', 'AR') AND "ca_country" = 'United States' AND "ca_address_sk" IS NOT NULL) AS "t8" ON "t2"."wr_refunded_addr_sk" = "t8"."ca_address_sk" AND ("t8"."IN" AND "t0"."BETWEEN" OR "t8"."IN2" AND "t0"."BETWEEN5" OR "t8"."IN3" AND "t0"."BETWEEN6") +WHERE "ca_state" IN ('IN', 'OH', 'NJ', 'WI', 'CT', 'KY', 'LA', 'IA', 'AR') AND "ca_country" = 'United States' AND "ca_address_sk" IS NOT NULL) AS "t4" ON "t0"."wr_refunded_addr_sk" = "t4"."ca_address_sk" +INNER JOIN (SELECT "t6"."ws_sold_date_sk", "t6"."ws_item_sk", "t6"."ws_order_number", "t6"."ws_quantity", "t6"."BETWEEN", "t6"."BETWEEN5", "t6"."BETWEEN6", "t6"."BETWEEN7", "t6"."BETWEEN8", "t6"."BETWEEN9", "t8"."d_date_sk" +FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_order_number", "ws_quantity", "ws_net_profit" BETWEEN 100 AND 200 AS "BETWEEN", "ws_net_profit" BETWEEN 150 AND 300 AS "BETWEEN5", "ws_net_profit" BETWEEN 50 AND 250 AS "BETWEEN6", "ws_sales_price" BETWEEN 100 AND 150 AS "BETWEEN7", "ws_sales_price" BETWEEN 50 AND 100 AS "BETWEEN8", "ws_sales_price" BETWEEN 150 AND 200 AS "BETWEEN9" +FROM "WEB_SALES" +WHERE (100 <= "ws_sales_price" OR "ws_sales_price" <= 150 OR 50 <= "ws_sales_price" OR "ws_sales_price" <= 100 OR 150 <= "ws_sales_price" OR "ws_sales_price" <= 200) AND (100 <= "ws_net_profit" OR "ws_net_profit" <= 200 OR 150 <= "ws_net_profit" OR "ws_net_profit" <= 300 OR 50 <= "ws_net_profit" OR "ws_net_profit" <= 250) AND "ws_item_sk" IS NOT NULL AND "ws_order_number" IS NOT NULL AND "ws_sold_date_sk" IS NOT NULL) AS "t6" INNER JOIN (SELECT "d_date_sk" FROM "DATE_DIM" -WHERE "d_year" = 2000 AND "d_date_sk" IS NOT NULL) AS "t10" ON "t0"."ws_sold_date_sk" = "t10"."d_date_sk" -INNER JOIN (SELECT "r_reason_sk", "r_reason_desc" -FROM "REASON" -WHERE "r_reason_sk" IS NOT NULL) AS "t12" ON "t2"."wr_reason_sk" = "t12"."r_reason_sk" -GROUP BY "t12"."r_reason_desc" +WHERE "d_year" = 2000 AND "d_date_sk" IS NOT NULL) AS "t8" ON "t6"."ws_sold_date_sk" = "t8"."d_date_sk") AS "t9" ON ("t4"."IN" AND "t9"."BETWEEN" OR "t4"."IN2" AND "t9"."BETWEEN5" OR "t4"."IN3" AND "t9"."BETWEEN6") AND "t0"."wr_item_sk" = "t9"."ws_item_sk" AND "t0"."wr_order_number" = "t9"."ws_order_number" +INNER JOIN (SELECT "t11"."cd_demo_sk", "t11"."cd_marital_status", "t11"."cd_education_status", "t11"."=", "t11"."=4", "t11"."=5", "t11"."=6", "t11"."=7", "t11"."=8", "t13"."cd_demo_sk" AS "cd_demo_sk0", "t13"."cd_marital_status" AS "cd_marital_status0", "t13"."cd_education_status" AS "cd_education_status0" +FROM (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status", "cd_marital_status" = 'M' AS "=", "cd_education_status" = 'Advanced Degree ' AS "=4", "cd_marital_status" = 'S' AS "=5", "cd_education_status" = 'College ' AS "=6", "cd_marital_status" = 'W' AS "=7", "cd_education_status" = '2 yr Degree ' AS "=8" +FROM "CUSTOMER_DEMOGRAPHICS" +WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('Advanced Degree ', 'College ', '2 yr Degree ') AND "cd_demo_sk" IS NOT NULL) AS "t11" +INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status" +FROM "CUSTOMER_DEMOGRAPHICS" +WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('Advanced Degree ', 'College ', '2 yr Degree ') AND "cd_demo_sk" IS NOT NULL) AS "t13" ON "t11"."cd_marital_status" = "t13"."cd_marital_status" AND "t11"."cd_education_status" = "t13"."cd_education_status") AS "t14" ON "t0"."wr_returning_cdemo_sk" = "t14"."cd_demo_sk0" AND "t0"."wr_refunded_cdemo_sk" = "t14"."cd_demo_sk" AND ("t14"."=" AND "t14"."=4" AND "t9"."BETWEEN7" OR "t14"."=5" AND "t14"."=6" AND "t9"."BETWEEN8" OR "t14"."=7" AND "t14"."=8" AND "t9"."BETWEEN9") +GROUP BY "t2"."r_reason_desc" hive.sql.query.fieldNames r_reason_desc,$f1,$f2,$f3,$f4,$f5,$f6 hive.sql.query.fieldTypes char(100),bigint,bigint,decimal(11,6),bigint,decimal(11,6),bigint hive.sql.query.split false diff --git a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out index 78ef416b76..c9133d3e8a 100644 --- a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out @@ -37,13 +37,13 @@ POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08 OPTIMIZED SQL: SELECT `t2`.`key`, `t0`.`value` FROM (SELECT `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '') AS `t0` +WHERE `value` <> '' AND `ds` = '2008-04-08') AS `t0` INNER JOIN ((SELECT `key` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` INNER JOIN (SELECT `key`, `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '' AND `key` IS NOT NULL) AS `t4` ON `t2`.`key` = `t4`.`key`) ON `t0`.`value` = `t4`.`value` +WHERE `key` IS NOT NULL AND `value` <> '' AND `ds` = '2008-04-08') AS `t4` ON `t2`.`key` = `t4`.`key`) ON `t0`.`value` = `t4`.`value` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -139,12 +139,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: m - filterExpr: ((value <> '') and key is not null) (type: boolean) + filterExpr: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 25 Data size: 2289 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((value <> '') and key is not null) (type: boolean) + predicate: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 15 Data size: 1375 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/groupby_groupingset_bug.q.out b/ql/src/test/results/clientpositive/llap/groupby_groupingset_bug.q.out index 7e7a7f7dd6..63d56172b7 100644 --- a/ql/src/test/results/clientpositive/llap/groupby_groupingset_bug.q.out +++ b/ql/src/test/results/clientpositive/llap/groupby_groupingset_bug.q.out @@ -262,7 +262,7 @@ Stage-0 Select Operator [SEL_120] (rows=4 width=12) Output:["d_month_seq"] Filter Operator [FIL_119] (rows=4 width=12) - predicate:(((d_year * d_moy) > 200000) and (d_moy = 2) and (d_year = 2000) and d_month_seq is not null) + predicate:((d_year = 2000) and ((d_year * d_moy) > 200000) and (d_moy = 2) and d_month_seq is not null) TableScan [TS_17] (rows=28 width=12) default@x1_date_dim,x1_date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_month_seq","d_year","d_moy"] <-Select Operator [SEL_126] (rows=28 width=8) @@ -305,7 +305,7 @@ Stage-0 <-Select Operator [SEL_2] (rows=18 width=201) Output:["_col0","_col1","_col2"] Filter Operator [FIL_58] (rows=18 width=201) - predicate:(i_category is not null and i_current_price is not null and i_item_sk is not null) + predicate:(i_item_sk is not null and i_category is not null and i_current_price is not null) TableScan [TS_0] (rows=18 width=201) default@x1_item,i,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_category","i_current_price"] <-Select Operator [SEL_133] (rows=123457 width=8) diff --git a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out index 1bbe6bf473..3f6a78609a 100644 --- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out @@ -823,14 +823,14 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -839,7 +839,7 @@ STAGE PLANS: 1 _col0 (type: string) input vertices: 1 Map 3 - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -857,19 +857,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Reducer 2 @@ -955,14 +955,14 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -971,7 +971,7 @@ STAGE PLANS: 1 _col0 (type: string) input vertices: 1 Map 3 - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator aggregations: count() @@ -990,19 +990,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Reducer 2 @@ -1088,19 +1088,19 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Map 4 @@ -1108,19 +1108,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Reducer 2 @@ -1132,7 +1132,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -1226,19 +1226,19 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Map 4 @@ -1246,19 +1246,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Reducer 2 @@ -1270,7 +1270,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out index 4bc4d84289..2305f87e45 100644 --- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out +++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out @@ -1373,7 +1373,7 @@ STAGE PLANS: filterExpr: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) (type: boolean) + predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1450,7 +1450,7 @@ STAGE PLANS: filterExpr: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value < 'zzzzzzzz') and key is not null) (type: boolean) + predicate: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1604,7 +1604,7 @@ STAGE PLANS: filterExpr: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) (type: boolean) + predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1681,7 +1681,7 @@ STAGE PLANS: filterExpr: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value < 'zzzzzzzz') and key is not null) (type: boolean) + predicate: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out b/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out index 41447393ed..cc557b3dd9 100644 --- a/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out +++ b/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out @@ -39,7 +39,7 @@ STAGE PLANS: filterExpr: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key = '105') and (value = 'val_105')) (type: boolean) + predicate: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/llap/insert1.q.out b/ql/src/test/results/clientpositive/llap/insert1.q.out index 43e7587a83..a62f36292c 100644 --- a/ql/src/test/results/clientpositive/llap/insert1.q.out +++ b/ql/src/test/results/clientpositive/llap/insert1.q.out @@ -490,7 +490,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 1052 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/insert1_overwrite_partitions.q.out b/ql/src/test/results/clientpositive/llap/insert1_overwrite_partitions.q.out index 482a206fe6..40e2b6ea29 100644 --- a/ql/src/test/results/clientpositive/llap/insert1_overwrite_partitions.q.out +++ b/ql/src/test/results/clientpositive/llap/insert1_overwrite_partitions.q.out @@ -64,15 +64,15 @@ STAGE PLANS: TableScan alias: sourcetable filterExpr: ((ds = '2011-11-11') and (hr = '11')) (type: boolean) - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: one (type: string), two (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: -- - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE TopN Hash Memory Usage: 0.1 Execution mode: vectorized, llap LLAP IO: no inputs @@ -82,13 +82,13 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -97,19 +97,19 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-11-11' (type: string), '11' (type: string) outputColumnNames: one, two, ds, hr - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(one, 'hll'), compute_stats(two, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE value expressions: _col2 (type: struct), _col3 (type: struct) Reducer 3 Execution mode: llap @@ -119,14 +119,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -261,15 +261,15 @@ STAGE PLANS: TableScan alias: sourcetable filterExpr: ((ds = '2011-11-11') and (hr = '11')) (type: boolean) - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: one (type: string), two (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: -- - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE TopN Hash Memory Usage: 0.1 Execution mode: vectorized, llap LLAP IO: no inputs @@ -279,13 +279,13 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -294,7 +294,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string) outputColumnNames: one, two - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(one, 'hll'), compute_stats(two, 'hll') minReductionHashAggr: 0.99 @@ -427,15 +427,15 @@ STAGE PLANS: TableScan alias: sourcetable filterExpr: ((ds = '2011-11-11') and (hr = '11')) (type: boolean) - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: one (type: string), two (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: -- - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE TopN Hash Memory Usage: 0.1 Execution mode: vectorized, llap LLAP IO: no inputs @@ -445,13 +445,13 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 5 - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -460,19 +460,19 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-11-11' (type: string), '11' (type: string) outputColumnNames: one, two, ds, hr - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(one, 'hll'), compute_stats(two, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 5 Data size: 4715 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 5 Data size: 1595 Basic stats: PARTIAL Column stats: NONE value expressions: _col2 (type: struct), _col3 (type: struct) Reducer 3 Execution mode: llap @@ -482,14 +482,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 1886 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 2 Data size: 638 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat 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 039036096e..a4f2a777d8 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 @@ -2855,7 +2855,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col5, _col6, _col7 Statistics: Num rows: 2 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 = _col6) and (_col6 < 3)) (type: boolean) + predicate: ((_col6 < 3) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 261 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct) @@ -2867,7 +2867,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 76 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 = _col6) and (_col6 > 3) and (_col6 >= 3) and enforce_constraint(_col0 is not null)) (type: boolean) + predicate: ((_col6 > 3) and (_col6 >= 3) and enforce_constraint(_col0 is not null) and (_col0 = _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 261 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct), _col0 (type: int), _col2 (type: string) @@ -2900,7 +2900,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Filter Operator - predicate: (_col0 is null and enforce_constraint(_col6 is not null)) (type: boolean) + predicate: (enforce_constraint(_col6 is not null) and _col0 is null) (type: boolean) Statistics: Num rows: 1 Data size: 261 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col6 (type: int), _col7 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out index ef1699287d..4a078b8242 100644 --- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out @@ -618,7 +618,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/join46.q.out b/ql/src/test/results/clientpositive/llap/join46.q.out index 0267f2da78..85fd4c5656 100644 --- a/ql/src/test/results/clientpositive/llap/join46.q.out +++ b/ql/src/test/results/clientpositive/llap/join46.q.out @@ -206,10 +206,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test2_n0 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/keep_uniform.q.out b/ql/src/test/results/clientpositive/llap/keep_uniform.q.out index 11d65d499b..20d91c2fe0 100644 --- a/ql/src/test/results/clientpositive/llap/keep_uniform.q.out +++ b/ql/src/test/results/clientpositive/llap/keep_uniform.q.out @@ -464,7 +464,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 17:int), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 11:int), SelectColumnIsNotNull(col 13:int)) - predicate: (ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) (type: boolean) + predicate: (ws_order_number is not null and ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 240 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_ship_date_sk (type: int), ws_ship_addr_sk (type: int), ws_web_site_sk (type: int), ws_order_number (type: int), ws_ext_ship_cost (type: decimal(7,2)), ws_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/llap/lineage2.q.out b/ql/src/test/results/clientpositive/llap/lineage2.q.out index c0cd91f53d..26db2165f4 100644 --- a/ql/src/test/results/clientpositive/llap/lineage2.q.out +++ b/ql/src/test/results/clientpositive/llap/lineage2.q.out @@ -18,7 +18,7 @@ PREHOOK: query: select * from src1 where key > 10 and value > 'val' order by key PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -{"version":"1.0","engine":"tez","database":"default","hash":"e07e602503383cf2b8477d43c5043f35","queryText":"select * from src1 where key > 10 and value > 'val' order by key limit 5","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"((UDFToDouble(src1.key) > 10.0D) and (src1.value > 'val'))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"e07e602503383cf2b8477d43c5043f35","queryText":"select * from src1 where key > 10 and value > 'val' order by key limit 5","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[3,2],"targets":[0,1],"expression":"((src1.value > 'val') and (UDFToDouble(src1.key) > 10.0D))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]} 146 val_146 150 val_150 213 val_213 @@ -503,7 +503,7 @@ PREHOOK: query: select * from src1 where length(key) > 2 and value > 'a' PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -{"version":"1.0","engine":"tez","database":"default","hash":"f4a6b14cf6ce3c1313d70720cea4e8b3","queryText":"select * from src1 where length(key) > 2 and value > 'a'","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"((length(src1.key) > 2) and (src1.value > 'a'))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"f4a6b14cf6ce3c1313d70720cea4e8b3","queryText":"select * from src1 where length(key) > 2 and value > 'a'","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[3,2],"targets":[0,1],"expression":"((src1.value > 'a') and (length(src1.key) > 2))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]} 238 val_238 311 val_311 255 val_255 @@ -659,7 +659,7 @@ PREHOOK: Input: default@dest_l2 PREHOOK: Input: default@dest_l3 PREHOOK: Output: database:default PREHOOK: Output: default@t_n10 -{"version":"1.0","engine":"tez","database":"default","hash":"1a18373814a0ccf82ee1409db6a912b5","queryText":"create table t_n10 as\nselect distinct a.c2, a.c3 from dest_l2 a\ninner join dest_l3 b on (a.id = b.id)\nwhere a.id > 0 and b.c3 = 15","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[4],"targets":[0,1],"expression":"(a.id > 0)","edgeType":"PREDICATE"},{"sources":[4,5],"targets":[0,1],"expression":"(a.id = b.id)","edgeType":"PREDICATE"},{"sources":[6,5],"targets":[0,1],"expression":"((b.c3 = 15) and (b.id > 0))","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"compute_stats(default.dest_l2.c2, 'hll')","edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"compute_stats(default.dest_l2.c3, 'hll')","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.t_n10.c2"},{"id":1,"vertexType":"COLUMN","vertexId":"default.t_n10.c3"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.c3"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_l3.id"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_l3.c3"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"1a18373814a0ccf82ee1409db6a912b5","queryText":"create table t_n10 as\nselect distinct a.c2, a.c3 from dest_l2 a\ninner join dest_l3 b on (a.id = b.id)\nwhere a.id > 0 and b.c3 = 15","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[4],"targets":[0,1],"expression":"(a.id > 0)","edgeType":"PREDICATE"},{"sources":[4,5],"targets":[0,1],"expression":"(a.id = b.id)","edgeType":"PREDICATE"},{"sources":[5,6],"targets":[0,1],"expression":"((b.id > 0) and (b.c3 = 15))","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"compute_stats(default.dest_l2.c2, 'hll')","edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"compute_stats(default.dest_l2.c3, 'hll')","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.t_n10.c2"},{"id":1,"vertexType":"COLUMN","vertexId":"default.t_n10.c3"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.c3"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_l3.id"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_l3.c3"}]} PREHOOK: query: SELECT substr(src1.key,1,1), count(DISTINCT substr(src1.value,5)), concat(substr(src1.key,1,1),sum(substr(src1.value,5))) from src1 diff --git a/ql/src/test/results/clientpositive/llap/lineage3.q.out b/ql/src/test/results/clientpositive/llap/lineage3.q.out index 783dfa7c13..c14b32a2c9 100644 --- a/ql/src/test/results/clientpositive/llap/lineage3.q.out +++ b/ql/src/test/results/clientpositive/llap/lineage3.q.out @@ -135,7 +135,7 @@ and x.ctinyint + length(c.cstring2) < 1000 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -{"version":"1.0","engine":"tez","database":"default","hash":"15e00f9e88c1ad6b2f53a33a0c147f0e","queryText":"select x.ctinyint, x.cint, c.cbigint-100, c.cstring1\nfrom alltypesorc c\njoin (\n select a.ctinyint ctinyint, b.cint cint\n from (select * from alltypesorc a where cboolean1=false) a\n join alltypesorc b on (a.cint = b.cbigint - 224870380)\n ) x on (x.cint = c.cint)\nwhere x.ctinyint > 10\nand x.cint < 4.5\nand x.ctinyint + length(c.cstring2) < 1000","edges":[{"sources":[4],"targets":[0],"edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"expression":"(c.cbigint - 100L)","edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5],"targets":[0,1,2,3],"expression":"(CAST( c.cint AS decimal(11,1)) < 4.5)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(c.cint = b.cint)","edgeType":"PREDICATE"},{"sources":[5,6],"targets":[0,1,2,3],"expression":"((CAST( b.cint AS decimal(11,1)) < 4.5) and b.cbigint is not null)","edgeType":"PREDICATE"},{"sources":[6,5],"targets":[0,1,2,3],"expression":"((b.cbigint - 224870380L) = UDFToLong(a.cint))","edgeType":"PREDICATE"},{"sources":[4,5,8],"targets":[0,1,2,3],"expression":"((a.ctinyint > 10Y) and UDFToLong(a.cint) is not null and (not a.cboolean1))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"x.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"x.cint"},{"id":2,"vertexType":"COLUMN","vertexId":"_c2"},{"id":3,"vertexType":"COLUMN","vertexId":"c.cstring1"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"15e00f9e88c1ad6b2f53a33a0c147f0e","queryText":"select x.ctinyint, x.cint, c.cbigint-100, c.cstring1\nfrom alltypesorc c\njoin (\n select a.ctinyint ctinyint, b.cint cint\n from (select * from alltypesorc a where cboolean1=false) a\n join alltypesorc b on (a.cint = b.cbigint - 224870380)\n ) x on (x.cint = c.cint)\nwhere x.ctinyint > 10\nand x.cint < 4.5\nand x.ctinyint + length(c.cstring2) < 1000","edges":[{"sources":[4],"targets":[0],"edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"expression":"(c.cbigint - 100L)","edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5],"targets":[0,1,2,3],"expression":"(CAST( c.cint AS decimal(11,1)) < 4.5)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(c.cint = b.cint)","edgeType":"PREDICATE"},{"sources":[5,6],"targets":[0,1,2,3],"expression":"((CAST( b.cint AS decimal(11,1)) < 4.5) and b.cbigint is not null)","edgeType":"PREDICATE"},{"sources":[6,5],"targets":[0,1,2,3],"expression":"((b.cbigint - 224870380L) = UDFToLong(a.cint))","edgeType":"PREDICATE"},{"sources":[4,8,5],"targets":[0,1,2,3],"expression":"((a.ctinyint > 10Y) and (not a.cboolean1) and UDFToLong(a.cint) is not null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"x.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"x.cint"},{"id":2,"vertexType":"COLUMN","vertexId":"_c2"},{"id":3,"vertexType":"COLUMN","vertexId":"c.cstring1"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"}]} 11 -654374827 857266369 OEfPnHnIYueoup PREHOOK: query: select c1, x2, x3 from ( @@ -186,7 +186,7 @@ where key not in (select key+18 from src1) order by key PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -{"version":"1.0","engine":"tez","database":"default","hash":"cbc4367150807328dda0f1cf4c74b811","queryText":"select key, value from src1\nwhere key not in (select key+18 from src1) order by key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key) = (UDFToDouble(src1.key) + 18.0D))","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"UDFToDouble(src1.key) is not null","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"((true is null or (count(*) = 0L)) and (src1.key is not null or (count(*) = 0L) or true is not null) and ((count((UDFToDouble(src1.key) + 18.0D)) >= count(*)) or (count(*) = 0L) or true is not null or src1.key is null))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"TABLE","vertexId":"default.src1"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"cbc4367150807328dda0f1cf4c74b811","queryText":"select key, value from src1\nwhere key not in (select key+18 from src1) order by key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key) = (UDFToDouble(src1.key) + 18.0D))","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"UDFToDouble(src1.key) is not null","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"((true is null or (count(*) = 0L)) and ((count((UDFToDouble(src1.key) + 18.0D)) >= count(*)) or (count(*) = 0L) or true is not null or src1.key is null) and (src1.key is not null or (count(*) = 0L) or true is not null))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"TABLE","vertexId":"default.src1"}]} PREHOOK: query: select * from src1 a where not exists (select cint from alltypesorc b @@ -297,7 +297,7 @@ PREHOOK: type: CREATEVIEW PREHOOK: Input: default@alltypesorc PREHOOK: Output: database:default PREHOOK: Output: default@dest_v3 -{"version":"1.0","engine":"tez","database":"default","hash":"9848a9a38a4f6f031dc669e7e495f9ee","queryText":"create view dest_v3 (a1, a2, a3, a4, a5, a6, a7) as\n select x.csmallint, x.cbigint bint1, x.ctinyint, c.cbigint bint2, x.cint, x.cfloat, c.cstring1\n from alltypesorc c\n join (\n select a.csmallint csmallint, a.ctinyint ctinyint, a.cstring2 cstring2,\n a.cint cint, a.cstring1 ctring1, b.cfloat cfloat, b.cbigint cbigint\n from ( select * from alltypesorc a where cboolean1=true ) a\n join alltypesorc b on (a.csmallint = b.cint)\n ) x on (x.ctinyint = c.cbigint)\n where x.csmallint=11\n and x.cint > 899\n and x.cfloat > 4.5\n and c.cstring1 < '7'\n and x.cint + x.cfloat + length(c.cstring1) < 1000","edges":[{"sources":[],"targets":[0],"expression":"11S","edgeType":"PROJECTION"},{"sources":[7],"targets":[1,2],"edgeType":"PROJECTION"},{"sources":[8],"targets":[3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"sources":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[11],"targets":[6],"edgeType":"PROJECTION"},{"sources":[11,7],"targets":[0,1,3,2,4,5,6],"expression":"((c.cstring1 < '7') and c.cbigint is not null)","edgeType":"PREDICATE"},{"sources":[7,8],"targets":[0,1,3,2,4,5,6],"expression":"(c.cbigint = UDFToLong(a.ctinyint))","edgeType":"PREDICATE"},{"sources":[12,13,9,8],"targets":[0,1,3,2,4,5,6],"expression":"(a.cboolean1 and (a.csmallint = 11S) and (a.cint > 899) and UDFToInteger(a.csmallint) is not null and UDFToLong(a.ctinyint) is not null)","edgeType":"PREDICATE"},{"sources":[10,9],"targets":[0,1,3,2,4,5,6],"expression":"((b.cfloat > 4.5) and (b.cint = 11))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.csmallint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_v3.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_v3.cint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_v3.cfloat"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_v3.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"}]} +{"version":"1.0","engine":"tez","database":"default","hash":"9848a9a38a4f6f031dc669e7e495f9ee","queryText":"create view dest_v3 (a1, a2, a3, a4, a5, a6, a7) as\n select x.csmallint, x.cbigint bint1, x.ctinyint, c.cbigint bint2, x.cint, x.cfloat, c.cstring1\n from alltypesorc c\n join (\n select a.csmallint csmallint, a.ctinyint ctinyint, a.cstring2 cstring2,\n a.cint cint, a.cstring1 ctring1, b.cfloat cfloat, b.cbigint cbigint\n from ( select * from alltypesorc a where cboolean1=true ) a\n join alltypesorc b on (a.csmallint = b.cint)\n ) x on (x.ctinyint = c.cbigint)\n where x.csmallint=11\n and x.cint > 899\n and x.cfloat > 4.5\n and c.cstring1 < '7'\n and x.cint + x.cfloat + length(c.cstring1) < 1000","edges":[{"sources":[],"targets":[0],"expression":"11S","edgeType":"PROJECTION"},{"sources":[7],"targets":[1,2],"edgeType":"PROJECTION"},{"sources":[8],"targets":[3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"sources":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[11],"targets":[6],"edgeType":"PROJECTION"},{"sources":[7,11],"targets":[0,1,3,2,4,5,6],"expression":"(c.cbigint is not null and (c.cstring1 < '7'))","edgeType":"PREDICATE"},{"sources":[7,8],"targets":[0,1,3,2,4,5,6],"expression":"(c.cbigint = UDFToLong(a.ctinyint))","edgeType":"PREDICATE"},{"sources":[12,13,9,8],"targets":[0,1,3,2,4,5,6],"expression":"(a.cboolean1 and (a.csmallint = 11S) and (a.cint > 899) and UDFToInteger(a.csmallint) is not null and UDFToLong(a.ctinyint) is not null)","edgeType":"PREDICATE"},{"sources":[9,10],"targets":[0,1,3,2,4,5,6],"expression":"((b.cint = 11) and (b.cfloat > 4.5))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.csmallint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_v3.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_v3.cint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_v3.cfloat"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_v3.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"}]} PREHOOK: query: alter view dest_v3 as select * from ( select sum(a.ctinyint) over (partition by a.csmallint order by a.csmallint) a, diff --git a/ql/src/test/results/clientpositive/llap/llap_uncompressed.q.out b/ql/src/test/results/clientpositive/llap/llap_uncompressed.q.out index 960caff569..3c813079c0 100644 --- a/ql/src/test/results/clientpositive/llap/llap_uncompressed.q.out +++ b/ql/src/test/results/clientpositive/llap/llap_uncompressed.q.out @@ -189,7 +189,7 @@ STAGE PLANS: alias: orc_llap_n0 filterExpr: ((cint > 10) and (cint < 5000000)) (type: boolean) Filter Operator - predicate: ((cint < 5000000) and (cint > 10)) (type: boolean) + predicate: ((cint > 10) and (cint < 5000000)) (type: boolean) Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean), cdecimal1 (type: decimal(10,2)), cdecimal2 (type: decimal(38,5)) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 diff --git a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out index fe648f6226..3715be62a8 100644 --- a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out +++ b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out @@ -217,10 +217,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test2_n2 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out index a1478549ab..eb2c45c960 100644 --- a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out +++ b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out @@ -160,7 +160,7 @@ STAGE PLANS: filterExpr: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n1_key1_min) AND DynamicValue(RS_7_srcpart_small_n1_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n1_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key BETWEEN DynamicValue(RS_7_srcpart_small_n1_key1_min) AND DynamicValue(RS_7_srcpart_small_n1_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n1_key1_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_srcpart_small_n1_key1_min) AND DynamicValue(RS_7_srcpart_small_n1_key1_max) and in_bloom_filter(key, DynamicValue(RS_7_srcpart_small_n1_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out index 08668526a0..d826726666 100644 --- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out @@ -49,7 +49,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -633,7 +633,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out index 0fc64bbb64..174e1328c5 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out @@ -200,7 +200,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) @@ -465,7 +465,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out index 215809fb9a..d050706a37 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out @@ -526,7 +526,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out index ce8105f6ba..13d59193d8 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out @@ -756,7 +756,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)), d (type: int) @@ -1727,7 +1727,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 4L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 4L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 4L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)), d (type: int) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out index 9044c4dcdf..fdf277240a 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out @@ -253,7 +253,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)) @@ -979,7 +979,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 4L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 4L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 4L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out index 37d80401f2..81f9843f80 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out @@ -200,7 +200,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) @@ -465,7 +465,7 @@ STAGE PLANS: filterExpr: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 5 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((a = 3) and (d = 3)) (type: boolean) + predicate: ((d = 3) and (a = 3)) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out index 7f2849a233..eb4ccd044b 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out @@ -526,7 +526,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out index c90dde16ac..4bcacfeb2f 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out @@ -645,7 +645,7 @@ STAGE PLANS: filterExpr: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (c > 10) and a is not null) (type: boolean) + predicate: ((c > 10) and (ROW__ID.writeid > 1L) and a is not null) (type: boolean) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: a (type: int), c (type: decimal(10,2)) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out index 531cd68791..d77a5ee66a 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), key (type: string) @@ -623,7 +623,7 @@ STAGE PLANS: filterExpr: ((ROW__ID.writeid > 1L) and (UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 501 Data size: 90180 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 1L) and (UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((ROW__ID.writeid > 1L) and (UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 18 Data size: 3240 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), key (type: string) @@ -937,10 +937,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_txn - filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D) and (ROW__ID.writeid > 2L)) (type: boolean) + filterExpr: ((ROW__ID.writeid > 2L) and (UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 502 Data size: 90862 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 2L) and (UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((ROW__ID.writeid > 2L) and (UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 18 Data size: 3258 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -961,7 +961,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out index 016e30692a..d9c76fbf06 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_2.q.out @@ -382,7 +382,7 @@ STAGE PLANS: alias: default.partition_mv_1 filterExpr: ((UDFToDouble(key) > 210.0D) and (UDFToDouble(key) < 230.0D)) (type: boolean) Filter Operator - predicate: ((UDFToDouble(key) < 230.0D) and (UDFToDouble(key) > 210.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 210.0D) and (UDFToDouble(key) < 230.0D)) (type: boolean) Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 @@ -546,7 +546,7 @@ STAGE PLANS: alias: default.partition_mv_4 filterExpr: ((UDFToDouble(key) > 224.0D) and (UDFToDouble(key) < 226.0D)) (type: boolean) Filter Operator - predicate: ((UDFToDouble(key) < 226.0D) and (UDFToDouble(key) > 224.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 224.0D) and (UDFToDouble(key) < 226.0D)) (type: boolean) Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out index 54d749fcff..aefc67e797 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned_3.q.out @@ -51,7 +51,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out index 91ba0cafa0..0266051d40 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_2.q.out @@ -670,7 +670,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.mv1_n0 - filterExpr: ((name = name2) and (deptno = deptno2)) (type: boolean) + filterExpr: ((deptno = deptno2) and (name = name2)) (type: boolean) Statistics: Num rows: 8 Data size: 1536 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((deptno = deptno2) and (name = name2)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out index c7e4c26cb6..a009ed0d55 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_5.q.out @@ -442,7 +442,7 @@ STAGE PLANS: filterExpr: ((deptno > 11) and (deptno < 19)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((deptno < 19) and (deptno > 11)) (type: boolean) + predicate: ((deptno > 11) and (deptno < 19)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: empid (type: int) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out index e93ea763df..ca999f986c 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_7.q.out @@ -253,7 +253,7 @@ STAGE PLANS: filterExpr: ((deptno > 10) and (deptno <= 11)) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((deptno <= 11) and (deptno > 10)) (type: boolean) + predicate: ((deptno > 10) and (deptno <= 11)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int) @@ -315,7 +315,7 @@ STAGE PLANS: filterExpr: ((deptno > 10) and (deptno <= 11) and name is not null) (type: boolean) Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((deptno <= 11) and (deptno > 10) and name is not null) (type: boolean) + predicate: ((deptno > 10) and (deptno <= 11) and name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int), name (type: varchar(256)) @@ -569,7 +569,7 @@ STAGE PLANS: filterExpr: ((deptno > 10) and (deptno < 20) and ((deptno <= 11) or (deptno >= 19)) and name is not null) (type: boolean) Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((deptno <= 11) or (deptno >= 19)) and (deptno < 20) and (deptno > 10) and name is not null) (type: boolean) + predicate: ((deptno > 10) and (deptno < 20) and ((deptno <= 11) or (deptno >= 19)) and name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int), name (type: varchar(256)) @@ -634,7 +634,7 @@ STAGE PLANS: filterExpr: ((deptno > 10) and (deptno < 20) and ((deptno <= 11) or (deptno >= 19))) (type: boolean) Statistics: Num rows: 4 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((deptno <= 11) or (deptno >= 19)) and (deptno < 20) and (deptno > 10)) (type: boolean) + predicate: ((deptno > 10) and (deptno < 20) and ((deptno <= 11) or (deptno >= 19))) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int), salary (type: float) @@ -888,7 +888,7 @@ STAGE PLANS: filterExpr: ((deptno > 0) and (deptno < 10) and name is not null) (type: boolean) Statistics: Num rows: 3 Data size: 279 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((deptno < 10) and (deptno > 0) and name is not null) (type: boolean) + predicate: ((deptno > 0) and (deptno < 10) and name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 93 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int), name (type: varchar(256)) @@ -909,7 +909,7 @@ STAGE PLANS: filterExpr: ((deptno > 0) and (deptno < 10)) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((deptno < 10) and (deptno > 0)) (type: boolean) + predicate: ((deptno > 0) and (deptno < 10)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: deptno (type: int) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out index 85b61ec01a..1ddc449352 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_part_2.q.out @@ -745,7 +745,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.mv1_part_n0 - filterExpr: ((name = name2) and (deptno = deptno2)) (type: boolean) + filterExpr: ((deptno = deptno2) and (name = name2)) (type: boolean) Statistics: Num rows: 8 Data size: 1560 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((deptno = deptno2) and (name = name2)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out index 10bee53bb9..e3d3b2b339 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out @@ -646,10 +646,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: ((d_year = 1993) and (lo_quantity < 25.0D) and lo_discount BETWEEN 1.0D AND 3.0D) (type: boolean) + filterExpr: ((lo_quantity < 25.0D) and (d_year = 1993) and lo_discount BETWEEN 1.0D AND 3.0D) (type: boolean) Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d_year = 1993) and (lo_quantity < 25.0D) and lo_discount BETWEEN 1.0D AND 3.0D) (type: boolean) + predicate: ((lo_quantity < 25.0D) and (d_year = 1993) and lo_discount BETWEEN 1.0D AND 3.0D) (type: boolean) Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -829,7 +829,7 @@ STAGE PLANS: filterExpr: ((d_year = 1994) and (d_weeknuminyear = 6) and lo_discount BETWEEN 5.0D AND 7.0D and lo_quantity BETWEEN 26.0D AND 35.0D) (type: boolean) Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d_weeknuminyear = 6) and (d_year = 1994) and lo_discount BETWEEN 5.0D AND 7.0D and lo_quantity BETWEEN 26.0D AND 35.0D) (type: boolean) + predicate: ((d_year = 1994) and (d_weeknuminyear = 6) and lo_discount BETWEEN 5.0D AND 7.0D and lo_quantity BETWEEN 26.0D AND 35.0D) (type: boolean) Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -1683,7 +1683,7 @@ STAGE PLANS: filterExpr: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (s_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997')) (type: boolean) Statistics: Num rows: 1 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997') and (s_city) IN ('UNITED KI1', 'UNITED KI5')) (type: boolean) + predicate: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (s_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997')) (type: boolean) Statistics: Num rows: 1 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c_city (type: string), d_year (type: int), s_city (type: string), lo_revenue (type: double) @@ -1815,7 +1815,7 @@ STAGE PLANS: filterExpr: ((p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c_nation (type: string), d_year (type: int), net_revenue (type: double) @@ -1945,7 +1945,7 @@ STAGE PLANS: filterExpr: ((d_year) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (d_year) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((d_year) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: d_year (type: int), p_category (type: string), s_nation (type: string), net_revenue (type: double) @@ -2075,7 +2075,7 @@ STAGE PLANS: filterExpr: ((d_year) IN (1997, 1998) and (c_region = 'AMERICA') and (p_category = 'MFGR#14') and (s_nation = 'UNITED STATES')) (type: boolean) Statistics: Num rows: 1 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (d_year) IN (1997, 1998) and (p_category = 'MFGR#14') and (s_nation = 'UNITED STATES')) (type: boolean) + predicate: ((d_year) IN (1997, 1998) and (c_region = 'AMERICA') and (p_category = 'MFGR#14') and (s_nation = 'UNITED STATES')) (type: boolean) Statistics: Num rows: 1 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: d_year (type: int), p_brand1 (type: string), s_city (type: string), net_revenue (type: double) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out index 64f534ad83..cafe83cf42 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out @@ -648,7 +648,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: ((UDFToInteger(d_year) = 1993) and (UDFToDouble(lo_quantity) < 25.0D) and UDFToDouble(lo_discount) BETWEEN 1.0D AND 3.0D) (type: boolean) + filterExpr: ((UDFToDouble(lo_quantity) < 25.0D) and (UDFToInteger(d_year) = 1993) and UDFToDouble(lo_discount) BETWEEN 1.0D AND 3.0D) (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((UDFToDouble(lo_quantity) < 25.0D) and (UDFToInteger(d_year) = 1993) and UDFToDouble(lo_discount) BETWEEN 1.0D AND 3.0D) (type: boolean) @@ -831,7 +831,7 @@ STAGE PLANS: filterExpr: ((UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6) and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToInteger(d_weeknuminyear) = 6) and (UDFToInteger(d_year) = 1994) and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D) (type: boolean) + predicate: ((UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6) and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -1689,7 +1689,7 @@ STAGE PLANS: filterExpr: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (s_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997')) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997') and (s_city) IN ('UNITED KI1', 'UNITED KI5')) (type: boolean) + predicate: ((c_city) IN ('UNITED KI1', 'UNITED KI5') and (s_city) IN ('UNITED KI1', 'UNITED KI5') and (d_yearmonth = 'Dec1997')) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c_city (type: string), s_city (type: string), UDFToInteger(d_year) (type: int), lo_revenue (type: double) @@ -1821,7 +1821,7 @@ STAGE PLANS: filterExpr: ((p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(d_year) (type: int), c_nation (type: string), net_revenue (type: double) @@ -1951,7 +1951,7 @@ STAGE PLANS: filterExpr: ((UDFToInteger(d_year)) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 512 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToInteger(d_year)) IN (1997, 1998) and (c_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((UDFToInteger(d_year)) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (c_region = 'AMERICA') and (s_region = 'AMERICA')) (type: boolean) Statistics: Num rows: 1 Data size: 512 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(d_year) (type: int), s_nation (type: string), p_category (type: string), net_revenue (type: double) diff --git a/ql/src/test/results/clientpositive/llap/mergejoin.q.out b/ql/src/test/results/clientpositive/llap/mergejoin.q.out index 264dac5c4b..2b99d0eb97 100644 --- a/ql/src/test/results/clientpositive/llap/mergejoin.q.out +++ b/ql/src/test/results/clientpositive/llap/mergejoin.q.out @@ -42,7 +42,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 0:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((key BETWEEN DynamicValue(RS_7_b_key_min) AND DynamicValue(RS_7_b_key_max) and in_bloom_filter(key, DynamicValue(RS_7_b_key_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_7_b_key_min) AND DynamicValue(RS_7_b_key_max) and in_bloom_filter(key, DynamicValue(RS_7_b_key_bloom_filter)))) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -2037,7 +2037,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:string), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 1:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((value BETWEEN DynamicValue(RS_10_c_value_min) AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, DynamicValue(RS_10_c_value_bloom_filter))) and key is not null and value is not null) (type: boolean) + predicate: (key is not null and value is not null and (value BETWEEN DynamicValue(RS_10_c_value_min) AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -2172,7 +2172,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), FilterExprAndExpr(children: FilterLongColumnBetweenDynamicValue(col 0:int, left 0, right 0), VectorInBloomFilterColDynamicValue)) - predicate: ((key BETWEEN DynamicValue(RS_12_a_key_min) AND DynamicValue(RS_12_a_key_max) and in_bloom_filter(key, DynamicValue(RS_12_a_key_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_12_a_key_min) AND DynamicValue(RS_12_a_key_max) and in_bloom_filter(key, DynamicValue(RS_12_a_key_bloom_filter)))) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -3153,7 +3153,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:string), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 1:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((value BETWEEN DynamicValue(RS_10_c_value_min) AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, DynamicValue(RS_10_c_value_bloom_filter))) and key is not null and value is not null) (type: boolean) + predicate: (key is not null and value is not null and (value BETWEEN DynamicValue(RS_10_c_value_min) AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -3288,7 +3288,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), FilterExprAndExpr(children: FilterLongColumnBetweenDynamicValue(col 0:int, left 0, right 0), VectorInBloomFilterColDynamicValue)) - predicate: ((key BETWEEN DynamicValue(RS_12_a_key_min) AND DynamicValue(RS_12_a_key_max) and in_bloom_filter(key, DynamicValue(RS_12_a_key_bloom_filter))) and key is not null) (type: boolean) + predicate: (key is not null and (key BETWEEN DynamicValue(RS_12_a_key_min) AND DynamicValue(RS_12_a_key_max) and in_bloom_filter(key, DynamicValue(RS_12_a_key_bloom_filter)))) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) diff --git a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out index c11f1ee715..974bc64894 100644 --- a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out @@ -277,11 +277,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s (type: string), bo (type: boolean), bin (type: binary), si (type: smallint), i (type: int), b (type: bigint) outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), sum(1), sum(0.2), count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7) minReductionHashAggr: 0.99 @@ -421,11 +421,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s (type: string), bo (type: boolean), bin (type: binary), si (type: smallint), i (type: int), b (type: bigint) outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), sum(1), sum(0.2), count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7) minReductionHashAggr: 0.99 @@ -720,11 +720,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 1339425 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 360640 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ts (type: timestamp) outputColumnNames: ts - Statistics: Num rows: 9489 Data size: 1339425 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 360640 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(ts) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out index 0fbdf9945d..5ec762a132 100644 --- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out @@ -864,7 +864,7 @@ STAGE PLANS: filterExpr: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 5000 Data size: 2622552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key1 is not null and key2 is not null and value is not null) (type: boolean) + predicate: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 4250 Data size: 2229169 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key1 (type: string), key2 (type: string), value (type: string) @@ -1206,7 +1206,7 @@ STAGE PLANS: filterExpr: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 5000 Data size: 2622552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key1 is not null and key2 is not null and value is not null) (type: boolean) + predicate: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 4250 Data size: 2229169 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key1 (type: string), key2 (type: string), value (type: string) @@ -1551,7 +1551,7 @@ STAGE PLANS: filterExpr: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 5000 Data size: 2622552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key1 is not null and key2 is not null and value is not null) (type: boolean) + predicate: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 4250 Data size: 2229169 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key1 (type: string), key2 (type: string), value (type: string) @@ -1924,7 +1924,7 @@ STAGE PLANS: filterExpr: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 5000 Data size: 2622552 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key1 is not null and key2 is not null and value is not null) (type: boolean) + predicate: (key1 is not null and value is not null and key2 is not null) (type: boolean) Statistics: Num rows: 4250 Data size: 2229169 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key1 (type: string), key2 (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out index 015d78764a..7618dc7074 100644 --- a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out @@ -121,9 +121,9 @@ STAGE PLANS: Processor Tree: TableScan alias: emps_n1 - filterExpr: (((empno + 1)) IN (1, 3) and (deptno = 2)) (type: boolean) + filterExpr: ((deptno = 2) and ((empno + 1)) IN (1, 3)) (type: boolean) Filter Operator - predicate: (((empno + 1)) IN (1, 3) and (deptno = 2)) (type: boolean) + predicate: ((deptno = 2) and ((empno + 1)) IN (1, 3)) (type: boolean) Select Operator expressions: empno (type: int), 2 (type: int), empname (type: string) outputColumnNames: _col0, _col1, _col2 @@ -223,7 +223,7 @@ STAGE PLANS: alias: emps_n1 filterExpr: ((deptno = 2) and ((((empno * 2) | 1) = (empno + 1)) or (((empno * 2) | 1) = (empno + 2)))) (type: boolean) Filter Operator - predicate: (((((empno * 2) | 1) = (empno + 1)) or (((empno * 2) | 1) = (empno + 2))) and (deptno = 2)) (type: boolean) + predicate: ((deptno = 2) and ((((empno * 2) | 1) = (empno + 1)) or (((empno * 2) | 1) = (empno + 2)))) (type: boolean) Select Operator expressions: empno (type: int), 2 (type: int), empname (type: string) outputColumnNames: _col0, _col1, _col2 diff --git a/ql/src/test/results/clientpositive/llap/multi_column_in_single.q.out b/ql/src/test/results/clientpositive/llap/multi_column_in_single.q.out index ec3232e829..f5d6bbd7f6 100644 --- a/ql/src/test/results/clientpositive/llap/multi_column_in_single.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_column_in_single.q.out @@ -133,7 +133,7 @@ STAGE PLANS: alias: emps_n7 filterExpr: ((deptno = 2) and ((empno + 1) = 3)) (type: boolean) Filter Operator - predicate: (((empno + 1) = 3) and (deptno = 2)) (type: boolean) + predicate: ((deptno = 2) and ((empno + 1) = 3)) (type: boolean) Select Operator expressions: empno (type: int), 2 (type: int), empname (type: string) outputColumnNames: _col0, _col1, _col2 @@ -159,9 +159,9 @@ STAGE PLANS: Processor Tree: TableScan alias: emps_n7 - filterExpr: (((empno + 1) <> 3) or (deptno <> 2)) (type: boolean) + filterExpr: ((deptno <> 2) or ((empno + 1) <> 3)) (type: boolean) Filter Operator - predicate: (((empno + 1) <> 3) or (deptno <> 2)) (type: boolean) + predicate: ((deptno <> 2) or ((empno + 1) <> 3)) (type: boolean) Select Operator expressions: empno (type: int), deptno (type: int), empname (type: string) outputColumnNames: _col0, _col1, _col2 @@ -187,7 +187,7 @@ STAGE PLANS: alias: emps_n7 filterExpr: ((deptno = 2) and (((empno * 2) | 1) = (empno + 2))) (type: boolean) Filter Operator - predicate: ((((empno * 2) | 1) = (empno + 2)) and (deptno = 2)) (type: boolean) + predicate: ((deptno = 2) and (((empno * 2) | 1) = (empno + 2))) (type: boolean) Select Operator expressions: empno (type: int), 2 (type: int), empname (type: string) outputColumnNames: _col0, _col1, _col2 diff --git a/ql/src/test/results/clientpositive/llap/multi_insert.q.out b/ql/src/test/results/clientpositive/llap/multi_insert.q.out index 46bc2edcc9..271bc36e98 100644 --- a/ql/src/test/results/clientpositive/llap/multi_insert.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_insert.q.out @@ -82,7 +82,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -303,7 +303,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -524,7 +524,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -745,7 +745,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -984,7 +984,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1215,7 +1215,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1446,7 +1446,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1677,7 +1677,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1892,7 +1892,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -1953,7 +1953,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2193,7 +2193,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2254,7 +2254,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2494,7 +2494,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2555,7 +2555,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2795,7 +2795,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2856,7 +2856,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false diff --git a/ql/src/test/results/clientpositive/llap/orc_llap.q.out b/ql/src/test/results/clientpositive/llap/orc_llap.q.out index ba7ec3a911..4f805b0a23 100644 --- a/ql/src/test/results/clientpositive/llap/orc_llap.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_llap.q.out @@ -424,7 +424,7 @@ STAGE PLANS: filterExpr: ((cint > 5) and (cint < 10)) (type: boolean) Statistics: Num rows: 122880 Data size: 9173100 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cint < 10) and (cint > 5)) (type: boolean) + predicate: ((cint > 5) and (cint < 10)) (type: boolean) Statistics: Num rows: 13653 Data size: 1019300 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: hash(cstring2) (type: int) @@ -604,7 +604,7 @@ STAGE PLANS: filterExpr: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 122880 Data size: 9724466 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and csmallint is not null) (type: boolean) + predicate: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 68484 Data size: 5419732 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), cstring1 (type: string) @@ -625,7 +625,7 @@ STAGE PLANS: filterExpr: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 122880 Data size: 9906988 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and csmallint is not null) (type: boolean) + predicate: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 68484 Data size: 5521416 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), cstring2 (type: string) @@ -908,7 +908,7 @@ STAGE PLANS: filterExpr: ((cint > 5) and (cint < 10)) (type: boolean) Statistics: Num rows: 245760 Data size: 18346100 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((cint < 10) and (cint > 5)) (type: boolean) + predicate: ((cint > 5) and (cint < 10)) (type: boolean) Statistics: Num rows: 27306 Data size: 2038500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: hash(cstring2) (type: int) @@ -1088,7 +1088,7 @@ STAGE PLANS: filterExpr: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 245760 Data size: 19448826 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and csmallint is not null) (type: boolean) + predicate: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 136968 Data size: 10839366 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), cstring1 (type: string) @@ -1109,7 +1109,7 @@ STAGE PLANS: filterExpr: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 245760 Data size: 19813868 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and csmallint is not null) (type: boolean) + predicate: (csmallint is not null and cbigint is not null) (type: boolean) Statistics: Num rows: 136968 Data size: 11042828 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), cstring2 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out index f4c56dd740..b210c09ace 100644 --- a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out @@ -337,7 +337,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 4188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean) + predicate: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Statistics: Num rows: 116 Data size: 464 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: hash(t) (type: int) @@ -410,7 +410,7 @@ STAGE PLANS: filterExpr: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Statistics: Num rows: 1049 Data size: 4188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean) + predicate: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Statistics: Num rows: 116 Data size: 464 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: hash(t) (type: int) @@ -507,7 +507,7 @@ STAGE PLANS: TableScan alias: orc_pred Filter Operator - predicate: ((s like 'bob%') and (t IS NOT DISTINCT FROM -1) and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -539,7 +539,7 @@ STAGE PLANS: alias: orc_pred filterExpr: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((s like 'bob%') and (t IS NOT DISTINCT FROM -1) and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -623,7 +623,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and s is not null and t BETWEEN 25 AND 30) (type: boolean) + predicate: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 25 Data size: 2525 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -693,7 +693,7 @@ STAGE PLANS: filterExpr: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and s is not null and t BETWEEN 25 AND 30) (type: boolean) + predicate: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 25 Data size: 2525 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -828,7 +828,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like '%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 5 Data size: 565 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -908,10 +908,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: ((d >= 10.0D) and (d < 12.0D) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like '%car%'))) (type: boolean) + filterExpr: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like '%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 5 Data size: 565 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -1060,7 +1060,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10) and (not (s like '%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 3 Data size: 339 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -1164,7 +1164,7 @@ STAGE PLANS: filterExpr: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10) and (not (s like '%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 3 Data size: 339 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) diff --git a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out index 700be27235..eff0fd6b95 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out @@ -342,7 +342,7 @@ STAGE PLANS: TableScan alias: tbl_pred Filter Operator - predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean) + predicate: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Select Operator expressions: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float), d (type: double), bo (type: boolean), s (type: string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 @@ -378,7 +378,7 @@ STAGE PLANS: alias: tbl_pred filterExpr: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Filter Operator - predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean) + predicate: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean) Select Operator expressions: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float), d (type: double), bo (type: boolean), s (type: string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 @@ -443,7 +443,7 @@ STAGE PLANS: TableScan alias: tbl_pred Filter Operator - predicate: ((s like 'bob%') and (t IS NOT DISTINCT FROM -1) and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -475,7 +475,7 @@ STAGE PLANS: alias: tbl_pred filterExpr: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((s like 'bob%') and (t IS NOT DISTINCT FROM -1) and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1) and s is not null and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -559,7 +559,7 @@ STAGE PLANS: alias: tbl_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and s is not null and t BETWEEN 25 AND 30) (type: boolean) + predicate: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 25 Data size: 2525 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -629,7 +629,7 @@ STAGE PLANS: filterExpr: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and s is not null and t BETWEEN 25 AND 30) (type: boolean) + predicate: (s is not null and (s like 'bob%') and (t <> -1) and (t <> -2) and (t <> -3) and t BETWEEN 25 AND 30) (type: boolean) Statistics: Num rows: 25 Data size: 2525 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -764,7 +764,7 @@ STAGE PLANS: alias: tbl_pred Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like '%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 5 Data size: 565 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -844,10 +844,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: tbl_pred - filterExpr: ((d >= 10.0D) and (d < 12.0D) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like '%car%'))) (type: boolean) + filterExpr: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like '%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 0Y) and (d >= 10.0D) and (d < 12.0D) and UDFToInteger(si) BETWEEN 300 AND 400 and (s like '%son') and (not (s like '%car%'))) (type: boolean) Statistics: Num rows: 5 Data size: 565 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -1041,7 +1041,7 @@ STAGE PLANS: alias: tbl_pred Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10) and (not (s like '%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 3 Data size: 339 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -1145,7 +1145,7 @@ STAGE PLANS: filterExpr: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 1049 Data size: 118521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((d < 12.0D) and (d >= 10) and (not (s like '%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si BETWEEN 300 AND 400) (type: boolean) + predicate: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d < 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si BETWEEN 300 AND 400) (type: boolean) Statistics: Num rows: 3 Data size: 339 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), d (type: double), s (type: string) @@ -1261,7 +1261,7 @@ STAGE PLANS: filterExpr: ((f < 123.2) and (f > 1.92) and (f >= 9.99) and f BETWEEN 1.92 AND 123.2 and (i < 67627) and (i > 60627) and (i >= 60626) and i BETWEEN 60626 AND 67627 and (b < 4294967861L) and (b > 4294967261L) and (b >= 4294967260L) and b BETWEEN 4294967261L AND 4294967861L) (type: boolean) Statistics: Num rows: 1049 Data size: 16784 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((b < 4294967861L) and (b > 4294967261L) and (b >= 4294967260L) and (f < 123.2) and (f > 1.92) and (f >= 9.99) and (i < 67627) and (i > 60627) and (i >= 60626) and b BETWEEN 4294967261L AND 4294967861L and f BETWEEN 1.92 AND 123.2 and i BETWEEN 60626 AND 67627) (type: boolean) + predicate: ((f < 123.2) and (f > 1.92) and (f >= 9.99) and f BETWEEN 1.92 AND 123.2 and (i < 67627) and (i > 60627) and (i >= 60626) and i BETWEEN 60626 AND 67627 and (b < 4294967861L) and (b > 4294967261L) and (b >= 4294967260L) and b BETWEEN 4294967261L AND 4294967861L) (type: boolean) Statistics: Num rows: 38 Data size: 608 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: f (type: float), i (type: int), b (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/partition_ctas.q.out b/ql/src/test/results/clientpositive/llap/partition_ctas.q.out index 6aca46b8bf..5e04366a7c 100644 --- a/ql/src/test/results/clientpositive/llap/partition_ctas.q.out +++ b/ql/src/test/results/clientpositive/llap/partition_ctas.q.out @@ -35,7 +35,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 300.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 300.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 300.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), key (type: string) diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out index cba24342f8..535d6585a7 100644 --- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out +++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out @@ -180,26 +180,26 @@ STAGE PLANS: TableScan alias: t1_new_n0 filterExpr: (ds = '2011-10-13') (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: (ds = '2011-10-13') (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-10-13' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 544 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 544 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -404,13 +404,13 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-10-13' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 544 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 544 Basic stats: COMPLETE Column stats: COMPLETE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -531,13 +531,13 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-10-15' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat @@ -618,22 +618,22 @@ STAGE PLANS: filterExpr: ((ds = '2011-10-15') and keymap is not null) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false predicate: ((ds = '2011-10-15') and keymap is not null) (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: keymap (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE tag: 0 value expressions: _col1 (type: string) auto parallelism: true @@ -678,22 +678,22 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col1 (type: string) outputColumnNames: _col1, _col2 - Position of Big Table: 0 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Position of Big Table: 1 + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: _col2 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: _col0 (type: string), _col1 (type: string), '2011-10-15' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL File Output Operator compressed: false GlobalTableId: 0 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 2 Data size: 924 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 736 Basic stats: COMPLETE Column stats: PARTIAL #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat diff --git a/ql/src/test/results/clientpositive/llap/q93_with_constraints.q.out b/ql/src/test/results/clientpositive/llap/q93_with_constraints.q.out index 32fac181e9..89b71eac49 100644 --- a/ql/src/test/results/clientpositive/llap/q93_with_constraints.q.out +++ b/ql/src/test/results/clientpositive/llap/q93_with_constraints.q.out @@ -260,20 +260,20 @@ STAGE PLANS: Map Operator Tree: TableScan alias: reason - filterExpr: ((r_reason_desc = 'Did not like the warranty') and r_reason_sk is not null) (type: boolean) + filterExpr: (r_reason_sk is not null and (r_reason_desc = 'Did not like the warranty')) (type: boolean) Statistics: Num rows: 72 Data size: 13160 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((r_reason_desc = 'Did not like the warranty') and r_reason_sk is not null) (type: boolean) - Statistics: Num rows: 2 Data size: 365 Basic stats: COMPLETE Column stats: NONE + predicate: (r_reason_sk is not null and (r_reason_desc = 'Did not like the warranty')) (type: boolean) + Statistics: Num rows: 5 Data size: 913 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: r_reason_sk (type: int) outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 365 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 913 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 2 Data size: 365 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 913 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: all inputs Map 7 diff --git a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out index 9051dd0464..836681fa9b 100644 --- a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out +++ b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: ((x+1 < '11') and !@#$%^&*()_q is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (!@#$%^&*()_q is not null and (x+1 < '11')) (type: boolean) + predicate: ((x+1 < '11') and !@#$%^&*()_q is not null) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: x+1 (type: string), !@#$%^&*()_q (type: string) diff --git a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out index 7aa358e3f7..ab9e4a446e 100644 --- a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out +++ b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out @@ -154,7 +154,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter)))) (type: boolean) Statistics: Num rows: 123456 Data size: 987648 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter)))) (type: boolean) Statistics: Num rows: 123456 Data size: 987648 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int) @@ -331,7 +331,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter)))) (type: boolean) Statistics: Num rows: 123456 Data size: 987648 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_d_d_date_sk_min) AND DynamicValue(RS_7_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_d_d_date_sk_bloom_filter)))) (type: boolean) Statistics: Num rows: 123456 Data size: 987648 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int) diff --git a/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out b/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out index d6eb82d429..1145371645 100644 --- a/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out +++ b/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out @@ -307,7 +307,7 @@ STAGE PLANS: filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) = 0.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 175168 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) = 0.0D) and (ds = '2008-04-08')) (type: boolean) + predicate: ((ds = '2008-04-08') and (UDFToDouble(key) = 0.0D)) (type: boolean) Statistics: Num rows: 2 Data size: 700 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 2 Data size: 700 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out index 312f456cd5..6b36584cfe 100644 --- a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out +++ b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out @@ -36,10 +36,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n7 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 332 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -117,10 +117,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n7 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 332 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out b/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out index 8ac5953b2e..c72a512214 100644 --- a/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out +++ b/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out @@ -95,7 +95,7 @@ Stage-0 Select Operator [SEL_5] (runtime: rows=3 width=4) Output:["_col0"] Filter Operator [FIL_19] (runtime: rows=3 width=4) - predicate:((p < 10) and (p > 2)) + predicate:((p > 2) and (p < 10)) TableScan [TS_3] (runtime: rows=5 width=4) default@px,px,Tbl:COMPLETE,Col:COMPLETE,Output:["p"] @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_5] (rows=1/3 width=4) Output:["_col0"] Filter Operator [FIL_19] (rows=1/3 width=4) - predicate:((p < 10) and (p > 2)) + predicate:((p > 2) and (p < 10)) TableScan [TS_3] (rows=5/5 width=4) default@px,px,Tbl:COMPLETE,Col:COMPLETE,Output:["p"] @@ -212,7 +212,7 @@ Stage-0 Select Operator [SEL_5] (rows=1/3 width=4) Output:["_col0"] Filter Operator [FIL_19] (rows=1/3 width=4) - predicate:((p < 10) and (p > 2)) + predicate:((p > 2) and (p < 10)) TableScan [TS_3] (rows=5/5 width=4) default@px,px,Tbl:COMPLETE,Col:COMPLETE,Output:["p"] <-Select Operator [SEL_2] (rows=1/5 width=4) diff --git a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out index b3a9ba5be3..df8ef0da1b 100644 --- a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out +++ b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out @@ -83,7 +83,7 @@ Stage-0 Select Operator [SEL_35] (rows=1 width=4) Output:["_col0"] Filter Operator [FIL_34] (rows=1 width=4) - predicate:((p < 10) and (p > 2)) + predicate:((p > 2) and (p < 10)) TableScan [TS_3] (rows=5 width=4) default@px_n0,px_n0,Tbl:COMPLETE,Col:COMPLETE,Output:["p"] @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_35] (runtime: rows=3 width=4) Output:["_col0"] Filter Operator [FIL_34] (runtime: rows=3 width=4) - predicate:((p < 10) and (p > 2)) + predicate:((p > 2) and (p < 10)) TableScan [TS_3] (runtime: rows=5 width=4) default@px_n0,px_n0,Tbl:COMPLETE,Col:COMPLETE,Output:["p"] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex.q.out index dd14525b8d..178df3386c 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n2 - Statistics: Num rows: 6 Data size: 21030 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -661,7 +661,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n2 - Statistics: Num rows: 4 Data size: 4892 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex_llap_io.q.out index 8d1b0c02b4..ff6808d0a1 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_nonvec_part_all_complex_llap_io.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n5 - Statistics: Num rows: 6 Data size: 21030 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -663,7 +663,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n5 - Statistics: Num rows: 4 Data size: 4892 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex.q.out index 3e45c26c1f..ef125addb6 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n8 - Statistics: Num rows: 6 Data size: 21030 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -713,7 +713,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n8 - Statistics: Num rows: 4 Data size: 4892 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex_llap_io.q.out index bc9f0bc4cc..a32c519838 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_complex_llap_io.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n0 - Statistics: Num rows: 6 Data size: 21030 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -715,7 +715,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n0 - Statistics: Num rows: 4 Data size: 4892 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex.q.out index 4d39cd193b..f70f092394 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n3 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -661,7 +661,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n3 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex_llap_io.q.out index 944aa55051..aa50f3bf1a 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_nonvec_part_all_complex_llap_io.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n1 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -663,7 +663,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n1 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex.q.out index 4430551f0b..a9495e5edc 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n6 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -713,7 +713,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n6 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex_llap_io.q.out index dfee8cd5c8..093b460b78 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vec_part_all_complex_llap_io.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1 - Statistics: Num rows: 4 Data size: 4423 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -240,7 +240,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -756,7 +756,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4 - Statistics: Num rows: 2 Data size: 654 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 576 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] @@ -924,7 +924,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex.q.out index 6fa84f655a..e35c6618fd 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n4 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -713,7 +713,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n4 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex_llap_io.q.out index 788c44a89d..90e0c4134e 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_all_complex_llap_io.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n7 - Statistics: Num rows: 4 Data size: 4423 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:s1:struct, 2:b:string, 3:part:int, 4:ROW__ID:struct] @@ -225,7 +225,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_change_various_various_struct1_n7 - Statistics: Num rows: 6 Data size: 17227 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 6 Data size: 16320 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), s1 (type: struct), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3 @@ -649,7 +649,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n7 - Statistics: Num rows: 2 Data size: 654 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 2 Data size: 576 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true vectorizationSchemaColumns: [0:insert_num:int, 1:b:string, 2:s3:struct, 3:part:int, 4:ROW__ID:struct] @@ -804,7 +804,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part_add_to_various_various_struct4_n7 - Statistics: Num rows: 4 Data size: 4073 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 3736 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: insert_num (type: int), part (type: int), b (type: string), s3 (type: struct) outputColumnNames: _col0, _col1, _col2, _col3 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 4001abbb5e..e56067f43d 100644 --- a/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out +++ b/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out @@ -200,7 +200,7 @@ STAGE PLANS: filterExpr: (str is not null and (str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter))) and str is not null) (type: boolean) + predicate: (str is not null and (str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: str (type: string) @@ -502,7 +502,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_9_srcpart_date_str_min) AND DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_9_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_9_srcpart_date_str_min) AND DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_9_srcpart_date_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_9_srcpart_date_str_min) AND DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_9_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -677,7 +677,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_i_cstring_min) AND DynamicValue(RS_3_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_3_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_3_i_cstring_min) AND DynamicValue(RS_3_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_3_i_cstring_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_i_cstring_min) AND DynamicValue(RS_3_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_3_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -842,7 +842,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -1142,7 +1142,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -1162,7 +1162,7 @@ STAGE PLANS: filterExpr: (str is not null and (str BETWEEN DynamicValue(RS_21_v_key1_min) AND DynamicValue(RS_21_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_21_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((str BETWEEN DynamicValue(RS_21_v_key1_min) AND DynamicValue(RS_21_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_21_v_key1_bloom_filter))) and str is not null) (type: boolean) + predicate: (str is not null and (str BETWEEN DynamicValue(RS_21_v_key1_min) AND DynamicValue(RS_21_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_21_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: str (type: string) @@ -1318,7 +1318,7 @@ STAGE PLANS: filterExpr: (str is not null and (str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter))) and str is not null) (type: boolean) + predicate: (str is not null and (str BETWEEN DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: str (type: string) @@ -1616,7 +1616,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_12_srcpart_date_str_min) AND DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_12_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_12_srcpart_date_str_min) AND DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_12_srcpart_date_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_12_srcpart_date_str_min) AND DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_12_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -1790,7 +1790,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_9_i_cstring_min) AND DynamicValue(RS_9_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_9_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_9_i_cstring_min) AND DynamicValue(RS_9_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_9_i_cstring_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_9_i_cstring_min) AND DynamicValue(RS_9_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_9_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -1967,7 +1967,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key1 (type: string) @@ -2255,7 +2255,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: key1 (type: string) @@ -2271,7 +2271,7 @@ STAGE PLANS: filterExpr: (str is not null and (str BETWEEN DynamicValue(RS_17_v_key1_min) AND DynamicValue(RS_17_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_17_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((str BETWEEN DynamicValue(RS_17_v_key1_min) AND DynamicValue(RS_17_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_17_v_key1_bloom_filter))) and str is not null) (type: boolean) + predicate: (str is not null and (str BETWEEN DynamicValue(RS_17_v_key1_min) AND DynamicValue(RS_17_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_17_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: str (type: string) @@ -2423,7 +2423,7 @@ STAGE PLANS: filterExpr: (str is not null and (str BETWEEN DynamicValue(RS_5_v_key1_min) AND DynamicValue(RS_5_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_5_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((str BETWEEN DynamicValue(RS_5_v_key1_min) AND DynamicValue(RS_5_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_5_v_key1_bloom_filter))) and str is not null) (type: boolean) + predicate: (str is not null and (str BETWEEN DynamicValue(RS_5_v_key1_min) AND DynamicValue(RS_5_v_key1_max) and in_bloom_filter(str, DynamicValue(RS_5_v_key1_bloom_filter)))) (type: boolean) Statistics: Num rows: 2000 Data size: 174000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: str (type: string) @@ -2695,7 +2695,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_4_srcpart_date_str_min) AND DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_4_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_4_srcpart_date_str_min) AND DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_4_srcpart_date_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_4_srcpart_date_str_min) AND DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, DynamicValue(RS_4_srcpart_date_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: key1 (type: string) @@ -2849,7 +2849,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_11_i_cstring_min) AND DynamicValue(RS_11_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_11_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_11_i_cstring_min) AND DynamicValue(RS_11_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_11_i_cstring_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_11_i_cstring_min) AND DynamicValue(RS_11_i_cstring_max) and in_bloom_filter(key1, DynamicValue(RS_11_i_cstring_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: key1 (type: string) @@ -3028,7 +3028,7 @@ STAGE PLANS: filterExpr: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Filter Operator - predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean) + predicate: (key1 is not null and (key1 BETWEEN DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 1000 Data size: 87000 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: key1 (type: string) @@ -3316,7 +3316,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col6 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean) + predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct) @@ -3328,7 +3328,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean) + predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct), _col0 (type: int) @@ -3656,7 +3656,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col6 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean) + predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct) @@ -3668,7 +3668,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean) + predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct), _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/semijoin_reddedup.q.out b/ql/src/test/results/clientpositive/llap/semijoin_reddedup.q.out index 62047e194d..7db8e4df0d 100644 --- a/ql/src/test/results/clientpositive/llap/semijoin_reddedup.q.out +++ b/ql/src/test/results/clientpositive/llap/semijoin_reddedup.q.out @@ -273,7 +273,7 @@ STAGE PLANS: filterExpr: (o_orderkey is not null and o_custkey is not null) (type: boolean) Statistics: Num rows: 1500000000 Data size: 296399999792 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (o_custkey is not null and o_orderkey is not null) (type: boolean) + predicate: (o_orderkey is not null and o_custkey is not null) (type: boolean) Statistics: Num rows: 1349999996 Data size: 266759999022 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: o_orderkey (type: bigint), o_custkey (type: bigint), o_totalprice (type: double), o_orderdate (type: string) diff --git a/ql/src/test/results/clientpositive/llap/sharedwork.q.out b/ql/src/test/results/clientpositive/llap/sharedwork.q.out index a3ba5a5f55..0cc878740e 100644 --- a/ql/src/test/results/clientpositive/llap/sharedwork.q.out +++ b/ql/src/test/results/clientpositive/llap/sharedwork.q.out @@ -103,7 +103,7 @@ POSTHOOK: Input: default@my_table_0003 OPTIMIZED SQL: SELECT `t0`.`col_7`, `t0`.`CAST` AS `col_3`, `t0`.`col_20`, `t2`.`col_21` AS `col_21_1232`, `t0`.`col_1`, `t4`.`col_22`, `t6`.`col_21` AS `col_21_879`, `t4`.`col_23` FROM (SELECT `col_1`, `col_7`, `col_20`, CAST(`col_3` AS DATE) AS `CAST` FROM `default`.`my_table_0001` -WHERE `col_20` IN ('part1', 'part2', 'part3') AND (CAST(`col_7` AS DOUBLE) IS NOT NULL OR `col_7` IS NULL) AND CAST(`col_3` AS DATE) BETWEEN DATE '2018-07-01' AND DATE '2019-01-23') AS `t0` +WHERE (CAST(`col_7` AS DOUBLE) IS NOT NULL OR `col_7` IS NULL) AND `col_20` IN ('part1', 'part2', 'part3') AND CAST(`col_3` AS DATE) BETWEEN DATE '2018-07-01' AND DATE '2019-01-23') AS `t0` LEFT JOIN (SELECT `col_24`, `col_21` FROM `default`.`my_table_0003` WHERE `col_24` IN ('part1', 'part2', 'part3')) AS `t2` ON `t0`.`col_20` = `t2`.`col_24` @@ -135,7 +135,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: table__323 - filterExpr: ((col_20) IN ('part1', 'part2', 'part3') and (UDFToDouble(col_7) is not null or col_7 is null) and CAST( col_3 AS DATE) BETWEEN DATE'2018-07-01' AND DATE'2019-01-23') (type: boolean) + filterExpr: ((UDFToDouble(col_7) is not null or col_7 is null) and (col_20) IN ('part1', 'part2', 'part3') and CAST( col_3 AS DATE) BETWEEN DATE'2018-07-01' AND DATE'2019-01-23') (type: boolean) Statistics: Num rows: 1 Data size: 592 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -654,7 +654,7 @@ INNER JOIN (SELECT `p_size` + 1 AS `$f0` FROM `default`.`part` WHERE `p_size` IS NOT NULL GROUP BY `p_size` + 1) AS `t11` ON `t8`.`$f1` = `t11`.`$f0`) AS `t12` ON `part`.`p_type` = `t12`.`p_type` AND `part`.`p_size` + 1 = `t12`.`size`) AS `t13` -WHERE (`t13`.`$f2` IS NULL OR `t13`.`c` = 0 OR `t13`.`c` IS NULL) AND (`t13`.`p_type` IS NOT NULL OR `t13`.`c` = 0 OR `t13`.`c` IS NULL OR `t13`.`$f2` IS NOT NULL) AND (`t13`.`ck` < (`t13`.`c` IS NOT TRUE) OR `t13`.`c` = 0 OR `t13`.`c` IS NULL OR `t13`.`$f2` IS NOT NULL OR `t13`.`p_type` IS NULL) +WHERE (`t13`.`$f2` IS NULL OR `t13`.`c` = 0 OR `t13`.`c` IS NULL) AND (`t13`.`ck` < (`t13`.`c` IS NOT TRUE) OR `t13`.`c` = 0 OR `t13`.`c` IS NULL OR `t13`.`$f2` IS NOT NULL OR `t13`.`p_type` IS NULL) AND (`t13`.`p_type` IS NOT NULL OR `t13`.`c` = 0 OR `t13`.`c` IS NULL OR `t13`.`$f2` IS NOT NULL) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1022,7 +1022,7 @@ STAGE PLANS: Statistics: Num rows: 39 Data size: 9387 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator isSamplingPred: false - predicate: (((_col5 < _col4 is not true) or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4 is not true) or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 39 Data size: 9387 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/skewjoin.q.out b/ql/src/test/results/clientpositive/llap/skewjoin.q.out index 3b7fc3b958..d2f9456f54 100644 --- a/ql/src/test/results/clientpositive/llap/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/skewjoin.q.out @@ -892,7 +892,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(substring(value, 5)) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -912,7 +912,7 @@ STAGE PLANS: filterExpr: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((substring(value, 5) + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out index 4c54cb60b7..8ebc139faa 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out @@ -664,7 +664,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and key2 is not null) (type: boolean) + predicate: (key2 is not null and key is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), key2 (type: int), value (type: string) @@ -747,7 +747,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and key2 is not null) (type: boolean) + predicate: (key2 is not null and key is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), key2 (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out index 184e8de3b2..b9386ec490 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out @@ -252,7 +252,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '1') and (key = 238)) (type: boolean) + filterExpr: ((key = 238) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = 238) (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out index 7b02b593d3..ad1705d48b 100644 --- a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out +++ b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out @@ -99,7 +99,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col6 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean) + predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct) @@ -111,7 +111,7 @@ STAGE PLANS: Map-reduce partition columns: UDFToInteger(_col0) (type: int) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean) + predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col4 (type: struct), _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/stats11.q.out b/ql/src/test/results/clientpositive/llap/stats11.q.out index 9b930b53db..634a287714 100644 --- a/ql/src/test/results/clientpositive/llap/stats11.q.out +++ b/ql/src/test/results/clientpositive/llap/stats11.q.out @@ -313,7 +313,7 @@ FROM `default`.`srcbucket_mapjoin_n15` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -413,22 +413,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -500,17 +500,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -541,7 +541,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 @@ -756,7 +756,7 @@ FROM `default`.`srcbucket_mapjoin_n15` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -856,22 +856,22 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 149 Data size: 85004 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 149 Data size: 23124 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false predicate: key is not null (type: boolean) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) null sort order: a sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 142 Data size: 81010 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 122 Data size: 18933 Basic stats: PARTIAL Column stats: NONE tag: 1 value expressions: _col1 (type: string) auto parallelism: true @@ -943,17 +943,17 @@ STAGE PLANS: 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col3 Position of Big Table: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col3 (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false GlobalTableId: 1 #### A masked pattern was here #### NumFilesPerFileSink: 1 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE #### A masked pattern was here #### table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -984,7 +984,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) outputColumnNames: key, value1, value2 - Statistics: Num rows: 156 Data size: 89111 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 134 Data size: 20826 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll') minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/stats_only_null.q.out b/ql/src/test/results/clientpositive/llap/stats_only_null.q.out index 02f21e932f..1413f808ef 100644 --- a/ql/src/test/results/clientpositive/llap/stats_only_null.q.out +++ b/ql/src/test/results/clientpositive/llap/stats_only_null.q.out @@ -161,11 +161,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_null_part - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: a (type: double), b (type: int), c (type: string), d (type: smallint) outputColumnNames: a, b, c, d - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), count(a), count(b), count(c), count(d) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/subquery_ALL.q.out b/ql/src/test/results/clientpositive/llap/subquery_ALL.q.out index 76c8f4b1f4..5fef12f6d6 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_ALL.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_ALL.q.out @@ -142,7 +142,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 39 Data size: 836 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null)) (type: boolean) Statistics: Num rows: 39 Data size: 836 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 39 Data size: 836 Basic stats: COMPLETE Column stats: COMPLETE @@ -611,7 +611,7 @@ STAGE PLANS: outputColumnNames: _col1, _col5, _col6, _col8 Statistics: Num rows: 42 Data size: 1916 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col6 >= _col5) or (_col5 = 0L) or _col8 is not null or _col1 is null) and (_col1 is not null or (_col5 = 0L) or _col8 is not null) and (_col8 is null or (_col5 = 0L))) (type: boolean) + predicate: ((_col8 is null or (_col5 = 0L)) and ((_col6 >= _col5) or (_col5 = 0L) or _col8 is not null or _col1 is null) and (_col1 is not null or (_col5 = 0L) or _col8 is not null)) (type: boolean) Statistics: Num rows: 42 Data size: 1916 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 42 Data size: 1916 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/llap/subquery_corr.q.out b/ql/src/test/results/clientpositive/llap/subquery_corr.q.out index 6c140ab171..607384b8d3 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_corr.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_corr.q.out @@ -46,7 +46,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -152,7 +152,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -758,7 +758,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/subquery_exists.q.out b/ql/src/test/results/clientpositive/llap/subquery_exists.q.out index 30bae8aad5..0735c0a707 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_exists.q.out @@ -1350,7 +1350,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: i (type: int), j (type: int) diff --git a/ql/src/test/results/clientpositive/llap/subquery_in.q.out b/ql/src/test/results/clientpositive/llap/subquery_in.q.out index d773bbc560..98bb91f629 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out @@ -397,7 +397,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -1100,7 +1100,7 @@ STAGE PLANS: filterExpr: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 14 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int) @@ -1474,10 +1474,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_brand <> 'Brand#14') and (p_size <> 340) and p_type is not null) (type: boolean) + filterExpr: ((p_size <> 340) and (p_brand <> 'Brand#14') and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_brand <> 'Brand#14') and (p_size <> 340) and p_type is not null) (type: boolean) + predicate: ((p_size <> 340) and (p_brand <> 'Brand#14') and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2160,7 +2160,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2181,7 +2181,7 @@ STAGE PLANS: filterExpr: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((p_size + 121150) = p_partkey) and p_name is not null and p_size is not null) (type: boolean) + predicate: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1677 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -2262,7 +2262,7 @@ STAGE PLANS: filterExpr: (p_partkey is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_partkey is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2283,7 +2283,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3735,7 +3735,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3756,7 +3756,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -3906,7 +3906,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3927,7 +3927,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5954 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5954 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -4079,7 +4079,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 6058 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 6058 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_type (type: string), p_size (type: int) @@ -4100,7 +4100,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -4216,7 +4216,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -4237,7 +4237,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -4389,7 +4389,7 @@ STAGE PLANS: filterExpr: (p_type is not null and UDFToLong(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToLong(p_size) is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and UDFToLong(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -4569,7 +4569,7 @@ STAGE PLANS: filterExpr: (p_partkey is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(p_size) is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -4635,7 +4635,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 13 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(_col1) is not null and _col2 is not null) (type: boolean) + predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) Statistics: Num rows: 13 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), (UDFToDouble(_col1) / _col2) (type: double) @@ -5023,7 +5023,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 13 Data size: 8307 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 1 Data size: 639 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -5277,7 +5277,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 13 Data size: 8307 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 1 Data size: 639 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -5336,7 +5336,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (UDFToDouble(_col1) is not null and _col2 is not null) (type: boolean) + predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) Statistics: Num rows: 13 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col1) / _col2) (type: double), _col0 (type: int), true (type: boolean) @@ -5649,7 +5649,7 @@ STAGE PLANS: filterExpr: (j is not null and UDFToLong(i) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToLong(i) is not null and j is not null) (type: boolean) + predicate: (j is not null and UDFToLong(i) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: i (type: int), j (type: int) @@ -5977,7 +5977,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -6019,7 +6019,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2808 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2808 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_size (type: int) diff --git a/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out b/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out index ca42b9724a..9e75c759e7 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out @@ -999,7 +999,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1037,7 +1037,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1831,7 +1831,7 @@ STAGE PLANS: 1 Reducer 9 Statistics: Num rows: 1 Data size: 668 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 668 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out index c78898cba6..c964baad47 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out @@ -108,7 +108,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -389,7 +389,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -614,7 +614,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -865,7 +865,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L))) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 1355 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1093,7 +1093,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 1 Data size: 1335 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col1 is null) and (_col1 is not null or (_col9 = 0L) or _col12 is not null) and (_col12 is null or (_col9 = 0L))) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and (_col1 is not null or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 1335 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1833,7 +1833,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1854,7 +1854,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -1885,7 +1885,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_name (type: string) @@ -1911,7 +1911,7 @@ STAGE PLANS: filterExpr: ((p_type is not null and p_brand is not null) or (p_type is not null and p_brand is not null and p_container is not null)) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -1924,7 +1924,7 @@ STAGE PLANS: Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: string) Filter Operator - predicate: (p_brand is not null and p_container is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -2002,7 +2002,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 16 Data size: 3891 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 16 Data size: 3891 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2154,7 +2154,7 @@ STAGE PLANS: filterExpr: (p_name is not null and p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_name is not null and p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2197,7 +2197,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_brand (type: string), p_type (type: string) @@ -2342,7 +2342,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_container is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2363,7 +2363,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -2394,7 +2394,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_container is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_name (type: string), p_container (type: string) @@ -2420,7 +2420,7 @@ STAGE PLANS: filterExpr: ((p_type is not null and p_brand is not null) or (p_type is not null and p_brand is not null and p_container is not null)) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -2433,7 +2433,7 @@ STAGE PLANS: Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: string) Filter Operator - predicate: (p_brand is not null and p_container is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 7488 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -2511,7 +2511,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 16 Data size: 5484 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 16 Data size: 5484 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2661,7 +2661,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2682,7 +2682,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -2785,7 +2785,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 16 Data size: 3891 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 16 Data size: 3891 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2904,7 +2904,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2925,7 +2925,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_brand (type: string), p_type (type: string) @@ -2946,7 +2946,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -3090,7 +3090,7 @@ STAGE PLANS: filterExpr: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 14 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int), 1 (type: int) @@ -3134,7 +3134,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 10400 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) @@ -3246,7 +3246,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col4, _col5, _col7 Statistics: Num rows: 2 Data size: 64 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 >= _col4) or (_col4 = 0L) or _col7 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col7 is not null) and (_col7 is null or (_col4 = 0L))) (type: boolean) + predicate: ((_col7 is null or (_col4 = 0L)) and (_col2 is not null or (_col4 = 0L) or _col7 is not null) and ((_col5 >= _col4) or (_col4 = 0L) or _col7 is not null or _col2 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 64 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), 1 (type: int) @@ -3362,7 +3362,7 @@ STAGE PLANS: filterExpr: ((value is not null and key is not null) or ((key > '9') and value is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -3395,7 +3395,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -4175,7 +4175,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 27 Data size: 17153 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col9 <> 0L) and _col12 is null and (_col10 >= _col9) and _col5 is not null) or (_col0 = 3) or (_col9 = 0L)) (type: boolean) + predicate: ((_col9 = 0L) or (_col0 = 3) or ((_col9 <> 0L) and _col12 is null and (_col10 >= _col9) and _col5 is not null)) (type: boolean) Statistics: Num rows: 27 Data size: 17153 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4398,7 +4398,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col4, _col5 Statistics: Num rows: 631 Data size: 65521 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 <> 0L) and _col4 is not null) or _col1 is not null or _col5 is not null) (type: boolean) + predicate: (_col5 is not null or ((_col2 <> 0L) and _col4 is not null) or _col1 is not null) (type: boolean) Statistics: Num rows: 631 Data size: 65521 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 631 Data size: 65521 Basic stats: COMPLETE Column stats: COMPLETE @@ -4539,7 +4539,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_retailprice is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_retailprice is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_retailprice is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_type (type: string), p_retailprice (type: double) diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out index 9a5b1496b9..1a7e5987dd 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out @@ -117,7 +117,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 631 Data size: 122942 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 631 Data size: 122942 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -406,7 +406,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8 Statistics: Num rows: 38 Data size: 8914 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 38 Data size: 8914 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col2 (type: int) @@ -691,7 +691,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 27 Data size: 3815 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 27 Data size: 3815 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: int) @@ -796,7 +796,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double), true (type: boolean) @@ -1008,7 +1008,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8 Statistics: Num rows: 15 Data size: 3605 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 15 Data size: 3605 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col2 (type: int) @@ -1488,7 +1488,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '11') or ((key < '11') and (key > '104') is not true)) (type: boolean) + filterExpr: ((key < '11') or ((key > '104') is not true and (key < '11'))) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE @@ -1505,7 +1505,7 @@ STAGE PLANS: Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 166 Data size: 14442 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '11') and (key > '104') is not true) (type: boolean) + predicate: ((key > '104') is not true and (key < '11')) (type: boolean) Statistics: Num rows: 83 Data size: 7221 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CASE WHEN ((key > '104')) THEN (null) ELSE (key) END (type: string) @@ -1572,7 +1572,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 230 Data size: 23950 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null)) (type: boolean) Statistics: Num rows: 230 Data size: 23950 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -1664,10 +1664,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_brand <> 'Brand#14') and (p_size <> 340)) (type: boolean) + filterExpr: ((p_size <> 340) and (p_brand <> 'Brand#14')) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_brand <> 'Brand#14') and (p_size <> 340)) (type: boolean) + predicate: ((p_size <> 340) and (p_brand <> 'Brand#14')) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1708,7 +1708,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 1560 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (((p_size * p_size) <> 340) and p_size is not null and p_type is not null) (type: boolean) + predicate: (((p_size * p_size) <> 340) and p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2808 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (p_size * p_size) (type: int), p_type (type: string) @@ -1756,7 +1756,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 64 Data size: 40340 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 64 Data size: 40340 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1938,7 +1938,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2159,7 +2159,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 32 Data size: 20348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col0 is not null and _col5 is not null) or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col0 is null or _col5 is null) and (_col12 is null or (_col9 = 0L))) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col0 is null or _col5 is null) and ((_col0 is not null and _col5 is not null) or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 32 Data size: 20348 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2426,7 +2426,7 @@ STAGE PLANS: outputColumnNames: _col1, _col3, _col4, _col7 Statistics: Num rows: 48 Data size: 660 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 48 Data size: 660 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 48 Data size: 660 Basic stats: COMPLETE Column stats: COMPLETE @@ -2618,7 +2618,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 32 Data size: 20348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col7 is null) and (_col12 is null or (_col9 = 0L)) and (_col7 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col7 is null) and (_col7 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 32 Data size: 20348 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2790,7 +2790,7 @@ STAGE PLANS: Statistics: Num rows: 6 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (((p_size + 121150) = p_partkey) and p_name is not null and p_size is not null) (type: boolean) + predicate: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1677 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -2838,7 +2838,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 40 Data size: 25032 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col1 is null) and (_col1 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and (_col14 is null or (_col10 = 0L) or _col10 is null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col1 is null) and (_col1 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 40 Data size: 25032 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2970,7 +2970,7 @@ STAGE PLANS: filterExpr: ((p_size is not null and p_partkey is not null) or (p_size is not null and p_partkey is not null and p_name is not null)) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count(), count(p_name) @@ -2986,7 +2986,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 312 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: bigint), _col3 (type: bigint) Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3030,7 +3030,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col16 Statistics: Num rows: 59 Data size: 37149 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col12 < _col11) is not true or (_col11 = 0L) or _col11 is null or _col16 is not null or _col1 is null) and (_col1 is not null or (_col11 = 0L) or _col11 is null or _col16 is not null) and (_col16 is null or (_col11 = 0L) or _col11 is null)) (type: boolean) + predicate: ((_col16 is null or (_col11 = 0L) or _col11 is null) and ((_col12 < _col11) is not true or (_col11 = 0L) or _col11 is null or _col16 is not null or _col1 is null) and (_col1 is not null or (_col11 = 0L) or _col11 is null or _col16 is not null)) (type: boolean) Statistics: Num rows: 59 Data size: 37149 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3158,7 +3158,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 1404 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (UDFToDouble(p_type) is not null and p_brand is not null) (type: boolean) + predicate: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(p_type) + 2.0D) (type: double), p_brand (type: string) @@ -3206,7 +3206,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 58 Data size: 13682 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 58 Data size: 13682 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -3444,7 +3444,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 46 Data size: 10734 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 46 Data size: 10734 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -3705,7 +3705,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 907 Data size: 177590 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 907 Data size: 177590 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -3930,7 +3930,7 @@ STAGE PLANS: Statistics: Num rows: 250 Data size: 25750 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (concat('v', value) is not null and key is not null) (type: boolean) + predicate: (key is not null and concat('v', value) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: concat('v', value) (type: string), key (type: string) @@ -4004,7 +4004,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col7 Statistics: Num rows: 1623 Data size: 309794 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 1401 Data size: 267414 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -4267,7 +4267,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4489,7 +4489,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 33 Data size: 20987 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4789,7 +4789,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 539 Data size: 104726 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 539 Data size: 104726 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -5408,7 +5408,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 1404 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (UDFToDouble(p_type) is not null and p_brand is not null) (type: boolean) + predicate: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 5096 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: p_brand (type: string), p_type (type: string) @@ -5488,7 +5488,7 @@ STAGE PLANS: outputColumnNames: _col1, _col3, _col4, _col7 Statistics: Num rows: 53 Data size: 780 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 53 Data size: 780 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 53 Data size: 780 Basic stats: COMPLETE Column stats: COMPLETE @@ -5726,7 +5726,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 5 Data size: 108 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 5 Data size: 108 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -5836,7 +5836,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2_n0 - filterExpr: (UDFToDouble(c1) is not null or (UDFToDouble(c1) is not null and c1 is not null)) (type: boolean) + filterExpr: (UDFToDouble(c1) is not null or (c1 is not null and UDFToDouble(c1) is not null)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: UDFToDouble(c1) is not null (type: boolean) @@ -5852,7 +5852,7 @@ STAGE PLANS: Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int) Filter Operator - predicate: (UDFToDouble(c1) is not null and c1 is not null) (type: boolean) + predicate: (c1 is not null and UDFToDouble(c1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), UDFToDouble(c1) (type: double) @@ -5870,10 +5870,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1_n0 - filterExpr: (UDFToDouble(c2) is not null and c2 is not null) (type: boolean) + filterExpr: (c2 is not null and UDFToDouble(c2) is not null) (type: boolean) Statistics: Num rows: 4 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(c2) is not null and c2 is not null) (type: boolean) + predicate: (c2 is not null and UDFToDouble(c2) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: c2 (type: char(100)) @@ -5917,7 +5917,7 @@ STAGE PLANS: outputColumnNames: _col0, _col3, _col4, _col7 Statistics: Num rows: 6 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 6 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -6152,7 +6152,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2_n0 - filterExpr: (b is not null or (b is not null and a is not null)) (type: boolean) + filterExpr: (b is not null or (a is not null and b is not null)) (type: boolean) Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: b is not null (type: boolean) @@ -6215,7 +6215,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col7 Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -6378,7 +6378,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t7 - filterExpr: (j is not null or (j is not null and i is not null)) (type: boolean) + filterExpr: (j is not null or (i is not null and j is not null)) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: j is not null (type: boolean) @@ -6463,7 +6463,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col6 Statistics: Num rows: 2 Data size: 56 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and (_col6 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col6 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 56 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: int) @@ -6648,7 +6648,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: i (type: int), j (type: int) @@ -6714,7 +6714,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col6 Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and (_col6 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col6 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -6863,7 +6863,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: i (type: int), j (type: int) @@ -6907,7 +6907,7 @@ STAGE PLANS: outputColumnNames: _col0, _col3, _col4, _col7 Statistics: Num rows: 4 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 4 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -7076,7 +7076,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -7254,7 +7254,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 4 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 4 Data size: 88 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -7431,7 +7431,7 @@ STAGE PLANS: residual filter predicates: {(_col1 > _col6)} Statistics: Num rows: 1145 Data size: 236851 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 1145 Data size: 236851 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out index ed4453cde1..cddbe791b3 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out @@ -925,7 +925,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -1593,7 +1593,7 @@ STAGE PLANS: filterExpr: (p_type is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(p_size) is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string), UDFToDouble(p_size) (type: double) @@ -1727,7 +1727,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1939,7 +1939,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null and p_retailprice is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_retailprice is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null and p_retailprice is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2339,7 +2339,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3354 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count(p_name) @@ -3455,7 +3455,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 7 Data size: 3595 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 6 Data size: 3081 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3708,7 +3708,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 14 Data size: 2025 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col3 is null) and (_col12 is null or (_col9 = 0L)) and (_col3 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and (_col3 is not null or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 14 Data size: 2025 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3870,7 +3870,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1)) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 9600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) @@ -4086,7 +4086,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1)) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 9600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) @@ -4444,7 +4444,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment_n11 (type: string) @@ -4465,7 +4465,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 8242 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_brand (type: string), p_type (type: string) @@ -5230,7 +5230,7 @@ STAGE PLANS: filterExpr: (name is not null and UDFToLong(empno) is not null) (type: boolean) Statistics: Num rows: 5 Data size: 1650 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToLong(empno) is not null and name is not null) (type: boolean) + predicate: (name is not null and UDFToLong(empno) is not null) (type: boolean) Statistics: Num rows: 5 Data size: 1650 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: empno (type: int), name (type: string), deptno (type: int), gender (type: string), city (type: string), empid (type: int), age (type: int), slacker (type: boolean), manager (type: boolean), joinedat (type: date), UDFToLong(deptno) (type: bigint) @@ -5991,7 +5991,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_size is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_size is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -6466,7 +6466,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col2 = 0L) or _col3 is null) (type: boolean) + predicate: (_col3 is null or (_col2 = 0L)) (type: boolean) Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: int) @@ -6810,7 +6810,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 17 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col2 = 0L) or _col3 is null) (type: boolean) + predicate: (_col3 is null or (_col2 = 0L)) (type: boolean) Statistics: Num rows: 2 Data size: 17 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/subquery_select.q.out b/ql/src/test/results/clientpositive/llap/subquery_select.q.out index 8b4af96f5d..1f451b1b29 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_select.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_select.q.out @@ -1903,7 +1903,7 @@ STAGE PLANS: filterExpr: ((value is not null and key is not null) or ((key > '9') and value is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -2076,7 +2076,7 @@ STAGE PLANS: filterExpr: ((value is not null and key is not null) or value is not null or ((key > '9') and value is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -4402,7 +4402,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -5010,7 +5010,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_partkey is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_type (type: string), p_size (type: int) @@ -5311,7 +5311,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_partkey is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 2912 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), p_type (type: string), p_size (type: int) diff --git a/ql/src/test/results/clientpositive/llap/subquery_views.q.out b/ql/src/test/results/clientpositive/llap/subquery_views.q.out index f5cc52aa2e..ccc913a0fe 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_views.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_views.q.out @@ -124,7 +124,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((key < '11') or ((value > 'val_11') and (key < '11')) or ((value > 'val_11') and (key < '11'))) (type: boolean) + filterExpr: ((key < '11') or ((key < '11') and (value > 'val_11')) or ((key < '11') and (value > 'val_11'))) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE @@ -281,7 +281,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 386 Data size: 73020 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 373 Data size: 70566 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -379,7 +379,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col8 Statistics: Num rows: 319 Data size: 30993 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 304 Data size: 29540 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out index 4e47226ca2..f959d71c2a 100644 --- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -196,7 +196,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int) @@ -332,7 +332,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int) @@ -639,7 +639,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -780,7 +780,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) @@ -920,7 +920,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out b/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out index 57f8f33f81..f7560f8759 100644 --- a/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out @@ -147,14 +147,14 @@ STAGE PLANS: TableScan alias: s3 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Map Operator Tree: TableScan alias: s1 @@ -173,16 +173,16 @@ STAGE PLANS: keys: 0 _col0 (type: int) 1 _col0 (type: int) - Statistics: Num rows: 266 Data size: 1064 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 266 Data size: 1064 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE value expressions: _col0 (type: bigint) Execution mode: llap Reducer 2 @@ -192,10 +192,10 @@ STAGE PLANS: aggregations: count(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -248,14 +248,14 @@ STAGE PLANS: TableScan alias: s3 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Map Operator Tree: TableScan alias: s1 @@ -271,10 +271,10 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 - Statistics: Num rows: 243 Data size: 68541 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 243 Data size: 68333 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 243 Data size: 68541 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 243 Data size: 68333 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -850,42 +850,42 @@ STAGE PLANS: TableScan alias: s3 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Map Operator Tree: TableScan alias: s1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Merge Join Operator condition map: Inner Join 0 to 1 keys: 0 _col0 (type: int) 1 _col0 (type: int) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE value expressions: _col0 (type: bigint) Execution mode: llap Reducer 2 @@ -895,10 +895,10 @@ STAGE PLANS: aggregations: count(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -962,30 +962,30 @@ STAGE PLANS: TableScan alias: s1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Merge Join Operator condition map: Inner Join 0 to 1 keys: 0 _col0 (type: int) 1 _col0 (type: int) - Statistics: Num rows: 266 Data size: 1064 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 266 Data size: 1064 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE value expressions: _col0 (type: bigint) Execution mode: llap Reducer 2 @@ -995,10 +995,10 @@ STAGE PLANS: aggregations: count(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out index ad96b5c3b0..f0c5092e3b 100644 --- a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out @@ -282,19 +282,19 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 242 Data size: 3490 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 242 Data size: 924 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Map 2 @@ -302,14 +302,14 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 500 Data size: 7216 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 475 Data size: 6855 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 1808 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 475 Data size: 6855 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 1808 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -318,7 +318,7 @@ STAGE PLANS: 1 _col0 (type: int) input vertices: 0 Map 1 - Statistics: Num rows: 522 Data size: 7540 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 522 Data size: 1988 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -406,19 +406,19 @@ STAGE PLANS: TableScan alias: a filterExpr: key is not null (type: boolean) - Statistics: Num rows: 242 Data size: 3490 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 242 Data size: 924 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 230 Data size: 3316 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 878 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Map 2 @@ -426,14 +426,14 @@ STAGE PLANS: TableScan alias: b filterExpr: key is not null (type: boolean) - Statistics: Num rows: 500 Data size: 7216 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 475 Data size: 6855 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 1808 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) outputColumnNames: _col0 - Statistics: Num rows: 475 Data size: 6855 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 1808 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -442,7 +442,7 @@ STAGE PLANS: 1 _col0 (type: int) input vertices: 0 Map 1 - Statistics: Num rows: 522 Data size: 7540 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 522 Data size: 1988 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -2058,18 +2058,18 @@ STAGE PLANS: TableScan alias: t1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 242 Data size: 45994 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 242 Data size: 43428 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 230 Data size: 43713 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 41274 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 230 Data size: 43713 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 41274 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: string) sort order: ++ - Statistics: Num rows: 230 Data size: 43713 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 41274 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Map 3 @@ -2077,18 +2077,18 @@ STAGE PLANS: TableScan alias: t2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 500 Data size: 94800 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 89488 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 475 Data size: 90060 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 85013 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 475 Data size: 90060 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 85013 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: string) sort order: ++ - Statistics: Num rows: 475 Data size: 90060 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 85013 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized, llap LLAP IO: no inputs Reducer 4 @@ -2096,20 +2096,20 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 230 Data size: 43713 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 230 Data size: 41274 Basic stats: COMPLETE Column stats: NONE Execution mode: llap Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 475 Data size: 90060 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 475 Data size: 85013 Basic stats: COMPLETE Column stats: NONE Merge Join Operator condition map: Inner Join 0 to 1 keys: 0 _col0 (type: int) 1 _col0 (type: int) - Statistics: Num rows: 522 Data size: 99066 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 522 Data size: 93514 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_reduce_side.q.out b/ql/src/test/results/clientpositive/llap/tez_smb_reduce_side.q.out index 63142735ca..2fdc64322d 100644 --- a/ql/src/test/results/clientpositive/llap/tez_smb_reduce_side.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_smb_reduce_side.q.out @@ -701,7 +701,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col3, _col5 Statistics: Num rows: 5 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and (_col5 is null or (_col2 = 0L) or _col2 is null)) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L) or _col2 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and ((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 5 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -924,7 +924,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col3, _col5 Statistics: Num rows: 5 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and (_col5 is null or (_col2 = 0L) or _col2 is null)) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L) or _col2 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and ((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 5 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/llap/tez_union_group_by.q.out b/ql/src/test/results/clientpositive/llap/tez_union_group_by.q.out index 35f1d47eb2..e042e6400a 100644 --- a/ql/src/test/results/clientpositive/llap/tez_union_group_by.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_union_group_by.q.out @@ -273,7 +273,7 @@ STAGE PLANS: filterExpr: (t is not null and (date >= '2014-03-04') and (date < '2014-09-03') and (u <> 0L)) (type: boolean) Statistics: Num rows: 1 Data size: 560 Basic stats: COMPLETE Column stats: PARTIAL Filter Operator - predicate: ((date < '2014-09-03') and (date >= '2014-03-04') and (u <> 0L) and t is not null) (type: boolean) + predicate: (t is not null and (date >= '2014-03-04') and (date < '2014-09-03') and (u <> 0L)) (type: boolean) Statistics: Num rows: 1 Data size: 560 Basic stats: COMPLETE Column stats: PARTIAL Reduce Output Operator key expressions: t (type: string), st (type: string) diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out index 69a837421e..17f646723b 100644 --- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -196,7 +196,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int) @@ -332,7 +332,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int) @@ -490,7 +490,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -631,7 +631,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) @@ -771,7 +771,7 @@ STAGE PLANS: filterExpr: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cbigint is not null and cint BETWEEN 1000000 AND 3000000) (type: boolean) + predicate: (cint BETWEEN 1000000 AND 3000000 and cbigint is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out index da261e4de1..635be07f37 100644 --- a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out +++ b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out @@ -3835,7 +3835,7 @@ POSTHOOK: Output: default@dst_union22_n0@ds=2 OPTIMIZED SQL: SELECT `k1`, `k2`, `k3`, `k4` FROM (SELECT `k1`, `k2`, `k3`, `k4` FROM `default`.`dst_union22_delta_n0` -WHERE `ds` = '1' AND `k0` <= 50 +WHERE `k0` <= 50 AND `ds` = '1' UNION ALL SELECT `t2`.`k1`, `t2`.`k2`, `t4`.`k3`, `t4`.`k4` FROM (SELECT `k1`, `k2`, `ds` = '1' AS `=` @@ -3843,7 +3843,7 @@ FROM `default`.`dst_union22_n0` WHERE `k1` > 20) AS `t2` LEFT JOIN (SELECT `k1`, `k3`, `k4` FROM `default`.`dst_union22_delta_n0` -WHERE `ds` = '1' AND `k0` > 50 AND `k1` > 20) AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=`) +WHERE `k0` > 50 AND `k1` > 20 AND `ds` = '1') AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=`) GROUP BY `k1`, `k2`, `k3`, `k4` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3866,7 +3866,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: dst_union22_delta_n0 - filterExpr: ((ds = '1') and (UDFToDouble(k0) <= 50.0D)) (type: boolean) + filterExpr: ((UDFToDouble(k0) <= 50.0D) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 221500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/llap/vector_between_in.q.out b/ql/src/test/results/clientpositive/llap/vector_between_in.q.out index 08345d34bd..99c7f4483b 100644 --- a/ql/src/test/results/clientpositive/llap/vector_between_in.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_between_in.q.out @@ -161,7 +161,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDateColNotEqualDateScalar(col 3:date, val -67), FilterDateColNotEqualDateScalar(col 3:date, val -171), FilterDateColNotEqualDateScalar(col 3:date, val 20)) - predicate: ((cdate <> DATE'1969-07-14') and (cdate <> DATE'1969-10-26') and (cdate <> DATE'1970-01-21')) (type: boolean) + predicate: ((cdate <> DATE'1969-10-26') and (cdate <> DATE'1969-07-14') and (cdate <> DATE'1970-01-21')) (type: boolean) Statistics: Num rows: 12289 Data size: 339304 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Select Vectorization: @@ -376,7 +376,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val 2365.8945945946), FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val 881.0135135135), FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val -3367.6517567568)) - predicate: ((cdecimal1 <> -3367.6517567568) and (cdecimal1 <> 2365.8945945946) and (cdecimal1 <> 881.0135135135)) (type: boolean) + predicate: ((cdecimal1 <> 2365.8945945946) and (cdecimal1 <> 881.0135135135) and (cdecimal1 <> -3367.6517567568)) (type: boolean) Statistics: Num rows: 12289 Data size: 1027600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Select Vectorization: diff --git a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out index 399d566fdf..57d1ff3faf 100644 --- a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out @@ -788,7 +788,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_date_1 - filterExpr: ((dt1 <> dt2) and (dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1)) (type: boolean) + filterExpr: ((dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1) and (dt1 <> dt2)) (type: boolean) Statistics: Num rows: 3 Data size: 336 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -797,8 +797,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongColumn(col 0:date, col 1:date), FilterLongColLessLongColumn(col 0:date, col 1:date), FilterLongColLessEqualLongColumn(col 0:date, col 1:date), FilterLongColGreaterLongColumn(col 1:date, col 0:date), FilterLongColGreaterEqualLongColumn(col 1:date, col 0:date)) - predicate: ((dt1 < dt2) and (dt1 <= dt2) and (dt1 <> dt2) and (dt2 > dt1) and (dt2 >= dt1)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessLongColumn(col 0:date, col 1:date), FilterLongColLessEqualLongColumn(col 0:date, col 1:date), FilterLongColGreaterLongColumn(col 1:date, col 0:date), FilterLongColGreaterEqualLongColumn(col 1:date, col 0:date), FilterLongColNotEqualLongColumn(col 0:date, col 1:date)) + predicate: ((dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1) and (dt1 <> dt2)) (type: boolean) Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: dt1 (type: date), dt2 (type: date) @@ -970,7 +970,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDateColEqualDateScalar(col 0:date, val 11323), FilterDateColNotEqualDateScalar(col 0:date, val 0)) - predicate: ((dt1 <> DATE'1970-01-01') and (dt1 = DATE'2001-01-01')) (type: boolean) + predicate: ((dt1 = DATE'2001-01-01') and (dt1 <> DATE'1970-01-01')) (type: boolean) Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: DATE'2001-01-01' (type: date), dt2 (type: date) diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_cast.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_cast.q.out index fb5fd32c02..f558cfc120 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_cast.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_cast.q.out @@ -23,7 +23,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (cdouble is not null and cint is not null and cboolean1 is not null and ctimestamp1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 638316 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -32,8 +32,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 8:timestamp)) - predicate: (cboolean1 is not null and cdouble is not null and cint is not null and ctimestamp1 is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 8:timestamp)) + predicate: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 5112 Data size: 265564 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), cint (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), CAST( cdouble AS decimal(20,10)) (type: decimal(20,10)), CAST( cint AS decimal(23,14)) (type: decimal(23,14)), CAST( cboolean1 AS decimal(5,2)) (type: decimal(5,2)), CAST( ctimestamp1 AS decimal(15,0)) (type: decimal(15,0)) @@ -151,7 +151,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypes_small - filterExpr: (cdouble is not null and cint is not null and cboolean1 is not null and ctimestamp1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 638316 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -160,8 +160,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 8:timestamp)) - predicate: (cboolean1 is not null and cdouble is not null and cint is not null and ctimestamp1 is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 8:timestamp)) + predicate: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 5112 Data size: 265564 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), cint (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), CAST( cdouble AS decimal(20,10)) (type: decimal(20,10)), CAST( cint AS decimal(23,14)) (type: decimal(23,14)), CAST( cboolean1 AS decimal(5,2)) (type: decimal(5,2)), CAST( ctimestamp1 AS decimal(15,0)) (type: decimal(15,0)) diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_expressions.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_expressions.q.out index c1a02432fb..b4fb00f31c 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_expressions.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_expressions.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: decimal_test_n1 - filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 12289 Data size: 2708832 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -71,8 +71,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 1:decimal(20,10), val 0), FilterDecimalColLessDecimalScalar(col 1:decimal(20,10), val 12345.5678), FilterDecimalColNotEqualDecimalScalar(col 2:decimal(23,14), val 0), FilterDecimalColGreaterDecimalScalar(col 2:decimal(23,14), val 1000), SelectColumnIsNotNull(col 0:double)) - predicate: ((cdecimal1 < 12345.5678) and (cdecimal1 > 0) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 1:decimal(20,10), val 0), FilterDecimalColLessDecimalScalar(col 1:decimal(20,10), val 12345.5678), FilterDecimalColGreaterDecimalScalar(col 2:decimal(23,14), val 1000), SelectColumnIsNotNull(col 0:double), FilterDecimalColNotEqualDecimalScalar(col 2:decimal(23,14), val 0)) + predicate: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 751 Data size: 165540 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdecimal1 + cdecimal2) (type: decimal(25,14)), (cdecimal1 - (2 * cdecimal2)) (type: decimal(26,14)), ((cdecimal1 + 2.34) / cdecimal2) (type: decimal(38,13)), (cdecimal1 * (cdecimal2 / 3.4)) (type: decimal(38,17)), (cdecimal1 % 10) (type: decimal(12,10)), UDFToInteger(cdecimal1) (type: int), UDFToShort(cdecimal2) (type: smallint), UDFToByte(cdecimal2) (type: tinyint), UDFToLong(cdecimal1) (type: bigint), UDFToBoolean(cdecimal1) (type: boolean), UDFToDouble(cdecimal2) (type: double), UDFToFloat(cdecimal1) (type: float), CAST( cdecimal2 AS STRING) (type: string), CAST( cdecimal1 AS TIMESTAMP) (type: timestamp) @@ -239,7 +239,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: decimal_test_small_n0 - filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 12288 Data size: 2708600 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -248,8 +248,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDecimal64ColGreaterDecimal64Scalar(col 1:decimal(10,3)/DECIMAL_64, val 0), FilterDecimalColLessDecimalScalar(col 4:decimal(10,3), val 12345.5678)(children: ConvertDecimal64ToDecimal(col 1:decimal(10,3)/DECIMAL_64) -> 4:decimal(10,3)), FilterDecimal64ColNotEqualDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 0), FilterDecimal64ColGreaterDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 100000), SelectColumnIsNotNull(col 0:double)) - predicate: ((cdecimal1 < 12345.5678) and (cdecimal1 > 0) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterDecimal64ColGreaterDecimal64Scalar(col 1:decimal(10,3)/DECIMAL_64, val 0), FilterDecimalColLessDecimalScalar(col 4:decimal(10,3), val 12345.5678)(children: ConvertDecimal64ToDecimal(col 1:decimal(10,3)/DECIMAL_64) -> 4:decimal(10,3)), FilterDecimal64ColGreaterDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 100000), SelectColumnIsNotNull(col 0:double), FilterDecimal64ColNotEqualDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 0)) + predicate: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 751 Data size: 165540 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdecimal1 + cdecimal2) (type: decimal(11,3)), (cdecimal1 - (2 * cdecimal2)) (type: decimal(11,3)), ((cdecimal1 + 2.34) / cdecimal2) (type: decimal(21,11)), (cdecimal1 * (cdecimal2 / 3.4)) (type: decimal(23,9)), (cdecimal1 % 10) (type: decimal(5,3)), UDFToInteger(cdecimal1) (type: int), UDFToShort(cdecimal2) (type: smallint), UDFToByte(cdecimal2) (type: tinyint), UDFToLong(cdecimal1) (type: bigint), UDFToBoolean(cdecimal1) (type: boolean), UDFToDouble(cdecimal2) (type: double), UDFToFloat(cdecimal1) (type: float), CAST( cdecimal2 AS STRING) (type: string), CAST( cdecimal1 AS TIMESTAMP) (type: timestamp) diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out index 605fec8182..f22399f6b3 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out @@ -657,7 +657,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: GroupingColumn(col 2, mask 2) -> 3:bigint), FilterLongColEqualLongScalar(col 4:bigint, val 1)(children: GroupingColumn(col 2, mask 1) -> 4:bigint)) - predicate: ((grouping(_col2, 0L) = 1L) or (grouping(_col2, 1L) = 1L)) (type: boolean) + predicate: ((grouping(_col2, 1L) = 1L) or (grouping(_col2, 0L) = 1L)) (type: boolean) Statistics: Num rows: 12 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: int), (grouping(_col2, 1L) + grouping(_col2, 0L)) (type: bigint), CASE WHEN (((grouping(_col2, 1L) + grouping(_col2, 0L)) = 1L)) THEN (_col0) ELSE (null) END (type: int) @@ -1315,7 +1315,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: GroupingColumn(col 2, mask 2) -> 3:bigint), FilterLongColEqualLongScalar(col 4:bigint, val 1)(children: GroupingColumn(col 2, mask 1) -> 4:bigint)) - predicate: ((grouping(_col2, 0L) = 1) or (grouping(_col2, 1L) = 1)) (type: boolean) + predicate: ((grouping(_col2, 1L) = 1) or (grouping(_col2, 0L) = 1)) (type: boolean) Statistics: Num rows: 12 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out index e3ea4ccc75..3c05e1d901 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out @@ -93,8 +93,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 3:boolean), FilterLongColEqualLongScalar(col 4:bigint, val 0)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 4:bigint, val 0), SelectColumnIsNotNull(col 3:boolean)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 5:bigint, col 4:bigint), FilterLongColEqualLongScalar(col 4:bigint, val 0), SelectColumnIsNotNull(col 3:boolean), SelectColumnIsNull(col 0:string))) - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 3:boolean), FilterLongColEqualLongScalar(col 4:bigint, val 0)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 5:bigint, col 4:bigint), FilterLongColEqualLongScalar(col 4:bigint, val 0), SelectColumnIsNotNull(col 3:boolean), SelectColumnIsNull(col 0:string)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 4:bigint, val 0), SelectColumnIsNotNull(col 3:boolean))) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 895 Data size: 175214 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/vector_groupby_sort_8.q.out b/ql/src/test/results/clientpositive/llap/vector_groupby_sort_8.q.out index de29f6c16a..d896bc935a 100644 --- a/ql/src/test/results/clientpositive/llap/vector_groupby_sort_8.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_groupby_sort_8.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1_n2 - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true vectorizationSchemaColumns: [0:key:string, 1:val:string, 2:ds:string, 3:ROW__ID:struct] @@ -72,7 +72,7 @@ STAGE PLANS: className: VectorSelectOperator native: true projectedOutputColumnNums: [0] - Statistics: Num rows: 6 Data size: 1128 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: NONE Group By Operator Group By Vectorization: className: VectorGroupByOperator @@ -84,7 +84,7 @@ STAGE PLANS: keys: key (type: string) mode: final outputColumnNames: _col0 - Statistics: Num rows: 3 Data size: 564 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 3 Data size: 552 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(_col0) Group By Vectorization: diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out index 4ba67196a1..5836daede3 100644 --- a/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_interval_2.q.out @@ -956,7 +956,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_interval_2 - filterExpr: ((CAST( str1 AS INTERVAL YEAR TO MONTH) <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) = INTERVAL'1-2') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) < INTERVAL'1-3') and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= INTERVAL'1-2') and (CAST( str2 AS INTERVAL YEAR TO MONTH) > INTERVAL'1-2') and (INTERVAL'1-2' = CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' > CAST( str1 AS INTERVAL YEAR TO MONTH))) (type: boolean) + filterExpr: ((CAST( str1 AS INTERVAL YEAR TO MONTH) <= INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) < INTERVAL'1-3') and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= INTERVAL'1-2') and (CAST( str2 AS INTERVAL YEAR TO MONTH) > INTERVAL'1-2') and (INTERVAL'1-2' <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) = INTERVAL'1-2') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> INTERVAL'1-3') and (INTERVAL'1-2' = CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <> CAST( str2 AS INTERVAL YEAR TO MONTH))) (type: boolean) Statistics: Num rows: 2 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -964,8 +964,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongColumn(col 7:interval_year_month, col 8:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 7:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 8:interval_year_month), FilterLongColLessEqualLongColumn(col 9:interval_year_month, col 10:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 9:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 10:interval_year_month), FilterLongColLessLongColumn(col 11:interval_year_month, col 12:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 11:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 12:interval_year_month), FilterLongColGreaterEqualLongColumn(col 13:interval_year_month, col 14:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 13:interval_year_month, CastStringToIntervalYearMonth(col 2:string) -> 14:interval_year_month), FilterLongColGreaterLongColumn(col 15:interval_year_month, col 16:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 15:interval_year_month, CastStringToIntervalYearMonth(col 2:string) -> 16:interval_year_month), FilterIntervalYearMonthColEqualIntervalYearMonthScalar(col 17:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 2:string) -> 17:interval_year_month), FilterIntervalYearMonthColNotEqualIntervalYearMonthScalar(col 18:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 18:interval_year_month), FilterIntervalYearMonthColLessEqualIntervalYearMonthScalar(col 19:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 19:interval_year_month), FilterIntervalYearMonthColLessIntervalYearMonthScalar(col 20:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 20:interval_year_month), FilterIntervalYearMonthColGreaterEqualIntervalYearMonthScalar(col 21:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 3:string) -> 21:interval_year_month), FilterIntervalYearMonthColGreaterIntervalYearMonthScalar(col 22:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 3:string) -> 22:interval_year_month), FilterIntervalYearMonthScalarEqualIntervalYearMonthColumn(val 14, col 23:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 23:interval_year_month), FilterIntervalYearMonthScalarNotEqualIntervalYearMonthColumn(val 14, col 24:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 24:interval_year_month), FilterIntervalYearMonthScalarLessEqualIntervalYearMonthColumn(val 14, col 25:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 25:interval_year_month), FilterIntervalYearMonthScalarLessIntervalYearMonthColumn(val 14, col 26:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 26:interval_year_month), FilterIntervalYearMonthScalarGreaterEqualIntervalYearMonthColumn(val 15, col 27:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 27:interval_year_month), FilterIntervalYearMonthScalarGreaterIntervalYearMonthColumn(val 15, col 28:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 28:interval_year_month)) - predicate: ((CAST( str1 AS INTERVAL YEAR TO MONTH) < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) < INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) = INTERVAL'1-2') and (CAST( str2 AS INTERVAL YEAR TO MONTH) > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) > INTERVAL'1-2') and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= INTERVAL'1-2') and (INTERVAL'1-2' < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' = CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' >= CAST( str1 AS INTERVAL YEAR TO MONTH))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterIntervalYearMonthColLessEqualIntervalYearMonthScalar(col 7:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 7:interval_year_month), FilterIntervalYearMonthColLessIntervalYearMonthScalar(col 8:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 8:interval_year_month), FilterIntervalYearMonthColGreaterEqualIntervalYearMonthScalar(col 9:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 3:string) -> 9:interval_year_month), FilterIntervalYearMonthColGreaterIntervalYearMonthScalar(col 10:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 3:string) -> 10:interval_year_month), FilterIntervalYearMonthScalarLessEqualIntervalYearMonthColumn(val 14, col 11:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 11:interval_year_month), FilterIntervalYearMonthScalarLessIntervalYearMonthColumn(val 14, col 12:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 12:interval_year_month), FilterIntervalYearMonthScalarGreaterEqualIntervalYearMonthColumn(val 15, col 13:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 13:interval_year_month), FilterIntervalYearMonthScalarGreaterIntervalYearMonthColumn(val 15, col 14:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 14:interval_year_month), FilterLongColLessEqualLongColumn(col 15:interval_year_month, col 16:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 15:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 16:interval_year_month), FilterLongColLessLongColumn(col 17:interval_year_month, col 18:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 17:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 18:interval_year_month), FilterLongColGreaterEqualLongColumn(col 19:interval_year_month, col 20:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 19:interval_year_month, CastStringToIntervalYearMonth(col 2:string) -> 20:interval_year_month), FilterLongColGreaterLongColumn(col 21:interval_year_month, col 22:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 21:interval_year_month, CastStringToIntervalYearMonth(col 2:string) -> 22:interval_year_month), FilterLongColNotEqualLongColumn(col 23:interval_year_month, col 24:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 23:interval_year_month, CastStringToIntervalYearMonth(col 3:string) -> 24:interval_year_month), FilterIntervalYearMonthColEqualIntervalYearMonthScalar(col 25:interval_year_month, val 14)(children: CastStringToIntervalYearMonth(col 2:string) -> 25:interval_year_month), FilterIntervalYearMonthColNotEqualIntervalYearMonthScalar(col 26:interval_year_month, val 15)(children: CastStringToIntervalYearMonth(col 2:string) -> 26:interval_year_month), FilterIntervalYearMonthScalarEqualIntervalYearMonthColumn(val 14, col 27:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 27:interval_year_month), FilterIntervalYearMonthScalarNotEqualIntervalYearMonthColumn(val 14, col 28:interval_year_month)(children: CastStringToIntervalYearMonth(col 3:string) -> 28:interval_year_month)) + predicate: ((CAST( str1 AS INTERVAL YEAR TO MONTH) <= INTERVAL'1-3') and (CAST( str1 AS INTERVAL YEAR TO MONTH) < INTERVAL'1-3') and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= INTERVAL'1-2') and (CAST( str2 AS INTERVAL YEAR TO MONTH) > INTERVAL'1-2') and (INTERVAL'1-2' <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-3' > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <= CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) < CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) >= CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str2 AS INTERVAL YEAR TO MONTH) > CAST( str1 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> CAST( str2 AS INTERVAL YEAR TO MONTH)) and (CAST( str1 AS INTERVAL YEAR TO MONTH) = INTERVAL'1-2') and (CAST( str1 AS INTERVAL YEAR TO MONTH) <> INTERVAL'1-3') and (INTERVAL'1-2' = CAST( str1 AS INTERVAL YEAR TO MONTH)) and (INTERVAL'1-2' <> CAST( str2 AS INTERVAL YEAR TO MONTH))) (type: boolean) Statistics: Num rows: 1 Data size: 214 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) @@ -1155,7 +1155,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_interval_2 - filterExpr: ((CAST( str3 AS INTERVAL DAY TO SECOND) <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) < CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) = INTERVAL'1 02:03:04.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <> INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <= INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) < INTERVAL'1 02:03:05.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) >= INTERVAL'1 02:03:04.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) > INTERVAL'1 02:03:04.000000000') and (INTERVAL'1 02:03:04.000000000' = CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' < CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' > CAST( str3 AS INTERVAL DAY TO SECOND))) (type: boolean) + filterExpr: ((CAST( str3 AS INTERVAL DAY TO SECOND) <= INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) < INTERVAL'1 02:03:05.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) >= INTERVAL'1 02:03:04.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) > INTERVAL'1 02:03:04.000000000') and (INTERVAL'1 02:03:04.000000000' <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' < CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) < CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) = INTERVAL'1 02:03:04.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <> INTERVAL'1 02:03:05.000000000') and (INTERVAL'1 02:03:04.000000000' = CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <> CAST( str4 AS INTERVAL DAY TO SECOND))) (type: boolean) Statistics: Num rows: 2 Data size: 444 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1163,8 +1163,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterIntervalDayTimeColNotEqualIntervalDayTimeColumn(col 7:interval_day_time, col 8:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 7:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 8:interval_day_time), FilterIntervalDayTimeColLessEqualIntervalDayTimeColumn(col 9:interval_day_time, col 10:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 9:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 10:interval_day_time), FilterIntervalDayTimeColLessIntervalDayTimeColumn(col 11:interval_day_time, col 12:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 11:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 12:interval_day_time), FilterIntervalDayTimeColGreaterEqualIntervalDayTimeColumn(col 13:interval_day_time, col 14:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 13:interval_day_time, CastStringToIntervalDayTime(col 4:string) -> 14:interval_day_time), FilterIntervalDayTimeColGreaterIntervalDayTimeColumn(col 15:interval_day_time, col 16:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 15:interval_day_time, CastStringToIntervalDayTime(col 4:string) -> 16:interval_day_time), FilterIntervalDayTimeColEqualIntervalDayTimeScalar(col 17:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 17:interval_day_time), FilterIntervalDayTimeColNotEqualIntervalDayTimeScalar(col 18:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 18:interval_day_time), FilterIntervalDayTimeColLessEqualIntervalDayTimeScalar(col 19:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 19:interval_day_time), FilterIntervalDayTimeColLessIntervalDayTimeScalar(col 20:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 20:interval_day_time), FilterIntervalDayTimeColGreaterEqualIntervalDayTimeScalar(col 21:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 5:string) -> 21:interval_day_time), FilterIntervalDayTimeColGreaterIntervalDayTimeScalar(col 22:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 5:string) -> 22:interval_day_time), FilterIntervalDayTimeScalarEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 23:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 23:interval_day_time), FilterIntervalDayTimeScalarNotEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 24:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 24:interval_day_time), FilterIntervalDayTimeScalarLessEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 25:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 25:interval_day_time), FilterIntervalDayTimeScalarLessIntervalDayTimeColumn(val 1 02:03:04.000000000, col 26:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 26:interval_day_time), FilterIntervalDayTimeScalarGreaterEqualIntervalDayTimeColumn(val 1 02:03:05.000000000, col 27:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 27:interval_day_time), FilterIntervalDayTimeScalarGreaterIntervalDayTimeColumn(val 1 02:03:05.000000000, col 28:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 28:interval_day_time)) - predicate: ((CAST( str3 AS INTERVAL DAY TO SECOND) < CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) < INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <= INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <> INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) = INTERVAL'1 02:03:04.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) > INTERVAL'1 02:03:04.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) >= INTERVAL'1 02:03:04.000000000') and (INTERVAL'1 02:03:04.000000000' < CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' = CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' > CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' >= CAST( str3 AS INTERVAL DAY TO SECOND))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterIntervalDayTimeColLessEqualIntervalDayTimeScalar(col 7:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 7:interval_day_time), FilterIntervalDayTimeColLessIntervalDayTimeScalar(col 8:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 8:interval_day_time), FilterIntervalDayTimeColGreaterEqualIntervalDayTimeScalar(col 9:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 5:string) -> 9:interval_day_time), FilterIntervalDayTimeColGreaterIntervalDayTimeScalar(col 10:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 5:string) -> 10:interval_day_time), FilterIntervalDayTimeScalarLessEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 11:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 11:interval_day_time), FilterIntervalDayTimeScalarLessIntervalDayTimeColumn(val 1 02:03:04.000000000, col 12:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 12:interval_day_time), FilterIntervalDayTimeScalarGreaterEqualIntervalDayTimeColumn(val 1 02:03:05.000000000, col 13:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 13:interval_day_time), FilterIntervalDayTimeScalarGreaterIntervalDayTimeColumn(val 1 02:03:05.000000000, col 14:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 14:interval_day_time), FilterIntervalDayTimeColLessEqualIntervalDayTimeColumn(col 15:interval_day_time, col 16:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 15:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 16:interval_day_time), FilterIntervalDayTimeColLessIntervalDayTimeColumn(col 17:interval_day_time, col 18:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 17:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 18:interval_day_time), FilterIntervalDayTimeColGreaterEqualIntervalDayTimeColumn(col 19:interval_day_time, col 20:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 19:interval_day_time, CastStringToIntervalDayTime(col 4:string) -> 20:interval_day_time), FilterIntervalDayTimeColGreaterIntervalDayTimeColumn(col 21:interval_day_time, col 22:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 21:interval_day_time, CastStringToIntervalDayTime(col 4:string) -> 22:interval_day_time), FilterIntervalDayTimeColNotEqualIntervalDayTimeColumn(col 23:interval_day_time, col 24:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 23:interval_day_time, CastStringToIntervalDayTime(col 5:string) -> 24:interval_day_time), FilterIntervalDayTimeColEqualIntervalDayTimeScalar(col 25:interval_day_time, val 1 02:03:04.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 25:interval_day_time), FilterIntervalDayTimeColNotEqualIntervalDayTimeScalar(col 26:interval_day_time, val 1 02:03:05.000000000)(children: CastStringToIntervalDayTime(col 4:string) -> 26:interval_day_time), FilterIntervalDayTimeScalarEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 27:interval_day_time)(children: CastStringToIntervalDayTime(col 4:string) -> 27:interval_day_time), FilterIntervalDayTimeScalarNotEqualIntervalDayTimeColumn(val 1 02:03:04.000000000, col 28:interval_day_time)(children: CastStringToIntervalDayTime(col 5:string) -> 28:interval_day_time)) + predicate: ((CAST( str3 AS INTERVAL DAY TO SECOND) <= INTERVAL'1 02:03:05.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) < INTERVAL'1 02:03:05.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) >= INTERVAL'1 02:03:04.000000000') and (CAST( str4 AS INTERVAL DAY TO SECOND) > INTERVAL'1 02:03:04.000000000') and (INTERVAL'1 02:03:04.000000000' <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' < CAST( str4 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:05.000000000' > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <= CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) < CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) >= CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str4 AS INTERVAL DAY TO SECOND) > CAST( str3 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) <> CAST( str4 AS INTERVAL DAY TO SECOND)) and (CAST( str3 AS INTERVAL DAY TO SECOND) = INTERVAL'1 02:03:04.000000000') and (CAST( str3 AS INTERVAL DAY TO SECOND) <> INTERVAL'1 02:03:05.000000000') and (INTERVAL'1 02:03:04.000000000' = CAST( str3 AS INTERVAL DAY TO SECOND)) and (INTERVAL'1 02:03:04.000000000' <> CAST( str4 AS INTERVAL DAY TO SECOND))) (type: boolean) Statistics: Num rows: 1 Data size: 222 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) @@ -1353,7 +1353,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDateScalarEqualDateColumn(val 11747, col 8:date)(children: DateColAddIntervalYearMonthColumn(col 1:date, col 7:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 7:interval_year_month) -> 8:date), SelectColumnIsTrue(col 13:boolean)(children: VectorUDFAdaptor(DATE'2002-03-01' BETWEEN (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) AND (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)))(children: DateColAddIntervalYearMonthColumn(col 1:date, col 9:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 9:interval_year_month) -> 10:date, DateColAddIntervalYearMonthColumn(col 1:date, col 11:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 11:interval_year_month) -> 12:date) -> 13:boolean), FilterDateColEqualDateScalar(col 15:date, val 11747)(children: DateColAddIntervalYearMonthColumn(col 1:date, col 14:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 14:interval_year_month) -> 15:date), FilterLongColumnBetween(col 17:date, left 11747, right 11747)(children: DateColAddIntervalYearMonthColumn(col 1:date, col 16:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 16:interval_year_month) -> 17:date), FilterLongColNotEqualLongColumn(col 1:date, col 19:date)(children: DateColAddIntervalYearMonthColumn(col 1:date, col 18:interval_year_month)(children: CastStringToIntervalYearMonth(col 2:string) -> 18:interval_year_month) -> 19:date), FilterDateScalarEqualDateColumn(val 11747, col 20:date)(children: DateColAddIntervalYearMonthScalar(col 1:date, val 1-2) -> 20:date), FilterLongColumnBetween(col 21:date, left 11747, right 11747)(children: DateColAddIntervalYearMonthScalar(col 1:date, val 1-2) -> 21:date), FilterDateColEqualDateScalar(col 22:date, val 11747)(children: DateColAddIntervalYearMonthScalar(col 1:date, val 1-2) -> 22:date), FilterLongColNotEqualLongColumn(col 1:date, col 23:date)(children: DateColAddIntervalYearMonthScalar(col 1:date, val 1-2) -> 23:date)) - predicate: (((dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) = DATE'2002-03-01') and ((dt + INTERVAL'1-2') = DATE'2002-03-01') and (DATE'2002-03-01' = (dt + CAST( str1 AS INTERVAL YEAR TO MONTH))) and (DATE'2002-03-01' = (dt + INTERVAL'1-2')) and (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) BETWEEN DATE'2002-03-01' AND DATE'2002-03-01' and (dt + INTERVAL'1-2') BETWEEN DATE'2002-03-01' AND DATE'2002-03-01' and (dt <> (dt + CAST( str1 AS INTERVAL YEAR TO MONTH))) and (dt <> (dt + INTERVAL'1-2')) and DATE'2002-03-01' BETWEEN (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) AND (dt + CAST( str1 AS INTERVAL YEAR TO MONTH))) (type: boolean) + predicate: ((DATE'2002-03-01' = (dt + CAST( str1 AS INTERVAL YEAR TO MONTH))) and DATE'2002-03-01' BETWEEN (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) AND (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) and ((dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) = DATE'2002-03-01') and (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) BETWEEN DATE'2002-03-01' AND DATE'2002-03-01' and (dt <> (dt + CAST( str1 AS INTERVAL YEAR TO MONTH))) and (DATE'2002-03-01' = (dt + INTERVAL'1-2')) and (dt + INTERVAL'1-2') BETWEEN DATE'2002-03-01' AND DATE'2002-03-01' and ((dt + INTERVAL'1-2') = DATE'2002-03-01') and (dt <> (dt + INTERVAL'1-2'))) (type: boolean) Statistics: Num rows: 1 Data size: 183 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) @@ -1533,7 +1533,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_interval_2 - filterExpr: ((TIMESTAMP'2002-03-01 01:02:03' = (ts + INTERVAL'1-2')) and TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2') and (TIMESTAMP'2002-04-01 01:02:03' <> (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-02-01 01:02:03' < (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-04-01 01:02:03' > (ts + INTERVAL'1-2')) and ((ts + INTERVAL'1-2') = TIMESTAMP'2002-03-01 01:02:03') and (ts + INTERVAL'1-2') BETWEEN TIMESTAMP'2002-03-01 01:02:03' AND TIMESTAMP'2002-03-01 01:02:03' and ((ts + INTERVAL'1-2') <> TIMESTAMP'2002-04-01 01:02:03') and ((ts + INTERVAL'1-2') > TIMESTAMP'2002-02-01 01:02:03') and ((ts + INTERVAL'1-2') < TIMESTAMP'2002-04-01 01:02:03') and (ts = (ts + INTERVAL'0-0')) and (ts <> (ts + INTERVAL'1-0')) and ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0') and (ts < (ts + INTERVAL'1-0')) and (ts > (ts - INTERVAL'1-0'))) (type: boolean) + filterExpr: ((TIMESTAMP'2002-02-01 01:02:03' < (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-04-01 01:02:03' > (ts + INTERVAL'1-2')) and ((ts + INTERVAL'1-2') > TIMESTAMP'2002-02-01 01:02:03') and ((ts + INTERVAL'1-2') < TIMESTAMP'2002-04-01 01:02:03') and (ts < (ts + INTERVAL'1-0')) and (ts > (ts - INTERVAL'1-0')) and (TIMESTAMP'2002-03-01 01:02:03' = (ts + INTERVAL'1-2')) and TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2') and (TIMESTAMP'2002-04-01 01:02:03' <> (ts + INTERVAL'1-2')) and ((ts + INTERVAL'1-2') = TIMESTAMP'2002-03-01 01:02:03') and (ts + INTERVAL'1-2') BETWEEN TIMESTAMP'2002-03-01 01:02:03' AND TIMESTAMP'2002-03-01 01:02:03' and ((ts + INTERVAL'1-2') <> TIMESTAMP'2002-04-01 01:02:03') and (ts = (ts + INTERVAL'0-0')) and (ts <> (ts + INTERVAL'1-0')) and ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0')) (type: boolean) Statistics: Num rows: 2 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1541,8 +1541,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarEqualTimestampColumn(val 2002-03-01 01:02:03, col 7:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 7:timestamp), SelectColumnIsTrue(col 10:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2'))(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 8:timestamp, TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 9:timestamp) -> 10:boolean), FilterTimestampScalarNotEqualTimestampColumn(val 2002-04-01 01:02:03, col 11:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 11:timestamp), FilterTimestampScalarLessTimestampColumn(val 2002-02-01 01:02:03, col 12:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 12:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2002-04-01 01:02:03, col 13:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 13:timestamp), FilterTimestampColEqualTimestampScalar(col 14:timestamp, val 2002-03-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 14:timestamp), FilterTimestampColumnBetween(col 15:timestamp, left 2002-02-28 17:02:03.0, right 2002-02-28 17:02:03.0)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 15:timestamp), FilterTimestampColNotEqualTimestampScalar(col 16:timestamp, val 2002-04-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 16:timestamp), FilterTimestampColGreaterTimestampScalar(col 17:timestamp, val 2002-02-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 17:timestamp), FilterTimestampColLessTimestampScalar(col 18:timestamp, val 2002-04-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 18:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 19:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 0-0) -> 19:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 20:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 20:timestamp), SelectColumnIsTrue(col 23:boolean)(children: VectorUDFAdaptor(ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0'))(children: TimestampColSubtractIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 21:timestamp, TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 22:timestamp) -> 23:boolean), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 24:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 24:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 25:timestamp)(children: TimestampColSubtractIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 25:timestamp)) - predicate: (((ts + INTERVAL'1-2') < TIMESTAMP'2002-04-01 01:02:03') and ((ts + INTERVAL'1-2') <> TIMESTAMP'2002-04-01 01:02:03') and ((ts + INTERVAL'1-2') = TIMESTAMP'2002-03-01 01:02:03') and ((ts + INTERVAL'1-2') > TIMESTAMP'2002-02-01 01:02:03') and (TIMESTAMP'2002-02-01 01:02:03' < (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-03-01 01:02:03' = (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-04-01 01:02:03' <> (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-04-01 01:02:03' > (ts + INTERVAL'1-2')) and (ts + INTERVAL'1-2') BETWEEN TIMESTAMP'2002-03-01 01:02:03' AND TIMESTAMP'2002-03-01 01:02:03' and (ts < (ts + INTERVAL'1-0')) and (ts <> (ts + INTERVAL'1-0')) and (ts = (ts + INTERVAL'0-0')) and (ts > (ts - INTERVAL'1-0')) and TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2') and ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0')) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarLessTimestampColumn(val 2002-02-01 01:02:03, col 7:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 7:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2002-04-01 01:02:03, col 8:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 8:timestamp), FilterTimestampColGreaterTimestampScalar(col 9:timestamp, val 2002-02-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 9:timestamp), FilterTimestampColLessTimestampScalar(col 10:timestamp, val 2002-04-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 10:timestamp), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 11:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 11:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 12:timestamp)(children: TimestampColSubtractIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 12:timestamp), FilterTimestampScalarEqualTimestampColumn(val 2002-03-01 01:02:03, col 13:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 13:timestamp), SelectColumnIsTrue(col 16:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2'))(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 14:timestamp, TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 15:timestamp) -> 16:boolean), FilterTimestampScalarNotEqualTimestampColumn(val 2002-04-01 01:02:03, col 17:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 17:timestamp), FilterTimestampColEqualTimestampScalar(col 18:timestamp, val 2002-03-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 18:timestamp), FilterTimestampColumnBetween(col 19:timestamp, left 2002-02-28 17:02:03.0, right 2002-02-28 17:02:03.0)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 19:timestamp), FilterTimestampColNotEqualTimestampScalar(col 20:timestamp, val 2002-04-01 01:02:03)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-2) -> 20:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 21:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 0-0) -> 21:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 22:timestamp)(children: TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 22:timestamp), SelectColumnIsTrue(col 25:boolean)(children: VectorUDFAdaptor(ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0'))(children: TimestampColSubtractIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 23:timestamp, TimestampColAddIntervalYearMonthScalar(col 0:timestamp, val 1-0) -> 24:timestamp) -> 25:boolean)) + predicate: ((TIMESTAMP'2002-02-01 01:02:03' < (ts + INTERVAL'1-2')) and (TIMESTAMP'2002-04-01 01:02:03' > (ts + INTERVAL'1-2')) and ((ts + INTERVAL'1-2') > TIMESTAMP'2002-02-01 01:02:03') and ((ts + INTERVAL'1-2') < TIMESTAMP'2002-04-01 01:02:03') and (ts < (ts + INTERVAL'1-0')) and (ts > (ts - INTERVAL'1-0')) and (TIMESTAMP'2002-03-01 01:02:03' = (ts + INTERVAL'1-2')) and TIMESTAMP'2002-03-01 01:02:03' BETWEEN (ts + INTERVAL'1-2') AND (ts + INTERVAL'1-2') and (TIMESTAMP'2002-04-01 01:02:03' <> (ts + INTERVAL'1-2')) and ((ts + INTERVAL'1-2') = TIMESTAMP'2002-03-01 01:02:03') and (ts + INTERVAL'1-2') BETWEEN TIMESTAMP'2002-03-01 01:02:03' AND TIMESTAMP'2002-03-01 01:02:03' and ((ts + INTERVAL'1-2') <> TIMESTAMP'2002-04-01 01:02:03') and (ts = (ts + INTERVAL'0-0')) and (ts <> (ts + INTERVAL'1-0')) and ts BETWEEN (ts - INTERVAL'1-0') AND (ts + INTERVAL'1-0')) (type: boolean) Statistics: Num rows: 1 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) @@ -1732,7 +1732,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_interval_2 - filterExpr: ((TIMESTAMP'2001-01-01 01:02:03' = (dt + INTERVAL'0 01:02:03.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (dt + INTERVAL'0 01:02:04.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000') and (TIMESTAMP'2001-01-01 01:02:03' < (dt + INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (dt - INTERVAL'0 01:02:04.000000000')) and ((dt + INTERVAL'0 01:02:03.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((dt - INTERVAL'0 01:02:04.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts = (dt + INTERVAL'0 01:02:03.000000000')) and (ts <> (dt + INTERVAL'0 01:02:04.000000000')) and ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000') and (ts < (dt + INTERVAL'0 01:02:04.000000000')) and (ts > (dt - INTERVAL'0 01:02:04.000000000'))) (type: boolean) + filterExpr: ((TIMESTAMP'2001-01-01 01:02:03' < (dt + INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (dt - INTERVAL'0 01:02:04.000000000')) and ((dt + INTERVAL'0 01:02:04.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((dt - INTERVAL'0 01:02:04.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts < (dt + INTERVAL'0 01:02:04.000000000')) and (ts > (dt - INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (dt + INTERVAL'0 01:02:03.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (dt + INTERVAL'0 01:02:04.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000') and ((dt + INTERVAL'0 01:02:03.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and (ts = (dt + INTERVAL'0 01:02:03.000000000')) and (ts <> (dt + INTERVAL'0 01:02:04.000000000')) and ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000')) (type: boolean) Statistics: Num rows: 2 Data size: 192 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1740,8 +1740,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarEqualTimestampColumn(val 2001-01-01 01:02:03, col 7:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 7:timestamp), FilterTimestampScalarNotEqualTimestampColumn(val 2001-01-01 01:02:03, col 8:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 8:timestamp), SelectColumnIsTrue(col 11:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000'))(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 9:timestamp, DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 10:timestamp) -> 11:boolean), FilterTimestampScalarLessTimestampColumn(val 2001-01-01 01:02:03, col 12:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 12:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2001-01-01 01:02:03, col 13:timestamp)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 13:timestamp), FilterTimestampColEqualTimestampScalar(col 14:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 14:timestamp), FilterTimestampColNotEqualTimestampScalar(col 15:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 15:timestamp), FilterTimestampColGreaterTimestampScalar(col 16:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 16:timestamp), FilterTimestampColLessTimestampScalar(col 17:timestamp, val 2001-01-01 01:02:03)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 17:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 18:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 18:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 19:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 19:timestamp), SelectColumnIsTrue(col 22:boolean)(children: VectorUDFAdaptor(ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000'))(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 20:timestamp, DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 21:timestamp) -> 22:boolean), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 23:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 23:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 24:timestamp)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 24:timestamp)) - predicate: (((dt + INTERVAL'0 01:02:03.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((dt - INTERVAL'0 01:02:04.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (TIMESTAMP'2001-01-01 01:02:03' < (dt + INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (dt + INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (dt + INTERVAL'0 01:02:03.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (dt - INTERVAL'0 01:02:04.000000000')) and (ts < (dt + INTERVAL'0 01:02:04.000000000')) and (ts <> (dt + INTERVAL'0 01:02:04.000000000')) and (ts = (dt + INTERVAL'0 01:02:03.000000000')) and (ts > (dt - INTERVAL'0 01:02:04.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000') and ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000')) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarLessTimestampColumn(val 2001-01-01 01:02:03, col 7:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 7:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2001-01-01 01:02:03, col 8:timestamp)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 8:timestamp), FilterTimestampColGreaterTimestampScalar(col 9:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 9:timestamp), FilterTimestampColLessTimestampScalar(col 10:timestamp, val 2001-01-01 01:02:03)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 10:timestamp), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 11:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 11:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 12:timestamp)(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 12:timestamp), FilterTimestampScalarEqualTimestampColumn(val 2001-01-01 01:02:03, col 13:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 13:timestamp), FilterTimestampScalarNotEqualTimestampColumn(val 2001-01-01 01:02:03, col 14:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 14:timestamp), SelectColumnIsTrue(col 17:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000'))(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 15:timestamp, DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 16:timestamp) -> 17:boolean), FilterTimestampColEqualTimestampScalar(col 18:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 18:timestamp), FilterTimestampColNotEqualTimestampScalar(col 19:timestamp, val 2001-01-01 01:02:03)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 19:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 20:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 20:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 21:timestamp)(children: DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:04.000000000) -> 21:timestamp), SelectColumnIsTrue(col 24:boolean)(children: VectorUDFAdaptor(ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000'))(children: DateColSubtractIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 22:timestamp, DateColAddIntervalDayTimeScalar(col 1:date, val 0 01:02:03.000000000) -> 23:timestamp) -> 24:boolean)) + predicate: ((TIMESTAMP'2001-01-01 01:02:03' < (dt + INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (dt - INTERVAL'0 01:02:04.000000000')) and ((dt + INTERVAL'0 01:02:04.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((dt - INTERVAL'0 01:02:04.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts < (dt + INTERVAL'0 01:02:04.000000000')) and (ts > (dt - INTERVAL'0 01:02:04.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (dt + INTERVAL'0 01:02:03.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (dt + INTERVAL'0 01:02:04.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000') and ((dt + INTERVAL'0 01:02:03.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((dt + INTERVAL'0 01:02:04.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and (ts = (dt + INTERVAL'0 01:02:03.000000000')) and (ts <> (dt + INTERVAL'0 01:02:04.000000000')) and ts BETWEEN (dt - INTERVAL'0 01:02:03.000000000') AND (dt + INTERVAL'0 01:02:03.000000000')) (type: boolean) Statistics: Num rows: 1 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) @@ -1931,7 +1931,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_interval_2 - filterExpr: ((TIMESTAMP'2001-01-01 01:02:03' = (ts + INTERVAL'0 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (ts + INTERVAL'1 00:00:00.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000') and (TIMESTAMP'2001-01-01 01:02:03' < (ts + INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (ts - INTERVAL'1 00:00:00.000000000')) and ((ts + INTERVAL'0 00:00:00.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((ts - INTERVAL'1 00:00:00.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts = (ts + INTERVAL'0 00:00:00.000000000')) and (ts <> (ts + INTERVAL'1 00:00:00.000000000')) and ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000') and (ts < (ts + INTERVAL'1 00:00:00.000000000')) and (ts > (ts - INTERVAL'1 00:00:00.000000000'))) (type: boolean) + filterExpr: ((TIMESTAMP'2001-01-01 01:02:03' < (ts + INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (ts - INTERVAL'1 00:00:00.000000000')) and ((ts + INTERVAL'1 00:00:00.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((ts - INTERVAL'1 00:00:00.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts < (ts + INTERVAL'1 00:00:00.000000000')) and (ts > (ts - INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (ts + INTERVAL'0 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (ts + INTERVAL'1 00:00:00.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000') and ((ts + INTERVAL'0 00:00:00.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and (ts = (ts + INTERVAL'0 00:00:00.000000000')) and (ts <> (ts + INTERVAL'1 00:00:00.000000000')) and ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000')) (type: boolean) Statistics: Num rows: 2 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1939,8 +1939,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarEqualTimestampColumn(val 2001-01-01 01:02:03, col 7:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 7:timestamp), FilterTimestampScalarNotEqualTimestampColumn(val 2001-01-01 01:02:03, col 8:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 8:timestamp), SelectColumnIsTrue(col 11:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000'))(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 9:timestamp, TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 10:timestamp) -> 11:boolean), FilterTimestampScalarLessTimestampColumn(val 2001-01-01 01:02:03, col 12:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 12:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2001-01-01 01:02:03, col 13:timestamp)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 13:timestamp), FilterTimestampColEqualTimestampScalar(col 14:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 14:timestamp), FilterTimestampColNotEqualTimestampScalar(col 15:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 15:timestamp), FilterTimestampColGreaterTimestampScalar(col 16:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 16:timestamp), FilterTimestampColLessTimestampScalar(col 17:timestamp, val 2001-01-01 01:02:03)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 17:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 18:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 18:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 19:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 19:timestamp), SelectColumnIsTrue(col 22:boolean)(children: VectorUDFAdaptor(ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000'))(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 20:timestamp, TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 21:timestamp) -> 22:boolean), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 23:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 23:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 24:timestamp)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 24:timestamp)) - predicate: (((ts + INTERVAL'0 00:00:00.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((ts - INTERVAL'1 00:00:00.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (TIMESTAMP'2001-01-01 01:02:03' < (ts + INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (ts + INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (ts + INTERVAL'0 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (ts - INTERVAL'1 00:00:00.000000000')) and (ts < (ts + INTERVAL'1 00:00:00.000000000')) and (ts <> (ts + INTERVAL'1 00:00:00.000000000')) and (ts = (ts + INTERVAL'0 00:00:00.000000000')) and (ts > (ts - INTERVAL'1 00:00:00.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000') and ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000')) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterTimestampScalarLessTimestampColumn(val 2001-01-01 01:02:03, col 7:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 7:timestamp), FilterTimestampScalarGreaterTimestampColumn(val 2001-01-01 01:02:03, col 8:timestamp)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 8:timestamp), FilterTimestampColGreaterTimestampScalar(col 9:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 9:timestamp), FilterTimestampColLessTimestampScalar(col 10:timestamp, val 2001-01-01 01:02:03)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 10:timestamp), FilterTimestampColLessTimestampColumn(col 0:timestamp, col 11:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 11:timestamp), FilterTimestampColGreaterTimestampColumn(col 0:timestamp, col 12:timestamp)(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 12:timestamp), FilterTimestampScalarEqualTimestampColumn(val 2001-01-01 01:02:03, col 13:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 13:timestamp), FilterTimestampScalarNotEqualTimestampColumn(val 2001-01-01 01:02:03, col 14:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 14:timestamp), SelectColumnIsTrue(col 17:boolean)(children: VectorUDFAdaptor(TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000'))(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 15:timestamp, TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 16:timestamp) -> 17:boolean), FilterTimestampColEqualTimestampScalar(col 18:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 18:timestamp), FilterTimestampColNotEqualTimestampScalar(col 19:timestamp, val 2001-01-01 01:02:03)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 19:timestamp), FilterTimestampColEqualTimestampColumn(col 0:timestamp, col 20:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 0 00:00:00.000000000) -> 20:timestamp), FilterTimestampColNotEqualTimestampColumn(col 0:timestamp, col 21:timestamp)(children: TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 21:timestamp), SelectColumnIsTrue(col 24:boolean)(children: VectorUDFAdaptor(ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000'))(children: TimestampColSubtractIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 22:timestamp, TimestampColAddIntervalDayTimeScalar(col 0:timestamp, val 1 00:00:00.000000000) -> 23:timestamp) -> 24:boolean)) + predicate: ((TIMESTAMP'2001-01-01 01:02:03' < (ts + INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' > (ts - INTERVAL'1 00:00:00.000000000')) and ((ts + INTERVAL'1 00:00:00.000000000') > TIMESTAMP'2001-01-01 01:02:03') and ((ts - INTERVAL'1 00:00:00.000000000') < TIMESTAMP'2001-01-01 01:02:03') and (ts < (ts + INTERVAL'1 00:00:00.000000000')) and (ts > (ts - INTERVAL'1 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' = (ts + INTERVAL'0 00:00:00.000000000')) and (TIMESTAMP'2001-01-01 01:02:03' <> (ts + INTERVAL'1 00:00:00.000000000')) and TIMESTAMP'2001-01-01 01:02:03' BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000') and ((ts + INTERVAL'0 00:00:00.000000000') = TIMESTAMP'2001-01-01 01:02:03') and ((ts + INTERVAL'1 00:00:00.000000000') <> TIMESTAMP'2001-01-01 01:02:03') and (ts = (ts + INTERVAL'0 00:00:00.000000000')) and (ts <> (ts + INTERVAL'1 00:00:00.000000000')) and ts BETWEEN (ts - INTERVAL'1 00:00:00.000000000') AND (ts + INTERVAL'1 00:00:00.000000000')) (type: boolean) Statistics: Num rows: 1 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ts (type: timestamp) diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vector_interval_mapjoin.q.out index 6d4d105bb9..a75fc35b81 100644 --- a/ql/src/test/results/clientpositive/llap/vector_interval_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_interval_mapjoin.q.out @@ -215,7 +215,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 12:date), SelectColumnIsNotNull(col 14:date)(children: CastTimestampToDate(col 10:timestamp) -> 14:date), SelectColumnIsNotNull(col 8:string)) - predicate: (CAST( ts AS DATE) is not null and dt is not null and s is not null) (type: boolean) + predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) Statistics: Num rows: 954 Data size: 178852 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) @@ -283,7 +283,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 12:date), SelectColumnIsNotNull(col 14:date)(children: CastTimestampToDate(col 10:timestamp) -> 14:date), SelectColumnIsNotNull(col 8:string)) - predicate: (CAST( ts AS DATE) is not null and dt is not null and s is not null) (type: boolean) + predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) Statistics: Num rows: 943 Data size: 176202 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) diff --git a/ql/src/test/results/clientpositive/llap/vector_join_filters.q.out b/ql/src/test/results/clientpositive/llap/vector_join_filters.q.out index 0049df3840..39f535784d 100644 --- a/ql/src/test/results/clientpositive/llap/vector_join_filters.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_join_filters.q.out @@ -86,7 +86,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: ((key = value) and (key > 40) and (value > 50)) (type: boolean) + predicate: ((key > 40) and (value > 50) and (key = value)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int) @@ -332,7 +332,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: ((key = value) and (key > 40) and (value > 50)) (type: boolean) + predicate: ((key > 40) and (value > 50) and (key = value)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int) @@ -507,7 +507,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: ((key = value) and (key > 40) and (value > 50)) (type: boolean) + predicate: ((key > 40) and (value > 50) and (key = value)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int) @@ -682,7 +682,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: ((key = value) and (key > 40) and (value > 50)) (type: boolean) + predicate: ((key > 40) and (value > 50) and (key = value)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int) @@ -857,7 +857,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: ((key = value) and (key > 40) and (value > 50)) (type: boolean) + predicate: ((key > 40) and (value > 50) and (key = value)) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int) diff --git a/ql/src/test/results/clientpositive/llap/vector_list_constant.q.out b/ql/src/test/results/clientpositive/llap/vector_list_constant.q.out index ca838571d8..13804f3c0f 100644 --- a/ql/src/test/results/clientpositive/llap/vector_list_constant.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_list_constant.q.out @@ -80,17 +80,17 @@ STAGE PLANS: Map Operator Tree: TableScan alias: testdatatypetable - Statistics: Num rows: 1 Data size: 6057 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 2807 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: c1 (type: int), c2 (type: boolean), c3 (type: double), c4 (type: string), c5 (type: array), c6 (type: map), c7 (type: map), c8 (type: struct), c9 (type: tinyint), c10 (type: smallint), c11 (type: float), c12 (type: bigint), (c1 * 2) (type: int), Const array> null (type: array>), c17 (type: timestamp), c18 (type: decimal(16,7)), c20 (type: date), c21 (type: varchar(20)), c22 (type: char(15)), c23 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19 - Statistics: Num rows: 1 Data size: 6057 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 2807 Basic stats: PARTIAL Column stats: NONE Limit Number of rows: 1 - Statistics: Num rows: 1 Data size: 6057 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 2807 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 6057 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 1 Data size: 2807 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/llap/vector_mapjoin_reduce.q.out b/ql/src/test/results/clientpositive/llap/vector_mapjoin_reduce.q.out index 3039e3191a..4eef3d509a 100644 --- a/ql/src/test/results/clientpositive/llap/vector_mapjoin_reduce.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_mapjoin_reduce.q.out @@ -43,7 +43,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 1:int), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 14 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int) @@ -323,7 +323,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 1:int), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 14 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int), 1 (type: int) @@ -462,7 +462,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 9600 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -470,7 +470,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 14:string, val AIR), FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 0:int)) + predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), FilterStringGroupColEqualStringScalar(col 14:string, val AIR), SelectColumnIsNotNull(col 0:int)) predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) Statistics: Num rows: 2 Data size: 192 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/llap/vector_mr_diff_schema_alias.q.out b/ql/src/test/results/clientpositive/llap/vector_mr_diff_schema_alias.q.out index 77b500d5fc..1169ea17d9 100644 --- a/ql/src/test/results/clientpositive/llap/vector_mr_diff_schema_alias.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_mr_diff_schema_alias.q.out @@ -266,7 +266,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_sold_date_sk (type: int), ss_store_sk (type: int) diff --git a/ql/src/test/results/clientpositive/llap/vector_multi_insert.q.out b/ql/src/test/results/clientpositive/llap/vector_multi_insert.q.out index dff2c54ad2..e75f580cbc 100644 --- a/ql/src/test/results/clientpositive/llap/vector_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_multi_insert.q.out @@ -123,7 +123,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.orc_rn1 Filter Operator - predicate: ((rn < 1000) and (rn >= 100)) (type: boolean) + predicate: ((rn >= 100) and (rn < 1000)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: rn (type: int) diff --git a/ql/src/test/results/clientpositive/llap/vector_orc_nested_column_pruning.q.out b/ql/src/test/results/clientpositive/llap/vector_orc_nested_column_pruning.q.out index 3f67e0b5a3..6c6b017694 100644 --- a/ql/src/test/results/clientpositive/llap/vector_orc_nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_orc_nested_column_pruning.q.out @@ -1503,7 +1503,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 8:int)(children: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 8:int), SelectColumnIsFalse(col 10:boolean)(children: VectorUDFStructField(col 9:struct,f11:map>, col 0:int)(children: VectorUDFStructField(col 2:struct,f11:map>>, col 1:int) -> 9:struct,f11:map>) -> 10:boolean)) - predicate: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) + predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1 (type: struct,f6:int>), s2 (type: struct,f11:map>>) @@ -1665,7 +1665,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (s1.f6 is not null and s2.f8.f9) (type: boolean) @@ -1815,7 +1815,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null and s2.f8.f9 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Pruned Column Paths: s1.f6, s2.f8.f9 Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: @@ -1824,8 +1824,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: SelectColumnIsTrue(col 15:boolean)(children: VectorUDFAdaptor((s2.f8.f9 and s1.f6 is not null and s2.f8.f9 is not null))(children: VectorUDFStructField(col 8:struct,f11:map>, col 0:int)(children: VectorUDFStructField(col 2:struct,f11:map>>, col 1:int) -> 8:struct,f11:map>) -> 9:boolean, IsNotNull(col 10:int)(children: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 10:int) -> 11:boolean, IsNotNull(col 13:boolean)(children: VectorUDFStructField(col 12:struct,f11:map>, col 0:int)(children: VectorUDFStructField(col 2:struct,f11:map>>, col 1:int) -> 12:struct,f11:map>) -> 13:boolean) -> 14:boolean) -> 15:boolean) - predicate: (s1.f6 is not null and s2.f8.f9 and s2.f8.f9 is not null) (type: boolean) + predicateExpression: SelectColumnIsTrue(col 15:boolean)(children: VectorUDFAdaptor((s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9))(children: IsNotNull(col 8:int)(children: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 8:int) -> 9:boolean, IsNotNull(col 11:boolean)(children: VectorUDFStructField(col 10:struct,f11:map>, col 0:int)(children: VectorUDFStructField(col 2:struct,f11:map>>, col 1:int) -> 10:struct,f11:map>) -> 11:boolean) -> 12:boolean, VectorUDFStructField(col 13:struct,f11:map>, col 0:int)(children: VectorUDFStructField(col 2:struct,f11:map>>, col 1:int) -> 13:struct,f11:map>) -> 14:boolean) -> 15:boolean) + predicate: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1.f6 (type: int), s2.f8.f9 (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out b/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out index 8b70a30ed6..fb3c01269d 100644 --- a/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_reuse_scratchcols.q.out @@ -96,7 +96,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint = 762L) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cstring1 = 'a') or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1))) (type: boolean) + filterExpr: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -105,8 +105,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterStringGroupColEqualStringScalar(col 6:string, val a), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean))) - predicate: (((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean)), FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterStringGroupColEqualStringScalar(col 6:string, val a)) + predicate: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 5465 Data size: 1157230 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), csmallint (type: smallint), cfloat (type: float), ctinyint (type: tinyint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) @@ -308,7 +308,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint = 762L) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cstring1 = 'a') or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1))) (type: boolean) + filterExpr: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -317,8 +317,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterStringGroupColEqualStringScalar(col 6:string, val a), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean))) - predicate: (((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean)), FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterStringGroupColEqualStringScalar(col 6:string, val a)) + predicate: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 5465 Data size: 1157230 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), csmallint (type: smallint), cfloat (type: float), ctinyint (type: tinyint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out index 09ca8c2700..56faf2c68d 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out @@ -1076,7 +1076,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 like '%b%') or (CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble)) (type: boolean) + filterExpr: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 1137584 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1085,7 +1085,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double)) + predicateExpression: FilterExprOrExpr(children: FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)) predicate: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 1137584 Basic stats: COMPLETE Column stats: COMPLETE Select Operator @@ -1286,7 +1286,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0)) or (cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%')) (type: boolean) + predicate: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or ((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE @@ -30106,7 +30106,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) and (cfloat = 3.02)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 49) and (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) and (cfloat = 3.5)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 45) and (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 3 Data size: 930 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -30356,7 +30356,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) or (cfloat = 3.02)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 49) or (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) or (cfloat = 3.5)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 45) or (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 2 Data size: 620 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_1.q.out b/ql/src/test/results/clientpositive/llap/vectorization_1.q.out index 2b33b2f6d9..334171da91 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_1.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or (cboolean1 < 0)) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -73,8 +73,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0)), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColLessLongScalar(col 10:boolean, val 0)) - predicate: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (UDFToLong(cint) > cbigint) or (cbigint < UDFToLong(ctinyint)) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0))) + predicate: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), cfloat (type: float), cint (type: int), cdouble (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_10.q.out b/ql/src/test/results/clientpositive/llap/vectorization_10.q.out index 58186c29c1..3342549193 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_10.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_10.q.out @@ -77,7 +77,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(6,2), val -5638.15)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(6,2))), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) -> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern %a)))) - predicate: (((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= '10')) (type: boolean) + predicate: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a')))) (type: boolean) Statistics: Num rows: 9557 Data size: 1937820 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), ctimestamp1 (type: timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 (type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) (type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), (UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), (- (- cdouble)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_11.q.out b/ql/src/test/results/clientpositive/llap/vectorization_11.q.out index a6e0be6fe4..ff03d60da4 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_11.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_11.q.out @@ -49,7 +49,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + filterExpr: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 12288 Data size: 2381474 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -58,8 +58,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string), FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a))) - predicate: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a)), FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string)) + predicate: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 6144 Data size: 1190792 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), ctimestamp1 (type: timestamp), (-3728 * UDFToInteger(csmallint)) (type: int), (cdouble - 9763215.5639D) (type: double), (- cdouble) (type: double), ((- cdouble) + 6981.0D) (type: double), (cdouble * -5638.15D) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_12.q.out b/ql/src/test/results/clientpositive/llap/vectorization_12.q.out index b5c7561b4c..620bc71291 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_12.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_12.q.out @@ -87,7 +87,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (ctimestamp1 is null and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean) + filterExpr: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 12288 Data size: 1647554 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -96,8 +96,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint)))) - predicate: (((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ctimestamp1 is null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), SelectColumnIsNull(col 8:timestamp)) + predicate: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 1 Data size: 166 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cboolean1 (type: boolean), cstring1 (type: string), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_13.q.out b/ql/src/test/results/clientpositive/llap/vectorization_13.q.out index fd6aa1f510..18ebf12e6a 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_13.q.out @@ -99,7 +99,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28789.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28788.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -458,7 +458,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28801.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28801.336)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_14.q.out b/ql/src/test/results/clientpositive/llap/vectorization_14.q.out index 1ff71547db..84c1e3515e 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_14.q.out @@ -89,7 +89,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToLong(ctinyint) <= cbigint) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) (type: boolean) + filterExpr: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 12288 Data size: 2139070 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -98,8 +98,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), FilterDoubleColLessDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float))) - predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and (UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 14:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 14:float)), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp))) + predicate: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 606 Data size: 105558 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), (- (-26.28D + cdouble)) (type: double), ((- (-26.28D + cdouble)) * (- (-26.28D + cdouble))) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_15.q.out b/ql/src/test/results/clientpositive/llap/vectorization_15.q.out index 21d29dd761..f7423ef0b2 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_15.q.out @@ -85,7 +85,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) + filterExpr: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -94,8 +94,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) - predicate: (((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 like '%ss%')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) + predicate: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cboolean1 (type: boolean), cdouble (type: double), cstring1 (type: string), ctinyint (type: tinyint), cint (type: int), ctimestamp1 (type: timestamp), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_16.q.out b/ql/src/test/results/clientpositive/llap/vectorization_16.q.out index d19d8880ae..8dcf6d0d1b 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_16.q.out @@ -72,7 +72,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_17.q.out b/ql/src/test/results/clientpositive/llap/vectorization_17.q.out index 98e92fe74a..ff11dfa7bb 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_17.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_17.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: boolean) + filterExpr: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 12288 Data size: 1647550 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -79,8 +79,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float))) - predicate: (((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float)), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)))) + predicate: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 4096 Data size: 549274 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cstring1 (type: string), cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_2.q.out b/ql/src/test/results/clientpositive/llap/vectorization_2.q.out index d2f41555fe..33c34a1642 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_2.q.out @@ -68,7 +68,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean) + filterExpr: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 12288 Data size: 2157324 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -77,7 +77,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375)), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359)))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359))), FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375))) predicate: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 4096 Data size: 719232 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/llap/vectorization_3.q.out b/ql/src/test/results/clientpositive/llap/vectorization_3.q.out index 5fcf6d53e0..7d1cadc849 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_3.q.out @@ -83,7 +83,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), FilterDecimalColNotEqualDecimalScalar(col 14:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 15:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 16:double), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp))) - predicate: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) + predicate: (((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean) Statistics: Num rows: 2503 Data size: 260060 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), ctinyint (type: tinyint), cfloat (type: float), cint (type: int), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_4.q.out b/ql/src/test/results/clientpositive/llap/vectorization_4.q.out index 9bd33105d7..ddcc12d4d2 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_4.q.out @@ -68,7 +68,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToInteger(csmallint) >= cint) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: boolean) + filterExpr: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -77,8 +77,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0)))) - predicate: (((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or (UDFToInteger(csmallint) >= cint)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0))), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553))) + predicate: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), ctinyint (type: tinyint), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_5.q.out b/ql/src/test/results/clientpositive/llap/vectorization_5.q.out index a4ff69bfe7..836e8bb52b 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_5.q.out @@ -72,7 +72,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %b%), SelectColumnIsNotNull(col 11:boolean)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterStringColLikeStringScalar(col 7:string, pattern a), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null) or ((cstring1 like '%b%') and cboolean2 is not null)) (type: boolean) + predicate: (((cstring1 like '%b%') and cboolean2 is not null) or ((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null)) (type: boolean) Statistics: Num rows: 7658 Data size: 1529972 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_6.q.out b/ql/src/test/results/clientpositive/llap/vectorization_6.q.out index 3762cc939b..23262fd5da 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_6.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_6.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null))) (type: boolean) + filterExpr: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 2110130 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -70,7 +70,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint))), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5951 Data size: 1022000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/llap/vectorization_7.q.out b/ql/src/test/results/clientpositive/llap/vectorization_7.q.out index 83a302733e..ef03189910 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_7.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_7.q.out @@ -76,7 +76,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -85,8 +85,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) @@ -330,7 +330,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -338,8 +338,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_8.q.out b/ql/src/test/results/clientpositive/llap/vectorization_8.q.out index 7d0594ae8f..eaa1f4dc1b 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_8.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_8.q.out @@ -72,7 +72,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -81,8 +81,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) @@ -313,7 +313,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -321,8 +321,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_9.q.out b/ql/src/test/results/clientpositive/llap/vectorization_9.q.out index d19d8880ae..8dcf6d0d1b 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_9.q.out @@ -72,7 +72,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out b/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out index a68b9e0904..7c87c30afc 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_decimal_date.q.out @@ -46,7 +46,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:double)) - predicate: (cdouble is not null and cint is not null) (type: boolean) + predicate: (cint is not null and cdouble is not null) (type: boolean) Statistics: Num rows: 6848 Data size: 920460 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdate (type: date), cint (type: int), cdecimal (type: decimal(20,10)) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out index 652883f0a1..3fe514b8b1 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_div0.q.out @@ -257,7 +257,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val 0), FilterLongColLessLongScalar(col 3:bigint, val 100000000)) - predicate: ((cbigint < 100000000L) and (cbigint > 0L)) (type: boolean) + predicate: ((cbigint > 0L) and (cbigint < 100000000L)) (type: boolean) Statistics: Num rows: 1365 Data size: 16320 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (cbigint - 988888L) (type: bigint), (cdouble / UDFToDouble((cbigint - 988888L))) (type: double), (1.2 / CAST( (cbigint - 988888L) AS decimal(19,0))) (type: decimal(22,21)) @@ -481,7 +481,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -500.0), FilterDoubleColLessDoubleScalar(col 5:double, val -199.0)) - predicate: ((cdouble < -199.0D) and (cdouble >= -500.0D)) (type: boolean) + predicate: ((cdouble >= -500.0D) and (cdouble < -199.0D)) (type: boolean) Statistics: Num rows: 1365 Data size: 16320 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (cdouble + 200.0D) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), ((cdouble + 200.0D) / (cdouble + 200.0D)) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), (3.0D / (cdouble + 200.0D)) (type: double), (1.2D / (cdouble + 200.0D)) (type: double) @@ -705,7 +705,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 2:int, val 500000000), FilterDoubleColGreaterDoubleScalar(col 5:double, val 1.0E9), FilterLongColEqualLongScalar(col 0:tinyint, val 0)) - predicate: ((cdouble > 1.0E9D) or (cint > 500000000) or (ctinyint = 0Y)) (type: boolean) + predicate: ((cint > 500000000) or (cdouble > 1.0E9D) or (ctinyint = 0Y)) (type: boolean) Statistics: Num rows: 4191 Data size: 75120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cbigint (type: bigint), ctinyint (type: tinyint), (UDFToDouble(cint) / UDFToDouble((cint - 528534767))) (type: double), (UDFToDouble(cbigint) / UDFToDouble((cbigint - 1018195815L))) (type: double), (UDFToDouble(ctinyint) / UDFToDouble(ctinyint)) (type: double), (cint % (cint - 528534767)) (type: int), (cbigint % (cbigint - 1018195815L)) (type: bigint), (ctinyint % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out index 750b364b16..4ed197813e 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_limit.q.out @@ -29,10 +29,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 183488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 20400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out index 900cfa393a..263b3d8aa3 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_short_regress.q.out @@ -96,7 +96,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint = 762L) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cstring1 = 'a') or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1))) (type: boolean) + filterExpr: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -104,8 +104,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterStringGroupColEqualStringScalar(col 6:string, val a), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean))) - predicate: (((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean)), FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterStringGroupColEqualStringScalar(col 6:string, val a)) + predicate: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 5465 Data size: 1157230 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), csmallint (type: smallint), cfloat (type: float), ctinyint (type: tinyint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) @@ -364,7 +364,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*') or ((cfloat > 79.553) and (cstring2 like '10%'))) (type: boolean) + filterExpr: (((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cfloat > 79.553) and (cstring2 like '10%')) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*')) (type: boolean) Statistics: Num rows: 12288 Data size: 2036734 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -372,8 +372,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 3:bigint, val 197), FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -26.28), FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 1:smallint) -> 13:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 14:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 14:float), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss.*)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 4:float, val 79.5530014038086), FilterStringColLikeStringScalar(col 7:string, pattern 10%))) - predicate: (((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*') or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cfloat > 79.553) and (cstring2 like '10%'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -26.28), FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 1:smallint) -> 13:double)), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 3:bigint, val 197), FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 4:float, val 79.5530014038086), FilterStringColLikeStringScalar(col 7:string, pattern 10%)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 14:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 14:float), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss.*))) + predicate: (((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cfloat > 79.553) and (cstring2 like '10%')) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*')) (type: boolean) Statistics: Num rows: 6826 Data size: 1131534 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cbigint (type: bigint), csmallint (type: smallint), cdouble (type: double), ctinyint (type: tinyint), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) @@ -624,7 +624,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctimestamp1 = ctimestamp2) or (cfloat = 762.0) or (cstring1 = 'ss') or ((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null)) (type: boolean) + filterExpr: ((ctimestamp1 = ctimestamp2) or ((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (cstring1 = 'ss')) (type: boolean) Statistics: Num rows: 12288 Data size: 3093170 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -632,8 +632,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterTimestampColEqualTimestampColumn(col 8:timestamp, col 9:timestamp), FilterDoubleColEqualDoubleScalar(col 4:float, val 762.0), FilterStringGroupColEqualStringScalar(col 6:string, val ss), FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterLongColEqualLongScalar(col 11:boolean, val 1)), FilterExprAndExpr(children: FilterStringGroupColGreaterStringScalar(col 7:string, val a), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (cstring1 = 'ss') or (ctimestamp1 = ctimestamp2)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterTimestampColEqualTimestampColumn(col 8:timestamp, col 9:timestamp), FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterLongColEqualLongScalar(col 11:boolean, val 1)), FilterExprAndExpr(children: FilterStringGroupColGreaterStringScalar(col 7:string, val a), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 9:timestamp)), FilterDoubleColEqualDoubleScalar(col 4:float, val 762.0), FilterStringGroupColEqualStringScalar(col 6:string, val ss)) + predicate: ((ctimestamp1 = ctimestamp2) or ((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (cstring1 = 'ss')) (type: boolean) Statistics: Num rows: 11346 Data size: 2856120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), (cdouble * cdouble) (type: double) @@ -863,7 +863,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or ((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or (cfloat = 17.0)) (type: boolean) + filterExpr: (((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or (cfloat = 17.0) or ((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss'))) (type: boolean) Statistics: Num rows: 12288 Data size: 2139070 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -871,8 +871,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 13:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 14:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double)), FilterDoubleColEqualDoubleScalar(col 4:float, val 17.0)) - predicate: (((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or ((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or (cfloat = 17.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 13:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double)), FilterDoubleColEqualDoubleScalar(col 4:float, val 17.0), FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss))) + predicate: (((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or (cfloat = 17.0) or ((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss'))) (type: boolean) Statistics: Num rows: 2824 Data size: 491654 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), cbigint (type: bigint), cint (type: int), cfloat (type: float), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double) @@ -1110,7 +1110,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring1 regexp 'a.*' and (cstring2 like '%ss%')) or ((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint))) (type: boolean) + filterExpr: (((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) Statistics: Num rows: 12288 Data size: 3056470 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1118,8 +1118,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColRegExpStringScalar(col 6:string, pattern a.*), FilterStringColLikeStringScalar(col 7:string, pattern %ss%)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 11:boolean, val 1), FilterDecimalColLessDecimalScalar(col 13:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(8,3)), FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterDoubleColGreaterEqualDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColGreaterLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint))) - predicate: (((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or ((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 11:boolean, val 1), FilterDecimalColLessDecimalScalar(col 13:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(8,3)), FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterDoubleColGreaterEqualDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColGreaterLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterStringColRegExpStringScalar(col 6:string, pattern a.*), FilterStringColLikeStringScalar(col 7:string, pattern %ss%))) + predicate: (((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) Statistics: Num rows: 9898 Data size: 2462086 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), ctimestamp2 (type: timestamp), cstring1 (type: string), cboolean2 (type: boolean), ctinyint (type: tinyint), cfloat (type: float), ctimestamp1 (type: timestamp), csmallint (type: smallint), cbigint (type: bigint), (-3728L * cbigint) (type: bigint), (- cint) (type: int), (-863.257 - CAST( cint AS decimal(10,0))) (type: decimal(14,3)), (- csmallint) (type: smallint), (csmallint - (- csmallint)) (type: smallint), ((csmallint - (- csmallint)) + (- csmallint)) (type: smallint), (UDFToDouble(cint) / UDFToDouble(cint)) (type: double), ((-863.257 - CAST( cint AS decimal(10,0))) - -26.28) (type: decimal(15,3)), (- cfloat) (type: float), (cdouble * -89010.0D) (type: double), (UDFToDouble(ctinyint) / 988888.0D) (type: double), (- ctinyint) (type: tinyint), (79.553 / CAST( ctinyint AS decimal(3,0))) (type: decimal(9,7)) @@ -1412,7 +1412,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or (cbigint = 359L) or (cboolean1 < 0) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint = 359L) or ((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1420,8 +1420,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessLongScalar(col 0:int, val 197)(children: col 0:tinyint), FilterLongColEqualLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterLongColEqualLongScalar(col 3:bigint, val 359), FilterLongColLessLongScalar(col 10:boolean, val 0), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %ss), FilterDoubleColLessEqualDoubleColumn(col 4:float, col 13:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 13:float))) - predicate: (((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint))) or (cbigint = 359L) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColEqualLongScalar(col 3:bigint, val 359), FilterExprAndExpr(children: FilterLongColLessLongScalar(col 0:int, val 197)(children: col 0:tinyint), FilterLongColEqualLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %ss), FilterDoubleColLessEqualDoubleColumn(col 4:float, col 13:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 13:float))) + predicate: ((cboolean1 < 0) or (cbigint = 359L) or ((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) Statistics: Num rows: 8194 Data size: 1734900 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cbigint (type: bigint), cstring1 (type: string), cboolean1 (type: boolean), cfloat (type: float), cdouble (type: double), ctimestamp2 (type: timestamp), csmallint (type: smallint), cstring2 (type: string), cboolean2 (type: boolean), (UDFToDouble(cint) / UDFToDouble(cbigint)) (type: double), (CAST( cbigint AS decimal(19,0)) % 79.553) (type: decimal(5,3)), (- (UDFToDouble(cint) / UDFToDouble(cbigint))) (type: double), (10.175 % cfloat) (type: float), (- cfloat) (type: float), (cfloat - (- cfloat)) (type: float), ((cfloat - (- cfloat)) % -6432.0) (type: float), (cdouble * UDFToDouble(csmallint)) (type: double), (- cdouble) (type: double), (- cbigint) (type: bigint), (UDFToDouble(cfloat) - (UDFToDouble(cint) / UDFToDouble(cbigint))) (type: double), (- csmallint) (type: smallint), (3569L % cbigint) (type: bigint), (359.0D - cdouble) (type: double), (- csmallint) (type: smallint) @@ -1663,7 +1663,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss')) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28))) (type: boolean) + filterExpr: (((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss'))) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1671,8 +1671,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 13:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(7,2)), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss), FilterDoubleColNotEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterLongColEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 16:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 3:bigint) -> 16:float), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(7,2)))) - predicate: (((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss')) or ((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 3:bigint) -> 13:float), FilterDecimalColGreaterEqualDecimalScalar(col 14:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 14:decimal(7,2))), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 3:bigint) -> 15:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss), FilterDoubleColNotEqualDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 16:double)), FilterLongColEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 17:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(7,2)), FilterStringColLikeStringScalar(col 7:string, pattern ss))) + predicate: (((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss'))) (type: boolean) Statistics: Num rows: 10922 Data size: 2312410 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cstring1 (type: string), cboolean2 (type: boolean), ctimestamp2 (type: timestamp), cdouble (type: double), cfloat (type: float), cbigint (type: bigint), csmallint (type: smallint), cboolean1 (type: boolean), (cint + UDFToInteger(csmallint)) (type: int), (cbigint - UDFToLong(ctinyint)) (type: bigint), (- cbigint) (type: bigint), (- cfloat) (type: float), ((cbigint - UDFToLong(ctinyint)) + cbigint) (type: bigint), (cdouble / cdouble) (type: double), (- cdouble) (type: double), (UDFToLong((cint + UDFToInteger(csmallint))) * (- cbigint)) (type: bigint), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (-1.389 / CAST( ctinyint AS decimal(3,0))) (type: decimal(8,7)), (UDFToDouble(cbigint) % cdouble) (type: double), (- csmallint) (type: smallint), (UDFToInteger(csmallint) + (cint + UDFToInteger(csmallint))) (type: int) @@ -1972,7 +1972,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) + filterExpr: (((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) Statistics: Num rows: 12288 Data size: 2528254 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -1980,8 +1980,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 13:decimal(13,3), val -1.389)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterLongColLessLongScalar(col 1:int, val -6432)(children: col 1:smallint)), FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleColumn(col 5:double, col 4:double)(children: col 4:float), FilterStringGroupColLessEqualStringScalar(col 7:string, val a)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern ss%), FilterDecimalColLessDecimalScalar(col 14:decimal(22,3), val 10.175)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)))) - predicate: (((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleColumn(col 5:double, col 4:double)(children: col 4:float), FilterStringGroupColLessEqualStringScalar(col 7:string, val a)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 13:decimal(13,3), val -1.389)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterLongColLessLongScalar(col 1:int, val -6432)(children: col 1:smallint)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern ss%), FilterDecimalColLessDecimalScalar(col 14:decimal(22,3), val 10.175)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)))) + predicate: (((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) Statistics: Num rows: 3868 Data size: 795962 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cstring2 (type: string), cdouble (type: double), cfloat (type: float), cbigint (type: bigint), csmallint (type: smallint), (UDFToDouble(cbigint) / 3569.0D) (type: double), (-257 - UDFToInteger(csmallint)) (type: int), (-6432.0 * cfloat) (type: float), (- cdouble) (type: double), (cdouble * 10.175D) (type: double), (UDFToDouble((-6432.0 * cfloat)) / UDFToDouble(cfloat)) (type: double), (- cfloat) (type: float), (cint % UDFToInteger(csmallint)) (type: int), (- cdouble) (type: double), (cdouble * (- cdouble)) (type: double) @@ -2223,7 +2223,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble) and (UDFToInteger(ctinyint) <= cint)) (type: boolean) + filterExpr: ((UDFToInteger(ctinyint) <= cint) and (UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -2231,8 +2231,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 1:int, val -257)(children: col 1:smallint), FilterDoubleColGreaterEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterLongColLessEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint)) - predicate: ((UDFToDouble(cint) >= cdouble) and (UDFToInteger(csmallint) >= -257) and (UDFToInteger(ctinyint) <= cint)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterLongColGreaterEqualLongScalar(col 1:int, val -257)(children: col 1:smallint), FilterDoubleColGreaterEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double)) + predicate: ((UDFToInteger(ctinyint) <= cint) and (UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble)) (type: boolean) Statistics: Num rows: 455 Data size: 9548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), cbigint (type: bigint), ctinyint (type: tinyint), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -2515,7 +2515,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 2563.58), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 3:bigint, col 2:bigint)(children: col 2:int), FilterLongColLessLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterDoubleColLessDoubleScalar(col 4:float, val -5638.14990234375)), FilterDecimalColEqualDecimalScalar(col 13:decimal(6,2), val 2563.58)(children: CastLongToDecimal(col 0:tinyint) -> 13:decimal(6,2)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(21,2), val -5638.15)(children: CastLongToDecimal(col 3:bigint) -> 15:decimal(21,2))))) - predicate: ((((cbigint >= UDFToLong(cint)) and (UDFToInteger(csmallint) < cint) and (cfloat < -5638.15)) or (CAST( ctinyint AS decimal(6,2)) = 2563.58) or ((cdouble <= UDFToDouble(cbigint)) and (CAST( cbigint AS decimal(21,2)) < -5638.15))) and (cdouble > 2563.58D)) (type: boolean) + predicate: ((cdouble > 2563.58D) and (((cbigint >= UDFToLong(cint)) and (UDFToInteger(csmallint) < cint) and (cfloat < -5638.15)) or (CAST( ctinyint AS decimal(6,2)) = 2563.58) or ((cdouble <= UDFToDouble(cbigint)) and (CAST( cbigint AS decimal(21,2)) < -5638.15)))) (type: boolean) Statistics: Num rows: 2503 Data size: 59820 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), cfloat (type: float), (cdouble * cdouble) (type: double) @@ -2833,7 +2833,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToDouble(ctimestamp1) <> 0.0D) and (((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint))))) (type: boolean) + filterExpr: ((((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint)))) and (UDFToDouble(ctimestamp1) <> 0.0D)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -2841,7 +2841,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDoubleColNotEqualDoubleScalar(col 13:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss), FilterDoubleColGreaterDoubleScalar(col 14:double, val -3.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), SelectColumnIsNotNull(col 11:boolean)), FilterDoubleColEqualDoubleScalar(col 15:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double), FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 16:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 16:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)), FilterDoubleColEqualDoubleColumn(col 5:double, col 17:double)(children: CastLongToDouble(col 2:int) -> 17:double), FilterExprAndExpr(children: SelectColumnIsNull(col 10:boolean), FilterDoubleColLessDoubleColumn(col 4:float, col 18:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 18:float)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss), FilterDoubleColGreaterDoubleScalar(col 13:double, val -3.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), SelectColumnIsNotNull(col 11:boolean)), FilterDoubleColEqualDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 15:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 15:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)), FilterDoubleColEqualDoubleColumn(col 5:double, col 16:double)(children: CastLongToDouble(col 2:int) -> 16:double), FilterExprAndExpr(children: SelectColumnIsNull(col 10:boolean), FilterDoubleColLessDoubleColumn(col 4:float, col 17:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 17:float))), FilterDoubleColNotEqualDoubleScalar(col 18:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 18:double)) predicate: ((((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint)))) and (UDFToDouble(ctimestamp1) <> 0.0D)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE Select Operator @@ -3241,7 +3241,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null)) and cboolean1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and (((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null))) (type: boolean) Statistics: Num rows: 12288 Data size: 2601650 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -3249,9 +3249,9 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 1:smallint) -> 13:double), FilterLongColEqualLongColumn(col 11:boolean, col 10:boolean), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(22,3), val -863.257)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3))), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -257), FilterLongColGreaterEqualLongScalar(col 10:boolean, val 1), SelectColumnIsNotNull(col 6:string)), FilterStringColRegExpStringScalar(col 7:string, pattern b), FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), SelectColumnIsNull(col 9:timestamp))), SelectColumnIsNotNull(col 10:boolean)) - predicate: ((((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null)) and cboolean1 is not null) (type: boolean) - Statistics: Num rows: 7845 Data size: 1661020 Basic stats: COMPLETE Column stats: COMPLETE + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 1:smallint) -> 13:double), FilterLongColEqualLongColumn(col 11:boolean, col 10:boolean), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(22,3), val -863.257)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3))), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -257), FilterLongColGreaterEqualLongScalar(col 10:boolean, val 1), SelectColumnIsNotNull(col 6:string)), FilterStringColRegExpStringScalar(col 7:string, pattern b), FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), SelectColumnIsNull(col 9:timestamp)))) + predicate: (cboolean1 is not null and (((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null))) (type: boolean) + Statistics: Num rows: 5857 Data size: 1240180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cfloat (type: float), cbigint (type: bigint), cint (type: int), cdouble (type: double), ctinyint (type: tinyint), csmallint (type: smallint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14 @@ -3260,7 +3260,7 @@ STAGE PLANS: native: true projectedOutputColumnNums: [10, 4, 3, 2, 5, 0, 1, 15, 18, 19, 22, 23, 26, 27, 30] selectExpressions: CastLongToDouble(col 2:int) -> 15:double, DoubleColMultiplyDoubleColumn(col 16:double, col 17:double)(children: CastLongToDouble(col 2:int) -> 16:double, CastLongToDouble(col 2:int) -> 17:double) -> 18:double, CastLongToDouble(col 3:bigint) -> 19:double, DoubleColMultiplyDoubleColumn(col 20:double, col 21:double)(children: CastLongToDouble(col 3:bigint) -> 20:double, CastLongToDouble(col 3:bigint) -> 21:double) -> 22:double, CastLongToDouble(col 0:tinyint) -> 23:double, DoubleColMultiplyDoubleColumn(col 24:double, col 25:double)(children: CastLongToDouble(col 0:tinyint) -> 24:double, CastLongToDouble(col 0:tinyint) -> 25:double) -> 26:double, CastLongToDouble(col 1:smallint) -> 27:double, DoubleColMultiplyDoubleColumn(col 28:double, col 29:double)(children: CastLongToDouble(col 1:smallint) -> 28:double, CastLongToDouble(col 1:smallint) -> 29:double) -> 30:double - Statistics: Num rows: 7845 Data size: 1661020 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 5857 Data size: 1240180 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: max(_col1), sum(_col2), sum(_col8), sum(_col7), count(_col3), sum(_col4), count(_col4), min(_col2), sum(_col10), sum(_col9), count(_col2), sum(_col3), sum(_col12), sum(_col11), count(_col5), sum(_col14), sum(_col13), count(_col6) Group By Vectorization: diff --git a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out index 5e59a3c31b..18152f0ae8 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_context.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_context.q.out @@ -127,7 +127,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 6075 Data size: 72744 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ss_hdemo_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 6075 Data size: 72744 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_store_sk (type: int), ss_hdemo_sk (type: int), ss_net_profit (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out index 539cc25afe..4ba955e8cb 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out @@ -1164,7 +1164,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -1356,7 +1356,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -2921,7 +2921,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08')) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -3084,7 +3084,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -5547,7 +5547,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), hr (type: string) @@ -7538,10 +7538,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_date_hour_n2 - filterExpr: ((date) IN ('2008-04-08', '2008-04-09') and (UDFToDouble(hour) = 11.0D) and ds is not null and UDFToDouble(hr) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and UDFToDouble(hr) is not null and ds is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), UDFToDouble(hr) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction.q.out index 3e0df1ab65..12d25d76ae 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction.q.out @@ -66,7 +66,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 1:int), FilterExprAndExpr(children: FilterLongColumnBetweenDynamicValue(col 1:int, left 0, right 0), VectorInBloomFilterColDynamicValue)) - predicate: ((key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter))) and key_int is not null) (type: boolean) + predicate: (key_int is not null and (key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_int (type: int) @@ -311,7 +311,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 0:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter))) and key_str is not null) (type: boolean) + predicate: (key_str is not null and (key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_str (type: string) @@ -556,7 +556,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 0:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter))) and key_str is not null) (type: boolean) + predicate: (key_str is not null and (key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_str (type: string) @@ -802,7 +802,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 1:int), FilterExprAndExpr(children: FilterLongColumnBetweenDynamicValue(col 1:int, left 0, right 0), VectorInBloomFilterColDynamicValue)) - predicate: ((key_int BETWEEN DynamicValue(RS_10_b_key_int_min) AND DynamicValue(RS_10_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_10_b_key_int_bloom_filter))) and key_int is not null) (type: boolean) + predicate: (key_int is not null and (key_int BETWEEN DynamicValue(RS_10_b_key_int_min) AND DynamicValue(RS_10_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_10_b_key_int_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_int (type: int) @@ -1075,7 +1075,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 1:int), FilterExprAndExpr(children: FilterStringColumnBetweenDynamicValue(col 0:string, left NULL, right NULL), VectorInBloomFilterColDynamicValue)) - predicate: ((key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter))) and key_int is not null and key_str is not null) (type: boolean) + predicate: (key_str is not null and key_int is not null and (key_str BETWEEN DynamicValue(RS_7_b_key_str_min) AND DynamicValue(RS_7_b_key_str_max) and in_bloom_filter(key_str, DynamicValue(RS_7_b_key_str_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 45500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_str (type: string), key_int (type: int) @@ -1118,7 +1118,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 1:int)) - predicate: (key_int is not null and key_str is not null) (type: boolean) + predicate: (key_str is not null and key_int is not null) (type: boolean) Statistics: Num rows: 57 Data size: 5130 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_str (type: string), key_int (type: int) @@ -1320,7 +1320,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 1:int), FilterExprAndExpr(children: FilterLongColumnBetweenDynamicValue(col 1:int, left 0, right 0), VectorInBloomFilterColDynamicValue)) - predicate: ((key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter))) and key_int is not null) (type: boolean) + predicate: (key_int is not null and (key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_int (type: int) @@ -1573,7 +1573,7 @@ STAGE PLANS: filterExpr: (key_int is not null and (key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter))) and key_int is not null) (type: boolean) + predicate: (key_int is not null and (key_int BETWEEN DynamicValue(RS_7_b_key_int_min) AND DynamicValue(RS_7_b_key_int_max) and in_bloom_filter(key_int, DynamicValue(RS_7_b_key_int_bloom_filter)))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key_int (type: int) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out index 31ae41fbd9..5b3d8115b7 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out @@ -122,7 +122,7 @@ STAGE PLANS: filterExpr: (partkey_bigint is not null and (partkey_bigint BETWEEN DynamicValue(RS_7_b_partkey_bigint_min) AND DynamicValue(RS_7_b_partkey_bigint_max) and in_bloom_filter(partkey_bigint, DynamicValue(RS_7_b_partkey_bigint_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((partkey_bigint BETWEEN DynamicValue(RS_7_b_partkey_bigint_min) AND DynamicValue(RS_7_b_partkey_bigint_max) and in_bloom_filter(partkey_bigint, DynamicValue(RS_7_b_partkey_bigint_bloom_filter))) and partkey_bigint is not null) (type: boolean) + predicate: (partkey_bigint is not null and (partkey_bigint BETWEEN DynamicValue(RS_7_b_partkey_bigint_min) AND DynamicValue(RS_7_b_partkey_bigint_max) and in_bloom_filter(partkey_bigint, DynamicValue(RS_7_b_partkey_bigint_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: partkey_bigint (type: bigint) @@ -277,7 +277,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 1:decimal(10,1)/DECIMAL_64), FilterExprAndExpr(children: FilterDecimalColumnBetweenDynamicValue(col 9:decimal(10,1), left 0, right 0)(children: ConvertDecimal64ToDecimal(col 1:decimal(10,1)/DECIMAL_64) -> 9:decimal(10,1)), VectorInBloomFilterColDynamicValue(children: ConvertDecimal64ToDecimal(col 1:decimal(10,1)/DECIMAL_64) -> 10:decimal(10,1)))) - predicate: ((partkey_decimal BETWEEN DynamicValue(RS_7_b_partkey_decimal_min) AND DynamicValue(RS_7_b_partkey_decimal_max) and in_bloom_filter(partkey_decimal, DynamicValue(RS_7_b_partkey_decimal_bloom_filter))) and partkey_decimal is not null) (type: boolean) + predicate: (partkey_decimal is not null and (partkey_decimal BETWEEN DynamicValue(RS_7_b_partkey_decimal_min) AND DynamicValue(RS_7_b_partkey_decimal_max) and in_bloom_filter(partkey_decimal, DynamicValue(RS_7_b_partkey_decimal_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 11200 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: partkey_decimal (type: decimal(10,1)) @@ -543,7 +543,7 @@ STAGE PLANS: filterExpr: (partkey_double is not null and (partkey_double BETWEEN DynamicValue(RS_7_b_partkey_double_min) AND DynamicValue(RS_7_b_partkey_double_max) and in_bloom_filter(partkey_double, DynamicValue(RS_7_b_partkey_double_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((partkey_double BETWEEN DynamicValue(RS_7_b_partkey_double_min) AND DynamicValue(RS_7_b_partkey_double_max) and in_bloom_filter(partkey_double, DynamicValue(RS_7_b_partkey_double_bloom_filter))) and partkey_double is not null) (type: boolean) + predicate: (partkey_double is not null and (partkey_double BETWEEN DynamicValue(RS_7_b_partkey_double_min) AND DynamicValue(RS_7_b_partkey_double_max) and in_bloom_filter(partkey_double, DynamicValue(RS_7_b_partkey_double_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: partkey_double (type: double) @@ -687,7 +687,7 @@ STAGE PLANS: filterExpr: (shipdate_date is not null and (shipdate_date BETWEEN DynamicValue(RS_7_b_shipdate_date_min) AND DynamicValue(RS_7_b_shipdate_date_max) and in_bloom_filter(shipdate_date, DynamicValue(RS_7_b_shipdate_date_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 5600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((shipdate_date BETWEEN DynamicValue(RS_7_b_shipdate_date_min) AND DynamicValue(RS_7_b_shipdate_date_max) and in_bloom_filter(shipdate_date, DynamicValue(RS_7_b_shipdate_date_bloom_filter))) and shipdate_date is not null) (type: boolean) + predicate: (shipdate_date is not null and (shipdate_date BETWEEN DynamicValue(RS_7_b_shipdate_date_min) AND DynamicValue(RS_7_b_shipdate_date_max) and in_bloom_filter(shipdate_date, DynamicValue(RS_7_b_shipdate_date_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 5600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: shipdate_date (type: date) @@ -831,7 +831,7 @@ STAGE PLANS: filterExpr: (shipdate_ts is not null and (shipdate_ts BETWEEN DynamicValue(RS_7_b_shipdate_ts_min) AND DynamicValue(RS_7_b_shipdate_ts_max) and in_bloom_filter(shipdate_ts, DynamicValue(RS_7_b_shipdate_ts_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 4000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((shipdate_ts BETWEEN DynamicValue(RS_7_b_shipdate_ts_min) AND DynamicValue(RS_7_b_shipdate_ts_max) and in_bloom_filter(shipdate_ts, DynamicValue(RS_7_b_shipdate_ts_bloom_filter))) and shipdate_ts is not null) (type: boolean) + predicate: (shipdate_ts is not null and (shipdate_ts BETWEEN DynamicValue(RS_7_b_shipdate_ts_min) AND DynamicValue(RS_7_b_shipdate_ts_max) and in_bloom_filter(shipdate_ts, DynamicValue(RS_7_b_shipdate_ts_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 4000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: shipdate_ts (type: timestamp) @@ -975,7 +975,7 @@ STAGE PLANS: filterExpr: (shipdate_string is not null and (shipdate_string BETWEEN DynamicValue(RS_7_b_shipdate_string_min) AND DynamicValue(RS_7_b_shipdate_string_max) and in_bloom_filter(shipdate_string, DynamicValue(RS_7_b_shipdate_string_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((shipdate_string BETWEEN DynamicValue(RS_7_b_shipdate_string_min) AND DynamicValue(RS_7_b_shipdate_string_max) and in_bloom_filter(shipdate_string, DynamicValue(RS_7_b_shipdate_string_bloom_filter))) and shipdate_string is not null) (type: boolean) + predicate: (shipdate_string is not null and (shipdate_string BETWEEN DynamicValue(RS_7_b_shipdate_string_min) AND DynamicValue(RS_7_b_shipdate_string_max) and in_bloom_filter(shipdate_string, DynamicValue(RS_7_b_shipdate_string_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: shipdate_string (type: string) @@ -1119,7 +1119,7 @@ STAGE PLANS: filterExpr: (shipdate_char is not null and (shipdate_char BETWEEN DynamicValue(RS_7_b_shipdate_char_min) AND DynamicValue(RS_7_b_shipdate_char_max) and in_bloom_filter(shipdate_char, DynamicValue(RS_7_b_shipdate_char_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((shipdate_char BETWEEN DynamicValue(RS_7_b_shipdate_char_min) AND DynamicValue(RS_7_b_shipdate_char_max) and in_bloom_filter(shipdate_char, DynamicValue(RS_7_b_shipdate_char_bloom_filter))) and shipdate_char is not null) (type: boolean) + predicate: (shipdate_char is not null and (shipdate_char BETWEEN DynamicValue(RS_7_b_shipdate_char_min) AND DynamicValue(RS_7_b_shipdate_char_max) and in_bloom_filter(shipdate_char, DynamicValue(RS_7_b_shipdate_char_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: shipdate_char (type: char(10)) @@ -1263,7 +1263,7 @@ STAGE PLANS: filterExpr: (shipdate_varchar is not null and (shipdate_varchar BETWEEN DynamicValue(RS_7_b_shipdate_varchar_min) AND DynamicValue(RS_7_b_shipdate_varchar_max) and in_bloom_filter(shipdate_varchar, DynamicValue(RS_7_b_shipdate_varchar_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((shipdate_varchar BETWEEN DynamicValue(RS_7_b_shipdate_varchar_min) AND DynamicValue(RS_7_b_shipdate_varchar_max) and in_bloom_filter(shipdate_varchar, DynamicValue(RS_7_b_shipdate_varchar_bloom_filter))) and shipdate_varchar is not null) (type: boolean) + predicate: (shipdate_varchar is not null and (shipdate_varchar BETWEEN DynamicValue(RS_7_b_shipdate_varchar_min) AND DynamicValue(RS_7_b_shipdate_varchar_max) and in_bloom_filter(shipdate_varchar, DynamicValue(RS_7_b_shipdate_varchar_bloom_filter)))) (type: boolean) Statistics: Num rows: 100 Data size: 9400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: shipdate_varchar (type: varchar(10)) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out b/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out index bb23424ef9..83be1e974b 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_join46.q.out @@ -297,7 +297,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test2_n9 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -305,7 +305,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out index 193e3d1fec..1ce4278511 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_mapjoin3.q.out @@ -414,7 +414,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 1:int), SelectColumnIsNotNull(col 0:decimal(8,1)/DECIMAL_64)) - predicate: (decimal0801_col is not null and int_col_1 is not null) (type: boolean) + predicate: (int_col_1 is not null and decimal0801_col is not null) (type: boolean) Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal0801_col (type: decimal(8,1)), int_col_1 (type: int) @@ -848,7 +848,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 1:string)) - predicate: (f_id is not null and t_id is not null) (type: boolean) + predicate: (t_id is not null and f_id is not null) (type: boolean) Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: t_id (type: string), f_id (type: string) @@ -938,7 +938,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 2:string, val TEST), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 1:string)) - predicate: ((type = 'TEST') and f_id is not null and t_id is not null) (type: boolean) + predicate: ((type = 'TEST') and t_id is not null and f_id is not null) (type: boolean) Statistics: Num rows: 5 Data size: 2760 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: t_id (type: string), f_id (type: string) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out index 331a8f8600..6f8e9930c6 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_nested_mapjoin.q.out @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: (ctinyint is not null and csmallint is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 146796 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (csmallint is not null and ctinyint is not null) (type: boolean) + predicate: (ctinyint is not null and csmallint is not null) (type: boolean) Statistics: Num rows: 6848 Data size: 81820 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out index c53f00b382..29e35eccf4 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_string_funcs.q.out @@ -63,7 +63,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cbigint % 237L) = 0L) and (length(substr(cstring1, 1, 2)) <= 2) and (cstring1 like '%')) (type: boolean) + filterExpr: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) Statistics: Num rows: 12288 Data size: 1816546 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/load_dyn_part13.q.out b/ql/src/test/results/clientpositive/load_dyn_part13.q.out index 1fd0fa381b..ea730280bb 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part13.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part13.q.out @@ -110,7 +110,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 40.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 40.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 40.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), '33' (type: string) diff --git a/ql/src/test/results/clientpositive/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/louter_join_ppr.q.out index 02d4c02667..a898f7ed52 100644 --- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -70,7 +70,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -346,7 +346,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -387,7 +387,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -666,7 +666,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -704,7 +704,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -980,7 +980,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -1021,7 +1021,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/manyViewJoin.q.out b/ql/src/test/results/clientpositive/manyViewJoin.q.out index 13ed173d3f..0046e25590 100644 --- a/ql/src/test/results/clientpositive/manyViewJoin.q.out +++ b/ql/src/test/results/clientpositive/manyViewJoin.q.out @@ -24980,7 +24980,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and test_hive_23 is not null and test_hive_26 is not null and test_hive_27 is not null and test_hive_28 is not null and test_hive_30 is not null and test_hive_71 is not null and test_hive_72 is not null and test_hive_73 is not null and UDFToDouble(test_hive_74) is not null and test_hive_75 is not null and test_hive_76 is not null and UDFToDouble(test_hive_77) is not null and test_hive_78 is not null and test_hive_80 is not null and test_hive_81 is not null and test_hive_82 is not null and test_hive_83 is not null and test_hive_84 is not null and UDFToDouble(test_hive_85) is not null and test_hive_86 is not null and UDFToDouble(test_hive_87) is not null and test_hive_88 is not null and test_hive_89 is not null and UDFToDouble(test_hive_90) is not null and test_hive_91 is not null and UDFToDouble(test_hive_92) is not null and test_hive_93 is not null and test_hive_94 is not null and test_hive_95 is not null and test_hive_96 is not null and test_hive_99 is not null and test_hive_101 is not null and test_hive_102 is not null and test_hive_103 is not null and test_hive_105 is not null and UDFToDouble(test_hive_106) is not null and test_hive_107 is not null and test_hive_108 is not null and test_hive_109 is not null and test_hive_110 is not null and test_hive_111 is not null and test_hive_112 is not null and test_hive_113 is not null and test_hive_114 is not null and test_hive_115 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(test_hive_106) is not null and UDFToDouble(test_hive_74) is not null and UDFToDouble(test_hive_77) is not null and UDFToDouble(test_hive_85) is not null and UDFToDouble(test_hive_87) is not null and UDFToDouble(test_hive_90) is not null and UDFToDouble(test_hive_92) is not null and ds_ts is not null and test_hive_101 is not null and test_hive_102 is not null and test_hive_103 is not null and test_hive_105 is not null and test_hive_107 is not null and test_hive_108 is not null and test_hive_109 is not null and test_hive_110 is not null and test_hive_111 is not null and test_hive_112 is not null and test_hive_113 is not null and test_hive_114 is not null and test_hive_115 is not null and test_hive_23 is not null and test_hive_26 is not null and test_hive_27 is not null and test_hive_28 is not null and test_hive_30 is not null and test_hive_71 is not null and test_hive_72 is not null and test_hive_73 is not null and test_hive_75 is not null and test_hive_76 is not null and test_hive_78 is not null and test_hive_80 is not null and test_hive_81 is not null and test_hive_82 is not null and test_hive_83 is not null and test_hive_84 is not null and test_hive_86 is not null and test_hive_88 is not null and test_hive_89 is not null and test_hive_91 is not null and test_hive_93 is not null and test_hive_94 is not null and test_hive_95 is not null and test_hive_96 is not null and test_hive_99 is not null) (type: boolean) + predicate: (ds_ts is not null and test_hive_23 is not null and test_hive_26 is not null and test_hive_27 is not null and test_hive_28 is not null and test_hive_30 is not null and test_hive_71 is not null and test_hive_72 is not null and test_hive_73 is not null and UDFToDouble(test_hive_74) is not null and test_hive_75 is not null and test_hive_76 is not null and UDFToDouble(test_hive_77) is not null and test_hive_78 is not null and test_hive_80 is not null and test_hive_81 is not null and test_hive_82 is not null and test_hive_83 is not null and test_hive_84 is not null and UDFToDouble(test_hive_85) is not null and test_hive_86 is not null and UDFToDouble(test_hive_87) is not null and test_hive_88 is not null and test_hive_89 is not null and UDFToDouble(test_hive_90) is not null and test_hive_91 is not null and UDFToDouble(test_hive_92) is not null and test_hive_93 is not null and test_hive_94 is not null and test_hive_95 is not null and test_hive_96 is not null and test_hive_99 is not null and test_hive_101 is not null and test_hive_102 is not null and test_hive_103 is not null and test_hive_105 is not null and UDFToDouble(test_hive_106) is not null and test_hive_107 is not null and test_hive_108 is not null and test_hive_109 is not null and test_hive_110 is not null and test_hive_111 is not null and test_hive_112 is not null and test_hive_113 is not null and test_hive_114 is not null and test_hive_115 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(test_hive_1018) (type: int), UDFToInteger(test_hive_1004) (type: int), UDFToInteger(test_hive_1025) (type: int), test_hive_23 (type: string), test_hive_27 (type: string), test_hive_29 (type: string), test_hive_30 (type: string), test_hive_97 (type: string), test_hive_96 (type: string), test_hive_98 (type: string), test_hive_101 (type: string), test_hive_102 (type: string), test_hive_109 (type: string), test_hive_111 (type: string), test_hive_112 (type: string), test_hive_113 (type: string), test_hive_114 (type: string), test_hive_115 (type: string), test_hive_78 (type: string), test_hive_79 (type: string), test_hive_24 (type: string), test_hive_26 (type: string), test_hive_110 (type: string), test_hive_77 (type: string), test_hive_87 (type: string), test_hive_92 (type: string), test_hive_90 (type: string), test_hive_74 (type: string), test_hive_85 (type: string), test_hive_81 (type: string), test_hive_82 (type: string), test_hive_106 (type: string), test_hive_107 (type: string), test_hive_108 (type: string), test_hive_75 (type: string), test_hive_86 (type: string), test_hive_76 (type: string), test_hive_89 (type: string), test_hive_88 (type: string), test_hive_91 (type: string), test_hive_71 (type: string), test_hive_72 (type: string), test_hive_73 (type: string), test_hive_80 (type: string), test_hive_103 (type: string), test_hive_104 (type: string), test_hive_1002 (type: string), test_hive_1003 (type: string), CAST( from_unixtime(to_unix_timestamp(test_hive_25,'yyyymmdd'), 'yyyy-mm-dd') AS TIMESTAMP) (type: timestamp), test_hive_28 (type: string), test_hive_93 (type: string), test_hive_94 (type: string), test_hive_95 (type: string), test_hive_99 (type: string), test_hive_105 (type: string), test_hive_83 (type: string), test_hive_84 (type: string), test_hive_100 (type: string), UDFToInteger(test_hive_1023) (type: int), UDFToInteger(test_hive_1024) (type: int), UDFToInteger(test_hive_1010) (type: int), UDFToInteger(test_hive_1010_a_d) (type: int), UDFToInteger(test_hive_1010_a_g) (type: int), UDFToDouble(test_hive_1026) (type: double), UDFToDouble(test_hive_1000) (type: double), UDFToDouble(test_hive_1001) (type: double), UDFToInteger(test_hive_1030) (type: int), UDFToInteger(test_hive_1030_1) (type: int), UDFToInteger(test_hive_1030_2) (type: int), UDFToInteger(test_hive_1030_3) (type: int), UDFToDouble(test_hive_1021) (type: double), UDFToDouble(test_hive_1020) (type: double), UDFToInteger(test_hive_1022) (type: int), UDFToInteger(test_hive_1019) (type: int), UDFToDouble(test_hive_1027) (type: double), UDFToDouble(test_hive_1028) (type: double), UDFToDouble(test_hive_1029) (type: double), UDFToInteger(test_hive_1005) (type: int), UDFToInteger(test_hive_1005_a_d) (type: int), UDFToInteger(test_hive_1005_psr) (type: int), UDFToInteger(test_hive_1005_psr_a_d) (type: int), UDFToInteger(test_hive_1005_psr_e) (type: int), UDFToInteger(test_hive_1013) (type: int), UDFToInteger(test_hive_1013_a_d) (type: int), UDFToInteger(test_hive_1013_psr) (type: int), UDFToInteger(test_hive_1013_psr_a_d) (type: int), UDFToInteger(test_hive_1013_psr_e) (type: int), CAST( from_unixtime(to_unix_timestamp(test_hive_1034,'yyyymmddhhmmss'), 'yyyy-mm-dd hh:mm:ss') AS TIMESTAMP) (type: timestamp), ds_ts (type: bigint) @@ -25268,7 +25268,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_275 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_275 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_275 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_275 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1154 (type: string), ds_ts (type: bigint) @@ -25364,7 +25364,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_278 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_278 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_278 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_278 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1198 (type: string), ds_ts (type: bigint) @@ -25588,7 +25588,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_413 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_413 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_413 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_413 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1429 (type: string), ds_ts (type: bigint) @@ -25652,7 +25652,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_415 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_415 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_415 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_415 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1459 (type: string), ds_ts (type: bigint) @@ -25748,7 +25748,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_418 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_418 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_418 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_418 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1503 (type: string), ds_ts (type: bigint) @@ -25812,7 +25812,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_420 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_420 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_420 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_420 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1533 (type: string), ds_ts (type: bigint) @@ -26132,7 +26132,7 @@ STAGE PLANS: filterExpr: (ds_ts is not null and UDFToDouble(CAST( test_hive_445 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(CAST( test_hive_445 AS decimal(10,0))) is not null and ds_ts is not null) (type: boolean) + predicate: (ds_ts is not null and UDFToDouble(CAST( test_hive_445 AS decimal(10,0))) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 376 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CAST( test_hive_445 AS decimal(10,0)) (type: decimal(10,0)), test_hive_1847 (type: string), ds_ts (type: bigint) diff --git a/ql/src/test/results/clientpositive/mapjoin46.q.out b/ql/src/test/results/clientpositive/mapjoin46.q.out index 77f65e5480..8e46cf56ad 100644 --- a/ql/src/test/results/clientpositive/mapjoin46.q.out +++ b/ql/src/test/results/clientpositive/mapjoin46.q.out @@ -178,10 +178,10 @@ STAGE PLANS: $hdt$_1:test2_n2 TableScan alias: test2_n2 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out b/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out index 861dbf0305..3c1f4d2111 100644 --- a/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out @@ -76,7 +76,7 @@ STAGE PLANS: filterExpr: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key < 300)) (type: boolean) + predicate: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator filter predicates: @@ -238,7 +238,7 @@ STAGE PLANS: filterExpr: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and (key < 300)) (type: boolean) + predicate: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator filter predicates: diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out index c28818a471..edc68ec6fc 100644 --- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out @@ -93,7 +93,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -644,7 +644,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/masking_1.q.out b/ql/src/test/results/clientpositive/masking_1.q.out index 48ab78a35a..0958385b5c 100644 --- a/ql/src/test/results/clientpositive/masking_1.q.out +++ b/ql/src/test/results/clientpositive/masking_1.q.out @@ -28,10 +28,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -84,10 +84,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -137,10 +137,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 332 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -190,10 +190,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: reverse(value) (type: string) @@ -253,10 +253,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0) and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and UDFToDouble(key) is not null) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0) and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string), UDFToDouble(key) (type: double) @@ -396,10 +396,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -449,10 +449,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -502,10 +502,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D) and ((UDFToDouble(key) % 2.0D) = 0.0D)) (type: boolean) + filterExpr: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) < 10.0D) and (UDFToDouble(key) > 0.0D)) (type: boolean) + predicate: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), upper(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_10.q.out b/ql/src/test/results/clientpositive/masking_10.q.out index 7cf86f3db1..3f3871bb1c 100644 --- a/ql/src/test/results/clientpositive/masking_10.q.out +++ b/ql/src/test/results/clientpositive/masking_10.q.out @@ -30,10 +30,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89488 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 250 Data size: 44744 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: reverse(value) (type: string) @@ -127,10 +127,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89488 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 250 Data size: 44744 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -182,10 +182,10 @@ STAGE PLANS: value expressions: _col1 (type: string), _col2 (type: int), _col3 (type: string) TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89488 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 250 Data size: 44744 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), reverse(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_12.q.out b/ql/src/test/results/clientpositive/masking_12.q.out index 8ff059a6cd..a3b4eb25d6 100644 --- a/ql/src/test/results/clientpositive/masking_12.q.out +++ b/ql/src/test/results/clientpositive/masking_12.q.out @@ -44,12 +44,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n5 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -239,7 +239,7 @@ STAGE PLANS: insideView TRUE Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -354,12 +354,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n5 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 6)) (type: boolean) + filterExpr: ((key < 10) and (key > 6) and ((key % 2) = 0)) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 6)) (type: boolean) + predicate: ((key < 10) and (key > 6) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger((UDFToDouble(key) / 2.0D)) (type: int) @@ -417,12 +417,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n5 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -436,12 +436,12 @@ STAGE PLANS: value expressions: _col1 (type: string) TableScan alias: masking_test_n5 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 6) and ((UDFToInteger((UDFToDouble(key) / 2.0D)) % 2) = 0) and (UDFToInteger((UDFToDouble(key) / 2.0D)) < 10)) (type: boolean) + filterExpr: ((key < 10) and (key > 6) and ((key % 2) = 0) and ((UDFToInteger((UDFToDouble(key) / 2.0D)) % 2) = 0) and (UDFToInteger((UDFToDouble(key) / 2.0D)) < 10)) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToInteger((UDFToDouble(key) / 2.0D)) % 2) = 0) and ((key % 2) = 0) and (UDFToInteger((UDFToDouble(key) / 2.0D)) < 10) and (key < 10) and (key > 6)) (type: boolean) + predicate: ((key < 10) and (key > 6) and ((key % 2) = 0) and ((UDFToInteger((UDFToDouble(key) / 2.0D)) % 2) = 0) and (UDFToInteger((UDFToDouble(key) / 2.0D)) < 10)) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger((UDFToDouble(key) / 2.0D)) (type: int) @@ -460,14 +460,14 @@ STAGE PLANS: 0 _col0 (type: int) 1 _col0 (type: int) outputColumnNames: _col1 - Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 736 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 736 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 6 Data size: 1104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 736 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/masking_13.q.out b/ql/src/test/results/clientpositive/masking_13.q.out index af093c0e88..4ca113df9c 100644 --- a/ql/src/test/results/clientpositive/masking_13.q.out +++ b/ql/src/test/results/clientpositive/masking_13.q.out @@ -28,10 +28,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -127,12 +127,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 6)) (type: boolean) + filterExpr: ((key < 10) and (key > 6) and ((key % 2) = 0)) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 6)) (type: boolean) + predicate: ((key < 10) and (key > 6) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger((UDFToDouble(key) / 2.0D)) (type: int) diff --git a/ql/src/test/results/clientpositive/masking_1_newdb.q.out b/ql/src/test/results/clientpositive/masking_1_newdb.q.out index 08eeb6a191..a9c8f9deb4 100644 --- a/ql/src/test/results/clientpositive/masking_1_newdb.q.out +++ b/ql/src/test/results/clientpositive/masking_1_newdb.q.out @@ -46,10 +46,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n12 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -102,10 +102,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n12 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_3.q.out b/ql/src/test/results/clientpositive/masking_3.q.out index c8b1619a4b..10a8e09000 100644 --- a/ql/src/test/results/clientpositive/masking_3.q.out +++ b/ql/src/test/results/clientpositive/masking_3.q.out @@ -127,7 +127,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -2804,7 +2804,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -8376,10 +8376,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D) and ((UDFToDouble(key) % 2.0D) = 0.0D)) (type: boolean) + filterExpr: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) < 10.0D) and (UDFToDouble(key) > 0.0D)) (type: boolean) + predicate: (((UDFToDouble(key) % 2.0D) = 0.0D) and (UDFToDouble(key) > 0.0D) and (UDFToDouble(key) < 10.0D)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), upper(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_4.q.out b/ql/src/test/results/clientpositive/masking_4.q.out index 0c6a490e1d..e77c3ed5c1 100644 --- a/ql/src/test/results/clientpositive/masking_4.q.out +++ b/ql/src/test/results/clientpositive/masking_4.q.out @@ -92,10 +92,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n11 - filterExpr: (((key % 2) = 0) and (key = 5)) (type: boolean) + filterExpr: ((key = 5) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key = 5)) (type: boolean) + predicate: ((key = 5) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 5 (type: int), reverse(value) (type: string) @@ -138,10 +138,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n11 - filterExpr: (((key % 2) = 0) and (key = 5)) (type: boolean) + filterExpr: ((key = 5) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key = 5)) (type: boolean) + predicate: ((key = 5) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 5 (type: int), reverse(value) (type: string) @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/masking_8.q.out b/ql/src/test/results/clientpositive/masking_8.q.out index 19e7856531..939d965aff 100644 --- a/ql/src/test/results/clientpositive/masking_8.q.out +++ b/ql/src/test/results/clientpositive/masking_8.q.out @@ -33,10 +33,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n2 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 90500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 15023 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string), _c2 (type: string), ROW__ID (type: struct) @@ -89,10 +89,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n2 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 90500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 15023 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string), _c2 (type: string) @@ -145,10 +145,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n2 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 90500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 15023 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: INPUT__FILE__NAME (type: string), key (type: int), reverse(value) (type: string), _c2 (type: string), ROW__ID (type: struct) @@ -227,10 +227,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n2 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 433000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 71878 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ROW__ID (type: struct), key (type: int), _c1 (type: string), _c2 (type: string), _c3 (type: string), _c4 (type: string), _c5 (type: string), _c6 (type: string), _c7 (type: string), _c8 (type: string), _c9 (type: string), _c10 (type: string) diff --git a/ql/src/test/results/clientpositive/masking_9.q.out b/ql/src/test/results/clientpositive/masking_9.q.out index 2ea7699a3f..1a71236034 100644 --- a/ql/src/test/results/clientpositive/masking_9.q.out +++ b/ql/src/test/results/clientpositive/masking_9.q.out @@ -30,10 +30,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 250 Data size: 952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ROW__ID (type: struct) diff --git a/ql/src/test/results/clientpositive/masking_disablecbo_1.q.out b/ql/src/test/results/clientpositive/masking_disablecbo_1.q.out index fd0e6fbdb9..777352f86a 100644 --- a/ql/src/test/results/clientpositive/masking_disablecbo_1.q.out +++ b/ql/src/test/results/clientpositive/masking_disablecbo_1.q.out @@ -501,7 +501,7 @@ STAGE PLANS: filterExpr: ((key > 0) and (key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key > 0) and (key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), upper(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_disablecbo_2.q.out b/ql/src/test/results/clientpositive/masking_disablecbo_2.q.out index a12f014e3c..013aa533cb 100644 --- a/ql/src/test/results/clientpositive/masking_disablecbo_2.q.out +++ b/ql/src/test/results/clientpositive/masking_disablecbo_2.q.out @@ -150,7 +150,7 @@ STAGE PLANS: filterExpr: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and reverse(value) is not null and (UDFToInteger(key) > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and (UDFToInteger(key) > 0) and reverse(value) is not null) (type: boolean) + predicate: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and reverse(value) is not null and (UDFToInteger(key) > 0)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), reverse(value) (type: string) @@ -242,7 +242,7 @@ STAGE PLANS: filterExpr: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and UDFToDouble(reverse(value)) is not null and (UDFToInteger(key) > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and (UDFToInteger(key) > 0) and UDFToDouble(reverse(value)) is not null) (type: boolean) + predicate: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and UDFToDouble(reverse(value)) is not null and (UDFToInteger(key) > 0)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), reverse(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_disablecbo_3.q.out b/ql/src/test/results/clientpositive/masking_disablecbo_3.q.out index c5742d93b9..79454e4724 100644 --- a/ql/src/test/results/clientpositive/masking_disablecbo_3.q.out +++ b/ql/src/test/results/clientpositive/masking_disablecbo_3.q.out @@ -619,7 +619,7 @@ STAGE PLANS: filterExpr: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToDouble(key) (type: double), UDFToDouble(key) (type: double) @@ -1202,7 +1202,7 @@ STAGE PLANS: filterExpr: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToDouble(key) (type: double), UDFToDouble(key) (type: double) @@ -1785,7 +1785,7 @@ STAGE PLANS: filterExpr: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToDouble(key) (type: double), UDFToDouble(key) (type: double) @@ -6634,7 +6634,7 @@ STAGE PLANS: filterExpr: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToDouble(key) (type: double), UDFToDouble(key) (type: double) @@ -7217,7 +7217,7 @@ STAGE PLANS: filterExpr: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: (UDFToDouble(key) is not null and (key > 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToDouble(key) (type: double), UDFToDouble(key) (type: double) @@ -7798,7 +7798,7 @@ STAGE PLANS: filterExpr: ((key > 0) and (key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key > 0) and (key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 27 Data size: 4806 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), upper(value) (type: string) diff --git a/ql/src/test/results/clientpositive/masking_mv.q.out b/ql/src/test/results/clientpositive/masking_mv.q.out index 5d84ddd32d..87e873cc37 100644 --- a/ql/src/test/results/clientpositive/masking_mv.q.out +++ b/ql/src/test/results/clientpositive/masking_mv.q.out @@ -214,7 +214,7 @@ STAGE PLANS: filterExpr: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((0 = (key % 2)) and (key < 10)) (type: boolean) + predicate: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 83 Data size: 332 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -288,7 +288,7 @@ STAGE PLANS: filterExpr: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((0 = (key % 2)) and (key < 10)) (type: boolean) + predicate: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 83 Data size: 332 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: key (type: int) @@ -358,10 +358,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n_mv - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: reverse(value) (type: string) @@ -435,10 +435,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n_mv - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: reverse(value) (type: string), key (type: int) @@ -532,7 +532,7 @@ STAGE PLANS: filterExpr: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((0 = (key % 2)) and (key < 10)) (type: boolean) + predicate: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: reverse(value) (type: string) @@ -613,7 +613,7 @@ STAGE PLANS: filterExpr: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((0 = (key % 2)) and (key < 10)) (type: boolean) + predicate: ((key < 10) and (0 = (key % 2))) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: reverse(value) (type: string), key (type: int) diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out index b42cd40e9d..bbb5c3ff49 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition.q.out @@ -71,27 +71,27 @@ STAGE PLANS: TableScan alias: srcpart_merge_dp_n1 filterExpr: (ds = '2008-04-08') (type: boolean) - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key (type: string), value (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: key, value, ds, hr - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 99 Data size: 140664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 136984 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 99 Data size: 140664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 136984 Basic stats: PARTIAL Column stats: PARTIAL value expressions: _col2 (type: struct), _col3 (type: struct) File Output Operator compressed: false @@ -105,14 +105,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -134,7 +134,7 @@ STAGE PLANS: File Output Operator compressed: false Dp Sort State: PARTITION_SORTED - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -730,14 +730,14 @@ STAGE PLANS: TableScan alias: srcpart_merge_dp_n1 filterExpr: (ds = '2008-04-08') (type: boolean) - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -746,19 +746,19 @@ STAGE PLANS: Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), '11' (type: string) outputColumnNames: key, value, ds, hr - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 99 Data size: 93448 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 99 Data size: 31648 Basic stats: PARTIAL Column stats: NONE value expressions: _col2 (type: struct), _col3 (type: struct) Reduce Operator Tree: Group By Operator @@ -766,14 +766,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 46252 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 49 Data size: 15664 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 46252 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 49 Data size: 15664 Basic stats: PARTIAL Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 49 Data size: 46252 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 49 Data size: 15664 Basic stats: PARTIAL Column stats: NONE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -1407,27 +1407,27 @@ STAGE PLANS: TableScan alias: srcpart_merge_dp_n1 filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) outputColumnNames: key, value, ds, hr - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 99 Data size: 140664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 136984 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 99 Data size: 140664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 136984 Basic stats: PARTIAL Column stats: PARTIAL value expressions: _col2 (type: struct), _col3 (type: struct) File Output Operator compressed: false @@ -1441,14 +1441,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 49 Data size: 69064 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 49 Data size: 65384 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -1470,7 +1470,7 @@ STAGE PLANS: File Output Operator compressed: false Dp Sort State: PARTITION_SORTED - Statistics: Num rows: 99 Data size: 111664 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 99 Data size: 49864 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out index 3342ab69ad..1372ee58cf 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition2.q.out @@ -95,27 +95,27 @@ STAGE PLANS: TableScan alias: srcpart_merge_dp_n0 filterExpr: (ds = '2008-04-08') (type: boolean) - Statistics: Num rows: 297 Data size: 333310 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 148488 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key (type: string), value (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 297 Data size: 333310 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 148488 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col0 (type: string), _col1 (type: string), '2008-04-08' (type: string), _col2 (type: string) outputColumnNames: key, value, ds, hr - Statistics: Num rows: 297 Data size: 333310 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 148488 Basic stats: PARTIAL Column stats: PARTIAL Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 297 Data size: 420520 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 409848 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 297 Data size: 420520 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 409848 Basic stats: PARTIAL Column stats: PARTIAL value expressions: _col2 (type: struct), _col3 (type: struct) File Output Operator compressed: false @@ -129,14 +129,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 148 Data size: 207152 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 148 Data size: 196480 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 148 Data size: 207152 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 148 Data size: 196480 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 148 Data size: 207152 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 148 Data size: 196480 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -158,7 +158,7 @@ STAGE PLANS: File Output Operator compressed: false Dp Sort State: PARTITION_SORTED - Statistics: Num rows: 297 Data size: 333310 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 148488 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out b/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out index 46310e959d..13bba2b6cf 100644 --- a/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out +++ b/ql/src/test/results/clientpositive/merge_dynamic_partition3.q.out @@ -159,27 +159,27 @@ STAGE PLANS: TableScan alias: srcpart_merge_dp_n2 filterExpr: (ds >= '2008-04-08') (type: boolean) - Statistics: Num rows: 594 Data size: 775180 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 405536 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: key (type: string), value (type: string), ds (type: string), hr (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 594 Data size: 775180 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 405536 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) outputColumnNames: key, value, ds, hr - Statistics: Num rows: 594 Data size: 775180 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 405536 Basic stats: PARTIAL Column stats: PARTIAL Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string), hr (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 594 Data size: 949600 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 928256 Basic stats: PARTIAL Column stats: PARTIAL Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) sort order: ++ Map-reduce partition columns: _col0 (type: string), _col1 (type: string) - Statistics: Num rows: 594 Data size: 949600 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 928256 Basic stats: PARTIAL Column stats: PARTIAL value expressions: _col2 (type: struct), _col3 (type: struct) File Output Operator compressed: false @@ -193,14 +193,14 @@ STAGE PLANS: keys: KEY._col0 (type: string), KEY._col1 (type: string) mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 297 Data size: 469648 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 448304 Basic stats: PARTIAL Column stats: PARTIAL Select Operator expressions: _col2 (type: struct), _col3 (type: struct), _col0 (type: string), _col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 297 Data size: 469648 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 448304 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 297 Data size: 469648 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 297 Data size: 448304 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -222,7 +222,7 @@ STAGE PLANS: File Output Operator compressed: false Dp Sort State: PARTITION_SORTED - Statistics: Num rows: 594 Data size: 775180 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 594 Data size: 405536 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat diff --git a/ql/src/test/results/clientpositive/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/metadata_only_queries.q.out index 344f057e42..0f3cacbfa4 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries.q.out @@ -262,11 +262,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s (type: string), bo (type: boolean), bin (type: binary), si (type: smallint), i (type: int), b (type: bigint) outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), sum(1), sum(0.2), count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7) minReductionHashAggr: 0.99 @@ -388,11 +388,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s (type: string), bo (type: boolean), bin (type: binary), si (type: smallint), i (type: int), b (type: bigint) outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 - Statistics: Num rows: 9489 Data size: 4116353 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 3137568 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), sum(1), sum(0.2), count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7) minReductionHashAggr: 0.99 @@ -678,11 +678,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_tbl_part - Statistics: Num rows: 9489 Data size: 1339425 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 360640 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ts (type: timestamp) outputColumnNames: ts - Statistics: Num rows: 9489 Data size: 1339425 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 9489 Data size: 360640 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(ts) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/multi_insert_gby.q.out b/ql/src/test/results/clientpositive/multi_insert_gby.q.out index 67fcacfd44..692ef73a67 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby.q.out @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: ((key > 500) or (key > 450)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key > 450) or (key > 500)) (type: boolean) + predicate: ((key > 500) or (key > 450)) (type: boolean) Statistics: Num rows: 332 Data size: 28884 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/multi_insert_gby4.q.out b/ql/src/test/results/clientpositive/multi_insert_gby4.q.out index 852c547d00..4d90f583fb 100644 --- a/ql/src/test/results/clientpositive/multi_insert_gby4.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_gby4.q.out @@ -72,7 +72,7 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col0 > 500) or (_col0 > 450)) or (_col0 > 490)) (type: boolean) + predicate: ((_col0 > 490) or ((_col0 > 500) or (_col0 > 450))) (type: boolean) Statistics: Num rows: 498 Data size: 43326 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) diff --git a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out index 7783048fcd..4cca027140 100644 --- a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out @@ -76,7 +76,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -302,7 +302,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -567,7 +567,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -837,7 +837,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1153,7 +1153,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1405,7 +1405,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1725,7 +1725,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1977,7 +1977,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -2282,7 +2282,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2343,7 +2343,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2586,7 +2586,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2647,7 +2647,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2929,7 +2929,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -2990,7 +2990,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -3277,7 +3277,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -3338,7 +3338,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false @@ -4058,7 +4058,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -4178,7 +4178,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -4298,7 +4298,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -4418,7 +4418,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -4553,7 +4553,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -4697,7 +4697,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -4881,7 +4881,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -5064,7 +5064,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -5248,7 +5248,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -5431,7 +5431,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -5620,7 +5620,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: struct), _col1 (type: struct) Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -5842,7 +5842,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 4272 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) diff --git a/ql/src/test/results/clientpositive/multi_insert_with_join2.q.out b/ql/src/test/results/clientpositive/multi_insert_with_join2.q.out index 7436fbfb11..ef581fd45e 100644 --- a/ql/src/test/results/clientpositive/multi_insert_with_join2.q.out +++ b/ql/src/test/results/clientpositive/multi_insert_with_join2.q.out @@ -235,7 +235,7 @@ STAGE PLANS: value expressions: _col0 (type: string) TableScan alias: b - filterExpr: ((val = 'val_104') and (id = 'Id_2')) (type: boolean) + filterExpr: ((id = 'Id_2') and (val = 'val_104')) (type: boolean) Statistics: Num rows: 2 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((id = 'Id_2') and (val = 'val_104')) (type: boolean) @@ -391,7 +391,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col5, _col6 Statistics: Num rows: 3 Data size: 1074 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col1 <> _col6) and (_col5 = 'Id_2') and (_col6 = 'val_104')) (type: boolean) + predicate: ((_col6 = 'val_104') and (_col5 = 'Id_2') and (_col1 <> _col6)) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), 'Id_2' (type: string), 'val_104' (type: string) @@ -633,7 +633,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col5 = 'Id_2') and (_col6 = 'val_104')) (type: boolean) + predicate: ((_col6 = 'val_104') and (_col5 = 'Id_2')) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), 'Id_2' (type: string), 'val_104' (type: string) @@ -852,7 +852,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col5 = 'Id_2') and (_col6 = 'val_104')) (type: boolean) + predicate: ((_col6 = 'val_104') and (_col5 = 'Id_2')) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), 'Id_2' (type: string), 'val_104' (type: string) @@ -1071,7 +1071,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col5 = 'Id_2') and (_col6 = 'val_104')) (type: boolean) + predicate: ((_col6 = 'val_104') and (_col5 = 'Id_2')) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), 'Id_2' (type: string), 'val_104' (type: string) @@ -1271,7 +1271,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 716 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col2 = 'val_103') and (_col3 = 'Id_1')) (type: boolean) + predicate: ((_col3 = 'Id_1') and (_col2 = 'val_103')) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col3 (type: string), _col2 (type: string) @@ -1502,7 +1502,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 716 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col2 = 'val_103') and (_col3 = 'Id_1')) (type: boolean) + predicate: ((_col3 = 'Id_1') and (_col2 = 'val_103')) (type: boolean) Statistics: Num rows: 1 Data size: 358 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col3 (type: string), _col2 (type: string) diff --git a/ql/src/test/results/clientpositive/nested_column_pruning.q.out b/ql/src/test/results/clientpositive/nested_column_pruning.q.out index 0713a40e44..d8bc8f484d 100644 --- a/ql/src/test/results/clientpositive/nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/nested_column_pruning.q.out @@ -1019,7 +1019,7 @@ STAGE PLANS: filterExpr: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) + predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1 (type: struct,f6:int>), s2 (type: struct,f11:map>>) @@ -1116,7 +1116,7 @@ STAGE PLANS: value expressions: _col0 (type: struct,f6:int>) TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (s1.f6 is not null and s2.f8.f9) (type: boolean) @@ -1212,11 +1212,11 @@ STAGE PLANS: value expressions: _col0 (type: struct,f6:int>) TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null and s2.f8.f9 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Pruned Column Paths: s1.f6, s2.f8.f9 Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s1.f6 is not null and s2.f8.f9 and s2.f8.f9 is not null) (type: boolean) + predicate: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1.f6 (type: int), s2.f8.f9 (type: boolean) diff --git a/ql/src/test/results/clientpositive/nonmr_fetch.q.out b/ql/src/test/results/clientpositive/nonmr_fetch.q.out index 3256462d5d..eea015fbae 100644 --- a/ql/src/test/results/clientpositive/nonmr_fetch.q.out +++ b/ql/src/test/results/clientpositive/nonmr_fetch.q.out @@ -163,7 +163,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) > 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) > 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (UDFToDouble(key) > 100.0D) (type: boolean) @@ -1003,7 +1003,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 250.0D) and (UDFToDouble(key) > 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 200.0D) and (UDFToDouble(key) < 250.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), key (type: string) diff --git a/ql/src/test/results/clientpositive/nullgroup5.q.out b/ql/src/test/results/clientpositive/nullgroup5.q.out index 1059e949eb..77eeafcfb9 100644 --- a/ql/src/test/results/clientpositive/nullgroup5.q.out +++ b/ql/src/test/results/clientpositive/nullgroup5.q.out @@ -67,19 +67,19 @@ STAGE PLANS: TableScan alias: x filterExpr: (ds = '2009-04-05') (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (ds = '2009-04-05') (type: boolean) - Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 121 Data size: 100808 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 121 Data size: 39544 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 121 Data size: 100808 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 121 Data size: 39544 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -87,16 +87,16 @@ STAGE PLANS: TableScan alias: y filterExpr: (ds = '2009-04-09') (type: boolean) - Statistics: Num rows: 120 Data size: 100440 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 120 Data size: 39376 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 120 Data size: 100440 Basic stats: PARTIAL Column stats: NONE + Statistics: Num rows: 120 Data size: 39376 Basic stats: PARTIAL Column stats: NONE Union - Statistics: Num rows: 121 Data size: 100808 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 121 Data size: 39544 Basic stats: PARTIAL Column stats: PARTIAL File Output Operator compressed: false - Statistics: Num rows: 121 Data size: 100808 Basic stats: PARTIAL Column stats: PARTIAL + Statistics: Num rows: 121 Data size: 39544 Basic stats: PARTIAL Column stats: PARTIAL table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/orc_nested_column_pruning.q.out b/ql/src/test/results/clientpositive/orc_nested_column_pruning.q.out index 656ba2d3ea..0dd935b04b 100644 --- a/ql/src/test/results/clientpositive/orc_nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/orc_nested_column_pruning.q.out @@ -1019,7 +1019,7 @@ STAGE PLANS: filterExpr: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) + predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1 (type: struct,f6:int>), s2 (type: struct,f11:map>>) @@ -1116,7 +1116,7 @@ STAGE PLANS: value expressions: _col0 (type: struct,f6:int>) TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (s1.f6 is not null and s2.f8.f9) (type: boolean) @@ -1212,11 +1212,11 @@ STAGE PLANS: value expressions: _col0 (type: struct,f6:int>) TableScan alias: t2 - filterExpr: (s2.f8.f9 and s1.f6 is not null and s2.f8.f9 is not null) (type: boolean) + filterExpr: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Pruned Column Paths: s1.f6, s2.f8.f9 Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s1.f6 is not null and s2.f8.f9 and s2.f8.f9 is not null) (type: boolean) + predicate: (s1.f6 is not null and s2.f8.f9 is not null and s2.f8.f9) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s1.f6 (type: int), s2.f8.f9 (type: boolean) diff --git a/ql/src/test/results/clientpositive/outer_join_ppr.q.out b/ql/src/test/results/clientpositive/outer_join_ppr.q.out index 3fc678d5ca..8bc0e4ba1c 100644 --- a/ql/src/test/results/clientpositive/outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/outer_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -70,7 +70,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -349,7 +349,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -387,7 +387,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out index 864ec43abe..7d01ef9e0e 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out @@ -932,7 +932,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cstring2 like '%b%') or (CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble)) (type: boolean) + filterExpr: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 1137584 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -940,7 +940,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double)) + predicateExpression: FilterExprOrExpr(children: FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)) predicate: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 1137584 Basic stats: COMPLETE Column stats: COMPLETE Select Operator @@ -1102,7 +1102,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0)) or (cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%')) (type: boolean) + predicate: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or ((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE @@ -29916,7 +29916,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) and (cfloat = 3.02)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 49) and (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) and (cfloat = 3.5)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 45) and (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 3 Data size: 930 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -30157,7 +30157,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) or (cfloat = 3.02)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 49) or (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) or (cfloat = 3.5)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 45) or (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 2 Data size: 620 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out index 078d418a87..98c4691a94 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out @@ -58,7 +58,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or (cboolean1 < 0)) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -66,8 +66,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0)), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColLessLongScalar(col 10:boolean, val 0)) - predicate: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (UDFToLong(cint) > cbigint) or (cbigint < UDFToLong(ctinyint)) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0))) + predicate: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), cfloat (type: float), cint (type: int), cdouble (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out index 9c6e95cba2..0cbd846a54 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out @@ -73,7 +73,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(6,2), val -5638.15)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(6,2))), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) -> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern %a)))) - predicate: (((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= '10')) (type: boolean) + predicate: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a')))) (type: boolean) Statistics: Num rows: 9557 Data size: 1937820 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), ctimestamp1 (type: timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 (type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) (type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), (UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), (- (- cdouble)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_11.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_11.q.out index 2395f784c6..97f5ede98a 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_11.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_11.q.out @@ -46,7 +46,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + filterExpr: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 12288 Data size: 2381474 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -54,8 +54,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string), FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a))) - predicate: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a)), FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string)) + predicate: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 6144 Data size: 1190792 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), ctimestamp1 (type: timestamp), (-3728 * UDFToInteger(csmallint)) (type: int), (cdouble - 9763215.5639D) (type: double), (- cdouble) (type: double), ((- cdouble) + 6981.0D) (type: double), (cdouble * -5638.15D) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_12.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_12.q.out index 62647c9067..6059ac98fd 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_12.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_12.q.out @@ -81,7 +81,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (ctimestamp1 is null and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean) + filterExpr: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 12288 Data size: 1647554 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -89,8 +89,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint)))) - predicate: (((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ctimestamp1 is null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), SelectColumnIsNull(col 8:timestamp)) + predicate: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 1 Data size: 166 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cboolean1 (type: boolean), cstring1 (type: string), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_13.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_13.q.out index f0f3ea6f3a..119842757b 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_13.q.out @@ -92,7 +92,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28789.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28788.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -415,7 +415,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28801.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28801.336)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_14.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_14.q.out index b13ebed5d0..1d4a41c268 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_14.q.out @@ -83,7 +83,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToLong(ctinyint) <= cbigint) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) (type: boolean) + filterExpr: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 12288 Data size: 2139070 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -91,8 +91,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), FilterDoubleColLessDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float))) - predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and (UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 14:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 14:float)), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp))) + predicate: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 606 Data size: 105558 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), (- (-26.28D + cdouble)) (type: double), ((- (-26.28D + cdouble)) * (- (-26.28D + cdouble))) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_15.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_15.q.out index 0d772de3d7..f2d32b35f1 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_15.q.out @@ -79,7 +79,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) + filterExpr: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -87,8 +87,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) - predicate: (((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 like '%ss%')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) + predicate: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cboolean1 (type: boolean), cdouble (type: double), cstring1 (type: string), ctinyint (type: tinyint), cint (type: int), ctimestamp1 (type: timestamp), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_16.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_16.q.out index ebda1d2d14..6a038a3745 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_16.q.out @@ -65,7 +65,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_17.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_17.q.out index ce2f75eb5f..4a8eb4d0fa 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_17.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_17.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: boolean) + filterExpr: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 12288 Data size: 1647550 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -72,8 +72,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float))) - predicate: (((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float)), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)))) + predicate: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 4096 Data size: 549274 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cstring1 (type: string), cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_2.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_2.q.out index b52227c978..1b2800f55b 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_2.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean) + filterExpr: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 12288 Data size: 2157324 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -70,7 +70,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375)), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359)))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359))), FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375))) predicate: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 4096 Data size: 719232 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_3.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_3.q.out index ce8b80781b..4d3f0b6603 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_3.q.out @@ -76,7 +76,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), FilterDecimalColNotEqualDecimalScalar(col 14:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 15:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 16:double), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp))) - predicate: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) + predicate: (((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean) Statistics: Num rows: 2503 Data size: 260060 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), ctinyint (type: tinyint), cfloat (type: float), cint (type: int), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_4.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_4.q.out index cb29ecc45a..b185a234b4 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_4.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToInteger(csmallint) >= cint) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: boolean) + filterExpr: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -70,8 +70,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0)))) - predicate: (((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or (UDFToInteger(csmallint) >= cint)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0))), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553))) + predicate: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), ctinyint (type: tinyint), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_5.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_5.q.out index 9740f1c1d0..f100fff487 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_5.q.out @@ -65,7 +65,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %b%), SelectColumnIsNotNull(col 11:boolean)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterStringColLikeStringScalar(col 7:string, pattern a), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null) or ((cstring1 like '%b%') and cboolean2 is not null)) (type: boolean) + predicate: (((cstring1 like '%b%') and cboolean2 is not null) or ((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null)) (type: boolean) Statistics: Num rows: 7658 Data size: 1529972 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_6.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_6.q.out index 77c24c0a0b..59dad74855 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_6.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_6.q.out @@ -58,7 +58,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null))) (type: boolean) + filterExpr: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 2110130 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -66,7 +66,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint))), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5951 Data size: 1022000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out index baa2991d01..adfbdf9a8a 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -78,8 +78,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) @@ -289,7 +289,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -297,8 +297,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out index 3285996358..b15b1452a7 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out @@ -66,7 +66,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -74,8 +74,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) @@ -272,7 +272,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -280,8 +280,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_9.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_9.q.out index ebda1d2d14..6a038a3745 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_9.q.out @@ -65,7 +65,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_decimal_date.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_decimal_date.q.out index 65265db06e..d210a3e144 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_decimal_date.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_decimal_date.q.out @@ -43,7 +43,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:double)) - predicate: (cdouble is not null and cint is not null) (type: boolean) + predicate: (cint is not null and cdouble is not null) (type: boolean) Statistics: Num rows: 6848 Data size: 920460 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdate (type: date), cdecimal (type: decimal(20,10)) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_div0.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_div0.q.out index d28a3b3d7d..bcd4bdb9d0 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_div0.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_div0.q.out @@ -210,7 +210,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val 0), FilterLongColLessLongScalar(col 3:bigint, val 100000000)) - predicate: ((cbigint < 100000000L) and (cbigint > 0L)) (type: boolean) + predicate: ((cbigint > 0L) and (cbigint < 100000000L)) (type: boolean) Statistics: Num rows: 1365 Data size: 16320 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (cbigint - 988888L) (type: bigint), (cdouble / UDFToDouble((cbigint - 988888L))) (type: double), (1.2 / CAST( (cbigint - 988888L) AS decimal(19,0))) (type: decimal(22,21)) @@ -413,7 +413,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -500.0), FilterDoubleColLessDoubleScalar(col 5:double, val -199.0)) - predicate: ((cdouble < -199.0D) and (cdouble >= -500.0D)) (type: boolean) + predicate: ((cdouble >= -500.0D) and (cdouble < -199.0D)) (type: boolean) Statistics: Num rows: 1365 Data size: 16320 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (cdouble + 200.0D) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), ((cdouble + 200.0D) / (cdouble + 200.0D)) (type: double), (3.0D / (cdouble + 200.0D)) (type: double), (1.2D / (cdouble + 200.0D)) (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_limit.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_limit.q.out index f4a67f340e..67a99838c8 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_limit.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_limit.q.out @@ -21,10 +21,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 183488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 20400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_offset_limit.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_offset_limit.q.out index 47a7350bce..e204b9eede 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_offset_limit.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_offset_limit.q.out @@ -21,10 +21,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 183488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 20400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/pcr.q.out b/ql/src/test/results/clientpositive/pcr.q.out index f3fb02ce9e..584a4c4c14 100644 --- a/ql/src/test/results/clientpositive/pcr.q.out +++ b/ql/src/test/results/clientpositive/pcr.q.out @@ -62,7 +62,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' AND `key` < 5 +WHERE `key` < 5 AND `ds` <= '2000-04-09' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -74,7 +74,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds <= '2000-04-09') and (key < 5)) (type: boolean) + filterExpr: ((key < 5) and (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 11120 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -269,7 +269,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-10 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' OR `key` < 5 +WHERE `key` < 5 OR `ds` <= '2000-04-09' ORDER BY `key` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -281,12 +281,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds <= '2000-04-09') or (key < 5)) (type: boolean) + filterExpr: ((key < 5) or (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 60 Data size: 16680 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds <= '2000-04-09') or (key < 5)) (type: boolean) + predicate: ((key < 5) or (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 11120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) @@ -560,7 +560,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' AND `key` < 5 AND `value` <> 'val_2' +WHERE `key` < 5 AND `value` <> 'val_2' AND `ds` <= '2000-04-09' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1525,7 +1525,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 OPTIMIZED SQL: SELECT CAST(14 AS INTEGER) AS `key`, `value` FROM (SELECT `value` FROM `default`.`pcr_t1` -WHERE `ds` IN ('2000-04-08', '2000-04-09') AND `key` = 14 +WHERE `key` = 14 AND `ds` IN ('2000-04-08', '2000-04-09') ORDER BY `value`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1537,7 +1537,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds) IN ('2000-04-08', '2000-04-09') and (key = 14)) (type: boolean) + filterExpr: ((key = 14) and (ds) IN ('2000-04-08', '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 3760 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -3427,7 +3427,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((ds <= '2000-04-09') and (key = 2)) or (ds > '2000-04-08')) (type: boolean) + predicate: ((ds > '2000-04-08') or ((ds <= '2000-04-09') and (key = 2))) (type: boolean) Statistics: Num rows: 22 Data size: 6116 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) @@ -5072,7 +5072,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM (SELECT `key`, `value`, `hr` FROM `default`.`srcpart` -WHERE `hr` IN ('11', '12') AND `ds` = '2008-04-08' AND `key` = 11 +WHERE `key` = 11 AND `hr` IN ('11', '12') AND `ds` = '2008-04-08' ORDER BY `key`, `hr`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -5084,7 +5084,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((hr) IN ('11', '12') and (ds = '2008-04-08') and (UDFToDouble(key) = 11.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) = 11.0D) and (hr) IN ('11', '12') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -5272,7 +5272,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 OPTIMIZED SQL: SELECT `key`, `value`, `ds`, CAST('11' AS STRING) AS `hr` FROM (SELECT `key`, `value`, `ds` FROM `default`.`srcpart` -WHERE `hr` = '11' AND `key` = 11 +WHERE `key` = 11 AND `hr` = '11' ORDER BY `key`, `ds`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -5284,7 +5284,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((hr = '11') and (UDFToDouble(key) = 11.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) = 11.0D) and (hr = '11')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/pcs.q.out b/ql/src/test/results/clientpositive/pcs.q.out index 346bc69e36..082cdf04ad 100644 --- a/ql/src/test/results/clientpositive/pcs.q.out +++ b/ql/src/test/results/clientpositive/pcs.q.out @@ -1175,7 +1175,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (struct(ds)) IN (const struct('2000-04-08'), const struct('2000-04-09')) and (struct(ds,key)) IN (const struct('2000-04-08',1), const struct('2000-04-09',2))) (type: boolean) + predicate: ((struct(ds,key)) IN (const struct('2000-04-08',1), const struct('2000-04-09',2)) and (struct(ds)) IN (const struct('2000-04-08'), const struct('2000-04-09')) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: key (type: int), value (type: string) @@ -1201,7 +1201,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (struct(ds)) IN (const struct('2000-04-08'), const struct('2000-04-09')) and (struct(ds,key)) IN (const struct('2000-04-08',1), const struct('2000-04-09',2))) (type: boolean) + predicate: ((struct(ds,key)) IN (const struct('2000-04-08',1), const struct('2000-04-09',2)) and (struct(ds)) IN (const struct('2000-04-08'), const struct('2000-04-09')) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL Select Operator expressions: key (type: int), value (type: string) @@ -1567,7 +1567,7 @@ POSTHOOK: Input: default@pcs_t1@ds=2000-04-10 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `ds` FROM `default`.`pcs_t1` -WHERE (`ds` = '2000-04-08' OR `key` IS NOT NULL) AND `key` = 2 OR `ds` <> '2000-04-08' AND `key` = 3 +WHERE `ds` <> '2000-04-08' AND `key` = 3 OR (`ds` = '2000-04-08' OR `key` IS NOT NULL) AND `key` = 2 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1578,12 +1578,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcs_t1 - filterExpr: ((((ds = '2000-04-08') or key is not null) and (key = 2)) or ((ds <> '2000-04-08') and (key = 3))) (type: boolean) + filterExpr: (((ds <> '2000-04-08') and (key = 3)) or (((ds = '2000-04-08') or key is not null) and (key = 2))) (type: boolean) Statistics: Num rows: 60 Data size: 11280 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((((ds = '2000-04-08') or key is not null) and (key = 2)) or ((ds <> '2000-04-08') and (key = 3))) (type: boolean) + predicate: (((ds <> '2000-04-08') and (key = 3)) or (((ds = '2000-04-08') or key is not null) and (key = 2))) (type: boolean) Statistics: Num rows: 10 Data size: 1880 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string) @@ -1819,7 +1819,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((((((ds = '2000-04-08') or key is not null) and (key = 2)) or ((ds <> '2000-04-08') and (key = 3))) and ((key + 5) > 0)) or (key = 3)) (type: boolean) + predicate: ((key = 3) or (((((ds = '2000-04-08') or key is not null) and (key = 2)) or ((ds <> '2000-04-08') and (key = 3))) and ((key + 5) > 0))) (type: boolean) Statistics: Num rows: 8 Data size: 1504 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query1.q.out b/ql/src/test/results/clientpositive/perf/spark/query1.q.out index 7da93fac4f..cc0a45181b 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query1.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query1.q.out @@ -70,10 +70,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_state = 'NM') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_state = 'NM')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_state = 'NM') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_state = 'NM')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -145,7 +145,7 @@ STAGE PLANS: filterExpr: (sr_returned_date_sk is not null and sr_store_sk is not null and sr_customer_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_customer_sk is not null and sr_returned_date_sk is not null and sr_store_sk is not null) (type: boolean) + predicate: (sr_returned_date_sk is not null and sr_store_sk is not null and sr_customer_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_returned_date_sk (type: int), sr_customer_sk (type: int), sr_store_sk (type: int), sr_fee (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query10.q.out b/ql/src/test/results/clientpositive/perf/spark/query10.q.out index 51a0a03954..85bdad07f0 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query10.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query10.q.out @@ -177,7 +177,7 @@ STAGE PLANS: filterExpr: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2002) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) (type: boolean) + predicate: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -216,7 +216,7 @@ STAGE PLANS: filterExpr: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2002) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) (type: boolean) + predicate: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -255,7 +255,7 @@ STAGE PLANS: filterExpr: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2002) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) (type: boolean) + predicate: ((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -271,10 +271,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: ca - filterExpr: ((ca_county) IN ('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona Ana County') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_county) IN ('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona Ana County')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_county) IN ('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona Ana County') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_county) IN ('Walker County', 'Richland County', 'Gaines County', 'Douglas County', 'Dona Ana County')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query11.q.out b/ql/src/test/results/clientpositive/perf/spark/query11.q.out index 2c491505bd..6ac018fcdc 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query11.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query11.q.out @@ -226,7 +226,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -285,7 +285,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -344,7 +344,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -383,7 +383,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query12.q.out b/ql/src/test/results/clientpositive/perf/spark/query12.q.out index e25e075391..1d47d90bdb 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query12.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query12.q.out @@ -84,10 +84,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -146,10 +146,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string), i_item_desc (type: string), i_current_price (type: decimal(7,2)), i_class (type: string), i_category (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query13.q.out b/ql/src/test/results/clientpositive/perf/spark/query13.q.out index 8a0bd79837..cf37cceb07 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query13.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query13.q.out @@ -182,10 +182,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store_sales - filterExpr: (((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null) (type: boolean) + filterExpr: (ss_store_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250))) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250))) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_cdemo_sk (type: int), ss_hdemo_sk (type: int), ss_addr_sk (type: int), ss_store_sk (type: int), ss_quantity (type: int), ss_ext_sales_price (type: decimal(7,2)), ss_ext_wholesale_cost (type: decimal(7,2)), ss_net_profit BETWEEN 100 AND 200 (type: boolean), ss_net_profit BETWEEN 150 AND 300 (type: boolean), ss_net_profit BETWEEN 50 AND 250 (type: boolean), ss_sales_price BETWEEN 100 AND 150 (type: boolean), ss_sales_price BETWEEN 50 AND 100 (type: boolean), ss_sales_price BETWEEN 150 AND 200 (type: boolean) @@ -202,10 +202,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int), (cd_marital_status = 'M') (type: boolean), (cd_education_status = '4 yr Degree') (type: boolean), (cd_marital_status = 'D') (type: boolean), (cd_education_status = 'Primary') (type: boolean), (cd_marital_status = 'U') (type: boolean), (cd_education_status = 'Advanced Degree') (type: boolean) @@ -241,10 +241,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int), (ca_state) IN ('KY', 'GA', 'NM') (type: boolean), (ca_state) IN ('MT', 'OR', 'IN') (type: boolean), (ca_state) IN ('WI', 'MO', 'WV') (type: boolean) diff --git a/ql/src/test/results/clientpositive/perf/spark/query15.q.out b/ql/src/test/results/clientpositive/perf/spark/query15.q.out index b9ca7c7c40..61fc48dc9c 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query15.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query15.q.out @@ -107,7 +107,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) @@ -183,7 +183,7 @@ STAGE PLANS: outputColumnNames: _col2, _col3, _col8, _col9, _col10 Statistics: Num rows: 383314495 Data size: 51908482889 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (_col10 or _col3 or _col9) (type: boolean) + predicate: (_col3 or _col9 or _col10) (type: boolean) Statistics: Num rows: 383314495 Data size: 51908482889 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col2 (type: decimal(7,2)), _col8 (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query16.q.out b/ql/src/test/results/clientpositive/perf/spark/query16.q.out index 54ab1a39d2..a9247dd71a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query16.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query16.q.out @@ -84,10 +84,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-04-01 00:00:00' AND TIMESTAMP'2001-05-31 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-04-01 00:00:00' AND TIMESTAMP'2001-05-31 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-04-01 00:00:00' AND TIMESTAMP'2001-05-31 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-04-01 00:00:00' AND TIMESTAMP'2001-05-31 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -104,10 +104,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: call_center - filterExpr: ((cc_county) IN ('Ziebach County', 'Levy County', 'Huron County', 'Franklin Parish', 'Daviess County') and cc_call_center_sk is not null) (type: boolean) + filterExpr: (cc_call_center_sk is not null and (cc_county) IN ('Ziebach County', 'Levy County', 'Huron County', 'Franklin Parish', 'Daviess County')) (type: boolean) Statistics: Num rows: 60 Data size: 122700 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cc_county) IN ('Ziebach County', 'Levy County', 'Huron County', 'Franklin Parish', 'Daviess County') and cc_call_center_sk is not null) (type: boolean) + predicate: (cc_call_center_sk is not null and (cc_county) IN ('Ziebach County', 'Levy County', 'Huron County', 'Franklin Parish', 'Daviess County')) (type: boolean) Statistics: Num rows: 60 Data size: 122700 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cc_call_center_sk (type: int) @@ -139,7 +139,7 @@ STAGE PLANS: filterExpr: (cs_ship_date_sk is not null and cs_ship_addr_sk is not null and cs_call_center_sk is not null and cs_order_number is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_call_center_sk is not null and cs_order_number is not null and cs_ship_addr_sk is not null and cs_ship_date_sk is not null) (type: boolean) + predicate: (cs_ship_date_sk is not null and cs_ship_addr_sk is not null and cs_call_center_sk is not null and cs_order_number is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_ship_date_sk (type: int), cs_ship_addr_sk (type: int), cs_call_center_sk (type: int), cs_warehouse_sk (type: int), cs_order_number (type: int), cs_ext_ship_cost (type: decimal(7,2)), cs_net_profit (type: decimal(7,2)) @@ -203,10 +203,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state = 'NY') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state = 'NY')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state = 'NY') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state = 'NY')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query17.q.out b/ql/src/test/results/clientpositive/perf/spark/query17.q.out index 75dd535b2a..d46d3fb45e 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query17.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query17.q.out @@ -151,7 +151,7 @@ STAGE PLANS: filterExpr: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_quantity (type: int) @@ -168,10 +168,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d3 - filterExpr: ((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and (d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and (d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -190,7 +190,7 @@ STAGE PLANS: filterExpr: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_returned_date_sk (type: int), sr_item_sk (type: int), sr_customer_sk (type: int), sr_ticket_number (type: int), sr_return_quantity (type: int) @@ -207,10 +207,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - filterExpr: ((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and (d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and (d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -226,10 +226,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - filterExpr: ((d_quarter_name = '2000Q1') and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and (d_quarter_name = '2000Q1')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_quarter_name = '2000Q1') and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and (d_quarter_name = '2000Q1')) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query18.q.out b/ql/src/test/results/clientpositive/perf/spark/query18.q.out index 2ef8dfc77a..c5e6329768 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query18.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query18.q.out @@ -100,10 +100,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int), ca_county (type: string), ca_state (type: string), ca_country (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: filterExpr: (cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int), cs_bill_cdemo_sk (type: int), cs_item_sk (type: int), CAST( cs_quantity AS decimal(12,2)) (type: decimal(12,2)), CAST( cs_list_price AS decimal(12,2)) (type: decimal(12,2)), CAST( cs_coupon_amt AS decimal(12,2)) (type: decimal(12,2)), CAST( cs_sales_price AS decimal(12,2)) (type: decimal(12,2)), CAST( cs_net_profit AS decimal(12,2)) (type: decimal(12,2)) @@ -140,10 +140,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: cd1 - filterExpr: ((cd_gender = 'M') and (cd_education_status = 'College') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_gender = 'M') and (cd_education_status = 'College')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status = 'College') and (cd_gender = 'M') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_gender = 'M') and (cd_education_status = 'College')) (type: boolean) Statistics: Num rows: 465450 Data size: 179296539 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int), CAST( cd_dep_count AS decimal(12,2)) (type: decimal(12,2)) @@ -202,7 +202,7 @@ STAGE PLANS: filterExpr: ((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_customer_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: ((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_customer_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_cdemo_sk (type: int), c_current_addr_sk (type: int), CAST( c_birth_year AS decimal(12,2)) (type: decimal(12,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query19.q.out b/ql/src/test/results/clientpositive/perf/spark/query19.q.out index 142302797c..bf41c4991b 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query19.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query19.q.out @@ -109,7 +109,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -129,7 +129,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query20.q.out b/ql/src/test/results/clientpositive/perf/spark/query20.q.out index 6bd38844f2..4f49de0fe8 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query20.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query20.q.out @@ -76,10 +76,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -138,10 +138,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string), i_item_desc (type: string), i_current_price (type: decimal(7,2)), i_class (type: string), i_category (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query21.q.out b/ql/src/test/results/clientpositive/perf/spark/query21.q.out index 4da3c9b533..91528ecd49 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query21.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query21.q.out @@ -80,10 +80,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), (CAST( d_date AS DATE) < DATE'1998-04-08') (type: boolean), (CAST( d_date AS DATE) >= DATE'1998-04-08') (type: boolean) @@ -132,7 +132,7 @@ STAGE PLANS: filterExpr: (inv_warehouse_sk is not null and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_warehouse_sk is not null and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_warehouse_sk (type: int), inv_quantity_on_hand (type: int) @@ -224,7 +224,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 25012152 Data size: 395187961 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END) (type: boolean) + predicate: (CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END) (type: boolean) Statistics: Num rows: 6253038 Data size: 98796990 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query22.q.out b/ql/src/test/results/clientpositive/perf/spark/query22.q.out index 2795d206ad..2221ecb954 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query22.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query22.q.out @@ -117,7 +117,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query23.q.out b/ql/src/test/results/clientpositive/perf/spark/query23.q.out index a4526672fc..961dd03b87 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query23.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query23.q.out @@ -450,7 +450,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int), cs_item_sk (type: int), cs_quantity (type: int), cs_list_price (type: decimal(7,2)) @@ -549,7 +549,7 @@ STAGE PLANS: filterExpr: (ws_item_sk is not null and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_item_sk is not null and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_customer_sk (type: int), ws_quantity (type: int), ws_list_price (type: decimal(7,2)) @@ -569,7 +569,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 1) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -588,7 +588,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query24.q.out b/ql/src/test/results/clientpositive/perf/spark/query24.q.out index bfa360361e..f2853e0cfa 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query24.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query24.q.out @@ -164,7 +164,7 @@ STAGE PLANS: filterExpr: (ss_ticket_number is not null and ss_item_sk is not null and ss_store_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_ticket_number is not null and ss_item_sk is not null and ss_store_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_sales_price (type: decimal(7,2)) @@ -196,7 +196,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int) @@ -215,7 +215,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int), c_first_name (type: string), c_last_name (type: string), c_birth_country (type: string) @@ -429,7 +429,7 @@ STAGE PLANS: filterExpr: (ss_ticket_number is not null and ss_item_sk is not null and ss_store_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_ticket_number is not null and ss_item_sk is not null and ss_store_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_sales_price (type: decimal(7,2)) @@ -461,7 +461,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int), c_first_name (type: string), c_last_name (type: string), c_birth_country (type: string) @@ -498,10 +498,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_color = 'orchid') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_color = 'orchid')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_color = 'orchid') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_color = 'orchid')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_current_price (type: decimal(7,2)), i_size (type: string), i_units (type: string), i_manager_id (type: int) @@ -521,7 +521,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query25.q.out b/ql/src/test/results/clientpositive/perf/spark/query25.q.out index 591f572d73..085b7d55be 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query25.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query25.q.out @@ -157,7 +157,7 @@ STAGE PLANS: filterExpr: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_net_profit (type: decimal(7,2)) @@ -174,10 +174,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d3 - filterExpr: (d_moy BETWEEN 4 AND 10 and (d_year = 2000) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2000) and d_date_sk is not null and d_moy BETWEEN 4 AND 10) (type: boolean) + predicate: ((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -196,7 +196,7 @@ STAGE PLANS: filterExpr: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_returned_date_sk (type: int), sr_item_sk (type: int), sr_customer_sk (type: int), sr_ticket_number (type: int), sr_net_loss (type: decimal(7,2)) @@ -213,10 +213,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - filterExpr: (d_moy BETWEEN 4 AND 10 and (d_year = 2000) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2000) and d_date_sk is not null and d_moy BETWEEN 4 AND 10) (type: boolean) + predicate: ((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query26.q.out b/ql/src/test/results/clientpositive/perf/spark/query26.q.out index c66881a85f..7fce7bcff9 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query26.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query26.q.out @@ -64,10 +64,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: promotion - filterExpr: (((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean) + filterExpr: (p_promo_sk is not null and ((p_channel_email = 'N') or (p_channel_event = 'N'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean) + predicate: (p_promo_sk is not null and ((p_channel_email = 'N') or (p_channel_event = 'N'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_promo_sk (type: int) @@ -98,7 +98,7 @@ STAGE PLANS: filterExpr: (cs_bill_cdemo_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null and cs_promo_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_cdemo_sk is not null and cs_item_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_bill_cdemo_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null and cs_promo_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_cdemo_sk (type: int), cs_item_sk (type: int), cs_promo_sk (type: int), cs_quantity (type: int), cs_list_price (type: decimal(7,2)), cs_sales_price (type: decimal(7,2)), cs_coupon_amt (type: decimal(7,2)) @@ -135,10 +135,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary')) (type: boolean) Statistics: Num rows: 232725 Data size: 89648269 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query27.q.out b/ql/src/test/results/clientpositive/perf/spark/query27.q.out index 5e13f8af44..25921bfcfa 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query27.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query27.q.out @@ -68,10 +68,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_state (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: (ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_cdemo_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_cdemo_sk (type: int), ss_store_sk (type: int), ss_quantity (type: int), ss_list_price (type: decimal(7,2)), ss_sales_price (type: decimal(7,2)), ss_coupon_amt (type: decimal(7,2)) @@ -139,10 +139,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_gender = 'M') and (cd_marital_status = 'U') and (cd_education_status = '2 yr Degree') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_gender = 'M') and (cd_marital_status = 'U') and (cd_education_status = '2 yr Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status = '2 yr Degree') and (cd_gender = 'M') and (cd_marital_status = 'U') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_gender = 'M') and (cd_marital_status = 'U') and (cd_education_status = '2 yr Degree')) (type: boolean) Statistics: Num rows: 232725 Data size: 89648269 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query28.q.out b/ql/src/test/results/clientpositive/perf/spark/query28.q.out index e02bc3f7fa..882492156a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query28.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query28.q.out @@ -135,7 +135,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 16 AND 20 and (ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100) and ss_quantity BETWEEN 16 AND 20) (type: boolean) + predicate: (ss_quantity BETWEEN 16 AND 20 and (ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) @@ -162,7 +162,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 11 AND 15 and (ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24) and ss_quantity BETWEEN 11 AND 15) (type: boolean) + predicate: (ss_quantity BETWEEN 11 AND 15 and (ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) @@ -189,7 +189,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 6 AND 10 and (ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52) and ss_quantity BETWEEN 6 AND 10) (type: boolean) + predicate: (ss_quantity BETWEEN 6 AND 10 and (ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) @@ -216,7 +216,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 26 AND 30 and (ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62) and ss_quantity BETWEEN 26 AND 30) (type: boolean) + predicate: (ss_quantity BETWEEN 26 AND 30 and (ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) @@ -243,7 +243,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 21 AND 25 and (ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58) and ss_quantity BETWEEN 21 AND 25) (type: boolean) + predicate: (ss_quantity BETWEEN 21 AND 25 and (ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) @@ -478,7 +478,7 @@ STAGE PLANS: filterExpr: (ss_quantity BETWEEN 0 AND 5 and (ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34) and ss_quantity BETWEEN 0 AND 5) (type: boolean) + predicate: (ss_quantity BETWEEN 0 AND 5 and (ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34)) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_list_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query29.q.out b/ql/src/test/results/clientpositive/perf/spark/query29.q.out index 8d740db7ab..641568b55b 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query29.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query29.q.out @@ -155,7 +155,7 @@ STAGE PLANS: filterExpr: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_quantity (type: int) @@ -194,7 +194,7 @@ STAGE PLANS: filterExpr: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_returned_date_sk (type: int), sr_item_sk (type: int), sr_customer_sk (type: int), sr_ticket_number (type: int), sr_return_quantity (type: int) @@ -211,10 +211,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - filterExpr: (d_moy BETWEEN 4 AND 7 and (d_year = 1999) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 1999) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) (type: boolean) + predicate: ((d_year = 1999) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query3.q.out b/ql/src/test/results/clientpositive/perf/spark/query3.q.out index 7f13f03b64..10f93a7166 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query3.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query3.q.out @@ -67,7 +67,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query30.q.out b/ql/src/test/results/clientpositive/perf/spark/query30.q.out index 83e8c77d96..8f3850c062 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query30.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query30.q.out @@ -210,10 +210,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state = 'IL') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state = 'IL')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state = 'IL') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state = 'IL')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query31.q.out b/ql/src/test/results/clientpositive/perf/spark/query31.q.out index 8f926d7949..1e77385e7e 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query31.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query31.q.out @@ -147,7 +147,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -206,7 +206,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -265,7 +265,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -324,7 +324,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -383,7 +383,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -481,7 +481,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -843,7 +843,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col4, _col6, _col7, _col8, _col9, _col11, _col13 Statistics: Num rows: 2529945843 Data size: 223192556861 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END) (type: boolean) + predicate: (CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END) (type: boolean) Statistics: Num rows: 632486460 Data size: 55798139149 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col8 (type: string), 2000 (type: int), (_col6 / _col1) (type: decimal(37,20)), (_col9 / _col11) (type: decimal(37,20)), (_col4 / _col6) (type: decimal(37,20)), (_col13 / _col9) (type: decimal(37,20)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query32.q.out b/ql/src/test/results/clientpositive/perf/spark/query32.q.out index 5f15c57527..19b7b056ae 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query32.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query32.q.out @@ -75,10 +75,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -100,10 +100,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -133,7 +133,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_ext_discount_amt is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_ext_discount_amt is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_ext_discount_amt is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_item_sk (type: int), cs_ext_discount_amt (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query33.q.out b/ql/src/test/results/clientpositive/perf/spark/query33.q.out index 357b41d9bb..4e1ccdd677 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query33.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query33.q.out @@ -195,7 +195,7 @@ STAGE PLANS: filterExpr: (i_manufact_id is not null and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_sk is not null and i_manufact_id is not null) (type: boolean) + predicate: (i_manufact_id is not null and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_manufact_id (type: int) @@ -215,7 +215,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -250,10 +250,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Books') and i_manufact_id is not null) (type: boolean) + filterExpr: (i_manufact_id is not null and (i_category = 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Books') and i_manufact_id is not null) (type: boolean) + predicate: (i_manufact_id is not null and (i_category = 'Books')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_manufact_id (type: int) @@ -278,7 +278,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_addr_sk (type: int), cs_item_sk (type: int), cs_ext_sales_price (type: decimal(7,2)) @@ -298,7 +298,7 @@ STAGE PLANS: filterExpr: (i_manufact_id is not null and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_sk is not null and i_manufact_id is not null) (type: boolean) + predicate: (i_manufact_id is not null and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_manufact_id (type: int) @@ -318,7 +318,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -338,7 +338,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -376,7 +376,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query34.q.out b/ql/src/test/results/clientpositive/perf/spark/query34.q.out index 3a6cb35316..9da4ebec72 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query34.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query34.q.out @@ -85,10 +85,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_vehicle_count > 0) and hd_demo_sk is not null and (hd_buy_potential) IN ('>10000', 'unknown') and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_vehicle_count > 0) and hd_demo_sk is not null and (hd_buy_potential) IN ('>10000', 'unknown') and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END) (type: boolean) Statistics: Num rows: 1200 Data size: 128400 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -105,10 +105,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County', 'Fairfield County', 'Jackson County', 'Barrow County', 'Pennington County') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County', 'Fairfield County', 'Jackson County', 'Barrow County', 'Pennington County')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County', 'Fairfield County', 'Jackson County', 'Barrow County', 'Pennington County') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County', 'Fairfield County', 'Jackson County', 'Barrow County', 'Pennington County')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -136,7 +136,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int), ss_hdemo_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int) @@ -153,10 +153,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 2001, 2002) and ((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28)) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 2001, 2002) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and d_date_sk is not null and ((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28)) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and (d_year) IN (2000, 2001, 2002) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 2001, 2002) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and d_date_sk is not null and ((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query35.q.out b/ql/src/test/results/clientpositive/perf/spark/query35.q.out index a2eb9282ce..0959b85888 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query35.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query35.q.out @@ -173,7 +173,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_qoy < 4) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 12174 Data size: 13622706 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -212,7 +212,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_qoy < 4) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 12174 Data size: 13622706 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -251,7 +251,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_qoy < 4) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 12174 Data size: 13622706 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query36.q.out b/ql/src/test/results/clientpositive/perf/spark/query36.q.out index 9d60b05491..cde0e93e0a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query36.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query36.q.out @@ -80,10 +80,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC', 'AL', 'GA') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC', 'AL', 'GA')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC', 'AL', 'GA') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC', 'AL', 'GA')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -114,7 +114,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_store_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_store_sk (type: int), ss_ext_sales_price (type: decimal(7,2)), ss_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query37.q.out b/ql/src/test/results/clientpositive/perf/spark/query37.q.out index f9c741b771..b5408d8d05 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query37.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query37.q.out @@ -54,10 +54,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -102,10 +102,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_manufact_id) IN (678, 964, 918, 849) and i_current_price BETWEEN 22 AND 52 and i_item_sk is not null) (type: boolean) + filterExpr: (i_current_price BETWEEN 22 AND 52 and (i_manufact_id) IN (678, 964, 918, 849) and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_manufact_id) IN (678, 964, 918, 849) and i_current_price BETWEEN 22 AND 52 and i_item_sk is not null) (type: boolean) + predicate: (i_current_price BETWEEN 22 AND 52 and (i_manufact_id) IN (678, 964, 918, 849) and i_item_sk is not null) (type: boolean) Statistics: Num rows: 51333 Data size: 73728460 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string), i_item_desc (type: string), i_current_price (type: decimal(7,2)) @@ -125,7 +125,7 @@ STAGE PLANS: filterExpr: (inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand BETWEEN 100 AND 500) (type: boolean) + predicate: (inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 4176000 Data size: 65980122 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query38.q.out b/ql/src/test/results/clientpositive/perf/spark/query38.q.out index 3c4fb53c31..8f8de6fce2 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query38.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query38.q.out @@ -82,7 +82,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -142,7 +142,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_customer_sk (type: int) @@ -162,7 +162,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -202,7 +202,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_customer_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query39.q.out b/ql/src/test/results/clientpositive/perf/spark/query39.q.out index 41ae539c2a..bb6451bcec 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query39.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query39.q.out @@ -137,7 +137,7 @@ STAGE PLANS: filterExpr: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_warehouse_sk (type: int), inv_quantity_on_hand (type: int) @@ -157,7 +157,7 @@ STAGE PLANS: filterExpr: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_warehouse_sk (type: int), inv_quantity_on_hand (type: int) @@ -177,7 +177,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 5) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 5) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 5) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -215,7 +215,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 4) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query4.q.out b/ql/src/test/results/clientpositive/perf/spark/query4.q.out index bb5100ccb5..a7e317cc3c 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query4.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query4.q.out @@ -301,7 +301,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -359,7 +359,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -417,7 +417,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -475,7 +475,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -533,7 +533,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) @@ -572,7 +572,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string), c_preferred_cust_flag (type: string), c_birth_country (type: string), c_login (type: string), c_email_address (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query40.q.out b/ql/src/test/results/clientpositive/perf/spark/query40.q.out index 8930fcbfbf..9488fdd574 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query40.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query40.q.out @@ -78,10 +78,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), (CAST( d_date AS DATE) < DATE'1998-04-08') (type: boolean), (CAST( d_date AS DATE) >= DATE'1998-04-08') (type: boolean) @@ -131,7 +131,7 @@ STAGE PLANS: filterExpr: (cs_warehouse_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_warehouse_sk is not null) (type: boolean) + predicate: (cs_warehouse_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_warehouse_sk (type: int), cs_item_sk (type: int), cs_order_number (type: int), cs_sales_price (type: decimal(7,2)) @@ -151,7 +151,7 @@ STAGE PLANS: filterExpr: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cr_item_sk is not null and cr_order_number is not null) (type: boolean) + predicate: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_item_sk (type: int), cr_order_number (type: int), cr_refunded_cash (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query42.q.out b/ql/src/test/results/clientpositive/perf/spark/query42.q.out index 19c4a0b143..141c42039b 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query42.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query42.q.out @@ -69,7 +69,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query44.q.out b/ql/src/test/results/clientpositive/perf/spark/query44.q.out index 2fdd558415..c7c7965d91 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query44.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query44.q.out @@ -129,10 +129,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store_sales - filterExpr: ((ss_store_sk = 410) and ss_hdemo_sk is null) (type: boolean) + filterExpr: (ss_hdemo_sk is null and (ss_store_sk = 410)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_store_sk = 410) and ss_hdemo_sk is null) (type: boolean) + predicate: (ss_hdemo_sk is null and (ss_store_sk = 410)) (type: boolean) Statistics: Num rows: 143998908 Data size: 12703625455 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 143998908 Data size: 12703625455 Basic stats: COMPLETE Column stats: NONE @@ -152,10 +152,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store_sales - filterExpr: ((ss_store_sk = 410) and ss_hdemo_sk is null) (type: boolean) + filterExpr: (ss_hdemo_sk is null and (ss_store_sk = 410)) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_store_sk = 410) and ss_hdemo_sk is null) (type: boolean) + predicate: (ss_hdemo_sk is null and (ss_store_sk = 410)) (type: boolean) Statistics: Num rows: 143998908 Data size: 12703625455 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query45.q.out b/ql/src/test/results/clientpositive/perf/spark/query45.q.out index 0a6b373dba..b530804b70 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query45.q.out @@ -175,7 +175,7 @@ STAGE PLANS: filterExpr: (ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_customer_sk (type: int), ws_sales_price (type: decimal(7,2)) @@ -214,7 +214,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query46.q.out b/ql/src/test/results/clientpositive/perf/spark/query46.q.out index 04a0b3486b..5405c17904 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query46.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query46.q.out @@ -94,10 +94,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_city) IN ('Cedar Grove', 'Wildwood', 'Union', 'Salem', 'Highland Park') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_city) IN ('Cedar Grove', 'Wildwood', 'Union', 'Salem', 'Highland Park')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_city) IN ('Cedar Grove', 'Wildwood', 'Union', 'Salem', 'Highland Park') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_city) IN ('Cedar Grove', 'Wildwood', 'Union', 'Salem', 'Highland Park')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -149,7 +149,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int), c_first_name (type: string), c_last_name (type: string) @@ -209,7 +209,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int), ss_hdemo_sk (type: int), ss_addr_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_coupon_amt (type: decimal(7,2)), ss_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query47.q.out b/ql/src/test/results/clientpositive/perf/spark/query47.q.out index 4e0219dcb2..3031de6b6f 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query47.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query47.q.out @@ -127,7 +127,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_company_name is not null and s_store_name is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_store_name (type: string), s_company_name (type: string) @@ -152,7 +152,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_company_name is not null and s_store_name is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_store_name (type: string), s_company_name (type: string) @@ -177,7 +177,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_company_name is not null and s_store_name is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_store_name is not null and s_company_name is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_store_name (type: string), s_company_name (type: string) @@ -255,10 +255,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -278,7 +278,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -315,10 +315,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -338,7 +338,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -355,10 +355,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -378,7 +378,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -523,7 +523,7 @@ STAGE PLANS: isPivotResult: true Statistics: Num rows: 383325119 Data size: 33817053293 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 > 0) and (_col5 = 2000) and rank_window_1 is not null) (type: boolean) + predicate: ((_col0 > 0) and rank_window_1 is not null and (_col5 = 2000)) (type: boolean) Statistics: Num rows: 63887519 Data size: 5636175475 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: rank_window_1 (type: int), _col0 (type: decimal(21,6)), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: int), _col7 (type: decimal(17,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query48.q.out b/ql/src/test/results/clientpositive/perf/spark/query48.q.out index c9f9d24934..47cf453ef7 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query48.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query48.q.out @@ -184,10 +184,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store_sales - filterExpr: (((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null) (type: boolean) + filterExpr: ((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000))) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: ((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000))) (type: boolean) Statistics: Num rows: 191998545 Data size: 16938167362 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_cdemo_sk (type: int), ss_addr_sk (type: int), ss_store_sk (type: int), ss_quantity (type: int), ss_net_profit BETWEEN 0 AND 2000 (type: boolean), ss_net_profit BETWEEN 150 AND 3000 (type: boolean), ss_net_profit BETWEEN 50 AND 25000 (type: boolean) @@ -204,10 +204,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status = 'M') and (cd_education_status = '4 yr Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status = 'M') and (cd_education_status = '4 yr Degree')) (type: boolean) Statistics: Num rows: 465450 Data size: 179296539 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int) @@ -242,10 +242,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int), (ca_state) IN ('KY', 'GA', 'NM') (type: boolean), (ca_state) IN ('MT', 'OR', 'IN') (type: boolean), (ca_state) IN ('WI', 'MO', 'WV') (type: boolean) diff --git a/ql/src/test/results/clientpositive/perf/spark/query49.q.out b/ql/src/test/results/clientpositive/perf/spark/query49.q.out index 69dd18e4e8..8248b45b74 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query49.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query49.q.out @@ -301,7 +301,7 @@ STAGE PLANS: filterExpr: ((ws_net_profit > 1) and (ws_net_paid > 0) and (ws_quantity > 0) and ws_order_number is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ws_net_paid > 0) and (ws_net_profit > 1) and (ws_quantity > 0) and ws_item_sk is not null and ws_order_number is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: ((ws_net_profit > 1) and (ws_net_paid > 0) and (ws_quantity > 0) and ws_order_number is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 5333432 Data size: 725192506 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_order_number (type: int), CASE WHEN (ws_quantity is not null) THEN (ws_quantity) ELSE (0) END (type: int), CASE WHEN (ws_net_paid is not null) THEN (ws_net_paid) ELSE (0) END (type: decimal(7,2)) @@ -321,7 +321,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 12) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 12) and (d_year = 2000) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 12) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -340,7 +340,7 @@ STAGE PLANS: filterExpr: ((wr_return_amt > 10000) and wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((wr_return_amt > 10000) and wr_item_sk is not null and wr_order_number is not null) (type: boolean) + predicate: ((wr_return_amt > 10000) and wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 4799489 Data size: 441731394 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_item_sk (type: int), wr_order_number (type: int), CASE WHEN (wr_return_quantity is not null) THEN (wr_return_quantity) ELSE (0) END (type: int), CASE WHEN (wr_return_amt is not null) THEN (wr_return_amt) ELSE (0) END (type: decimal(7,2)) @@ -360,7 +360,7 @@ STAGE PLANS: filterExpr: ((cs_net_profit > 1) and (cs_net_paid > 0) and (cs_quantity > 0) and cs_order_number is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cs_net_paid > 0) and (cs_net_profit > 1) and (cs_quantity > 0) and cs_item_sk is not null and cs_order_number is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: ((cs_net_profit > 1) and (cs_net_paid > 0) and (cs_quantity > 0) and cs_order_number is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 10666290 Data size: 1444429931 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_item_sk (type: int), cs_order_number (type: int), CASE WHEN (cs_quantity is not null) THEN (cs_quantity) ELSE (0) END (type: int), CASE WHEN (cs_net_paid is not null) THEN (cs_net_paid) ELSE (0) END (type: decimal(7,2)) @@ -380,7 +380,7 @@ STAGE PLANS: filterExpr: ((cr_return_amount > 10000) and cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cr_return_amount > 10000) and cr_item_sk is not null and cr_order_number is not null) (type: boolean) + predicate: ((cr_return_amount > 10000) and cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 9599627 Data size: 1019078226 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_item_sk (type: int), cr_order_number (type: int), CASE WHEN (cr_return_quantity is not null) THEN (cr_return_quantity) ELSE (0) END (type: int), CASE WHEN (cr_return_amount is not null) THEN (cr_return_amount) ELSE (0) END (type: decimal(7,2)) @@ -400,7 +400,7 @@ STAGE PLANS: filterExpr: ((ss_net_profit > 1) and (ss_net_paid > 0) and (ss_quantity > 0) and ss_ticket_number is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ss_net_paid > 0) and (ss_net_profit > 1) and (ss_quantity > 0) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: ((ss_net_profit > 1) and (ss_net_paid > 0) and (ss_quantity > 0) and ss_ticket_number is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 21333171 Data size: 1882018537 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_ticket_number (type: int), CASE WHEN (ss_quantity is not null) THEN (ss_quantity) ELSE (0) END (type: int), CASE WHEN (ss_net_paid is not null) THEN (ss_net_paid) ELSE (0) END (type: decimal(7,2)) @@ -420,7 +420,7 @@ STAGE PLANS: filterExpr: ((sr_return_amt > 10000) and sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((sr_return_amt > 10000) and sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: ((sr_return_amt > 10000) and sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 19197050 Data size: 1487398277 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int), CASE WHEN (sr_return_quantity is not null) THEN (sr_return_quantity) ELSE (0) END (type: int), CASE WHEN (sr_return_amt is not null) THEN (sr_return_amt) ELSE (0) END (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query5.q.out b/ql/src/test/results/clientpositive/perf/spark/query5.q.out index 59bfebb780..690e948558 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query5.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query5.q.out @@ -373,7 +373,7 @@ STAGE PLANS: filterExpr: (cr_returned_date_sk is not null and cr_catalog_page_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cr_catalog_page_sk is not null and cr_returned_date_sk is not null) (type: boolean) + predicate: (cr_returned_date_sk is not null and cr_catalog_page_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_catalog_page_sk (type: int), cr_returned_date_sk (type: int), 0 (type: decimal(7,2)), 0 (type: decimal(7,2)), cr_return_amount (type: decimal(7,2)), cr_net_loss (type: decimal(7,2)) @@ -390,10 +390,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -472,7 +472,7 @@ STAGE PLANS: filterExpr: (wr_returned_date_sk is not null and wr_item_sk is not null and wr_order_number is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (wr_item_sk is not null and wr_order_number is not null and wr_returned_date_sk is not null) (type: boolean) + predicate: (wr_returned_date_sk is not null and wr_item_sk is not null and wr_order_number is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_returned_date_sk (type: int), wr_item_sk (type: int), wr_order_number (type: int), wr_return_amt (type: decimal(7,2)), wr_net_loss (type: decimal(7,2)) @@ -489,10 +489,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-08-18 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -531,7 +531,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_catalog_page_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_catalog_page_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_catalog_page_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_catalog_page_sk (type: int), cs_sold_date_sk (type: int), cs_ext_sales_price (type: decimal(7,2)), cs_net_profit (type: decimal(7,2)), 0 (type: decimal(7,2)), 0 (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query50.q.out b/ql/src/test/results/clientpositive/perf/spark/query50.q.out index 9abb497a4b..591bafbc43 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query50.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query50.q.out @@ -172,7 +172,7 @@ STAGE PLANS: filterExpr: (ss_ticket_number is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) (type: boolean) + predicate: (ss_ticket_number is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int) @@ -223,7 +223,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null and sr_customer_sk is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null and sr_customer_sk is not null and sr_returned_date_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_returned_date_sk (type: int), sr_item_sk (type: int), sr_customer_sk (type: int), sr_ticket_number (type: int) @@ -243,7 +243,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 9) and (d_year = 2000) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query51.q.out b/ql/src/test/results/clientpositive/perf/spark/query51.q.out index fc555a9c05..c486efa41b 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query51.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query51.q.out @@ -138,7 +138,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -158,7 +158,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query52.q.out b/ql/src/test/results/clientpositive/perf/spark/query52.q.out index adc405b3f0..27521b341d 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query52.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query52.q.out @@ -69,7 +69,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query53.q.out b/ql/src/test/results/clientpositive/perf/spark/query53.q.out index 85b1230993..0acc9ebdb7 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query53.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query53.q.out @@ -127,10 +127,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_manufact_id (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query54.q.out b/ql/src/test/results/clientpositive/perf/spark/query54.q.out index 865293d5f1..48bf87d718 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query54.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query54.q.out @@ -207,7 +207,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int), cs_item_sk (type: int) @@ -227,7 +227,7 @@ STAGE PLANS: filterExpr: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_customer_sk (type: int), ws_item_sk (type: int) @@ -244,10 +244,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Jewelry') and (i_class = 'consignment') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category = 'Jewelry') and (i_class = 'consignment')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Jewelry') and (i_class = 'consignment') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category = 'Jewelry') and (i_class = 'consignment')) (type: boolean) Statistics: Num rows: 115500 Data size: 165890114 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int) @@ -285,7 +285,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) @@ -305,7 +305,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (d_month_seq + 1) (type: int) @@ -330,7 +330,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (d_month_seq + 3) (type: int) @@ -355,7 +355,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3)) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999)) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3)) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (d_month_seq + 3) (type: int) @@ -380,7 +380,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3)) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999)) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3)) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (d_month_seq + 1) (type: int) @@ -677,7 +677,7 @@ STAGE PLANS: outputColumnNames: _col2, _col4, _col10, _col12, _col13 Statistics: Num rows: 58108714324214428 Data size: 9223372036854775807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col12 <= _col4) and (_col4 <= _col13)) (type: boolean) + predicate: ((_col4 <= _col13) and (_col12 <= _col4)) (type: boolean) Statistics: Num rows: 6456523813801603 Data size: 1024819115206086144 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col2 (type: decimal(7,2)), _col10 (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query55.q.out b/ql/src/test/results/clientpositive/perf/spark/query55.q.out index 9bc4ce36ad..502e053f1a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query55.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query55.q.out @@ -53,7 +53,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query56.q.out b/ql/src/test/results/clientpositive/perf/spark/query56.q.out index 2c8083cb76..b7be5c5042 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query56.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query56.q.out @@ -178,10 +178,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: (i_item_id is not null and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -201,7 +201,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 1) and (d_year = 2000) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -264,7 +264,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_addr_sk (type: int), cs_item_sk (type: int), cs_ext_sales_price (type: decimal(7,2)) @@ -281,10 +281,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: (i_item_id is not null and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -304,7 +304,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -324,7 +324,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 1) and (d_year = 2000) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 1) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -362,7 +362,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query57.q.out b/ql/src/test/results/clientpositive/perf/spark/query57.q.out index 9fd08266ca..933254c906 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query57.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query57.q.out @@ -212,7 +212,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_call_center_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_call_center_sk (type: int), cs_item_sk (type: int), cs_sales_price (type: decimal(7,2)) @@ -232,7 +232,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_call_center_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_call_center_sk (type: int), cs_item_sk (type: int), cs_sales_price (type: decimal(7,2)) @@ -249,10 +249,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -272,7 +272,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -292,7 +292,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_call_center_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_call_center_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_call_center_sk (type: int), cs_item_sk (type: int), cs_sales_price (type: decimal(7,2)) @@ -309,10 +309,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -332,7 +332,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -349,10 +349,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) (type: boolean) + predicate: ((d_year) IN (2000, 1999, 2001) and d_date_sk is not null and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int) @@ -372,7 +372,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_brand is not null and i_category is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_category is not null and i_brand is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_category (type: string) @@ -517,7 +517,7 @@ STAGE PLANS: isPivotResult: true Statistics: Num rows: 191657247 Data size: 25954241376 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 > 0) and (_col4 = 2000) and rank_window_1 is not null) (type: boolean) + predicate: (rank_window_1 is not null and (_col0 > 0) and (_col4 = 2000)) (type: boolean) Statistics: Num rows: 31942874 Data size: 4325706828 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: rank_window_1 (type: int), _col0 (type: decimal(21,6)), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), _col6 (type: decimal(17,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query58.q.out b/ql/src/test/results/clientpositive/perf/spark/query58.q.out index d191db3cd0..a2483a0a61 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query58.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query58.q.out @@ -322,10 +322,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -345,7 +345,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) @@ -385,7 +385,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -402,10 +402,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -422,10 +422,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -456,7 +456,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) @@ -496,7 +496,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -513,10 +513,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -533,10 +533,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -567,7 +567,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) @@ -607,7 +607,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -624,10 +624,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date = '1998-02-19') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date = '1998-02-19')) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -964,7 +964,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, _col7, _col9, _col10, _col11 Statistics: Num rows: 766650239 Data size: 67634106674 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (_col1 BETWEEN _col10 AND _col11 and _col1 BETWEEN _col6 AND _col7 and _col5 BETWEEN _col10 AND _col11 and _col5 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND _col7) (type: boolean) + predicate: (_col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND _col7 and _col1 BETWEEN _col10 AND _col11 and _col5 BETWEEN _col10 AND _col11 and _col1 BETWEEN _col6 AND _col7 and _col5 BETWEEN _col2 AND _col3) (type: boolean) Statistics: Num rows: 1442 Data size: 127213 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col5 (type: decimal(17,2)), (((_col5 / ((_col5 + _col1) + _col9)) / 3) * 100) (type: decimal(38,17)), _col1 (type: decimal(17,2)), (((_col1 / ((_col5 + _col1) + _col9)) / 3) * 100) (type: decimal(38,17)), _col9 (type: decimal(17,2)), (((_col9 / ((_col5 + _col1) + _col9)) / 3) * 100) (type: decimal(38,17)), (((_col5 + _col1) + _col9) / 3) (type: decimal(23,6)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query59.q.out b/ql/src/test/results/clientpositive/perf/spark/query59.q.out index 3723e32e84..65d7ee465e 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query59.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query59.q.out @@ -110,7 +110,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_store_id is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_store_id is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_store_id is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_store_id (type: string), s_store_name (type: string) @@ -135,7 +135,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_store_id is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_store_id is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_store_id is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_store_id (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query6.q.out b/ql/src/test/results/clientpositive/perf/spark/query6.q.out index 8fb4bddbe0..e3b4a3ff4d 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query6.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query6.q.out @@ -81,7 +81,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 2)) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 2) and (d_year = 2000)) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 2)) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_month_seq (type: int) @@ -236,7 +236,7 @@ STAGE PLANS: filterExpr: ((d_year = 2000) and (d_moy = 2) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 2) and (d_year = 2000) and d_month_seq is not null) (type: boolean) + predicate: ((d_year = 2000) and (d_moy = 2) and d_month_seq is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_month_seq (type: int) @@ -261,7 +261,7 @@ STAGE PLANS: filterExpr: (ss_customer_sk is not null and ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_customer_sk is not null and ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int) @@ -298,10 +298,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: i - filterExpr: (i_item_sk is not null and i_category is not null and i_current_price is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_current_price is not null and i_category is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_category is not null and i_current_price is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_current_price is not null and i_category is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_current_price (type: decimal(7,2)), i_category (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query60.q.out b/ql/src/test/results/clientpositive/perf/spark/query60.q.out index c07eb420f2..33569c48e5 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query60.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query60.q.out @@ -198,10 +198,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: (i_item_id is not null and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -221,7 +221,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 9) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -284,7 +284,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_addr_sk (type: int), cs_item_sk (type: int), cs_ext_sales_price (type: decimal(7,2)) @@ -301,10 +301,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: (i_item_id is not null and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -324,7 +324,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_addr_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -344,7 +344,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 9) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 9) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -382,7 +382,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_addr_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query61.q.out b/ql/src/test/results/clientpositive/perf/spark/query61.q.out index ce8dcf7816..f478be6a4f 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query61.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query61.q.out @@ -151,7 +151,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) @@ -190,7 +190,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -210,7 +210,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -226,10 +226,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Electronics') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category = 'Electronics')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Electronics') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category = 'Electronics')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int) @@ -347,10 +347,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: promotion - filterExpr: (((p_channel_dmail = 'Y') or (p_channel_email = 'Y') or (p_channel_tv = 'Y')) and p_promo_sk is not null) (type: boolean) + filterExpr: (p_promo_sk is not null and ((p_channel_dmail = 'Y') or (p_channel_email = 'Y') or (p_channel_tv = 'Y'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_channel_dmail = 'Y') or (p_channel_email = 'Y') or (p_channel_tv = 'Y')) and p_promo_sk is not null) (type: boolean) + predicate: (p_promo_sk is not null and ((p_channel_dmail = 'Y') or (p_channel_email = 'Y') or (p_channel_tv = 'Y'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_promo_sk (type: int) @@ -401,7 +401,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int) @@ -418,10 +418,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Electronics') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category = 'Electronics')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Electronics') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category = 'Electronics')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int) @@ -459,7 +459,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_store_sk (type: int), ss_promo_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -479,7 +479,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query63.q.out b/ql/src/test/results/clientpositive/perf/spark/query63.q.out index 255057b0ad..885a6be415 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query63.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query63.q.out @@ -129,10 +129,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_manager_id (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query65.q.out b/ql/src/test/results/clientpositive/perf/spark/query65.q.out index da758c74b1..37828d4818 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query65.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query65.q.out @@ -114,7 +114,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_store_sk (type: int), ss_sales_price (type: decimal(7,2)) @@ -134,7 +134,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -173,7 +173,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query66.q.out b/ql/src/test/results/clientpositive/perf/spark/query66.q.out index 7601a39801..111432d3f5 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query66.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query66.q.out @@ -621,7 +621,7 @@ STAGE PLANS: filterExpr: (ws_warehouse_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null and ws_ship_mode_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_ship_mode_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null and ws_warehouse_sk is not null) (type: boolean) + predicate: (ws_warehouse_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null and ws_ship_mode_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_sold_time_sk (type: int), ws_ship_mode_sk (type: int), ws_warehouse_sk (type: int), (ws_sales_price * CAST( ws_quantity AS decimal(10,0))) (type: decimal(18,2)), (ws_net_paid_inc_tax * CAST( ws_quantity AS decimal(10,0))) (type: decimal(18,2)) @@ -663,7 +663,7 @@ STAGE PLANS: filterExpr: (cs_warehouse_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_ship_mode_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_ship_mode_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_warehouse_sk is not null) (type: boolean) + predicate: (cs_warehouse_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_ship_mode_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_sold_time_sk (type: int), cs_ship_mode_sk (type: int), cs_warehouse_sk (type: int), (cs_ext_sales_price * CAST( cs_quantity AS decimal(10,0))) (type: decimal(18,2)), (cs_net_paid_inc_ship_tax * CAST( cs_quantity AS decimal(10,0))) (type: decimal(18,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query67.q.out b/ql/src/test/results/clientpositive/perf/spark/query67.q.out index d31acb2045..90fb13ff84 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query67.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query67.q.out @@ -142,7 +142,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_store_sk (type: int), CASE WHEN ((ss_sales_price is not null and CAST( ss_quantity AS decimal(10,0)) is not null)) THEN ((ss_sales_price * CAST( ss_quantity AS decimal(10,0)))) ELSE (0) END (type: decimal(18,2)) @@ -162,7 +162,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_year (type: int), d_moy (type: int), d_qoy (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query68.q.out b/ql/src/test/results/clientpositive/perf/spark/query68.q.out index eb8ad74eb5..4059e92bd6 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query68.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query68.q.out @@ -108,10 +108,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_city) IN ('Cedar Grove', 'Wildwood') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_city) IN ('Cedar Grove', 'Wildwood')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_city) IN ('Cedar Grove', 'Wildwood') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_city) IN ('Cedar Grove', 'Wildwood')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -163,7 +163,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_addr_sk (type: int), c_first_name (type: string), c_last_name (type: string) @@ -223,7 +223,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int), ss_hdemo_sk (type: int), ss_addr_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_ext_sales_price (type: decimal(7,2)), ss_ext_list_price (type: decimal(7,2)), ss_ext_tax (type: decimal(7,2)) @@ -240,10 +240,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (1998, 1999, 2000) and d_dom BETWEEN 1 AND 2 and d_date_sk is not null) (type: boolean) + filterExpr: (d_dom BETWEEN 1 AND 2 and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year) IN (1998, 1999, 2000) and d_date_sk is not null and d_dom BETWEEN 1 AND 2) (type: boolean) + predicate: (d_dom BETWEEN 1 AND 2 and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query69.q.out b/ql/src/test/results/clientpositive/perf/spark/query69.q.out index a00607e4fb..bd0ff6b625 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query69.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query69.q.out @@ -174,7 +174,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 1 AND 3) (type: boolean) + predicate: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -213,7 +213,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 1 AND 3) (type: boolean) + predicate: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -252,7 +252,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 1 AND 3) (type: boolean) + predicate: ((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -268,10 +268,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: ca - filterExpr: ((ca_state) IN ('CO', 'IL', 'MN') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state) IN ('CO', 'IL', 'MN')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state) IN ('CO', 'IL', 'MN') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state) IN ('CO', 'IL', 'MN')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query7.q.out b/ql/src/test/results/clientpositive/perf/spark/query7.q.out index 06ff361229..1131e44b18 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query7.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query7.q.out @@ -64,10 +64,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: promotion - filterExpr: (((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean) + filterExpr: (p_promo_sk is not null and ((p_channel_email = 'N') or (p_channel_event = 'N'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null) (type: boolean) + predicate: (p_promo_sk is not null and ((p_channel_email = 'N') or (p_channel_event = 'N'))) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_promo_sk (type: int) @@ -98,7 +98,7 @@ STAGE PLANS: filterExpr: (ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_item_sk is not null and ss_promo_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_cdemo_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_item_sk is not null and ss_promo_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_cdemo_sk (type: int), ss_promo_sk (type: int), ss_quantity (type: int), ss_list_price (type: decimal(7,2)), ss_sales_price (type: decimal(7,2)), ss_coupon_amt (type: decimal(7,2)) @@ -135,10 +135,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary')) (type: boolean) Statistics: Num rows: 232725 Data size: 89648269 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query70.q.out b/ql/src/test/results/clientpositive/perf/spark/query70.q.out index 658400be6e..f5163e02bc 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query70.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query70.q.out @@ -95,10 +95,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: (s_state is not null and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and s_state is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_state is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_state is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_county (type: string), s_state (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: filterExpr: (s_store_sk is not null and s_state is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s_state is not null and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and s_state is not null) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int), s_state (type: string) @@ -177,7 +177,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -196,7 +196,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -215,7 +215,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_store_sk (type: int), ss_net_profit (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query71.q.out b/ql/src/test/results/clientpositive/perf/spark/query71.q.out index 22ee5d0db9..1ab055a911 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query71.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query71.q.out @@ -112,7 +112,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_item_sk is not null and ws_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_item_sk is not null and ws_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_sold_time_sk (type: int), ws_item_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -151,7 +151,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_sold_date_sk is not null and ss_sold_time_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_sold_time_sk (type: int), ss_item_sk (type: int), ss_ext_sales_price (type: decimal(7,2)) @@ -207,10 +207,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: time_dim - filterExpr: ((t_meal_time) IN ('breakfast', 'dinner') and t_time_sk is not null) (type: boolean) + filterExpr: (t_time_sk is not null and (t_meal_time) IN ('breakfast', 'dinner')) (type: boolean) Statistics: Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t_meal_time) IN ('breakfast', 'dinner') and t_time_sk is not null) (type: boolean) + predicate: (t_time_sk is not null and (t_meal_time) IN ('breakfast', 'dinner')) (type: boolean) Statistics: Num rows: 86400 Data size: 40694400 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: t_time_sk (type: int), t_hour (type: int), t_minute (type: int) @@ -230,7 +230,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_item_sk is not null and cs_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_item_sk is not null and cs_sold_time_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_sold_time_sk (type: int), cs_item_sk (type: int), cs_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query72.q.out b/ql/src/test/results/clientpositive/perf/spark/query72.q.out index 5e1866b507..a80887eb0a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query72.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query72.q.out @@ -144,10 +144,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_buy_potential = '1001-5000') and hd_demo_sk is not null) (type: boolean) + filterExpr: (hd_demo_sk is not null and (hd_buy_potential = '1001-5000')) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((hd_buy_potential = '1001-5000') and hd_demo_sk is not null) (type: boolean) + predicate: (hd_demo_sk is not null and (hd_buy_potential = '1001-5000')) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -221,7 +221,7 @@ STAGE PLANS: filterExpr: (cs_item_sk is not null and cs_bill_cdemo_sk is not null and cs_bill_hdemo_sk is not null and cs_sold_date_sk is not null and cs_ship_date_sk is not null and cs_quantity is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_cdemo_sk is not null and cs_bill_hdemo_sk is not null and cs_item_sk is not null and cs_quantity is not null and cs_ship_date_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_item_sk is not null and cs_bill_cdemo_sk is not null and cs_bill_hdemo_sk is not null and cs_sold_date_sk is not null and cs_ship_date_sk is not null and cs_quantity is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_ship_date_sk (type: int), cs_bill_cdemo_sk (type: int), cs_bill_hdemo_sk (type: int), cs_item_sk (type: int), cs_promo_sk (type: int), cs_order_number (type: int), cs_quantity (type: int) @@ -238,10 +238,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_marital_status = 'M') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status = 'M')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_marital_status = 'M') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status = 'M')) (type: boolean) Statistics: Num rows: 930900 Data size: 358593079 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int) @@ -260,7 +260,7 @@ STAGE PLANS: filterExpr: (d_date_sk is not null and UDFToDouble(d_date) is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(d_date) is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and UDFToDouble(d_date) is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), UDFToDouble(d_date) (type: double) @@ -280,7 +280,7 @@ STAGE PLANS: filterExpr: ((d_year = 2001) and d_date_sk is not null and d_week_seq is not null and UDFToDouble(d_date) is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year = 2001) and UDFToDouble(d_date) is not null and d_date_sk is not null and d_week_seq is not null) (type: boolean) + predicate: ((d_year = 2001) and d_date_sk is not null and d_week_seq is not null and UDFToDouble(d_date) is not null) (type: boolean) Statistics: Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_week_seq (type: int), (UDFToDouble(d_date) + 5.0D) (type: double) @@ -320,7 +320,7 @@ STAGE PLANS: filterExpr: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null and inv_quantity_on_hand is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null and inv_quantity_on_hand is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_warehouse_sk (type: int), inv_quantity_on_hand (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query73.q.out b/ql/src/test/results/clientpositive/perf/spark/query73.q.out index 1a9793b836..1b23e05075 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query73.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query73.q.out @@ -79,10 +79,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_vehicle_count > 0) and hd_demo_sk is not null and (hd_buy_potential) IN ('>10000', 'unknown') and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_vehicle_count > 0) and hd_demo_sk is not null and (hd_buy_potential) IN ('>10000', 'unknown') and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END) (type: boolean) Statistics: Num rows: 1200 Data size: 128400 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -99,10 +99,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_county) IN ('Mobile County', 'Maverick County', 'Huron County', 'Kittitas County')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -130,7 +130,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int), ss_hdemo_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int) @@ -147,10 +147,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2000, 2001, 2002) and d_dom BETWEEN 1 AND 2 and d_date_sk is not null) (type: boolean) + filterExpr: (d_dom BETWEEN 1 AND 2 and (d_year) IN (2000, 2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_year) IN (2000, 2001, 2002) and d_date_sk is not null and d_dom BETWEEN 1 AND 2) (type: boolean) + predicate: (d_dom BETWEEN 1 AND 2 and (d_year) IN (2000, 2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query74.q.out b/ql/src/test/results/clientpositive/perf/spark/query74.q.out index 181e47c3fa..b28387f15d 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query74.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query74.q.out @@ -176,7 +176,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2001, 2002) and (d_year = 2001) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2001) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((d_year = 2001) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) @@ -198,7 +198,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string) @@ -235,7 +235,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2001, 2002) and (d_year = 2001) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2001) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((d_year = 2001) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) @@ -257,7 +257,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string) @@ -294,7 +294,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2001, 2002) and (d_year = 2002) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2002) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((d_year = 2002) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) @@ -316,7 +316,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string) @@ -333,7 +333,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (2001, 2002) and (d_year = 2002) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_year = 2002) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((d_year = 2002) and (d_year) IN (2001, 2002) and d_date_sk is not null) (type: boolean) @@ -355,7 +355,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_customer_id is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_customer_id is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_customer_id (type: string), c_first_name (type: string), c_last_name (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query75.q.out b/ql/src/test/results/clientpositive/perf/spark/query75.q.out index 1141cb3e77..05d30509e2 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query75.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query75.q.out @@ -234,7 +234,7 @@ STAGE PLANS: filterExpr: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cr_item_sk is not null and cr_order_number is not null) (type: boolean) + predicate: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_item_sk (type: int), cr_order_number (type: int), cr_return_quantity (type: int), cr_return_amount (type: decimal(7,2)) @@ -271,10 +271,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Sports') and i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null and (i_category = 'Sports')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Sports') and i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null and i_manufact_id is not null) (type: boolean) + predicate: (i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null and (i_category = 'Sports')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand_id (type: int), i_class_id (type: int), i_category_id (type: int), i_manufact_id (type: int) @@ -294,7 +294,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int), sr_return_quantity (type: int), sr_return_amt (type: decimal(7,2)) @@ -334,7 +334,7 @@ STAGE PLANS: filterExpr: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (wr_item_sk is not null and wr_order_number is not null) (type: boolean) + predicate: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_item_sk (type: int), wr_order_number (type: int), wr_return_quantity (type: int), wr_return_amt (type: decimal(7,2)) @@ -371,10 +371,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category = 'Sports') and i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null) (type: boolean) + filterExpr: (i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null and (i_category = 'Sports')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category = 'Sports') and i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null and i_manufact_id is not null) (type: boolean) + predicate: (i_item_sk is not null and i_brand_id is not null and i_class_id is not null and i_category_id is not null and i_manufact_id is not null and (i_category = 'Sports')) (type: boolean) Statistics: Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand_id (type: int), i_class_id (type: int), i_category_id (type: int), i_manufact_id (type: int) @@ -413,7 +413,7 @@ STAGE PLANS: filterExpr: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cr_item_sk is not null and cr_order_number is not null) (type: boolean) + predicate: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_item_sk (type: int), cr_order_number (type: int), cr_return_quantity (type: int), cr_return_amount (type: decimal(7,2)) @@ -453,7 +453,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int), sr_return_quantity (type: int), sr_return_amt (type: decimal(7,2)) @@ -493,7 +493,7 @@ STAGE PLANS: filterExpr: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (wr_item_sk is not null and wr_order_number is not null) (type: boolean) + predicate: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_item_sk (type: int), wr_order_number (type: int), wr_return_quantity (type: int), wr_return_amt (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query76.q.out b/ql/src/test/results/clientpositive/perf/spark/query76.q.out index b42102c644..c81d91dc5a 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query76.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query76.q.out @@ -101,7 +101,7 @@ STAGE PLANS: filterExpr: (ws_web_page_sk is null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_web_page_sk is null) (type: boolean) + predicate: (ws_web_page_sk is null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 72001334 Data size: 9790099106 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_ext_sales_price (type: decimal(7,2)) @@ -161,7 +161,7 @@ STAGE PLANS: filterExpr: (cs_warehouse_sk is null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_item_sk is not null and cs_sold_date_sk is not null and cs_warehouse_sk is null) (type: boolean) + predicate: (cs_warehouse_sk is null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 143994918 Data size: 19499804476 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_item_sk (type: int), cs_ext_sales_price (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query77.q.out b/ql/src/test/results/clientpositive/perf/spark/query77.q.out index ee09aea032..926f6e90c6 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query77.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query77.q.out @@ -301,10 +301,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -383,10 +383,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -492,10 +492,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -590,10 +590,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -609,10 +609,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query78.q.out b/ql/src/test/results/clientpositive/perf/spark/query78.q.out index 3aecec26c3..dadcda3efa 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query78.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query78.q.out @@ -157,7 +157,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_customer_sk (type: int), ss_ticket_number (type: int), ss_quantity (type: int), ss_wholesale_cost (type: decimal(7,2)), ss_sales_price (type: decimal(7,2)) @@ -177,7 +177,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_item_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_item_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_bill_customer_sk (type: int), ws_order_number (type: int), ws_quantity (type: int), ws_wholesale_cost (type: decimal(7,2)), ws_sales_price (type: decimal(7,2)) @@ -197,7 +197,7 @@ STAGE PLANS: filterExpr: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (wr_item_sk is not null and wr_order_number is not null) (type: boolean) + predicate: (wr_order_number is not null and wr_item_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_item_sk (type: int), wr_order_number (type: int) @@ -235,7 +235,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_item_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_item_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int), cs_item_sk (type: int), cs_order_number (type: int), cs_quantity (type: int), cs_wholesale_cost (type: decimal(7,2)), cs_sales_price (type: decimal(7,2)) @@ -255,7 +255,7 @@ STAGE PLANS: filterExpr: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cr_item_sk is not null and cr_order_number is not null) (type: boolean) + predicate: (cr_order_number is not null and cr_item_sk is not null) (type: boolean) Statistics: Num rows: 28798881 Data size: 3057234680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cr_item_sk (type: int), cr_order_number (type: int) @@ -293,7 +293,7 @@ STAGE PLANS: filterExpr: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_ticket_number is not null and sr_item_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_ticket_number (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query79.q.out b/ql/src/test/results/clientpositive/perf/spark/query79.q.out index 07f89a34fb..026dd25ae1 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query79.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query79.q.out @@ -141,7 +141,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int), ss_hdemo_sk (type: int), ss_addr_sk (type: int), ss_store_sk (type: int), ss_ticket_number (type: int), ss_coupon_amt (type: decimal(7,2)), ss_net_profit (type: decimal(7,2)) @@ -158,7 +158,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_year) IN (1998, 1999, 2000) and (d_dow = 1) and d_date_sk is not null) (type: boolean) + filterExpr: ((d_dow = 1) and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((d_dow = 1) and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) (type: boolean) diff --git a/ql/src/test/results/clientpositive/perf/spark/query8.q.out b/ql/src/test/results/clientpositive/perf/spark/query8.q.out index 926f55bf58..fbefb268b8 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query8.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query8.q.out @@ -292,10 +292,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer - filterExpr: ((c_preferred_cust_flag = 'Y') and c_current_addr_sk is not null) (type: boolean) + filterExpr: (c_current_addr_sk is not null and (c_preferred_cust_flag = 'Y')) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((c_preferred_cust_flag = 'Y') and c_current_addr_sk is not null) (type: boolean) + predicate: (c_current_addr_sk is not null and (c_preferred_cust_flag = 'Y')) (type: boolean) Statistics: Num rows: 40000000 Data size: 34400807926 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_current_addr_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query80.q.out b/ql/src/test/results/clientpositive/perf/spark/query80.q.out index 2340493d02..76e90cd9fe 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query80.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query80.q.out @@ -257,10 +257,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -282,10 +282,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -332,10 +332,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00' AND TIMESTAMP'1998-09-03 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -376,7 +376,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_promo_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_promo_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_item_sk (type: int), ss_store_sk (type: int), ss_promo_sk (type: int), ss_ticket_number (type: int), ss_ext_sales_price (type: decimal(7,2)), ss_net_profit (type: decimal(7,2)) @@ -415,7 +415,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_catalog_page_sk is not null and cs_item_sk is not null and cs_promo_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_catalog_page_sk is not null and cs_item_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_catalog_page_sk is not null and cs_item_sk is not null and cs_promo_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_catalog_page_sk (type: int), cs_item_sk (type: int), cs_promo_sk (type: int), cs_order_number (type: int), cs_ext_sales_price (type: decimal(7,2)), cs_net_profit (type: decimal(7,2)) @@ -452,10 +452,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: promotion - filterExpr: ((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean) + filterExpr: (p_promo_sk is not null and (p_channel_tv = 'N')) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean) + predicate: (p_promo_sk is not null and (p_channel_tv = 'N')) (type: boolean) Statistics: Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_promo_sk (type: int) @@ -494,7 +494,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_web_site_sk is not null and ws_item_sk is not null and ws_promo_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_item_sk is not null and ws_promo_sk is not null and ws_sold_date_sk is not null and ws_web_site_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_web_site_sk is not null and ws_item_sk is not null and ws_promo_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_web_site_sk (type: int), ws_promo_sk (type: int), ws_order_number (type: int), ws_ext_sales_price (type: decimal(7,2)), ws_net_profit (type: decimal(7,2)) @@ -531,10 +531,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: promotion - filterExpr: ((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean) + filterExpr: (p_promo_sk is not null and (p_channel_tv = 'N')) (type: boolean) Statistics: Num rows: 2300 Data size: 2713420 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((p_channel_tv = 'N') and p_promo_sk is not null) (type: boolean) + predicate: (p_promo_sk is not null and (p_channel_tv = 'N')) (type: boolean) Statistics: Num rows: 1150 Data size: 1356710 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_promo_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query81.q.out b/ql/src/test/results/clientpositive/perf/spark/query81.q.out index bcd1a5eace..f2eb1dcc02 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query81.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query81.q.out @@ -210,10 +210,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state = 'IL') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state = 'IL')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state = 'IL') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state = 'IL')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int), ca_street_number (type: string), ca_street_name (type: string), ca_street_type (type: string), ca_suite_number (type: string), ca_city (type: string), ca_county (type: string), ca_zip (type: string), ca_country (type: string), ca_gmt_offset (type: decimal(5,2)), ca_location_type (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query82.q.out b/ql/src/test/results/clientpositive/perf/spark/query82.q.out index 7acf39d8e4..4123709d12 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query82.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query82.q.out @@ -54,10 +54,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2002-05-30 00:00:00' AND TIMESTAMP'2002-07-29 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2002-05-30 00:00:00' AND TIMESTAMP'2002-07-29 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2002-05-30 00:00:00' AND TIMESTAMP'2002-07-29 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2002-05-30 00:00:00' AND TIMESTAMP'2002-07-29 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -102,10 +102,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_manufact_id) IN (437, 129, 727, 663) and i_current_price BETWEEN 30 AND 60 and i_item_sk is not null) (type: boolean) + filterExpr: (i_current_price BETWEEN 30 AND 60 and (i_manufact_id) IN (437, 129, 727, 663) and i_item_sk is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_manufact_id) IN (437, 129, 727, 663) and i_current_price BETWEEN 30 AND 60 and i_item_sk is not null) (type: boolean) + predicate: (i_current_price BETWEEN 30 AND 60 and (i_manufact_id) IN (437, 129, 727, 663) and i_item_sk is not null) (type: boolean) Statistics: Num rows: 51333 Data size: 73728460 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string), i_item_desc (type: string), i_current_price (type: decimal(7,2)) @@ -125,7 +125,7 @@ STAGE PLANS: filterExpr: (inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 37584000 Data size: 593821104 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand BETWEEN 100 AND 500) (type: boolean) + predicate: (inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 4176000 Data size: 65980122 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query83.q.out b/ql/src/test/results/clientpositive/perf/spark/query83.q.out index 95d58efcf8..fc54b84986 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query83.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query83.q.out @@ -176,10 +176,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -196,10 +196,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -244,7 +244,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -261,10 +261,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -284,7 +284,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) @@ -301,10 +301,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -349,7 +349,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -366,10 +366,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (d_date is not null and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -389,7 +389,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) @@ -406,10 +406,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + filterExpr: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and (d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int) @@ -454,7 +454,7 @@ STAGE PLANS: filterExpr: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i_item_id is not null and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and i_item_id is not null) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string) @@ -474,7 +474,7 @@ STAGE PLANS: filterExpr: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date is not null and d_week_seq is not null) (type: boolean) + predicate: (d_week_seq is not null and d_date is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date (type: string), d_week_seq (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query84.q.out b/ql/src/test/results/clientpositive/perf/spark/query84.q.out index c7935da3f5..d60b8fc3c5 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query84.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query84.q.out @@ -189,10 +189,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_city = 'Hopewell') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_city = 'Hopewell')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_city = 'Hopewell') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_city = 'Hopewell')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query85.q.out b/ql/src/test/results/clientpositive/perf/spark/query85.q.out index 1664a07aa3..91d77cf3ee 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query85.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query85.q.out @@ -253,10 +253,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: web_sales - filterExpr: (((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ws_item_sk is not null and ws_order_number is not null and ws_web_page_sk is not null and ws_sold_date_sk is not null) (type: boolean) + filterExpr: (ws_item_sk is not null and ws_order_number is not null and ws_web_page_sk is not null and ws_sold_date_sk is not null and ((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250))) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ws_item_sk is not null and ws_order_number is not null and ws_sold_date_sk is not null and ws_web_page_sk is not null) (type: boolean) + predicate: (ws_item_sk is not null and ws_order_number is not null and ws_web_page_sk is not null and ws_sold_date_sk is not null and ((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250))) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_web_page_sk (type: int), ws_order_number (type: int), ws_quantity (type: int), ws_net_profit BETWEEN 100 AND 200 (type: boolean), ws_net_profit BETWEEN 150 AND 300 (type: boolean), ws_net_profit BETWEEN 50 AND 250 (type: boolean), ws_sales_price BETWEEN 100 AND 150 (type: boolean), ws_sales_price BETWEEN 50 AND 100 (type: boolean), ws_sales_price BETWEEN 150 AND 200 (type: boolean) @@ -273,10 +273,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int), (ca_state) IN ('KY', 'GA', 'NM') (type: boolean), (ca_state) IN ('MT', 'OR', 'IN') (type: boolean), (ca_state) IN ('WI', 'MO', 'WV') (type: boolean) @@ -293,10 +293,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: cd2 - filterExpr: ((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int), cd_marital_status (type: string), cd_education_status (type: string) @@ -313,10 +313,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: cd1 - filterExpr: ((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int), cd_marital_status (type: string), cd_education_status (type: string), (cd_marital_status = 'M') (type: boolean), (cd_education_status = '4 yr Degree') (type: boolean), (cd_marital_status = 'D') (type: boolean), (cd_education_status = 'Primary') (type: boolean), (cd_marital_status = 'U') (type: boolean), (cd_education_status = 'Advanced Degree') (type: boolean) @@ -355,7 +355,7 @@ STAGE PLANS: filterExpr: (wr_item_sk is not null and wr_order_number is not null and wr_refunded_cdemo_sk is not null and wr_returning_cdemo_sk is not null and wr_refunded_addr_sk is not null and wr_reason_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (wr_item_sk is not null and wr_order_number is not null and wr_reason_sk is not null and wr_refunded_addr_sk is not null and wr_refunded_cdemo_sk is not null and wr_returning_cdemo_sk is not null) (type: boolean) + predicate: (wr_item_sk is not null and wr_order_number is not null and wr_refunded_cdemo_sk is not null and wr_returning_cdemo_sk is not null and wr_refunded_addr_sk is not null and wr_reason_sk is not null) (type: boolean) Statistics: Num rows: 14398467 Data size: 1325194184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: wr_item_sk (type: int), wr_refunded_cdemo_sk (type: int), wr_refunded_addr_sk (type: int), wr_returning_cdemo_sk (type: int), wr_reason_sk (type: int), wr_order_number (type: int), wr_fee (type: decimal(7,2)), wr_refunded_cash (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query86.q.out b/ql/src/test/results/clientpositive/perf/spark/query86.q.out index 227c886433..abb8e37595 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query86.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query86.q.out @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_item_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_net_paid (type: decimal(7,2)) @@ -98,7 +98,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query87.q.out b/ql/src/test/results/clientpositive/perf/spark/query87.q.out index 3966a917c4..f071fcf811 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query87.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query87.q.out @@ -81,7 +81,7 @@ STAGE PLANS: filterExpr: (ss_sold_date_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ss_customer_sk is not null and ss_sold_date_sk is not null) (type: boolean) + predicate: (ss_sold_date_sk is not null and ss_customer_sk is not null) (type: boolean) Statistics: Num rows: 575995635 Data size: 50814502088 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ss_sold_date_sk (type: int), ss_customer_sk (type: int) @@ -101,7 +101,7 @@ STAGE PLANS: filterExpr: (cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_bill_customer_sk is not null and cs_sold_date_sk is not null) (type: boolean) + predicate: (cs_sold_date_sk is not null and cs_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_sold_date_sk (type: int), cs_bill_customer_sk (type: int) @@ -121,7 +121,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int), d_date (type: string) @@ -161,7 +161,7 @@ STAGE PLANS: filterExpr: (ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_bill_customer_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_sold_date_sk is not null and ws_bill_customer_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_bill_customer_sk (type: int) @@ -412,7 +412,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4 Statistics: Num rows: 130677808 Data size: 13584384883 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 * 2L) = _col4) and (_col3 > 0L)) (type: boolean) + predicate: ((_col3 > 0L) and ((_col3 * 2L) = _col4)) (type: boolean) Statistics: Num rows: 21779634 Data size: 2264064077 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) @@ -459,7 +459,7 @@ STAGE PLANS: outputColumnNames: _col3, _col4 Statistics: Num rows: 27225312 Data size: 3527521010 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 * 2L) = _col4) and (_col3 > 0L)) (type: boolean) + predicate: ((_col3 > 0L) and ((_col3 * 2L) = _col4)) (type: boolean) Statistics: Num rows: 4537552 Data size: 587920168 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 4537552 Data size: 587920168 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/perf/spark/query88.q.out b/ql/src/test/results/clientpositive/perf/spark/query88.q.out index 5bf2a649ae..f2e2b94970 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query88.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query88.q.out @@ -215,10 +215,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -235,10 +235,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -818,10 +818,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -858,10 +858,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -994,10 +994,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1034,10 +1034,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -1059,10 +1059,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1099,10 +1099,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -1124,10 +1124,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1164,10 +1164,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -1189,10 +1189,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1229,10 +1229,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -1254,10 +1254,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1294,10 +1294,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) @@ -1319,10 +1319,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_dep_count) IN (3, 0, 1) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null) (type: boolean) + filterExpr: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) (type: boolean) + predicate: ((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and hd_demo_sk is not null and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -1359,10 +1359,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query89.q.out b/ql/src/test/results/clientpositive/perf/spark/query89.q.out index 0db44b0a8d..2d79ea5be7 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query89.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query89.q.out @@ -127,10 +127,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and (((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and (((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants')))) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_brand (type: string), i_class (type: string), i_category (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query91.q.out b/ql/src/test/results/clientpositive/perf/spark/query91.q.out index 4ea4e0f495..24ef4831f7 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query91.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query91.q.out @@ -114,10 +114,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: household_demographics - filterExpr: ((hd_buy_potential like '0-500%') and hd_demo_sk is not null) (type: boolean) + filterExpr: (hd_demo_sk is not null and (hd_buy_potential like '0-500%')) (type: boolean) Statistics: Num rows: 7200 Data size: 770400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((hd_buy_potential like '0-500%') and hd_demo_sk is not null) (type: boolean) + predicate: (hd_demo_sk is not null and (hd_buy_potential like '0-500%')) (type: boolean) Statistics: Num rows: 3600 Data size: 385200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: hd_demo_sk (type: int) @@ -166,10 +166,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_demographics - filterExpr: ((cd_education_status) IN ('Unknown', 'Advanced Degree') and (cd_marital_status) IN ('M', 'W') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree')) and cd_demo_sk is not null) (type: boolean) + filterExpr: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'W') and (cd_education_status) IN ('Unknown', 'Advanced Degree') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree'))) (type: boolean) Statistics: Num rows: 1861800 Data size: 717186159 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((cd_education_status) IN ('Unknown', 'Advanced Degree') and (cd_marital_status) IN ('M', 'W') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree')) and cd_demo_sk is not null) (type: boolean) + predicate: (cd_demo_sk is not null and (cd_marital_status) IN ('M', 'W') and (cd_education_status) IN ('Unknown', 'Advanced Degree') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree'))) (type: boolean) Statistics: Num rows: 930900 Data size: 358593079 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cd_demo_sk (type: int), cd_marital_status (type: string), cd_education_status (type: string) @@ -208,7 +208,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -227,7 +227,7 @@ STAGE PLANS: filterExpr: (c_customer_sk is not null and c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null and c_customer_sk is not null) (type: boolean) + predicate: (c_customer_sk is not null and c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 80000000 Data size: 68801615852 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: c_customer_sk (type: int), c_current_cdemo_sk (type: int), c_current_hdemo_sk (type: int), c_current_addr_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query92.q.out b/ql/src/test/results/clientpositive/perf/spark/query92.q.out index 5c45a36d14..9acde65a37 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query92.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query92.q.out @@ -79,10 +79,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -104,10 +104,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-18 00:00:00' AND TIMESTAMP'1998-06-16 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -137,7 +137,7 @@ STAGE PLANS: filterExpr: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_ext_discount_amt is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_ext_discount_amt is not null and ws_item_sk is not null and ws_sold_date_sk is not null) (type: boolean) + predicate: (ws_item_sk is not null and ws_sold_date_sk is not null and ws_ext_discount_amt is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_sold_date_sk (type: int), ws_item_sk (type: int), ws_ext_discount_amt (type: decimal(7,2)) diff --git a/ql/src/test/results/clientpositive/perf/spark/query93.q.out b/ql/src/test/results/clientpositive/perf/spark/query93.q.out index ed56e6b7cf..40893da19c 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query93.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query93.q.out @@ -54,10 +54,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: reason - filterExpr: ((r_reason_desc = 'Did not like the warranty') and r_reason_sk is not null) (type: boolean) + filterExpr: (r_reason_sk is not null and (r_reason_desc = 'Did not like the warranty')) (type: boolean) Statistics: Num rows: 72 Data size: 14400 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((r_reason_desc = 'Did not like the warranty') and r_reason_sk is not null) (type: boolean) + predicate: (r_reason_sk is not null and (r_reason_desc = 'Did not like the warranty')) (type: boolean) Statistics: Num rows: 36 Data size: 7200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: r_reason_sk (type: int) @@ -86,7 +86,7 @@ STAGE PLANS: filterExpr: (sr_item_sk is not null and sr_ticket_number is not null and sr_reason_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (sr_item_sk is not null and sr_reason_sk is not null and sr_ticket_number is not null) (type: boolean) + predicate: (sr_item_sk is not null and sr_ticket_number is not null and sr_reason_sk is not null) (type: boolean) Statistics: Num rows: 57591150 Data size: 4462194832 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: sr_item_sk (type: int), sr_reason_sk (type: int), sr_ticket_number (type: int), sr_return_quantity (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query94.q.out b/ql/src/test/results/clientpositive/perf/spark/query94.q.out index 213c427345..f282d51ef1 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query94.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query94.q.out @@ -80,10 +80,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -100,10 +100,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: web_site - filterExpr: ((web_company_name = 'pri') and web_site_sk is not null) (type: boolean) + filterExpr: (web_site_sk is not null and (web_company_name = 'pri')) (type: boolean) Statistics: Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((web_company_name = 'pri') and web_site_sk is not null) (type: boolean) + predicate: (web_site_sk is not null and (web_company_name = 'pri')) (type: boolean) Statistics: Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: web_site_sk (type: int) @@ -135,7 +135,7 @@ STAGE PLANS: filterExpr: (ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null and ws_order_number is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) (type: boolean) + predicate: (ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null and ws_order_number is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_ship_date_sk (type: int), ws_ship_addr_sk (type: int), ws_web_site_sk (type: int), ws_warehouse_sk (type: int), ws_order_number (type: int), ws_ext_ship_cost (type: decimal(7,2)), ws_net_profit (type: decimal(7,2)) @@ -199,10 +199,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state = 'TX') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state = 'TX')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state = 'TX') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state = 'TX')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query95.q.out b/ql/src/test/results/clientpositive/perf/spark/query95.q.out index 0db6f9b158..c9a495622c 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query95.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query95.q.out @@ -86,10 +86,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND TIMESTAMP'1999-06-30 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -106,10 +106,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: web_site - filterExpr: ((web_company_name = 'pri') and web_site_sk is not null) (type: boolean) + filterExpr: (web_site_sk is not null and (web_company_name = 'pri')) (type: boolean) Statistics: Num rows: 84 Data size: 155408 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((web_company_name = 'pri') and web_site_sk is not null) (type: boolean) + predicate: (web_site_sk is not null and (web_company_name = 'pri')) (type: boolean) Statistics: Num rows: 42 Data size: 77704 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: web_site_sk (type: int) @@ -144,7 +144,7 @@ STAGE PLANS: filterExpr: (ws_order_number is not null and ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) (type: boolean) + predicate: (ws_order_number is not null and ws_ship_date_sk is not null and ws_ship_addr_sk is not null and ws_web_site_sk is not null) (type: boolean) Statistics: Num rows: 144002668 Data size: 19580198212 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ws_ship_date_sk (type: int), ws_ship_addr_sk (type: int), ws_web_site_sk (type: int), ws_order_number (type: int), ws_ext_ship_cost (type: decimal(7,2)), ws_net_profit (type: decimal(7,2)) @@ -240,10 +240,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: customer_address - filterExpr: ((ca_state = 'TX') and ca_address_sk is not null) (type: boolean) + filterExpr: (ca_address_sk is not null and (ca_state = 'TX')) (type: boolean) Statistics: Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((ca_state = 'TX') and ca_address_sk is not null) (type: boolean) + predicate: (ca_address_sk is not null and (ca_state = 'TX')) (type: boolean) Statistics: Num rows: 20000000 Data size: 20297597642 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ca_address_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query96.q.out b/ql/src/test/results/clientpositive/perf/spark/query96.q.out index da2a98330e..8b5fbf91f5 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query96.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query96.q.out @@ -92,10 +92,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: store - filterExpr: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + filterExpr: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 1704 Data size: 3256276 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s_store_name = 'ese') and s_store_sk is not null) (type: boolean) + predicate: (s_store_sk is not null and (s_store_name = 'ese')) (type: boolean) Statistics: Num rows: 852 Data size: 1628138 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: s_store_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query97.q.out b/ql/src/test/results/clientpositive/perf/spark/query97.q.out index 9bae208e86..ff8030348f 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query97.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query97.q.out @@ -97,7 +97,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -116,7 +116,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/spark/query98.q.out b/ql/src/test/results/clientpositive/perf/spark/query98.q.out index ed834aefff..eb7b97a249 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query98.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query98.q.out @@ -82,10 +82,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: date_dim - filterExpr: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + filterExpr: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00' and d_date_sk is not null) (type: boolean) + predicate: (d_date_sk is not null and CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00' AND TIMESTAMP'2001-02-11 00:00:00') (type: boolean) Statistics: Num rows: 8116 Data size: 9081804 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -144,10 +144,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: item - filterExpr: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + filterExpr: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null) (type: boolean) + predicate: (i_item_sk is not null and (i_category) IN ('Jewelry', 'Sports', 'Books')) (type: boolean) Statistics: Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i_item_sk (type: int), i_item_id (type: string), i_item_desc (type: string), i_current_price (type: decimal(7,2)), i_class (type: string), i_category (type: string) diff --git a/ql/src/test/results/clientpositive/perf/spark/query99.q.out b/ql/src/test/results/clientpositive/perf/spark/query99.q.out index ccab4be556..03bf8fd97e 100644 --- a/ql/src/test/results/clientpositive/perf/spark/query99.q.out +++ b/ql/src/test/results/clientpositive/perf/spark/query99.q.out @@ -170,7 +170,7 @@ STAGE PLANS: filterExpr: (cs_warehouse_sk is not null and cs_ship_mode_sk is not null and cs_call_center_sk is not null and cs_ship_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (cs_call_center_sk is not null and cs_ship_date_sk is not null and cs_ship_mode_sk is not null and cs_warehouse_sk is not null) (type: boolean) + predicate: (cs_warehouse_sk is not null and cs_ship_mode_sk is not null and cs_call_center_sk is not null and cs_ship_date_sk is not null) (type: boolean) Statistics: Num rows: 287989836 Data size: 38999608952 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cs_ship_date_sk (type: int), cs_call_center_sk (type: int), cs_ship_mode_sk (type: int), cs_warehouse_sk (type: int), CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) <= 30)) THEN (1) ELSE (0) END (type: int), CASE WHEN ((((cs_ship_date_sk - cs_sold_date_sk) > 30) and ((cs_ship_date_sk - cs_sold_date_sk) <= 60))) THEN (1) ELSE (0) END (type: int), CASE WHEN ((((cs_ship_date_sk - cs_sold_date_sk) > 60) and ((cs_ship_date_sk - cs_sold_date_sk) <= 90))) THEN (1) ELSE (0) END (type: int), CASE WHEN ((((cs_ship_date_sk - cs_sold_date_sk) > 90) and ((cs_ship_date_sk - cs_sold_date_sk) <= 120))) THEN (1) ELSE (0) END (type: int), CASE WHEN (((cs_ship_date_sk - cs_sold_date_sk) > 120)) THEN (1) ELSE (0) END (type: int) @@ -202,7 +202,7 @@ STAGE PLANS: filterExpr: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) (type: boolean) + predicate: (d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) (type: boolean) Statistics: Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_date_sk (type: int) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_ext_query1.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_ext_query1.q.out index f7a2a66d72..a87cfd5a1e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_ext_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_ext_query1.q.out @@ -73,7 +73,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -85,7 +85,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -166,7 +166,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[{5.175767820386722E7 rows, 0.0 cpu, 0.0 io}]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -178,7 +178,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[{5.3635511784936875E7 rows, 0.0 cpu, 0.0 io}]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query1.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query1.q.out index a52ff24f0a..5fb4a985ba 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query1.q.out @@ -73,7 +73,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]) @@ -85,7 +85,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query10.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query10.q.out index ccad67d5a7..9dc22a37ea 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query10.q.out @@ -141,7 +141,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= HiveJoin(condition=[=($5, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ca_address_sk=[$0], ca_county=[$7]) HiveFilter(condition=[AND(IN($7, _UTF-16LE'Walker County', _UTF-16LE'Richland County', _UTF-16LE'Gaines County', _UTF-16LE'Douglas County', _UTF-16LE'Dona Ana County'), IS NOT NULL($0))]) @@ -152,7 +152,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), BETWEEN(false, $8, 4, 7), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query11.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query11.q.out index 535e73491a..b6f3727e70 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query11.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query11.q.out @@ -168,7 +168,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], -=[-($17, $14)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) @@ -197,7 +197,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], -=[-($17, $14)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query12.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query12.q.out index 882bad0118..edb893eb6d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query12.q.out @@ -81,7 +81,7 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query13.q.out index f9748e1715..cc9a30681b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query13.q.out @@ -124,7 +124,7 @@ HiveProject($f0=[/(CAST($0):DOUBLE, $1)], $f1=[/($2, $3)], $f2=[/($4, $5)], $f3= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_quantity=[$10], ss_ext_sales_price=[$15], ss_ext_wholesale_cost=[$16], BETWEEN=[BETWEEN(false, $22, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], BETWEEN9=[BETWEEN(false, $22, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], BETWEEN10=[BETWEEN(false, $22, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], BETWEEN11=[BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], BETWEEN12=[BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0))], BETWEEN13=[BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $22), <=($22, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 250:DECIMAL(12, 2))), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($7), OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $22), <=($22, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 250:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query14.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query14.q.out index e783983937..dfb4c33864 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query14.q.out @@ -238,7 +238,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_quantity=[$10], ss_list_price=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 11), IS NOT NULL($0))]) @@ -246,7 +246,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(i_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -258,39 +258,39 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveProject($f0=[/($0, $1)]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) @@ -335,7 +335,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_quantity=[$18], cs_list_price=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 11), IS NOT NULL($0))]) @@ -343,7 +343,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(i_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -355,39 +355,39 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveProject($f0=[/($0, $1)]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) @@ -432,7 +432,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_quantity=[$18], ws_list_price=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 11), IS NOT NULL($0))]) @@ -440,7 +440,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(i_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -452,39 +452,39 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $6, 1999, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveProject($f0=[/($0, $1)]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query15.q.out index 24cd0ccc25..62dab7cd32 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query15.q.out @@ -61,9 +61,9 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$1], cs_sales_price=[$2], >=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_sales_price=[$21], >=[>($21, 500:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query16.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query16.q.out index 2aa90c4add..7f39e2e0a0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query16.q.out @@ -83,7 +83,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_ship_date_sk=[$2], cs_ship_addr_sk=[$10], cs_call_center_sk=[$11], cs_warehouse_sk=[$14], cs_order_number=[$17], cs_ext_ship_cost=[$28], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($10), IS NOT NULL($11), IS NOT NULL($17))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($10), IS NOT NULL($17))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[cs1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-04-01 00:00:00:TIMESTAMP(9), 2001-05-31 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -92,7 +92,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveFilter(condition=[AND(IN($25, _UTF-16LE'Ziebach County', _UTF-16LE'Levy County', _UTF-16LE'Huron County', _UTF-16LE'Franklin Parish', _UTF-16LE'Daviess County'), IS NOT NULL($0))]) HiveTableScan(table=[[default, call_center]], table:alias=[call_center]) HiveProject(cs_warehouse_sk=[$14], cs_order_number=[$17]) - HiveFilter(condition=[AND(IS NOT NULL($17), IS NOT NULL($14))]) + HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($17))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[cs2]) HiveProject(cr_order_number0=[$0], $f1=[true]) HiveAggregate(group=[{16}]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query17.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query17.q.out index 3771c2251c..302b72d243 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query17.q.out @@ -110,7 +110,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[=($7, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($15, _UTF-16LE'2000Q1'), IS NOT NULL($0))]) @@ -122,7 +122,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[AND(=($7, $1), =($6, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(IN($15, _UTF-16LE'2000Q1', _UTF-16LE'2000Q2', _UTF-16LE'2000Q3'), IS NOT NULL($0))]) @@ -130,7 +130,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$1], sr_customer_sk=[$2], sr_ticket_number=[$3], sr_return_quantity=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_customer_sk=[$3], sr_ticket_number=[$9], sr_return_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(IN($15, _UTF-16LE'2000Q1', _UTF-16LE'2000Q2', _UTF-16LE'2000Q3'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query18.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query18.q.out index ebeb13b0ee..c527b42212 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query18.q.out @@ -86,7 +86,7 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveJoin(condition=[=($1, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4], CAST=[CAST($13):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(IN($12, 9, 5, 12, 4, 1, 10), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IN($12, 9, 5, 12, 4, 1, 10), IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0], ca_county=[$7], ca_state=[$8], ca_country=[$10]) HiveFilter(condition=[AND(IN($8, _UTF-16LE'ND', _UTF-16LE'WI', _UTF-16LE'AL', _UTF-16LE'NC', _UTF-16LE'OK', _UTF-16LE'MS', _UTF-16LE'TN'), IS NOT NULL($0))]) @@ -102,12 +102,12 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveJoin(condition=[=($2, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_bill_cdemo_sk=[$4], cs_item_sk=[$15], CAST=[CAST($18):DECIMAL(12, 2)], CAST5=[CAST($20):DECIMAL(12, 2)], CAST6=[CAST($27):DECIMAL(12, 2)], CAST7=[CAST($21):DECIMAL(12, 2)], CAST8=[CAST($33):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($15))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0], CAST=[CAST($6):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($3, _UTF-16LE'College'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($3, _UTF-16LE'College'), =($1, _UTF-16LE'M'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query19.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query19.q.out index be19babca6..c486a7e96a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query19.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query19.q.out @@ -78,10 +78,10 @@ HiveProject(brand_id=[$0], brand=[$1], i_manufact_id=[$2], i_manufact=[$3], ext_ HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 11), =($6, 1999), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8], i_manufact_id=[$13], i_manufact=[$14]) HiveFilter(condition=[AND(=($20, 7), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query20.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query20.q.out index fcc5e795b7..9aa0653d0b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query20.q.out @@ -73,7 +73,7 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query23.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query23.q.out index f004144407..6aaf3a0c8d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query23.q.out @@ -141,7 +141,7 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18], cs_list_price=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 1), IS NOT NULL($0))]) @@ -170,7 +170,7 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], *=[*(CAST($10):DECIMAL(10, 0), $13)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(IN($6, 1999, 2000, 2001, 2002), IS NOT NULL($0))]) @@ -196,7 +196,7 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_bill_customer_sk=[$4], ws_quantity=[$18], ws_list_price=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($4), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 1), IS NOT NULL($0))]) @@ -225,7 +225,7 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], *=[*(CAST($10):DECIMAL(10, 0), $13)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(IN($6, 1999, 2000, 2001, 2002), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query24.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query24.q.out index 6c4426c0f3..5939b3cb5d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query24.q.out @@ -129,7 +129,7 @@ HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3]) HiveJoin(condition=[AND(=($1, $10), =($2, $19))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($9), IS NOT NULL($2), IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_current_price=[$5], i_size=[$15], i_units=[$18], i_manager_id=[$20]) HiveFilter(condition=[AND(=($17, _UTF-16LE'orchid'), IS NOT NULL($0))]) @@ -156,7 +156,7 @@ HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3]) HiveJoin(condition=[=($0, $18)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $5), =($2, $14))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($9), IS NOT NULL($2), IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveJoin(condition=[AND(=($1, $5), <>($4, $8))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4], c_first_name=[$8], c_last_name=[$9], c_birth_country=[$14]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query25.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query25.q.out index a2eda86bdc..25b5e69d71 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query25.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query25.q.out @@ -118,27 +118,27 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($2, $14), =($1, $13), =($4, $15))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 4), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($8, 4), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$1], cs_item_sk=[$2], cs_net_profit=[$3], d_date_sk=[$4], sr_returned_date_sk=[$5], sr_item_sk=[$6], sr_customer_sk=[$7], sr_ticket_number=[$8], sr_net_loss=[$9], d_date_sk0=[$10]) HiveJoin(condition=[AND(=($7, $1), =($6, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 10), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), BETWEEN(false, $8, 4, 10), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$1], sr_customer_sk=[$2], sr_ticket_number=[$3], sr_net_loss=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_customer_sk=[$3], sr_ticket_number=[$9], sr_net_loss=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 10), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), BETWEEN(false, $8, 4, 10), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) HiveFilter(condition=[IS NOT NULL($0)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query26.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query26.q.out index 9f51402caf..8437af174a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query26.q.out @@ -62,10 +62,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_cdemo_sk=[$4], cs_item_sk=[$15], cs_promo_sk=[$16], cs_quantity=[$18], cs_list_price=[$20], cs_sales_price=[$21], cs_coupon_amt=[$27]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($15), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'F'), =($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), =($1, _UTF-16LE'F'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query27.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query27.q.out index c622176b22..601364abe9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query27.q.out @@ -70,7 +70,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($2, _UTF-16LE'U'), =($3, _UTF-16LE'2 yr Degree'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'U'), =($3, _UTF-16LE'2 yr Degree'), =($1, _UTF-16LE'M'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query29.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query29.q.out index d0bca31963..a08138a1e6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query29.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query29.q.out @@ -111,7 +111,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($17, $1), =($16, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(IN($6, 1999, 2000, 2001), IS NOT NULL($0))]) @@ -125,18 +125,18 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($2, $9), =($1, $8), =($4, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 4), =($6, 1999), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 4), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$1], sr_customer_sk=[$2], sr_ticket_number=[$3], sr_return_quantity=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_customer_sk=[$3], sr_ticket_number=[$9], sr_return_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 7), =($6, 1999), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, $8, 4, 7), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) HiveFilter(condition=[IS NOT NULL($0)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query30.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query30.q.out index 833652a21f..c44ab4d8d8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query30.q.out @@ -91,7 +91,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_returned_date_sk=[$0], wr_returning_customer_sk=[$7], wr_returning_addr_sk=[$10], wr_return_amt=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0), IS NOT NULL($10))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query31.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query31.q.out index 310c004248..24925a757c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query31.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query31.q.out @@ -126,7 +126,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 1), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -139,7 +139,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 3), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 3), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject($f0=[$0], $f3=[$1], >=[>($1, 0:DECIMAL(1, 0))]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -152,7 +152,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1], ca_county0=[$2], $f10=[$3], ca_county1=[$4], $f11=[$5]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -168,7 +168,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -181,7 +181,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 1), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -194,6 +194,6 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 3), =($6, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 3), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query32.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query32.q.out index 2720c3bdee..9a34c1c7e6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query32.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query32.q.out @@ -66,7 +66,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($22))]) + HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -79,7 +79,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveAggregate(group=[{1}], agg#0=[sum($2)], agg#1=[count($2)]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query34.q.out index b88ee6ee80..0c77719be8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query34.q.out @@ -85,13 +85,13 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[=($2, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(<=(1, $9), <=($9, 3), <=(25, $9), <=($9, 28)), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)), OR(<=(1, $9), <=($9, 3), <=(25, $9), <=($9, 28)), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), >($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[AND(IN($23, _UTF-16LE'Mobile County', _UTF-16LE'Maverick County', _UTF-16LE'Huron County', _UTF-16LE'Kittitas County', _UTF-16LE'Fairfield County', _UTF-16LE'Jackson County', _UTF-16LE'Barrow County', _UTF-16LE'Pennington County'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query35.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query35.q.out index f14a2bd8f3..7c7bce96e4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query35.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query35.q.out @@ -138,7 +138,7 @@ HiveProject(ca_state=[$0], cd_gender=[$1], cd_marital_status=[$2], cnt1=[$3], _o HiveJoin(condition=[=($5, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ca_address_sk=[$0], ca_state=[$8]) HiveFilter(condition=[IS NOT NULL($0)]) @@ -149,7 +149,7 @@ HiveProject(ca_state=[$0], cd_gender=[$1], cd_marital_status=[$2], cnt1=[$3], _o HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), <($10, 4), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query36.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query36.q.out index 831a87d91b..f0204dd970 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query36.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query36.q.out @@ -77,7 +77,7 @@ HiveProject(gross_margin=[$0], i_category=[$1], i_class=[$2], lochierarchy=[$3], HiveJoin(condition=[=($6, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_ext_sales_price=[$15], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query37.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query37.q.out index 35ba509597..2b553a723f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query37.q.out @@ -50,7 +50,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($15)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 678, 964, 918, 849), BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(2, 0)), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(2, 0)), IN($13, 678, 964, 918, 849), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(inv_date_sk=[$0], inv_item_sk=[$1], d_date_sk=[$2]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query38.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query38.q.out index b23be251fd..e0ac565d2e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query38.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query38.q.out @@ -101,7 +101,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_bill_customer_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query4.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query4.q.out index 8a87d166f4..7b01a6e8b9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query4.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query4.q.out @@ -238,7 +238,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], /=[/(+(-(-($17, $16), $14), $15), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) @@ -252,7 +252,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], /=[/(+(-(-($25, $24), $22), $23), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) @@ -282,7 +282,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], /=[/(+(-(-($17, $16), $14), $15), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) @@ -310,7 +310,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], /=[/(+(-(-($25, $24), $22), $23), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query40.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query40.q.out index 09939b54e9..312ac30dd4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query40.q.out @@ -77,7 +77,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($3, $6), =($2, $5))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_warehouse_sk=[$14], cs_item_sk=[$15], cs_order_number=[$17], cs_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cr_item_sk=[$2], cr_order_number=[$16], cr_refunded_cash=[$23]) HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($2))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query42.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query42.q.out index 0a7dac0336..fc46de80b3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query42.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query42.q.out @@ -60,7 +60,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 1998), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1998), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[dt]) HiveProject(i_item_sk=[$0], i_category_id=[$11], i_category=[$12]) HiveFilter(condition=[AND(=($20, 1), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query46.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query46.q.out index 89218b861e..a7491f55d8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query46.q.out @@ -101,10 +101,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveJoin(condition=[=($4, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_coupon_amt=[$19], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($7, 6, 0), IN($6, 1998, 1999, 2000), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), IN($7, 6, 0), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[AND(IN($22, _UTF-16LE'Cedar Grove', _UTF-16LE'Wildwood', _UTF-16LE'Union', _UTF-16LE'Salem', _UTF-16LE'Highland Park'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query47.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query47.q.out index f9a4523fd2..60d80e010f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query47.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query47.q.out @@ -125,7 +125,7 @@ HiveProject(i_category=[$0], d_year=[$1], d_moy=[$2], avg_monthly_sales=[$3], su HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) @@ -146,7 +146,7 @@ HiveProject(i_category=[$0], d_year=[$1], d_moy=[$2], avg_monthly_sales=[$3], su HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) @@ -166,7 +166,7 @@ HiveProject(i_category=[$0], d_year=[$1], d_moy=[$2], avg_monthly_sales=[$3], su HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query48.q.out index eb4646dca9..97c9f47e38 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query48.q.out @@ -156,7 +156,7 @@ HiveAggregate(group=[{}], agg#0=[sum($10)]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_cdemo_sk=[$4], ss_addr_sk=[$6], ss_store_sk=[$7], ss_quantity=[$10], BETWEEN=[BETWEEN(false, $22, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], BETWEEN6=[BETWEEN(false, $22, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], BETWEEN7=[BETWEEN(false, $22, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(0:DECIMAL(12, 2), $22), <=($22, 2000:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 3000:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 25000:DECIMAL(12, 2))), OR(BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0)), BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0)), BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($6), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0)), BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0)), BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))), IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($7), OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(0:DECIMAL(12, 2), $22), <=($22, 2000:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 3000:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 25000:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query49.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query49.q.out index 1e28ff9f43..99569a8431 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query49.q.out @@ -287,7 +287,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, web_returns]], table:alias=[wr]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_order_number=[$17], CASE=[CASE(IS NOT NULL($18), $18, 0)], CASE4=[CASE(IS NOT NULL($29), $29, 0:DECIMAL(12, 2))]) - HiveFilter(condition=[AND(>($33, 1:DECIMAL(1, 0)), >($29, 0:DECIMAL(1, 0)), >($18, 0), IS NOT NULL($17), IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>($33, 1:DECIMAL(1, 0)), >($29, 0:DECIMAL(1, 0)), >($18, 0), IS NOT NULL($0), IS NOT NULL($17), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12), IS NOT NULL($0))]) @@ -303,7 +303,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, catalog_returns]], table:alias=[cr]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_order_number=[$17], CASE=[CASE(IS NOT NULL($18), $18, 0)], CASE4=[CASE(IS NOT NULL($29), $29, 0:DECIMAL(12, 2))]) - HiveFilter(condition=[AND(>($33, 1:DECIMAL(1, 0)), >($29, 0:DECIMAL(1, 0)), >($18, 0), IS NOT NULL($17), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>($33, 1:DECIMAL(1, 0)), >($29, 0:DECIMAL(1, 0)), >($18, 0), IS NOT NULL($0), IS NOT NULL($17), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[cs]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12), IS NOT NULL($0))]) @@ -319,7 +319,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, store_returns]], table:alias=[sr]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ticket_number=[$9], CASE=[CASE(IS NOT NULL($10), $10, 0)], CASE4=[CASE(IS NOT NULL($20), $20, 0:DECIMAL(12, 2))]) - HiveFilter(condition=[AND(>($22, 1:DECIMAL(1, 0)), >($20, 0:DECIMAL(1, 0)), >($10, 0), IS NOT NULL($9), IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>($22, 1:DECIMAL(1, 0)), >($20, 0:DECIMAL(1, 0)), >($10, 0), IS NOT NULL($0), IS NOT NULL($9), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[sts]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query5.q.out index 78d97dc495..9a09d8996d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query5.q.out @@ -290,7 +290,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(store_sk=[$7], date_sk=[$0], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$11], net_loss=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-08-18 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -311,7 +311,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(page_sk=[$12], date_sk=[$0], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$18], net_loss=[$26]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($12), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-08-18 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -323,12 +323,12 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(wsr_web_site_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) HiveProject(wsr_web_site_sk=[$13], date_sk=[$0], sales_price=[$23], profit=[$33], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wsr_web_site_sk=[$1], date_sk=[$3], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$6], net_loss=[$7]) HiveJoin(condition=[AND(=($4, $0), =($5, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_item_sk=[$3], ws_web_site_sk=[$13], ws_order_number=[$17]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($17), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($3), IS NOT NULL($17))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wr_returned_date_sk=[$0], wr_item_sk=[$2], wr_order_number=[$13], wr_return_amt=[$15], wr_net_loss=[$23]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($13))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query50.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query50.q.out index 1b21b9fdaa..4fe81c9dfd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query50.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query50.q.out @@ -133,11 +133,11 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveJoin(condition=[=($0, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($4, $8), =($1, $6), =($2, $7))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($9), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_customer_sk=[$3], sr_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($9), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($9), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 9), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query51.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query51.q.out index 79c5f992ce..a072421bad 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query51.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query51.q.out @@ -106,7 +106,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{1, 4}], agg#0=[sum($2)]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS NOT NULL($0))]) @@ -117,7 +117,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{1, 4}], agg#0=[sum($2)]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query52.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query52.q.out index 27cb4eb3c0..eab5d69e61 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query52.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query52.q.out @@ -59,7 +59,7 @@ HiveProject(d_year=[CAST(1998):INTEGER], brand_id=[$0], brand=[$1], ext_price=[$ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 1998), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1998), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[dt]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[AND(=($20, 1), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query53.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query53.q.out index 93ead4bf0b..a440eb2eed 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query53.q.out @@ -76,7 +76,7 @@ HiveSortLimit(sort0=[$2], sort1=[$1], sort2=[$0], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) HiveFilter(condition=[AND(IN($10, _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'reference', _UTF-16LE'self-help', _UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants'), IN($8, _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #9', _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Women', _UTF-16LE'Music', _UTF-16LE'Men'), OR(AND(IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics'), IN($10, _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'reference', _UTF-16LE'self-help'), IN($8, _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Women', _UTF-16LE'Music', _UTF-16LE'Men'), IN($10, _UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'))), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query54.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query54.q.out index 26f5014cd0..af2f1cce19 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query54.q.out @@ -143,7 +143,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($10, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_month_seq=[$3]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) @@ -168,16 +168,16 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$1], cs_item_sk=[$2]) HiveUnion(all=[true]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(sold_date_sk=[$0], customer_sk=[$4], item_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 3), =($6, 1999), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 3), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Jewelry'), =($10, _UTF-16LE'consignment'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($10, _UTF-16LE'consignment'), =($12, _UTF-16LE'Jewelry'), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(cnt=[$0]) HiveFilter(condition=[<=(sq_count_check($0), 1)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query55.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query55.q.out index 24c93f6adc..f617d8b98e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query55.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query55.q.out @@ -43,7 +43,7 @@ HiveProject(brand_id=[$0], brand=[$1], ext_price=[$2]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[AND(=($20, 36), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query57.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query57.q.out index 6e90bfd468..f0dd0f2f37 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query57.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query57.q.out @@ -119,7 +119,7 @@ HiveProject(i_category=[$0], i_brand=[$1], d_year=[$2], d_moy=[$3], avg_monthly_ HiveJoin(condition=[=($7, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_call_center_sk=[$11], cs_item_sk=[$15], cs_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($11), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) @@ -140,7 +140,7 @@ HiveProject(i_category=[$0], i_brand=[$1], d_year=[$2], d_moy=[$3], avg_monthly_ HiveJoin(condition=[=($7, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_call_center_sk=[$11], cs_item_sk=[$15], cs_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($11), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) @@ -160,7 +160,7 @@ HiveProject(i_category=[$0], i_brand=[$1], d_year=[$2], d_moy=[$3], avg_monthly_ HiveJoin(condition=[=($7, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_call_center_sk=[$11], cs_item_sk=[$15], cs_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($11), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8]) HiveFilter(condition=[AND(IN($6, 2000, 1999, 2001), OR(=($6, 2000), IN(ROW($6, $8), ROW(1999, 12), ROW(2001, 1))), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out index 08ceccf7c0..523f02e7d7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out @@ -149,7 +149,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) @@ -180,7 +180,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) @@ -211,7 +211,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out index 4c4b76f63f..944b113e7b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out @@ -70,7 +70,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveJoin(condition=[=($6, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[s]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(d_date_sk=[$0], d_month_seq=[$3]) @@ -91,7 +91,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_current_price=[$1], i_category=[$2], i_category0=[$3], *=[$4], cnt=[$5]) HiveJoin(condition=[AND(=($3, $2), >($1, $4))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_current_price=[$5], i_category=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12), IS NOT NULL($5))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($0), IS NOT NULL($12))]) HiveTableScan(table=[[default, item]], table:alias=[i]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_category=[$0], *=[*(1.2:DECIMAL(2, 1), CAST(/($1, $2)):DECIMAL(16, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out index f5694d68e1..eec48472d5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out @@ -120,7 +120,7 @@ HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 4), CA HiveJoin(condition=[=($1, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($8), IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS NOT NULL($0))]) @@ -149,7 +149,7 @@ HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 4), CA HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out index e4218340dd..35351157fb 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out @@ -78,7 +78,7 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manager_id=[$20]) HiveFilter(condition=[AND(IN($10, _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'refernece', _UTF-16LE'self-help', _UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants'), IN($8, _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #9', _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Women', _UTF-16LE'Music', _UTF-16LE'Men'), OR(AND(IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics'), IN($10, _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'refernece', _UTF-16LE'self-help'), IN($8, _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Women', _UTF-16LE'Music', _UTF-16LE'Men'), IN($10, _UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'))), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out index 6a3247fe9e..35b52752a1 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out @@ -283,7 +283,7 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($4, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], c_first_shipto_date_sk=[$5], c_first_sales_date_sk=[$6]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(d_date_sk=[$0], d_year=[$6]) HiveFilter(condition=[IS NOT NULL($0)]) @@ -330,10 +330,10 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), IS NOT NULL($0))]) @@ -367,7 +367,7 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($4, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], c_first_shipto_date_sk=[$5], c_first_sales_date_sk=[$6]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(d_date_sk=[$0], d_year=[$6]) HiveFilter(condition=[IS NOT NULL($0)]) @@ -414,10 +414,10 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out index b5b85e5d25..3255a9fb95 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out @@ -472,7 +472,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_sold_time_sk=[$1], ws_ship_mode_sk=[$14], ws_warehouse_sk=[$15], *=[*($21, CAST($18):DECIMAL(10, 0))], *5=[*($30, CAST($18):DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($1), IS NOT NULL($14))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($14))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $2, 49530, 78330), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out index f14338cd8a..6032192938 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out @@ -115,10 +115,10 @@ HiveSortLimit(sort0=[$0], sort1=[$4], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($4, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_ext_sales_price=[$15], ss_ext_list_price=[$17], ss_ext_tax=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), BETWEEN(false, $9, 1, 2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 1, 2), IN($6, 1998, 1999, 2000), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[AND(IN($22, _UTF-16LE'Cedar Grove', _UTF-16LE'Wildwood'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out index 0cc24d321e..de7353d83b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out @@ -119,7 +119,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ HiveJoin(condition=[=($5, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ca_address_sk=[$0], ca_state=[$8]) HiveFilter(condition=[AND(IN($8, _UTF-16LE'CO', _UTF-16LE'IL', _UTF-16LE'MN'), IS NOT NULL($0))]) @@ -130,7 +130,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, $8, 1, 3), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out index d4c3ac61c1..61e2ea44a3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out @@ -62,10 +62,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_cdemo_sk=[$4], ss_promo_sk=[$8], ss_quantity=[$10], ss_list_price=[$12], ss_sales_price=[$13], ss_coupon_amt=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($8))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'F'), =($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), =($1, _UTF-16LE'F'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out index 20444c6616..e1c8bc4a6a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out @@ -103,26 +103,26 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_sold_time_sk=[$1], ws_item_sk=[$3], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($1))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_sold_time_sk=[$1], cs_item_sk=[$15], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15), IS NOT NULL($1))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_sold_time_sk=[$1], ss_item_sk=[$2], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($1))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[AND(=($20, 1), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query72.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query72.q.out index 129116def7..c38ed02ebd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query72.q.out @@ -89,7 +89,7 @@ HiveSortLimit(sort0=[$5], sort1=[$0], sort2=[$1], sort3=[$2], dir0=[DESC-nulls-l HiveJoin(condition=[AND(=($14, $1), <($3, $17))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($4, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(inv_date_sk=[$0], inv_item_sk=[$1], inv_warehouse_sk=[$2], inv_quantity_on_hand=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($1), IS NOT NULL($2), IS NOT NULL($0))]) HiveTableScan(table=[[default, inventory]], table:alias=[inventory]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2]) HiveFilter(condition=[IS NOT NULL($0)]) @@ -108,7 +108,7 @@ HiveSortLimit(sort0=[$5], sort1=[$0], sort2=[$1], sort3=[$2], dir0=[DESC-nulls-l HiveJoin(condition=[=($2, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_ship_date_sk=[$2], cs_bill_cdemo_sk=[$4], cs_bill_hdemo_sk=[$5], cs_item_sk=[$15], cs_promo_sk=[$16], cs_order_number=[$17], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($4), IS NOT NULL($5), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($18))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($18), IS NOT NULL($5), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0], d_week_seq=[$4], +=[+(CAST($2):DOUBLE, 5)]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL(CAST($2):DOUBLE))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query73.q.out index 8f686fed36..e5e28587ae 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query73.q.out @@ -79,13 +79,13 @@ HiveSortLimit(sort0=[$5], dir0=[DESC-nulls-last]) HiveJoin(condition=[=($2, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), BETWEEN(false, $9, 1, 2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 1, 2), IN($6, 2000, 2001, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), >($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[AND(IN($23, _UTF-16LE'Mobile County', _UTF-16LE'Maverick County', _UTF-16LE'Huron County', _UTF-16LE'Kittitas County'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query74.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query74.q.out index 2974e00613..6b180bd064 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query74.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query74.q.out @@ -140,10 +140,10 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_net_paid=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2002), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2002), IN($6, 2001, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -158,7 +158,7 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2002), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2002), IN($6, 2001, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject($f0=[$0], $f4=[$3]) HiveFilter(condition=[>($3, 0:DECIMAL(1, 0))]) @@ -169,10 +169,10 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_net_paid=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), IN($6, 2001, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(customer_id=[$0], year_total=[$3], CAST=[CAST(IS NOT NULL($3)):BOOLEAN]) HiveFilter(condition=[>($3, 0:DECIMAL(1, 0))]) @@ -186,6 +186,6 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2001), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2001), IN($6, 2001, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query75.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query75.q.out index 1374e8d6ab..73b94521e5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query75.q.out @@ -177,13 +177,13 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_order_number=[$17], cs_quantity=[$18], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -193,13 +193,13 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ticket_number=[$9], ss_quantity=[$10], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -209,13 +209,13 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_order_number=[$17], ws_quantity=[$18], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2001), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], i_manufact_id=[$3], $f4=[$4], $f5=[$5]) HiveAggregate(group=[{0, 1, 2, 3}], agg#0=[sum($4)], agg#1=[sum($5)]) @@ -235,13 +235,13 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_order_number=[$17], cs_quantity=[$18], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -251,13 +251,13 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ticket_number=[$9], ss_quantity=[$10], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -267,12 +267,12 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveJoin(condition=[=($6, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_order_number=[$17], ws_quantity=[$18], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query76.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query76.q.out index 6f4f32e307..9eb6c1d386 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query76.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query76.q.out @@ -72,13 +72,13 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NULL($6), IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NULL($6), IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(channel=[_UTF-16LE'web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=[_UTF-16LE'ws_web_page_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$6], d_qoy=[$7], i_category=[$4], ext_sales_price=[$2]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NULL($12), IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NULL($12), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveFilter(condition=[IS NOT NULL($0)]) @@ -90,7 +90,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NULL($14), IS NOT NULL($15), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NULL($14), IS NOT NULL($0), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveFilter(condition=[IS NOT NULL($0)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query77.q.out index 29ff348890..02caf99f7d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query77.q.out @@ -260,7 +260,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_store_sk=[$7], sr_return_amt=[$11], sr_net_loss=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-09-03 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -308,7 +308,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, web_page]], table:alias=[web_page]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_returned_date_sk=[$0], wr_web_page_sk=[$11], wr_return_amt=[$15], wr_net_loss=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-09-03 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query78.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query78.q.out index f77eadfc6b..6bc9ff36b3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query78.q.out @@ -145,7 +145,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[IS NULL($8)]) HiveJoin(condition=[AND(=($8, $3), =($1, $7))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_ticket_number=[$9], ss_quantity=[$10], ss_wholesale_cost=[$11], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9]) HiveFilter(condition=[AND(IS NOT NULL($9), IS NOT NULL($2))]) @@ -161,7 +161,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[IS NULL($8)]) HiveJoin(condition=[AND(=($8, $3), =($1, $7))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_bill_customer_sk=[$4], ws_order_number=[$17], ws_quantity=[$18], ws_wholesale_cost=[$19], ws_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wr_item_sk=[$2], wr_order_number=[$13]) HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($2))]) @@ -178,7 +178,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[IS NULL($8)]) HiveJoin(condition=[AND(=($8, $3), =($2, $7))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_order_number=[$17], cs_quantity=[$18], cs_wholesale_cost=[$19], cs_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($15), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cr_item_sk=[$2], cr_order_number=[$16]) HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($2))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query79.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query79.q.out index 4317c1b764..cd2ae22ac3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query79.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query79.q.out @@ -68,10 +68,10 @@ HiveProject(c_last_name=[$0], c_first_name=[$1], _o__c2=[$2], ss_ticket_number=[ HiveJoin(condition=[=($4, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_coupon_amt=[$19], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), =($7, 1), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($7, 1), IN($6, 1998, 1999, 2000), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_city=[$22]) HiveFilter(condition=[AND(BETWEEN(false, $6, 200, 295), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query8.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query8.q.out index d80d3365d9..3176ddded5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query8.q.out @@ -234,7 +234,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2002), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($6, 2002), =($10, 1), IS NOT NULL($0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(substr=[$0], s_store_sk=[$1], s_store_name=[$2], substr0=[$3]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query80.q.out index 7f479b35b7..634fc836b8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query80.q.out @@ -235,7 +235,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], ss_ext_sales_price=[$15], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2), IS NOT NULL($8))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9], sr_return_amt=[$11], sr_net_loss=[$19]) HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($9))]) @@ -261,7 +261,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($2, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_catalog_page_sk=[$12], cs_item_sk=[$15], cs_promo_sk=[$16], cs_order_number=[$17], cs_ext_sales_price=[$23], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12), IS NOT NULL($15), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($0), IS NOT NULL($12), IS NOT NULL($15))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cr_item_sk=[$2], cr_order_number=[$16], cr_return_amount=[$18], cr_net_loss=[$26]) HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($16))]) @@ -287,7 +287,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_web_site_sk=[$13], ws_promo_sk=[$16], ws_order_number=[$17], ws_ext_sales_price=[$23], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($13), IS NOT NULL($3), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($13), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wr_item_sk=[$2], wr_order_number=[$13], wr_return_amt=[$15], wr_net_loss=[$23]) HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($13))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query81.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query81.q.out index 3e63c0c6b6..efe06612b9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query81.q.out @@ -92,7 +92,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_returning_addr_sk=[$10], cr_return_amt_inc_tax=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) @@ -108,7 +108,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_returning_addr_sk=[$10], cr_return_amt_inc_tax=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10))]) + HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query82.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query82.q.out index 1037ce66c6..74fa05cc3d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query82.q.out @@ -50,7 +50,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 437, 129, 727, 663), BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(2, 0)), IS NOT NULL($0))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(2, 0)), IN($13, 437, 129, 727, 663), IS NOT NULL($0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(inv_date_sk=[$0], inv_item_sk=[$1], d_date_sk=[$2]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query83.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query83.q.out index 7dd31f22fa..5ee3bfc644 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query83.q.out @@ -176,7 +176,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_return_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) @@ -200,7 +200,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_returned_date_sk=[$0], wr_item_sk=[$2], wr_return_quantity=[$14]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query84.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query84.q.out index 006f70365e..bac98bee0d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query84.q.out @@ -68,7 +68,7 @@ HiveProject(customer_id=[$0], customername=[$1]) HiveJoin(condition=[=($6, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_id=[$1], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], ||=[||(||($9, _UTF-16LE', '), $8)]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0]) HiveFilter(condition=[AND(=($6, _UTF-16LE'Hopewell'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query85.q.out index 3de854da06..5e69ad8e8d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query85.q.out @@ -189,7 +189,7 @@ HiveProject(_o__c0=[$0], _o__c1=[$1], _o__c2=[$2], _o__c3=[$3]) HiveJoin(condition=[AND(=($1, $21), =($3, $26), OR(AND($15, $16, $8), AND($17, $18, $9), AND($19, $20, $10)), OR(AND($30, $5), AND($31, $6), AND($32, $7)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_web_page_sk=[$12], ws_order_number=[$17], ws_quantity=[$18], BETWEEN=[BETWEEN(false, $33, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], BETWEEN6=[BETWEEN(false, $33, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], BETWEEN7=[BETWEEN(false, $33, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], BETWEEN8=[BETWEEN(false, $21, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], BETWEEN9=[BETWEEN(false, $21, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0))], BETWEEN10=[BETWEEN(false, $21, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $21), <=($21, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $21), <=($21, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $21), <=($21, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $33), <=($33, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $33), <=($33, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $33), <=($33, 250:DECIMAL(12, 2))), IS NOT NULL($3), IS NOT NULL($17), IS NOT NULL($12), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $21), <=($21, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $21), <=($21, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $21), <=($21, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $33), <=($33, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $33), <=($33, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $33), <=($33, 250:DECIMAL(12, 2))), IS NOT NULL($0), IS NOT NULL($12), IS NOT NULL($3), IS NOT NULL($17))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))]) @@ -198,18 +198,18 @@ HiveProject(_o__c0=[$0], _o__c1=[$1], _o__c2=[$2], _o__c3=[$3]) HiveJoin(condition=[=($24, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $22), =($2, $23), =($0, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], ==[=($2, _UTF-16LE'M')], =4=[=($3, _UTF-16LE'4 yr Degree')], =5=[=($2, _UTF-16LE'D')], =6=[=($3, _UTF-16LE'Primary')], =7=[=($2, _UTF-16LE'U')], =8=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveJoin(condition=[=($12, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($8, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_item_sk=[$2], wr_refunded_cdemo_sk=[$4], wr_refunded_addr_sk=[$6], wr_returning_cdemo_sk=[$8], wr_reason_sk=[$12], wr_order_number=[$13], wr_fee=[$18], wr_refunded_cash=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($13), IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($8), IS NOT NULL($4), IS NOT NULL($12), IS NOT NULL($2), IS NOT NULL($13))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(ca_address_sk=[$0], IN=[IN($8, _UTF-16LE'KY', _UTF-16LE'GA', _UTF-16LE'NM')], IN2=[IN($8, _UTF-16LE'MT', _UTF-16LE'OR', _UTF-16LE'IN')], IN3=[IN($8, _UTF-16LE'WI', _UTF-16LE'MO', _UTF-16LE'WV')]) HiveFilter(condition=[AND(IN($8, _UTF-16LE'KY', _UTF-16LE'GA', _UTF-16LE'NM', _UTF-16LE'MT', _UTF-16LE'OR', _UTF-16LE'IN', _UTF-16LE'WI', _UTF-16LE'MO', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) HiveProject(r_reason_sk=[$0], r_reason_desc=[$2]) HiveFilter(condition=[IS NOT NULL($0)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query87.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query87.q.out index 2700be640b..2684a3ea36 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query87.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query87.q.out @@ -106,7 +106,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_bill_customer_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query88.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query88.q.out index 5dbc2bcfc6..aad955e024 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query88.q.out @@ -214,10 +214,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30), IS NOT NULL($0))]) @@ -231,10 +231,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 12), <($4, 30), IS NOT NULL($0))]) @@ -248,10 +248,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 11), >=($4, 30), IS NOT NULL($0))]) @@ -265,10 +265,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 11), <($4, 30), IS NOT NULL($0))]) @@ -282,10 +282,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 10), >=($4, 30), IS NOT NULL($0))]) @@ -299,10 +299,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 10), <($4, 30), IS NOT NULL($0))]) @@ -316,10 +316,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 9), >=($4, 30), IS NOT NULL($0))]) @@ -333,10 +333,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)), IS NOT NULL($0))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 9), <($4, 30), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query89.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query89.q.out index bd40a31ff9..62aa4bb5c9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query89.q.out @@ -74,7 +74,7 @@ HiveProject(i_category=[$0], i_class=[$1], i_brand=[$2], s_store_name=[$3], s_co HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_brand=[$8], i_class=[$10], i_category=[$12]) HiveFilter(condition=[AND(IN($10, _UTF-16LE'wallpaper', _UTF-16LE'parenting', _UTF-16LE'musical', _UTF-16LE'womens', _UTF-16LE'birdal', _UTF-16LE'pants'), IN($12, _UTF-16LE'Home', _UTF-16LE'Books', _UTF-16LE'Electronics', _UTF-16LE'Shoes', _UTF-16LE'Jewelry', _UTF-16LE'Men'), OR(AND(IN($12, _UTF-16LE'Home', _UTF-16LE'Books', _UTF-16LE'Electronics'), IN($10, _UTF-16LE'wallpaper', _UTF-16LE'parenting', _UTF-16LE'musical')), AND(IN($12, _UTF-16LE'Shoes', _UTF-16LE'Jewelry', _UTF-16LE'Men'), IN($10, _UTF-16LE'womens', _UTF-16LE'birdal', _UTF-16LE'pants'))), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query90.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query90.q.out index ba6733844a..f1c996d72e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query90.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query90.q.out @@ -60,7 +60,7 @@ HiveProject(am_pm_ratio=[/(CAST($0):DECIMAL(15, 4), CAST($1):DECIMAL(15, 4))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_time_sk=[$1], ws_ship_hdemo_sk=[$10], ws_web_page_sk=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($1), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($10), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wp_web_page_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $10, 5000, 5200), IS NOT NULL($0))]) @@ -77,7 +77,7 @@ HiveProject(am_pm_ratio=[/(CAST($0):DECIMAL(15, 4), CAST($1):DECIMAL(15, 4))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_time_sk=[$1], ws_ship_hdemo_sk=[$10], ws_web_page_sk=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($1), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($10), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wp_web_page_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $10, 5000, 5200), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query91.q.out index ef1676c804..3a2aacfff0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query91.q.out @@ -87,16 +87,16 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($0), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'Unknown', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'W'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown'), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree')), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'W'), IN($3, _UTF-16LE'Unknown', _UTF-16LE'Advanced Degree'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown'), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree')), IS NOT NULL($0))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$1], cr_call_center_sk=[$2], cr_net_loss=[$3], d_date_sk=[$4], cc_call_center_sk=[$5], cc_call_center_id=[$6], cc_name=[$7], cc_manager=[$8]) HiveJoin(condition=[=($2, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_call_center_sk=[$11], cr_net_loss=[$26]) - HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query92.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query92.q.out index 1a45e859d4..f1640b1327 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query92.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query92.q.out @@ -70,7 +70,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($22))]) + HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -83,7 +83,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveAggregate(group=[{1}], agg#0=[sum($2)], agg#1=[count($2)]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query93.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query93.q.out index ee9f9789d8..b0b8169a91 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query93.q.out @@ -51,7 +51,7 @@ HiveSortLimit(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_item_sk=[$2], sr_reason_sk=[$8], sr_ticket_number=[$9], sr_return_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($9), IS NOT NULL($8))]) + HiveFilter(condition=[AND(IS NOT NULL($8), IS NOT NULL($2), IS NOT NULL($9))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(r_reason_sk=[$0]) HiveFilter(condition=[AND(=($2, _UTF-16LE'Did not like the warranty'), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query94.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query94.q.out index 7210fa1170..5649216146 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query94.q.out @@ -79,7 +79,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$11], ws_web_site_sk=[$13], ws_warehouse_sk=[$15], ws_order_number=[$17], ws_ext_ship_cost=[$28], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($13), IS NOT NULL($17))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2), IS NOT NULL($17))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1999-05-01 00:00:00:TIMESTAMP(9), 1999-06-30 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) @@ -88,7 +88,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveFilter(condition=[AND(=($14, _UTF-16LE'pri'), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) HiveProject(ws_warehouse_sk=[$15], ws_order_number=[$17]) - HiveFilter(condition=[AND(IS NOT NULL($17), IS NOT NULL($15))]) + HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($17))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws2]) HiveProject(wr_order_number0=[$0], $f1=[true]) HiveAggregate(group=[{13}]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query95.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query95.q.out index 266fc8b265..218ca7d8b6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query95.q.out @@ -106,7 +106,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $6)], agg#1=[sum($7)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$11], ws_web_site_sk=[$13], ws_order_number=[$17], ws_ext_ship_cost=[$28], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($17), IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2), IS NOT NULL($17))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 1999-05-01 00:00:00:TIMESTAMP(9), 1999-06-30 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query96.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query96.q.out index e142933ed9..5ff8531d9b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query96.q.out @@ -44,7 +44,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query98.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query98.q.out index d406b47d36..8881f9e4db 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query98.q.out @@ -79,7 +79,7 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9)), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query99.q.out b/ql/src/test/results/clientpositive/perf/tez/cbo_query99.q.out index 8ca409d3c3..ce6fdabbe8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/cbo_query99.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query99.q.out @@ -88,7 +88,7 @@ HiveProject(_o__c0=[$0], sm_type=[$1], cc_name=[$2], 30 days=[$3], 31-60 days=[$ HiveJoin(condition=[=($1, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_ship_date_sk=[$2], cs_call_center_sk=[$11], cs_ship_mode_sk=[$13], cs_warehouse_sk=[$14], CASE=[CASE(<=(-($2, $0), 30), 1, 0)], CASE5=[CASE(AND(>(-($2, $0), 30), <=(-($2, $0), 60)), 1, 0)], CASE6=[CASE(AND(>(-($2, $0), 60), <=(-($2, $0), 90)), 1, 0)], CASE7=[CASE(AND(>(-($2, $0), 90), <=(-($2, $0), 120)), 1, 0)], CASE8=[CASE(>(-($2, $0), 120), 1, 0)]) - HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($2), IS NOT NULL($13), IS NOT NULL($11))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS NOT NULL($0))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_ext_query1.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_ext_query1.q.out index 7b754f736d..bdd0085dbc 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_ext_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_ext_query1.q.out @@ -72,7 +72,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -84,7 +84,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -164,7 +164,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[{5.175767820386722E7 rows, 0.0 cpu, 0.0 io}]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -176,7 +176,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[{5.3635511784936875E7 rows, 0.0 cpu, 0.0 io}]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(d_date_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query1.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query1.q.out index d50691434d..95ee6e5dd1 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query1.q.out @@ -72,7 +72,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2000)]) @@ -84,7 +84,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveAggregate(group=[{1, 2}], agg#0=[sum($3)]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_customer_sk=[$3], sr_store_sk=[$7], sr_fee=[$14]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query10.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query10.q.out index 42e3df0a76..fe3319261e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query10.q.out @@ -141,7 +141,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= HiveJoin(condition=[=($5, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ca_address_sk=[$0], ca_county=[$7]) HiveFilter(condition=[IN($7, _UTF-16LE'Walker County', _UTF-16LE'Richland County', _UTF-16LE'Gaines County', _UTF-16LE'Douglas County', _UTF-16LE'Dona Ana County')]) @@ -151,7 +151,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2002), BETWEEN(false, $8, 4, 7))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query11.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query11.q.out index 0388034f84..53d470da5c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query11.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query11.q.out @@ -167,7 +167,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], -=[-($17, $14)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2002)]) @@ -207,7 +207,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], -=[-($17, $14)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query13.q.out index d4753960ee..b70f23c643 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query13.q.out @@ -126,7 +126,7 @@ HiveProject($f0=[/(CAST($0):DOUBLE, $1)], $f1=[/($2, $3)], $f2=[/($4, $5)], $f3= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_quantity=[$10], ss_ext_sales_price=[$15], ss_ext_wholesale_cost=[$16], BETWEEN=[BETWEEN(false, $22, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], BETWEEN9=[BETWEEN(false, $22, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], BETWEEN10=[BETWEEN(false, $22, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], BETWEEN11=[BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], BETWEEN12=[BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0))], BETWEEN13=[BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $22), <=($22, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 250:DECIMAL(12, 2))), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($7), OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $22), <=($22, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 250:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query14.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query14.q.out index 7eacbc758d..88e5ea0f87 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query14.q.out @@ -238,7 +238,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(ss_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -256,7 +256,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -269,7 +269,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -282,7 +282,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_quantity=[$10], ss_list_price=[$12]) @@ -334,7 +334,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(ss_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -352,7 +352,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -365,7 +365,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -378,7 +378,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_quantity=[$18], cs_list_price=[$20]) @@ -430,7 +430,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(ss_item_sk=[$0]) HiveJoin(condition=[AND(=($1, $4), =($2, $5), =($3, $6))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2]) HiveFilter(condition=[=($3, 3)]) @@ -448,7 +448,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iss]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -461,7 +461,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[ics]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], $f3=[$3]) HiveAggregate(group=[{4, 5, 6}], agg#0=[count()]) @@ -474,7 +474,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[BETWEEN(false, $6, 1999, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[iws]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_quantity=[$18], ws_list_price=[$20]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query15.q.out index 73da8bfe42..fa7ad1f2dd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query15.q.out @@ -60,9 +60,9 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$1], cs_sales_price=[$2], >=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_sales_price=[$21], >=[>($21, 500:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query16.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query16.q.out index f931724b4a..01373c7b9d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query16.q.out @@ -83,7 +83,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_ship_date_sk=[$2], cs_ship_addr_sk=[$10], cs_call_center_sk=[$11], cs_warehouse_sk=[$14], cs_order_number=[$17], cs_ext_ship_cost=[$28], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($10), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($10))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[cs1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-04-01 00:00:00:TIMESTAMP(9), 2001-05-31 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query17.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query17.q.out index efafbf376c..795d15ebbd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query17.q.out @@ -110,7 +110,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[AND(=($14, $1), =($13, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[IN($15, _UTF-16LE'2000Q1', _UTF-16LE'2000Q2', _UTF-16LE'2000Q3')]) @@ -119,7 +119,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveJoin(condition=[AND(=($2, $9), =($1, $8), =($4, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($15, _UTF-16LE'2000Q1')]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query18.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query18.q.out index 1aeb29aaf6..82d5661402 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query18.q.out @@ -98,13 +98,13 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveJoin(condition=[=($2, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_bill_cdemo_sk=[$4], cs_item_sk=[$15], CAST=[CAST($18):DECIMAL(12, 2)], CAST5=[CAST($20):DECIMAL(12, 2)], CAST6=[CAST($27):DECIMAL(12, 2)], CAST7=[CAST($21):DECIMAL(12, 2)], CAST8=[CAST($33):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0], CAST=[CAST($6):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($3, _UTF-16LE'College'))]) + HiveFilter(condition=[AND(=($3, _UTF-16LE'College'), =($1, _UTF-16LE'M'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(cd_demo_sk=[$0]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query19.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query19.q.out index 0027cf4c34..110f0cf6d7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query19.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query19.q.out @@ -80,7 +80,7 @@ HiveProject(brand_id=[$0], brand=[$1], i_manufact_id=[$2], i_manufact=[$3], ext_ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 11), =($6, 1999))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8], i_manufact_id=[$13], i_manufact=[$14]) HiveFilter(condition=[=($20, 7)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query23.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query23.q.out index 070894d6c9..dfa794d1b8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query23.q.out @@ -140,14 +140,14 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveAggregate(group=[{1}], agg#0=[sum($2)]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[CAST($3):INTEGER NOT NULL], *=[*(CAST($10):DECIMAL(10, 0), $13)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[IN($6, 1999, 2000, 2001, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18], cs_list_price=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 1))]) @@ -186,7 +186,7 @@ HiveAggregate(group=[{}], agg#0=[sum($0)]) HiveAggregate(group=[{1}], agg#0=[sum($2)]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[CAST($3):INTEGER NOT NULL], *=[*(CAST($10):DECIMAL(10, 0), $13)]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[IN($6, 1999, 2000, 2001, 2002)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query24.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query24.q.out index 9d93d73ec9..ddcf036d7a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query24.q.out @@ -126,7 +126,7 @@ HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3]) HiveJoin(condition=[AND(=($1, $7), =($2, $16))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($3, $6), =($0, $5))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) @@ -155,7 +155,7 @@ HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3]) HiveJoin(condition=[AND(=($1, $7), =($2, $16))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($3, $6), =($0, $5))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_sales_price=[$13]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query25.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query25.q.out index be19f71193..20526fe1cd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query25.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query25.q.out @@ -115,19 +115,19 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($14, $1), =($13, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 10), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), BETWEEN(false, $8, 4, 10))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], ss_customer_sk=[$2], ss_store_sk=[$3], ss_ticket_number=[$4], ss_net_profit=[$5], d_date_sk=[$6], sr_returned_date_sk=[$7], sr_item_sk=[$8], sr_customer_sk=[$9], sr_ticket_number=[$10], sr_net_loss=[$11], d_date_sk0=[$12]) HiveJoin(condition=[AND(=($2, $9), =($1, $8), =($4, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 4), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($8, 4))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$1], sr_customer_sk=[$2], sr_ticket_number=[$3], sr_net_loss=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -135,7 +135,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 10), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), BETWEEN(false, $8, 4, 10))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query26.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query26.q.out index f89362300e..e91d2b4aa8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query26.q.out @@ -61,10 +61,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_cdemo_sk=[$4], cs_item_sk=[$15], cs_promo_sk=[$16], cs_quantity=[$18], cs_list_price=[$20], cs_sales_price=[$21], cs_coupon_amt=[$27]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($0), IS NOT NULL($4))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'F'), =($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), =($1, _UTF-16LE'F'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query27.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query27.q.out index 4908bc6171..d01e0afb7d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query27.q.out @@ -69,7 +69,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($2, _UTF-16LE'U'), =($3, _UTF-16LE'2 yr Degree'))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'U'), =($3, _UTF-16LE'2 yr Degree'), =($1, _UTF-16LE'M'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query29.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query29.q.out index f73b7cee01..608290e271 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query29.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query29.q.out @@ -113,7 +113,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($14, $1), =($13, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], cs_item_sk=[$15], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[IN($6, 1999, 2000, 2001)]) @@ -122,10 +122,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[AND(=($2, $9), =($1, $8), =($4, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9], ss_quantity=[$10]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 4), =($6, 1999))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 4))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$1], sr_customer_sk=[$2], sr_ticket_number=[$3], sr_return_quantity=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -133,7 +133,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(BETWEEN(false, $8, 4, 7), =($6, 1999))]) + HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, $8, 4, 7))]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query30.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query30.q.out index 564fe6af99..d6dd7fe30a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query30.q.out @@ -91,7 +91,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_returned_date_sk=[$0], wr_returning_customer_sk=[$7], wr_returning_addr_sk=[$10], wr_return_amt=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0), IS NOT NULL($10))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2002)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query31.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query31.q.out index 55435c7049..6933573ec7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query31.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query31.q.out @@ -126,7 +126,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -139,7 +139,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 3), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject($f0=[$0], $f3=[$1], >=[>($1, 0:DECIMAL(1, 0))]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -152,7 +152,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1], ca_county0=[$2], $f10=[$3], ca_county1=[$4], $f11=[$5]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -168,7 +168,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 2), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 2))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -181,7 +181,7 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ca_county=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[sum($4)]) @@ -194,6 +194,6 @@ HiveProject(ca_county=[$8], d_year=[CAST(2000):INTEGER], web_q1_q2_increase=[/($ HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 3), =($6, 2000))]) + HiveFilter(condition=[AND(=($6, 2000), =($10, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query32.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query32.q.out index 5ba034ce3f..2041398ac6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query32.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query32.q.out @@ -66,7 +66,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_item_sk=[$15], cs_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($22))]) + HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query34.q.out index 9f6a6f7ff9..bb0a5719f8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query34.q.out @@ -84,13 +84,13 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveJoin(condition=[=($2, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(<=(1, $9), <=($9, 3), <=(25, $9), <=($9, 28)), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)))]) + HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)), OR(<=(1, $9), <=($9, 3), <=(25, $9), <=($9, 28)))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), >($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) + HiveFilter(condition=[AND(>($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, _UTF-16LE'Mobile County', _UTF-16LE'Maverick County', _UTF-16LE'Huron County', _UTF-16LE'Kittitas County', _UTF-16LE'Fairfield County', _UTF-16LE'Jackson County', _UTF-16LE'Barrow County', _UTF-16LE'Pennington County')]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query35.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query35.q.out index e4346963f8..174d640c6a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query35.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query35.q.out @@ -139,7 +139,7 @@ HiveProject(ca_state=[$0], cd_gender=[$1], cd_marital_status=[$2], cnt1=[$3], _o HiveJoin(condition=[=($2, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(cd_demo_sk=[$0], cd_gender=[$1], cd_marital_status=[$2], cd_dep_count=[$6], cd_dep_employed_count=[$7], cd_dep_college_count=[$8]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) @@ -148,7 +148,7 @@ HiveProject(ca_state=[$0], cd_gender=[$1], cd_marital_status=[$2], cnt1=[$3], _o HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), <($10, 4))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query37.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query37.q.out index dfa6798d3e..f1f1bb3096 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query37.q.out @@ -49,7 +49,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(cs_item_sk=[$15]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 678, 964, 918, 849), BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(2, 0)))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(2, 0)), IN($13, 678, 964, 918, 849))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(inv_date_sk=[$0], inv_item_sk=[$1], d_date_sk=[$2]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query38.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query38.q.out index a08b35d90e..87a71219e0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query38.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query38.q.out @@ -98,7 +98,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_bill_customer_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[BETWEEN(false, $3, 1212, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query4.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query4.q.out index b8e135292a..bb4ed738c6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query4.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query4.q.out @@ -237,7 +237,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], /=[/(+(-(-($17, $16), $14), $15), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2002)]) @@ -263,7 +263,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], /=[/(+(-(-($25, $24), $22), $23), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2002)]) @@ -291,7 +291,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], /=[/(+(-(-($17, $16), $14), $15), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -304,7 +304,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$3], /=[/(+(-(-($25, $24), $22), $23), 2:DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query42.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query42.q.out index 8f2f79f346..1e00bd5c5f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query42.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query42.q.out @@ -60,7 +60,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 1998))]) + HiveFilter(condition=[AND(=($6, 1998), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[dt]) HiveProject(i_item_sk=[$0], i_category_id=[$11], i_category=[$12]) HiveFilter(condition=[=($20, 1)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query46.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query46.q.out index df36f9ba14..d0a32f7aab 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query46.q.out @@ -99,15 +99,15 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveJoin(condition=[=($4, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_coupon_amt=[$19], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($7, 6, 0), IN($6, 1998, 1999, 2000))]) + HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), IN($7, 6, 0))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($22, _UTF-16LE'Cedar Grove', _UTF-16LE'Wildwood', _UTF-16LE'Union', _UTF-16LE'Salem', _UTF-16LE'Highland Park')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[OR(=($3, 2), =($4, 1))]) + HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query48.q.out index a20a40766b..4be0b33782 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query48.q.out @@ -152,7 +152,7 @@ HiveAggregate(group=[{}], agg#0=[sum($8)]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_cdemo_sk=[$4], ss_addr_sk=[$6], ss_quantity=[$10], BETWEEN=[BETWEEN(false, $22, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], BETWEEN6=[BETWEEN(false, $22, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], BETWEEN7=[BETWEEN(false, $22, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(0:DECIMAL(12, 2), $22), <=($22, 2000:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 3000:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 25000:DECIMAL(12, 2))), OR(BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0)), BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0)), BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($6), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(BETWEEN(false, $13, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0)), BETWEEN(false, $13, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0)), BETWEEN(false, $13, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))), IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($7), OR(<=(100:DECIMAL(3, 0), $13), <=($13, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $13), <=($13, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $13), <=($13, 200:DECIMAL(3, 0))), OR(<=(0:DECIMAL(12, 2), $22), <=($22, 2000:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $22), <=($22, 3000:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $22), <=($22, 25000:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query5.q.out index 63e53e880d..298f8e7eae 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query5.q.out @@ -290,7 +290,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(store_sk=[$7], date_sk=[$0], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$11], net_loss=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-08-18 00:00:00:TIMESTAMP(9))]) @@ -309,7 +309,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(page_sk=[$12], date_sk=[$0], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$18], net_loss=[$26]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($12), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-08-18 00:00:00:TIMESTAMP(9))]) @@ -321,7 +321,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(wsr_web_site_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) HiveProject(wsr_web_site_sk=[$13], date_sk=[$0], sales_price=[$23], profit=[$33], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(ws_web_site_sk=[$1], wr_returned_date_sk=[$3], $f2=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], $f3=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], wr_return_amt=[$6], wr_net_loss=[$7]) HiveJoin(condition=[AND(=($4, $0), =($5, $2))], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query50.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query50.q.out index 8acc34d291..908f1a3d11 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query50.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query50.q.out @@ -132,7 +132,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveJoin(condition=[=($3, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($4, $8), =($1, $6), =($2, $7))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_item_sk=[$2], sr_customer_sk=[$3], sr_ticket_number=[$9]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query52.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query52.q.out index ab2db4ba84..2b1593f13b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query52.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query52.q.out @@ -59,7 +59,7 @@ HiveProject(d_year=[CAST(1998):INTEGER], brand_id=[$0], brand=[$1], ext_price=[$ HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 1998))]) + HiveFilter(condition=[AND(=($6, 1998), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[dt]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[=($20, 1)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query54.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query54.q.out index cdeab44f60..5da4713d01 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query54.q.out @@ -141,7 +141,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(cnt=[$0]) HiveFilter(condition=[<=(sq_count_check($0), 1)]) @@ -177,13 +177,13 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(sold_date_sk=[$0], customer_sk=[$4], item_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 3), =($6, 1999))]) + HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Jewelry'), =($10, _UTF-16LE'consignment'))]) + HiveFilter(condition=[AND(=($10, _UTF-16LE'consignment'), =($12, _UTF-16LE'Jewelry'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveJoin(condition=[AND(=($1, $3), =($2, $4))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ca_address_sk=[$0], ca_county=[$7], ca_state=[$8]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query55.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query55.q.out index 6af451cf4b..7d0bd5a6bf 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query55.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query55.q.out @@ -43,7 +43,7 @@ HiveProject(brand_id=[$0], brand=[$1], ext_price=[$2]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[=($20, 36)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query6.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query6.q.out index 00aafffb60..c78b94b9bf 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query6.q.out @@ -86,11 +86,11 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], ss_customer_sk=[$2], i_item_sk=[$3], i_current_price=[$4], i_category=[$5], i_category0=[$6], *=[$7]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[s]) HiveJoin(condition=[AND(=($3, $2), >($1, $4))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_sk=[$0], i_current_price=[$5], i_category=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($12), IS NOT NULL($5))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($12))]) HiveTableScan(table=[[default, item]], table:alias=[i]) HiveProject(i_category=[$0], *=[*(1.2:DECIMAL(2, 1), CAST(/($1, $2)):DECIMAL(16, 6))]) HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(16, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query61.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query61.q.out index 0a9ecd7450..b95ccd9ea4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query61.q.out @@ -120,7 +120,7 @@ HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 4), CA HiveJoin(condition=[=($1, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($8), IS NOT NULL($0), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) @@ -132,7 +132,7 @@ HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 4), CA HiveFilter(condition=[=($27, -7:DECIMAL(1, 0))]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($8, _UTF-16LE'Y'), =($9, _UTF-16LE'Y'), =($11, _UTF-16LE'Y'))]) + HiveFilter(condition=[OR(=($9, _UTF-16LE'Y'), =($11, _UTF-16LE'Y'), =($8, _UTF-16LE'Y'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[sum($7)]) @@ -149,7 +149,7 @@ HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 4), CA HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_store_sk=[$7], ss_ext_sales_price=[$15]) - HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query64.q.out index b66c32fd00..486aef4f1c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query64.q.out @@ -286,15 +286,15 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($7, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($8, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], c_first_shipto_date_sk=[$5], c_first_sales_date_sk=[$6]) - HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -347,15 +347,15 @@ HiveProject(product_name=[$0], store_name=[$1], store_zip=[$2], b_street_number= HiveJoin(condition=[=($7, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($8, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], c_first_shipto_date_sk=[$5], c_first_sales_date_sk=[$6]) - HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($5), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(2, 0), 45:DECIMAL(2, 0)), IN($17, _UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', _UTF-16LE'navajo', _UTF-16LE'chocolate'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query66.q.out index 34cddacd86..6e4ab9b627 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query66.q.out @@ -471,7 +471,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_sold_time_sk=[$1], ws_ship_mode_sk=[$14], ws_warehouse_sk=[$15], *=[*($21, CAST($18):DECIMAL(10, 0))], *5=[*($30, CAST($18):DECIMAL(10, 0))]) - HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($1), IS NOT NULL($14))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($15), IS NOT NULL($0), IS NOT NULL($14))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[BETWEEN(false, $2, 49530, 78330)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query68.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query68.q.out index e5c182273b..c1605999a8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query68.q.out @@ -113,15 +113,15 @@ HiveSortLimit(sort0=[$0], sort1=[$4], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($4, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_ext_sales_price=[$15], ss_ext_list_price=[$17], ss_ext_tax=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($6), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), BETWEEN(false, $9, 1, 2))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 1, 2), IN($6, 1998, 1999, 2000))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($22, _UTF-16LE'Cedar Grove', _UTF-16LE'Wildwood')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[OR(=($3, 2), =($4, 1))]) + HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query69.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query69.q.out index 1eb6a11a2a..933967eb7c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query69.q.out @@ -119,7 +119,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ HiveJoin(condition=[=($5, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ca_address_sk=[$0], ca_state=[$8]) HiveFilter(condition=[IN($8, _UTF-16LE'CO', _UTF-16LE'IL', _UTF-16LE'MN')]) @@ -129,7 +129,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ HiveProject(ss_customer_sk0=[$1]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, $8, 1, 3))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query7.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query7.q.out index bdd86fcfb4..56c09fc01d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query7.q.out @@ -64,7 +64,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS NOT NULL($8))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'F'), =($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'))]) + HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($3, _UTF-16LE'Primary'), =($1, _UTF-16LE'F'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query71.q.out index b5764f1d83..bcd25b3254 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query71.q.out @@ -103,10 +103,10 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_sold_time_sk=[$1], ws_item_sk=[$3], ws_ext_sales_price=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -114,7 +114,7 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -122,7 +122,7 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($8, 12), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8]) HiveFilter(condition=[=($20, 1)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query72.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query72.q.out index 30239c6233..346a3a9a46 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query72.q.out @@ -97,7 +97,7 @@ HiveSortLimit(sort0=[$5], sort1=[$0], sort2=[$1], sort3=[$2], dir0=[DESC-nulls-l HiveJoin(condition=[=($3, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_ship_date_sk=[$2], cs_bill_cdemo_sk=[$4], cs_bill_hdemo_sk=[$5], cs_item_sk=[$15], cs_promo_sk=[$16], cs_order_number=[$17], cs_quantity=[$18]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($5), IS NOT NULL($0), IS NOT NULL($2), IS NOT NULL($18))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($18), IS NOT NULL($5))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cd_demo_sk=[$0]) HiveFilter(condition=[=($2, _UTF-16LE'M')]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query73.q.out index 3fc0b5549d..1f814a9e15 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query73.q.out @@ -78,13 +78,13 @@ HiveSortLimit(sort0=[$5], dir0=[DESC-nulls-last]) HiveJoin(condition=[=($2, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_store_sk=[$7], ss_ticket_number=[$9]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), BETWEEN(false, $9, 1, 2))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 1, 2), IN($6, 2000, 2001, 2002))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), >($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) + HiveFilter(condition=[AND(>($4, 0), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, _UTF-16LE'Mobile County', _UTF-16LE'Maverick County', _UTF-16LE'Huron County', _UTF-16LE'Kittitas County')]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query74.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query74.q.out index 5325e21871..6d983afc31 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query74.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query74.q.out @@ -139,10 +139,10 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_net_paid=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2002))]) + HiveFilter(condition=[AND(=($6, 2002), IN($6, 2001, 2002))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f4=[$3]) @@ -155,7 +155,7 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2002))]) + HiveFilter(condition=[AND(=($6, 2002), IN($6, 2001, 2002))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(customer_id=[$0], year_total=[$3], CAST=[CAST(IS NOT NULL($3)):BOOLEAN]) @@ -169,7 +169,7 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), IN($6, 2001, 2002))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject($f0=[$0], $f4=[$3]) HiveFilter(condition=[>($3, 0:DECIMAL(1, 0))]) @@ -179,9 +179,9 @@ HiveSortLimit(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_net_paid=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($0))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 2001, 2002), =($6, 2001))]) + HiveFilter(condition=[AND(=($6, 2001), IN($6, 2001, 2002))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query75.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query75.q.out index fbd7fa5775..82f65782a6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query75.q.out @@ -182,7 +182,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -197,7 +197,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -212,7 +212,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], i_manufact_id=[$3], $f4=[$4], $f5=[$5]) HiveAggregate(group=[{0, 1, 2, 3}], agg#0=[sum($4)], agg#1=[sum($5)]) @@ -237,7 +237,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -252,7 +252,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_brand_id=[$11], i_class_id=[$12], i_category_id=[$13], i_manufact_id=[$14], sales_cnt=[-($7, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($8, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[right], algorithm=[none], cost=[not available]) @@ -267,6 +267,6 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], i_brand_i HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_class_id=[$9], i_category_id=[$11], i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, _UTF-16LE'Sports'), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query77.q.out index 7aebc6fcb8..2f75361df1 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query77.q.out @@ -254,7 +254,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(sr_store_sk=[CAST($1):INTEGER NOT NULL], sr_return_amt=[$2], sr_net_loss=[$3]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_returned_date_sk=[$0], sr_store_sk=[$7], sr_return_amt=[$11], sr_net_loss=[$19]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-09-03 00:00:00:TIMESTAMP(9))]) @@ -296,7 +296,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(wr_web_page_sk=[CAST($1):INTEGER NOT NULL], wr_return_amt=[$2], wr_net_loss=[$3]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_returned_date_sk=[$0], wr_web_page_sk=[$11], wr_return_amt=[$15], wr_net_loss=[$23]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($11))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-08-04 00:00:00:TIMESTAMP(9), 1998-09-03 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query78.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query78.q.out index d55c397844..94bfba4a3b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query78.q.out @@ -176,7 +176,7 @@ HiveSortLimit(fetch=[100]) HiveFilter(condition=[IS NULL($8)]) HiveJoin(condition=[AND(=($8, $3), =($1, $7))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_bill_customer_sk=[$4], ws_order_number=[$17], ws_quantity=[$18], ws_wholesale_cost=[$19], ws_sales_price=[$21]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wr_item_sk=[$2], wr_order_number=[$13]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query79.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query79.q.out index 552f96bc3e..8b26fcc315 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query79.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query79.q.out @@ -67,15 +67,15 @@ HiveProject(c_last_name=[$0], c_first_name=[$1], _o__c2=[$2], ss_ticket_number=[ HiveJoin(condition=[=($4, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], ss_coupon_amt=[$19], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($5), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), =($7, 1))]) + HiveFilter(condition=[AND(=($7, 1), IN($6, 1998, 1999, 2000))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_city=[$22]) HiveFilter(condition=[BETWEEN(false, $6, 200, 295)]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[OR(=($3, 8), >($4, 0))]) + HiveFilter(condition=[OR(>($4, 0), =($3, 8))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query8.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query8.q.out index fe14ea31ac..aa1b4d9e2b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query8.q.out @@ -234,7 +234,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[AND(=($10, 1), =($6, 2002))]) + HiveFilter(condition=[AND(=($6, 2002), =($10, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(substr=[$0], s_store_sk=[$1], s_store_name=[$2], substr0=[$3]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query80.q.out index 685a200477..fa6a0e8163 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query80.q.out @@ -234,7 +234,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], ss_ext_sales_price=[$15], ss_net_profit=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($8))]) + HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($8), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9], sr_return_amt=[$11], sr_net_loss=[$19]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) @@ -258,7 +258,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($2, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(cs_sold_date_sk=[$0], cs_catalog_page_sk=[$12], cs_item_sk=[$15], cs_promo_sk=[$16], cs_order_number=[$17], cs_ext_sales_price=[$23], cs_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($0), IS NOT NULL($12))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(cr_item_sk=[$2], cr_order_number=[$16], cr_return_amount=[$18], cr_net_loss=[$26]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) @@ -283,7 +283,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($1, $7), =($4, $8))], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_web_site_sk=[$13], ws_promo_sk=[$16], ws_order_number=[$17], ws_ext_sales_price=[$23], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($13), IS NOT NULL($16))]) + HiveFilter(condition=[AND(IS NOT NULL($16), IS NOT NULL($13), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wr_item_sk=[$2], wr_order_number=[$13], wr_return_amt=[$15], wr_net_loss=[$23]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query81.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query81.q.out index fd293e35e8..b3c8f0394f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query81.q.out @@ -92,7 +92,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_returning_addr_sk=[$10], cr_return_amt_inc_tax=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) @@ -108,7 +108,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_returning_addr_sk=[$10], cr_return_amt_inc_tax=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($10))]) + HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query82.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query82.q.out index 973672d92a..ae31d5a036 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query82.q.out @@ -49,7 +49,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(ss_item_sk=[$2]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 437, 129, 727, 663), BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(2, 0)))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(2, 0)), IN($13, 437, 129, 727, 663))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(inv_date_sk=[$0], inv_item_sk=[$1], d_date_sk=[$2]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query84.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query84.q.out index d5974e2683..4a27a097b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query84.q.out @@ -67,7 +67,7 @@ HiveProject(customer_id=[$0], customername=[$1]) HiveProject(c_customer_id=[$0], c_current_cdemo_sk=[$1], c_current_hdemo_sk=[$2], c_current_addr_sk=[$3], ||=[$4], ca_address_sk=[$5]) HiveJoin(condition=[=($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_id=[$1], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], ||=[||(||($9, _UTF-16LE', '), $8)]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0]) HiveFilter(condition=[=($6, _UTF-16LE'Hopewell')]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query85.q.out index 2ec57ae3d8..a9a45073ff 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query85.q.out @@ -191,7 +191,7 @@ HiveProject(_o__c0=[$0], _o__c1=[$1], _o__c2=[$2], _o__c3=[$3]) HiveJoin(condition=[AND(=($1, $20), =($2, $25), OR(AND($14, $15, $7), AND($16, $17, $8), AND($18, $19, $9)), OR(AND($29, $4), AND($30, $5), AND($31, $6)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_order_number=[$17], ws_quantity=[$18], BETWEEN=[BETWEEN(false, $33, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], BETWEEN6=[BETWEEN(false, $33, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], BETWEEN7=[BETWEEN(false, $33, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], BETWEEN8=[BETWEEN(false, $21, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], BETWEEN9=[BETWEEN(false, $21, 50:DECIMAL(2, 0), 100:DECIMAL(3, 0))], BETWEEN10=[BETWEEN(false, $21, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) - HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $21), <=($21, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $21), <=($21, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $21), <=($21, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $33), <=($33, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $33), <=($33, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $33), <=($33, 250:DECIMAL(12, 2))), IS NOT NULL($12), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(<=(100:DECIMAL(3, 0), $21), <=($21, 150:DECIMAL(3, 0)), <=(50:DECIMAL(2, 0), $21), <=($21, 100:DECIMAL(3, 0)), <=(150:DECIMAL(3, 0), $21), <=($21, 200:DECIMAL(3, 0))), OR(<=(100:DECIMAL(12, 2), $33), <=($33, 200:DECIMAL(12, 2)), <=(150:DECIMAL(12, 2), $33), <=($33, 300:DECIMAL(12, 2)), <=(50:DECIMAL(12, 2), $33), <=($33, 250:DECIMAL(12, 2))), IS NOT NULL($0), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 1998)]) @@ -199,17 +199,17 @@ HiveProject(_o__c0=[$0], _o__c1=[$1], _o__c2=[$2], _o__c3=[$3]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$1], cd_education_status=[$2], ==[$3], =4=[$4], =5=[$5], =6=[$6], =7=[$7], =8=[$8], wr_item_sk=[$9], wr_refunded_cdemo_sk=[$10], wr_refunded_addr_sk=[$11], wr_returning_cdemo_sk=[$12], wr_reason_sk=[$13], wr_order_number=[$14], wr_fee=[$15], wr_refunded_cash=[$16], ca_address_sk=[$17], IN=[$18], IN2=[$19], IN3=[$20], cd_demo_sk0=[$21], cd_marital_status0=[$22], cd_education_status0=[$23]) HiveJoin(condition=[AND(=($1, $22), =($2, $23), =($0, $10))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], ==[=($2, _UTF-16LE'M')], =4=[=($3, _UTF-16LE'4 yr Degree')], =5=[=($2, _UTF-16LE'D')], =6=[=($3, _UTF-16LE'Primary')], =7=[=($2, _UTF-16LE'U')], =8=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveJoin(condition=[=($12, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($8, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_item_sk=[$2], wr_refunded_cdemo_sk=[$4], wr_refunded_addr_sk=[$6], wr_returning_cdemo_sk=[$8], wr_reason_sk=[$12], wr_order_number=[$13], wr_fee=[$18], wr_refunded_cash=[$20]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($6), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($8), IS NOT NULL($4), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) HiveProject(ca_address_sk=[$0], IN=[IN($8, _UTF-16LE'KY', _UTF-16LE'GA', _UTF-16LE'NM')], IN2=[IN($8, _UTF-16LE'MT', _UTF-16LE'OR', _UTF-16LE'IN')], IN3=[IN($8, _UTF-16LE'WI', _UTF-16LE'MO', _UTF-16LE'WV')]) HiveFilter(condition=[AND(IN($8, _UTF-16LE'KY', _UTF-16LE'GA', _UTF-16LE'NM', _UTF-16LE'MT', _UTF-16LE'OR', _UTF-16LE'IN', _UTF-16LE'WI', _UTF-16LE'MO', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'D', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Primary', _UTF-16LE'Advanced Degree'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query87.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query87.q.out index 5f629d137c..e100934a10 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query87.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query87.q.out @@ -103,7 +103,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_bill_customer_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))]) + HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[BETWEEN(false, $3, 1212, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query88.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query88.q.out index 421d3c2d0f..82c7398dc4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query88.q.out @@ -214,10 +214,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30))]) @@ -231,10 +231,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 12), <($4, 30))]) @@ -248,10 +248,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 11), >=($4, 30))]) @@ -265,10 +265,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 11), <($4, 30))]) @@ -282,10 +282,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 10), >=($4, 30))]) @@ -299,10 +299,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 10), <($4, 30))]) @@ -316,10 +316,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 9), >=($4, 30))]) @@ -333,10 +333,10 @@ HiveProject($f0=[$0], $f00=[$7], $f01=[$6], $f02=[$5], $f03=[$4], $f04=[$3], $f0 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(<=($4, 5), <=($4, 2), <=($4, 3)), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) + HiveFilter(condition=[AND(IN($3, 3, 0, 1), OR(AND(=($3, 3), <=($4, 5)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))), OR(<=($4, 5), <=($4, 2), <=($4, 3)))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 9), <($4, 30))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query90.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query90.q.out index 96b7e8895c..474be21c3e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query90.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query90.q.out @@ -60,7 +60,7 @@ HiveProject(am_pm_ratio=[/(CAST($0):DECIMAL(15, 4), CAST($1):DECIMAL(15, 4))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_time_sk=[$1], ws_ship_hdemo_sk=[$10], ws_web_page_sk=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($1), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($10), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wp_web_page_sk=[$0]) HiveFilter(condition=[BETWEEN(false, $10, 5000, 5200)]) @@ -77,7 +77,7 @@ HiveProject(am_pm_ratio=[/(CAST($0):DECIMAL(15, 4), CAST($1):DECIMAL(15, 4))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_time_sk=[$1], ws_ship_hdemo_sk=[$10], ws_web_page_sk=[$12]) - HiveFilter(condition=[AND(IS NOT NULL($10), IS NOT NULL($1), IS NOT NULL($12))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($10), IS NOT NULL($12))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(wp_web_page_sk=[$0]) HiveFilter(condition=[BETWEEN(false, $10, 5000, 5200)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query91.q.out index d2f79b1512..e19d1ca301 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query91.q.out @@ -88,15 +88,15 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($3))]) + HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($2), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($3, _UTF-16LE'Unknown', _UTF-16LE'Advanced Degree'), IN($2, _UTF-16LE'M', _UTF-16LE'W'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown'), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree')))]) + HiveFilter(condition=[AND(IN($2, _UTF-16LE'M', _UTF-16LE'W'), IN($3, _UTF-16LE'Unknown', _UTF-16LE'Advanced Degree'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown'), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree')))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$1], cr_call_center_sk=[$2], cr_net_loss=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_returned_date_sk=[$0], cr_returning_customer_sk=[$7], cr_call_center_sk=[$11], cr_net_loss=[$26]) - HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($0), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query92.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query92.q.out index 80a1018561..b1cbf0cd15 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query92.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query92.q.out @@ -70,7 +70,7 @@ HiveAggregate(group=[{}], agg#0=[sum($2)]) HiveJoin(condition=[=($4, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], ws_ext_discount_amt=[$22]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($22))]) + HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($0))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1998-03-18 00:00:00:TIMESTAMP(9), 1998-06-16 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query94.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query94.q.out index 04e0bd53f5..8cf1329a8a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query94.q.out @@ -79,7 +79,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $4)], agg#1=[sum($5)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$11], ws_web_site_sk=[$13], ws_warehouse_sk=[$15], ws_order_number=[$17], ws_ext_ship_cost=[$28], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1999-05-01 00:00:00:TIMESTAMP(9), 1999-06-30 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query95.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query95.q.out index 34afce3c59..ace074316b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query95.q.out @@ -100,7 +100,7 @@ HiveAggregate(group=[{}], agg#0=[count(DISTINCT $6)], agg#1=[sum($7)], agg#2=[su HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$11], ws_web_site_sk=[$13], ws_order_number=[$17], ws_ext_ship_cost=[$28], ws_net_profit=[$33]) - HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($11), IS NOT NULL($13))]) + HiveFilter(condition=[AND(IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2))]) HiveTableScan(table=[[default, web_sales]], table:alias=[ws1]) HiveProject(d_date_sk=[$0], d_date=[$2]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 1999-05-01 00:00:00:TIMESTAMP(9), 1999-06-30 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query96.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query96.q.out index b0611d3127..0803d1e7cf 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query96.q.out @@ -44,7 +44,7 @@ HiveAggregate(group=[{}], agg#0=[count()]) HiveJoin(condition=[=($1, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_sold_time_sk=[$1], ss_hdemo_sk=[$5], ss_store_sk=[$7]) - HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($1), IS NOT NULL($7))]) + HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT NULL($5), IS NOT NULL($7))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(t_time_sk=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30))]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query99.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query99.q.out index 1cc459c6bc..203609360e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query99.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query99.q.out @@ -88,7 +88,7 @@ HiveProject(_o__c0=[$0], sm_type=[$1], cc_name=[$2], 30 days=[$3], 31-60 days=[$ HiveJoin(condition=[=($2, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_ship_date_sk=[$2], cs_call_center_sk=[$11], cs_ship_mode_sk=[$13], cs_warehouse_sk=[$14], CASE=[CASE(<=(-($2, $0), 30), 1, 0)], CASE5=[CASE(AND(>(-($2, $0), 30), <=(-($2, $0), 60)), 1, 0)], CASE6=[CASE(AND(>(-($2, $0), 60), <=(-($2, $0), 90)), 1, 0)], CASE7=[CASE(AND(>(-($2, $0), 90), <=(-($2, $0), 120)), 1, 0)], CASE8=[CASE(>(-($2, $0), 120), 1, 0)]) - HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($13), IS NOT NULL($11), IS NOT NULL($2))]) + HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT NULL($2), IS NOT NULL($13), IS NOT NULL($11))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, $3, 1212, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/mv_query44.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/mv_query44.q.out index 66915cc267..f56f9889b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/mv_query44.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/mv_query44.q.out @@ -207,7 +207,7 @@ Stage-0 Select Operator [SEL_173] (rows=287946 width=114) Output:["_col1"] Filter Operator [FIL_172] (rows=287946 width=114) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_15] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk","ss_net_profit"] <-Reducer 3 [CUSTOM_SIMPLE_EDGE] vectorized @@ -231,7 +231,7 @@ Stage-0 Output:["_col0"],keys:true Select Operator [SEL_161] (rows=287946 width=7) Filter Operator [FIL_160] (rows=287946 width=7) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk"] <-Reducer 6 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query1.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query1.q.out index eac858df43..346a55ce5e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query1.q.out @@ -133,7 +133,7 @@ Stage-0 Select Operator [SEL_143] (rows=53634860 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_141] (rows=53634860 width=119) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_3] (rows=57591150 width=119) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_customer_sk","sr_store_sk","sr_fee"] <-Reducer 2 [ONE_TO_ONE_EDGE] @@ -176,6 +176,6 @@ Stage-0 Select Operator [SEL_142] (rows=51757026 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_140] (rows=51757026 width=119) - predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_customer_sk is not null and sr_store_sk is not null and sr_returned_date_sk is not null) Please refer to the previous TableScan [TS_3] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query10.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query10.q.out index def822a940..adc3e2aa9b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query10.q.out @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_200] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_199] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_8] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -252,7 +252,7 @@ Stage-0 Select Operator [SEL_182] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_181] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -288,7 +288,7 @@ Stage-0 Select Operator [SEL_205] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_204] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_57_c_c_customer_sk_min) AND DynamicValue(RS_57_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_57_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_57_c_c_customer_sk_min) AND DynamicValue(RS_57_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_57_c_c_customer_sk_bloom_filter)))) TableScan [TS_18] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -326,7 +326,7 @@ Stage-0 Select Operator [SEL_213] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_212] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_60_c_c_customer_sk_min) AND DynamicValue(RS_60_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_60_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_60_c_c_customer_sk_min) AND DynamicValue(RS_60_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_60_c_c_customer_sk_bloom_filter)))) TableScan [TS_32] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query11.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query11.q.out index 356b3c997e..d6b40af016 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query11.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query11.q.out @@ -243,7 +243,7 @@ Stage-0 Select Operator [SEL_342] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_341] (rows=525327388 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_68_date_dim_d_date_sk_min) AND DynamicValue(RS_68_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_68_date_dim_d_date_sk_min) AND DynamicValue(RS_68_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_59] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_list_price"] <-Reducer 22 [BROADCAST_EDGE] vectorized @@ -295,7 +295,7 @@ Stage-0 Select Operator [SEL_334] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_333] (rows=143930993 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_40] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_list_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -355,7 +355,7 @@ Stage-0 Select Operator [SEL_324] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_323] (rows=525327388 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_list_price"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -410,7 +410,7 @@ Stage-0 Select Operator [SEL_309] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_308] (rows=143930993 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_list_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query12.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query12.q.out index 8b7c09b36d..a003208b52 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query12.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_68] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_67] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query13.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query13.q.out index 3165da9c14..9ed8394f2e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query13.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_113] (rows=265971 width=28) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_112] (rows=265971 width=183) - predicate:((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U')) + predicate:((cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) TableScan [TS_9] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 3 [SIMPLE_EDGE] @@ -179,7 +179,7 @@ Stage-0 Select Operator [SEL_110] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_109] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States')) TableScan [TS_6] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Reducer 2 [SIMPLE_EDGE] @@ -202,7 +202,7 @@ Stage-0 Select Operator [SEL_107] (rows=457561292 width=257) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12"] Filter Operator [FIL_106] (rows=457561292 width=450) - predicate:(((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_addr_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=450) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_ext_sales_price","ss_ext_wholesale_cost","ss_net_profit"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query14.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query14.q.out index 09d2ecb169..1ea859918c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query14.q.out @@ -359,7 +359,7 @@ Stage-0 Select Operator [SEL_1303] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_1302] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 11)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 79 [SIMPLE_EDGE] vectorized @@ -368,7 +368,7 @@ Stage-0 Select Operator [SEL_1365] (rows=286549727 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1364] (rows=286549727 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_227_date_dim_d_date_sk_min) AND DynamicValue(RS_227_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_227_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_227_date_dim_d_date_sk_min) AND DynamicValue(RS_227_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_227_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_143] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_quantity","cs_list_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -393,7 +393,7 @@ Stage-0 Select Operator [SEL_1340] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1331] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 33 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1370] @@ -425,7 +425,7 @@ Stage-0 Select Operator [SEL_1336] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1327] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 25 [SIMPLE_EDGE] SHUFFLE [RS_21] @@ -447,7 +447,7 @@ Stage-0 Select Operator [SEL_1417] (rows=550076554 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1416] (rows=550076554 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_19_d1_d_date_sk_min) AND DynamicValue(RS_19_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_d1_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_19_d1_d_date_sk_min) AND DynamicValue(RS_19_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_d1_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk"] <-Reducer 40 [BROADCAST_EDGE] vectorized @@ -481,7 +481,7 @@ Stage-0 Select Operator [SEL_1337] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1328] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 41 [SIMPLE_EDGE] SHUFFLE [RS_41] @@ -498,7 +498,7 @@ Stage-0 Select Operator [SEL_1431] (rows=286549727 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1430] (rows=286549727 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_39_d2_d_date_sk_min) AND DynamicValue(RS_39_d2_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_39_d2_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_39_d2_d_date_sk_min) AND DynamicValue(RS_39_d2_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_39_d2_d_date_sk_bloom_filter)))) TableScan [TS_29] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk"] <-Reducer 46 [BROADCAST_EDGE] vectorized @@ -532,7 +532,7 @@ Stage-0 Select Operator [SEL_1338] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1329] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 47 [SIMPLE_EDGE] SHUFFLE [RS_62] @@ -549,7 +549,7 @@ Stage-0 Select Operator [SEL_1445] (rows=143966864 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1444] (rows=143966864 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_60_d3_d_date_sk_min) AND DynamicValue(RS_60_d3_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_60_d3_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_60_d3_d_date_sk_min) AND DynamicValue(RS_60_d3_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_60_d3_d_date_sk_bloom_filter)))) TableScan [TS_50] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk"] <-Reducer 52 [BROADCAST_EDGE] vectorized @@ -592,7 +592,7 @@ Stage-0 Select Operator [SEL_1459] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1458] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_106_date_dim_d_date_sk_min) AND DynamicValue(RS_106_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_106_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_106_date_dim_d_date_sk_min) AND DynamicValue(RS_106_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_106_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_99] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_quantity","ss_list_price"] <-Reducer 56 [BROADCAST_EDGE] vectorized @@ -631,7 +631,7 @@ Stage-0 Select Operator [SEL_1474] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1473] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_116_date_dim_d_date_sk_min) AND DynamicValue(RS_116_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_116_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_116_date_dim_d_date_sk_min) AND DynamicValue(RS_116_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_116_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_109] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_quantity","cs_list_price"] <-Reducer 72 [BROADCAST_EDGE] vectorized @@ -670,7 +670,7 @@ Stage-0 Select Operator [SEL_1489] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1488] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_127_date_dim_d_date_sk_min) AND DynamicValue(RS_127_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_127_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_127_date_dim_d_date_sk_min) AND DynamicValue(RS_127_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_127_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_120] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_quantity","ws_list_price"] <-Reducer 78 [BROADCAST_EDGE] vectorized @@ -738,7 +738,7 @@ Stage-0 Select Operator [SEL_1381] (rows=143966864 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1380] (rows=143966864 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_371_date_dim_d_date_sk_min) AND DynamicValue(RS_371_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_371_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_371_date_dim_d_date_sk_min) AND DynamicValue(RS_371_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_371_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_287] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_quantity","ws_list_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -763,7 +763,7 @@ Stage-0 Select Operator [SEL_1342] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1333] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 37 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1386] @@ -925,7 +925,7 @@ Stage-0 Select Operator [SEL_1319] (rows=550076554 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1318] (rows=550076554 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_84_date_dim_d_date_sk_min) AND DynamicValue(RS_84_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_84_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_84_date_dim_d_date_sk_min) AND DynamicValue(RS_84_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_84_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_quantity","ss_list_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -950,7 +950,7 @@ Stage-0 Select Operator [SEL_1335] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1326] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null) Please refer to the previous TableScan [TS_81] <-Reducer 29 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1324] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query15.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query15.q.out index b41b4e3f33..61741ba6f2 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query15.q.out @@ -81,7 +81,7 @@ Stage-0 Select Operator [SEL_22] (rows=20154874 width=205) Output:["_col3","_col8"] Filter Operator [FIL_21] (rows=20154874 width=205) - predicate:(_col4 or _col5 or _col9) + predicate:(_col9 or _col4 or _col5) Merge Join Operator [MERGEJOIN_76] (rows=20154874 width=205) Conds:RS_18._col0=RS_19._col1(Inner),Output:["_col3","_col4","_col5","_col8","_col9"] <-Reducer 2 [SIMPLE_EDGE] @@ -116,7 +116,7 @@ Stage-0 Select Operator [SEL_83] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_82] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 2)) TableScan [TS_8] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 7 [SIMPLE_EDGE] vectorized @@ -125,7 +125,7 @@ Stage-0 Select Operator [SEL_91] (rows=285117831 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_90] (rows=285117831 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_12_date_dim_d_date_sk_min) AND DynamicValue(RS_12_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_12_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_12_date_dim_d_date_sk_min) AND DynamicValue(RS_12_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_12_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_5] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query16.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query16.q.out index 2aacd2461e..9c579a48e7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query16.q.out @@ -171,7 +171,7 @@ Stage-0 Select Operator [SEL_135] (rows=283695062 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_134] (rows=283695062 width=243) - predicate:((cs_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(cs_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter))) and cs_call_center_sk is not null and cs_ship_addr_sk is not null and cs_ship_date_sk is not null) + predicate:(cs_ship_date_sk is not null and cs_call_center_sk is not null and cs_ship_addr_sk is not null and (cs_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(cs_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=243) default@catalog_sales,cs1,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_ship_date_sk","cs_ship_addr_sk","cs_call_center_sk","cs_warehouse_sk","cs_order_number","cs_ext_ship_cost","cs_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -202,7 +202,7 @@ Stage-0 Select Operator [SEL_146] (rows=286548719 width=7) Output:["_col0","_col1"] Filter Operator [FIL_145] (rows=286548719 width=7) - predicate:((cs_order_number BETWEEN DynamicValue(RS_33_cs1_cs_order_number_min) AND DynamicValue(RS_33_cs1_cs_order_number_max) and in_bloom_filter(cs_order_number, DynamicValue(RS_33_cs1_cs_order_number_bloom_filter))) and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and (cs_order_number BETWEEN DynamicValue(RS_33_cs1_cs_order_number_min) AND DynamicValue(RS_33_cs1_cs_order_number_max) and in_bloom_filter(cs_order_number, DynamicValue(RS_33_cs1_cs_order_number_bloom_filter)))) TableScan [TS_22] (rows=287989836 width=7) default@catalog_sales,cs2,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_warehouse_sk","cs_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query17.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query17.q.out index 20db56a73c..8dc4fcca49 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query17.q.out @@ -193,7 +193,7 @@ Stage-0 Select Operator [SEL_234] (rows=501694138 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_233] (rows=501694138 width=23) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=23) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -248,7 +248,7 @@ Stage-0 Select Operator [SEL_229] (rows=285117831 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_228] (rows=285117831 width=15) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=15) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query18.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query18.q.out index a47ab06eaa..51d99b5df5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query18.q.out @@ -100,20 +100,20 @@ Stage-0 File Output Operator [FS_174] Limit [LIM_173] (rows=100 width=1165) Number of rows:100 - Select Operator [SEL_172] (rows=11124170 width=1165) + Select Operator [SEL_172] (rows=11124280 width=1165) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] <-Reducer 6 [SIMPLE_EDGE] vectorized SHUFFLE [RS_171] - Select Operator [SEL_170] (rows=11124170 width=1165) + Select Operator [SEL_170] (rows=11124280 width=1165) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] - Group By Operator [GBY_169] (rows=11124170 width=1229) + Group By Operator [GBY_169] (rows=11124280 width=1229) Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(VALUE._col0)","count(VALUE._col1)","sum(VALUE._col2)","count(VALUE._col3)","sum(VALUE._col4)","count(VALUE._col5)","sum(VALUE._col6)","count(VALUE._col7)","sum(VALUE._col8)","count(VALUE._col9)","sum(VALUE._col10)","count(VALUE._col11)","sum(VALUE._col12)","count(VALUE._col13)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4 <-Reducer 5 [SIMPLE_EDGE] SHUFFLE [RS_40] PartitionCols:_col0, _col1, _col2, _col3, _col4 - Group By Operator [GBY_39] (rows=11124170 width=1229) + Group By Operator [GBY_39] (rows=11124280 width=1229) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(_col12)","count(_col12)","sum(_col13)","count(_col13)","sum(_col14)","count(_col14)","sum(_col15)","count(_col15)","sum(_col16)","count(_col16)","sum(_col3)","count(_col3)","sum(_col19)","count(_col19)"],keys:_col21, _col5, _col6, _col7, 0L - Merge Join Operator [MERGEJOIN_144] (rows=2224834 width=816) + Merge Join Operator [MERGEJOIN_144] (rows=2224856 width=816) Conds:RS_35._col1=RS_168._col0(Inner),Output:["_col3","_col5","_col6","_col7","_col12","_col13","_col14","_col15","_col16","_col19","_col21"] <-Map 16 [SIMPLE_EDGE] vectorized SHUFFLE [RS_168] @@ -125,7 +125,7 @@ Stage-0 <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_35] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_143] (rows=2193811 width=813) + Merge Join Operator [MERGEJOIN_143] (rows=2193833 width=813) Conds:RS_32._col11=RS_166._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col12","_col13","_col14","_col15","_col16","_col19","_col21"] <-Map 15 [SIMPLE_EDGE] vectorized SHUFFLE [RS_166] @@ -137,19 +137,19 @@ Stage-0 <-Reducer 3 [SIMPLE_EDGE] SHUFFLE [RS_32] PartitionCols:_col11 - Merge Join Operator [MERGEJOIN_142] (rows=2193811 width=717) + Merge Join Operator [MERGEJOIN_142] (rows=2193833 width=717) Conds:RS_29._col0=RS_30._col1(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col11","_col12","_col13","_col14","_col15","_col16","_col19"] <-Reducer 11 [SIMPLE_EDGE] SHUFFLE [RS_30] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_141] (rows=15983481 width=639) + Merge Join Operator [MERGEJOIN_141] (rows=15983636 width=639) Conds:RS_18._col2=RS_164._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col11"] <-Map 14 [SIMPLE_EDGE] vectorized SHUFFLE [RS_164] PartitionCols:_col0 - Select Operator [SEL_163] (rows=103433 width=116) + Select Operator [SEL_163] (rows=103434 width=116) Output:["_col0","_col1"] - Filter Operator [FIL_162] (rows=103433 width=187) + Filter Operator [FIL_162] (rows=103434 width=187) predicate:((cd_education_status = 'College') and (cd_gender = 'M')) TableScan [TS_12] (rows=1861800 width=187) default@customer_demographics,cd1,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_education_status","cd_dep_count"] @@ -173,7 +173,7 @@ Stage-0 Select Operator [SEL_160] (rows=283692098 width=573) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_159] (rows=283692098 width=466) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=287989836 width=466) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_bill_cdemo_sk","cs_item_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt","cs_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -198,7 +198,7 @@ Stage-0 Select Operator [SEL_146] (rows=35631408 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_145] (rows=35631408 width=19) - predicate:((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_current_addr_sk is not null and c_current_cdemo_sk is not null) + predicate:((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=19) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk","c_birth_month","c_birth_year"] <-Map 8 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query19.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query19.q.out index 0d32740f04..fdae7ae76d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query19.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query19.q.out @@ -137,7 +137,7 @@ Stage-0 Select Operator [SEL_128] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_127] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 11)) TableScan [TS_8] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -146,7 +146,7 @@ Stage-0 Select Operator [SEL_136] (rows=501694138 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_135] (rows=501694138 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_5] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"] <-Reducer 12 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query20.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query20.q.out index d3ecdacc9c..164c9b3761 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query20.q.out @@ -132,7 +132,7 @@ Stage-0 Select Operator [SEL_68] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_67] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query21.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query21.q.out index f2e35fda39..af2e33e785 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query21.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query21.q.out @@ -88,7 +88,7 @@ Stage-0 <-Reducer 5 [SIMPLE_EDGE] vectorized SHUFFLE [RS_88] Filter Operator [FIL_87] (rows=115991 width=216) - predicate:(CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END) + predicate:(CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END) Group By Operator [GBY_86] (rows=463966 width=216) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1 <-Reducer 4 [SIMPLE_EDGE] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query23.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query23.q.out index 4e0cb4cf89..5a4fff804a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query23.q.out @@ -185,7 +185,7 @@ Stage-0 Select Operator [SEL_375] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_374] (rows=50 width=12) - predicate:((d_moy = 1) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 1)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 35 [SIMPLE_EDGE] vectorized @@ -194,7 +194,7 @@ Stage-0 Select Operator [SEL_444] (rows=143930993 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_443] (rows=143930993 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_145_date_dim_d_date_sk_min) AND DynamicValue(RS_145_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_145_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_145_date_dim_d_date_sk_min) AND DynamicValue(RS_145_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_145_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_78] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_quantity","ws_list_price"] <-Reducer 14 [BROADCAST_EDGE] vectorized @@ -262,7 +262,7 @@ Stage-0 Select Operator [SEL_407] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_406] (rows=525327388 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_15] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 26 [BROADCAST_EDGE] vectorized @@ -290,7 +290,7 @@ Stage-0 Select Operator [SEL_449] (rows=550080312 width=114) Output:["_col0","_col1"] Filter Operator [FIL_448] (rows=550080312 width=114) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_147_web_sales_ws_bill_customer_sk_min) AND DynamicValue(RS_147_web_sales_ws_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_147_web_sales_ws_bill_customer_sk_bloom_filter))) and ss_customer_sk is not null) + predicate:(ss_customer_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_147_web_sales_ws_bill_customer_sk_min) AND DynamicValue(RS_147_web_sales_ws_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_147_web_sales_ws_bill_customer_sk_bloom_filter)))) TableScan [TS_84] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -351,7 +351,7 @@ Stage-0 Select Operator [SEL_429] (rows=550076554 width=7) Output:["_col0","_col1"] Filter Operator [FIL_428] (rows=550076554 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_54_date_dim_d_date_sk_min) AND DynamicValue(RS_54_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_54_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_54_date_dim_d_date_sk_min) AND DynamicValue(RS_54_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_54_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_45] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk"] <-Reducer 33 [BROADCAST_EDGE] vectorized @@ -393,7 +393,7 @@ Stage-0 Select Operator [SEL_387] (rows=285117831 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_386] (rows=285117831 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_67_date_dim_d_date_sk_min) AND DynamicValue(RS_67_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_67_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_67_date_dim_d_date_sk_min) AND DynamicValue(RS_67_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_67_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity","cs_list_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized @@ -440,7 +440,7 @@ Stage-0 Select Operator [SEL_392] (rows=550080312 width=114) Output:["_col0","_col1"] Filter Operator [FIL_391] (rows=550080312 width=114) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_min) AND DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_bloom_filter))) and ss_customer_sk is not null) + predicate:(ss_customer_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_min) AND DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_69_catalog_sales_cs_bill_customer_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query24.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query24.q.out index ad75f8a6a0..288bd96cb7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query24.q.out @@ -239,7 +239,7 @@ Stage-0 Select Operator [SEL_336] (rows=525333486 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_335] (rows=525333486 width=122) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_74_customer_c_customer_sk_min) AND DynamicValue(RS_74_customer_c_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_74_customer_c_customer_sk_bloom_filter))) and ss_customer_sk is not null and ss_store_sk is not null) + predicate:(ss_customer_sk is not null and ss_store_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_74_customer_c_customer_sk_min) AND DynamicValue(RS_74_customer_c_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_74_customer_c_customer_sk_bloom_filter)))) TableScan [TS_46] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_sales_price"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -304,7 +304,7 @@ Stage-0 Select Operator [SEL_313] (rows=525333486 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_312] (rows=525333486 width=122) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_32_item_i_item_sk_min) AND DynamicValue(RS_32_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_32_item_i_item_sk_bloom_filter))) and ss_customer_sk is not null and ss_store_sk is not null) + predicate:(ss_customer_sk is not null and ss_store_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_32_item_i_item_sk_min) AND DynamicValue(RS_32_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_32_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_sales_price"] <-Reducer 20 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query25.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query25.q.out index 964641c873..c118018a66 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query25.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query25.q.out @@ -186,7 +186,7 @@ Stage-0 Select Operator [SEL_214] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_211] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 4)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,d3,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 14 [SIMPLE_EDGE] vectorized @@ -195,7 +195,7 @@ Stage-0 Select Operator [SEL_233] (rows=501694138 width=126) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_232] (rows=501694138 width=126) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=126) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -250,7 +250,7 @@ Stage-0 Select Operator [SEL_228] (rows=285117831 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_227] (rows=285117831 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query26.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query26.q.out index d1774f1562..7acfe564c3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query26.q.out @@ -133,7 +133,7 @@ Stage-0 Select Operator [SEL_100] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_99] (rows=14776 width=268) - predicate:((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W')) + predicate:((cd_marital_status = 'W') and (cd_education_status = 'Primary') and (cd_gender = 'F')) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -142,7 +142,7 @@ Stage-0 Select Operator [SEL_108] (rows=283691050 width=354) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_107] (rows=283691050 width=354) - predicate:((cs_bill_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(cs_bill_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_promo_sk is not null and cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and (cs_bill_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(cs_bill_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=354) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_cdemo_sk","cs_item_sk","cs_promo_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query27.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query27.q.out index 5bb760f24d..03f5a8a6fe 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query27.q.out @@ -139,7 +139,7 @@ Stage-0 Select Operator [SEL_101] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_100] (rows=14776 width=268) - predicate:((cd_education_status = '2 yr Degree') and (cd_gender = 'M') and (cd_marital_status = 'U')) + predicate:((cd_marital_status = 'U') and (cd_education_status = '2 yr Degree') and (cd_gender = 'M')) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -148,7 +148,7 @@ Stage-0 Select Operator [SEL_109] (rows=501690006 width=340) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_108] (rows=501690006 width=340) - predicate:((ss_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter))) and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and (ss_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=340) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_cdemo_sk","ss_store_sk","ss_quantity","ss_list_price","ss_sales_price","ss_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query28.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query28.q.out index e010dc784a..0cb5d232c7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query28.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query28.q.out @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_117] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_111] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52) and ss_quantity BETWEEN 6 AND 10) + predicate:(ss_quantity BETWEEN 6 AND 10 and (ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52)) TableScan [TS_0] (rows=575995635 width=324) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_quantity","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 7 [CUSTOM_SIMPLE_EDGE] @@ -189,7 +189,7 @@ Stage-0 Select Operator [SEL_116] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_110] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24) and ss_quantity BETWEEN 11 AND 15) + predicate:(ss_quantity BETWEEN 11 AND 15 and (ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24)) Please refer to the previous TableScan [TS_0] <-Reducer 6 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_51] @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_115] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_109] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100) and ss_quantity BETWEEN 16 AND 20) + predicate:(ss_quantity BETWEEN 16 AND 20 and (ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100)) Please refer to the previous TableScan [TS_0] <-Reducer 5 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_48] @@ -241,7 +241,7 @@ Stage-0 Select Operator [SEL_114] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_108] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58) and ss_quantity BETWEEN 21 AND 25) + predicate:(ss_quantity BETWEEN 21 AND 25 and (ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58)) Please refer to the previous TableScan [TS_0] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_45] @@ -267,7 +267,7 @@ Stage-0 Select Operator [SEL_113] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_107] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62) and ss_quantity BETWEEN 26 AND 30) + predicate:(ss_quantity BETWEEN 26 AND 30 and (ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62)) Please refer to the previous TableScan [TS_0] <-Reducer 3 [CUSTOM_SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_135] @@ -289,6 +289,6 @@ Stage-0 Select Operator [SEL_112] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_106] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34) and ss_quantity BETWEEN 0 AND 5) + predicate:(ss_quantity BETWEEN 0 AND 5 and (ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34)) Please refer to the previous TableScan [TS_0] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query29.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query29.q.out index a010cc22cc..3efff99848 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query29.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query29.q.out @@ -184,7 +184,7 @@ Stage-0 Select Operator [SEL_223] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_221] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 4)) TableScan [TS_9] (rows=73049 width=12) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 10 [SIMPLE_EDGE] vectorized @@ -193,7 +193,7 @@ Stage-0 Select Operator [SEL_233] (rows=501694138 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_232] (rows=501694138 width=23) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_23_d1_d_date_sk_min) AND DynamicValue(RS_23_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_23_d1_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=23) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"] <-Reducer 14 [BROADCAST_EDGE] vectorized @@ -249,7 +249,7 @@ Stage-0 Select Operator [SEL_219] (rows=285117831 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_218] (rows=285117831 width=15) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_34_d3_d_date_sk_min) AND DynamicValue(RS_34_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_d3_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=15) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query3.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query3.q.out index b45cdf0821..059d87e4b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query3.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query3.q.out @@ -106,7 +106,7 @@ Stage-0 Select Operator [SEL_63] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_62] (rows=550076554 width=114) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query30.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query30.q.out index 37f71b8ed8..183105f988 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query30.q.out @@ -213,10 +213,10 @@ Stage-0 <-Map 11 [SIMPLE_EDGE] vectorized SHUFFLE [RS_197] PartitionCols:_col0 - Select Operator [SEL_195] (rows=12539215 width=118) + Select Operator [SEL_195] (rows=12539214 width=118) Output:["_col0","_col1","_col2","_col3"] - Filter Operator [FIL_193] (rows=12539215 width=118) - predicate:(wr_returned_date_sk is not null and wr_returning_addr_sk is not null and wr_returning_customer_sk is not null) + Filter Operator [FIL_193] (rows=12539214 width=118) + predicate:(wr_returning_customer_sk is not null and wr_returned_date_sk is not null and wr_returning_addr_sk is not null) Please refer to the previous TableScan [TS_6] <-Map 14 [SIMPLE_EDGE] vectorized SHUFFLE [RS_201] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query31.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query31.q.out index 5cde5a0d4c..30dd59613d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query31.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query31.q.out @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_138] (rows=110 width=550) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_136] (rows=110 width=778) - predicate:(CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END) + predicate:(CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END) Merge Join Operator [MERGEJOIN_450] (rows=440 width=778) Conds:RS_133._col0=RS_134._col0(Inner),Output:["_col1","_col2","_col4","_col6","_col7","_col8","_col9","_col11","_col13"] <-Reducer 22 [ONE_TO_ONE_EDGE] @@ -203,7 +203,7 @@ Stage-0 Select Operator [SEL_460] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_454] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 2)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 35 [SIMPLE_EDGE] vectorized @@ -212,7 +212,7 @@ Stage-0 Select Operator [SEL_521] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_520] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_60] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -253,7 +253,7 @@ Stage-0 Select Operator [SEL_461] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_455] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 1)) Please refer to the previous TableScan [TS_3] <-Map 36 [SIMPLE_EDGE] vectorized SHUFFLE [RS_529] @@ -261,7 +261,7 @@ Stage-0 Select Operator [SEL_528] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_527] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_90_date_dim_d_date_sk_min) AND DynamicValue(RS_90_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_90_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_90_date_dim_d_date_sk_min) AND DynamicValue(RS_90_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_90_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_80] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 27 [BROADCAST_EDGE] vectorized @@ -302,7 +302,7 @@ Stage-0 Select Operator [SEL_462] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_456] (rows=130 width=12) - predicate:((d_qoy = 3) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 3)) Please refer to the previous TableScan [TS_3] <-Map 37 [SIMPLE_EDGE] vectorized SHUFFLE [RS_536] @@ -310,7 +310,7 @@ Stage-0 Select Operator [SEL_535] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_534] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_110_date_dim_d_date_sk_min) AND DynamicValue(RS_110_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_110_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_110_date_dim_d_date_sk_min) AND DynamicValue(RS_110_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_110_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_100] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 31 [BROADCAST_EDGE] vectorized @@ -358,7 +358,7 @@ Stage-0 Select Operator [SEL_459] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_453] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 2)) Please refer to the previous TableScan [TS_3] <-Map 34 [SIMPLE_EDGE] vectorized SHUFFLE [RS_514] @@ -366,7 +366,7 @@ Stage-0 Select Operator [SEL_513] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_512] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_40] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -412,7 +412,7 @@ Stage-0 Select Operator [SEL_458] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_452] (rows=130 width=12) - predicate:((d_qoy = 3) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 3)) Please refer to the previous TableScan [TS_3] <-Map 33 [SIMPLE_EDGE] vectorized SHUFFLE [RS_507] @@ -420,7 +420,7 @@ Stage-0 Select Operator [SEL_506] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_505] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -463,7 +463,7 @@ Stage-0 Select Operator [SEL_457] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_451] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 1)) Please refer to the previous TableScan [TS_3] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_491] @@ -471,7 +471,7 @@ Stage-0 Select Operator [SEL_490] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_489] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query33.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query33.q.out index 3a6c89518e..b59609f9e3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query33.q.out @@ -272,7 +272,7 @@ Stage-0 Select Operator [SEL_327] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_326] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 3)) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -281,7 +281,7 @@ Stage-0 Select Operator [SEL_369] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_368] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_85] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -339,7 +339,7 @@ Stage-0 Select Operator [SEL_343] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_342] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -397,7 +397,7 @@ Stage-0 Select Operator [SEL_361] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_360] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query34.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query34.q.out index bb4c46e36f..76b7f67ef3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query34.q.out @@ -139,7 +139,7 @@ Stage-0 Select Operator [SEL_114] (rows=480 width=4) Output:["_col0"] Filter Operator [FIL_113] (rows=480 width=104) - predicate:((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END) + predicate:((hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END and (hd_buy_potential) IN ('>10000', 'unknown')) TableScan [TS_8] (rows=7200 width=104) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"] <-Reducer 5 [SIMPLE_EDGE] @@ -153,7 +153,7 @@ Stage-0 Select Operator [SEL_103] (rows=595 width=4) Output:["_col0"] Filter Operator [FIL_102] (rows=595 width=12) - predicate:(((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28)) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and (d_year) IN (2000, 2001, 2002)) + predicate:((d_year) IN (2000, 2001, 2002) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and ((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28))) TableScan [TS_5] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 4 [SIMPLE_EDGE] vectorized @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_111] (rows=479121995 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_110] (rows=479121995 width=19) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_2] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_store_sk","ss_ticket_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query35.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query35.q.out index a7f7b20791..e22fc58b6b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query35.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query35.q.out @@ -202,7 +202,7 @@ Stage-0 Select Operator [SEL_190] (rows=217 width=4) Output:["_col0"] Filter Operator [FIL_189] (rows=217 width=12) - predicate:((d_qoy < 4) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_qoy < 4)) TableScan [TS_17] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -211,7 +211,7 @@ Stage-0 Select Operator [SEL_200] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_199] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_14] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -250,7 +250,7 @@ Stage-0 Select Operator [SEL_183] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_182] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -284,7 +284,7 @@ Stage-0 Select Operator [SEL_205] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_204] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_57_c_c_customer_sk_min) AND DynamicValue(RS_57_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_57_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_57_c_c_customer_sk_min) AND DynamicValue(RS_57_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_57_c_c_customer_sk_bloom_filter)))) TableScan [TS_24] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -322,7 +322,7 @@ Stage-0 Select Operator [SEL_213] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_212] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_60_c_c_customer_sk_min) AND DynamicValue(RS_60_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_60_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_60_c_c_customer_sk_min) AND DynamicValue(RS_60_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_60_c_c_customer_sk_bloom_filter)))) TableScan [TS_38] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out index 9f27081dda..8e12d0f0cf 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out @@ -153,7 +153,7 @@ Stage-0 Select Operator [SEL_91] (rows=525329897 width=225) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_90] (rows=525329897 width=225) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_12_d1_d_date_sk_min) AND DynamicValue(RS_12_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_12_d1_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_12_d1_d_date_sk_min) AND DynamicValue(RS_12_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_12_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=225) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out index 9ecd2bd756..a247442775 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_80] (rows=297 width=400) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_79] (rows=297 width=404) - predicate:((i_manufact_id) IN (678, 964, 918, 849) and i_current_price BETWEEN 22 AND 52) + predicate:(i_current_price BETWEEN 22 AND 52 and (i_manufact_id) IN (678, 964, 918, 849)) TableScan [TS_2] (rows=462000 width=403) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query38.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query38.q.out index 1a09fc45ac..f2c67f1721 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query38.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query38.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_234] (rows=285117831 width=7) Output:["_col0","_col1"] Filter Operator [FIL_233] (rows=285117831 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_24] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -191,7 +191,7 @@ Stage-0 Select Operator [SEL_244] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_243] (rows=143930993 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_58_date_dim_d_date_sk_min) AND DynamicValue(RS_58_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_58_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_58_date_dim_d_date_sk_min) AND DynamicValue(RS_58_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_58_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_49] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -242,7 +242,7 @@ Stage-0 Select Operator [SEL_212] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_211] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query39.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query39.q.out index 812928b32c..a6dcf1f06c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query39.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query39.q.out @@ -129,7 +129,7 @@ Stage-0 Select Operator [SEL_150] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_148] (rows=50 width=12) - predicate:((d_moy = 5) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 5)) TableScan [TS_2] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Reducer 9 [ONE_TO_ONE_EDGE] vectorized @@ -169,7 +169,7 @@ Stage-0 Select Operator [SEL_151] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_149] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 4)) Please refer to the previous TableScan [TS_2] PREHOOK: query: with inv as diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query4.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query4.q.out index 9af859df5f..e05e7a9ad0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query4.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query4.q.out @@ -325,7 +325,7 @@ Stage-0 Select Operator [SEL_100] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_244] (rows=525327388 width=435) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_107_date_dim_d_date_sk_min) AND DynamicValue(RS_107_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_107_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_107_date_dim_d_date_sk_min) AND DynamicValue(RS_107_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_107_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_98] (rows=575995635 width=435) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_sales_price","ss_ext_wholesale_cost","ss_ext_list_price"] <-Reducer 32 [BROADCAST_EDGE] vectorized @@ -379,7 +379,7 @@ Stage-0 Select Operator [SEL_81] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_241] (rows=143930993 width=455) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_88_date_dim_d_date_sk_min) AND DynamicValue(RS_88_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_88_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_88_date_dim_d_date_sk_min) AND DynamicValue(RS_88_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_88_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_79] (rows=144002668 width=455) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_sales_price","ws_ext_wholesale_cost","ws_ext_list_price"] <-Reducer 33 [BROADCAST_EDGE] vectorized @@ -431,7 +431,7 @@ Stage-0 Select Operator [SEL_62] (rows=285117831 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_238] (rows=285117831 width=453) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_69_date_dim_d_date_sk_min) AND DynamicValue(RS_69_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_69_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_69_date_dim_d_date_sk_min) AND DynamicValue(RS_69_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_69_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_60] (rows=287989836 width=453) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_ext_discount_amt","cs_ext_sales_price","cs_ext_wholesale_cost","cs_ext_list_price"] <-Reducer 34 [BROADCAST_EDGE] vectorized @@ -491,7 +491,7 @@ Stage-0 Select Operator [SEL_42] (rows=285117831 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_235] (rows=285117831 width=453) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_40] (rows=287989836 width=453) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_ext_discount_amt","cs_ext_sales_price","cs_ext_wholesale_cost","cs_ext_list_price"] <-Reducer 37 [BROADCAST_EDGE] vectorized @@ -551,7 +551,7 @@ Stage-0 Select Operator [SEL_22] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_232] (rows=525327388 width=435) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=435) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_sales_price","ss_ext_wholesale_cost","ss_ext_list_price"] <-Reducer 36 [BROADCAST_EDGE] vectorized @@ -606,7 +606,7 @@ Stage-0 Select Operator [SEL_2] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_229] (rows=143930993 width=455) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=455) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_sales_price","ws_ext_wholesale_cost","ws_ext_list_price"] <-Reducer 35 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out index fceed07d6f..43f0967c3c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_109] (rows=285115816 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_108] (rows=285115816 width=127) - predicate:((cs_item_sk BETWEEN DynamicValue(RS_20_item_i_item_sk_min) AND DynamicValue(RS_20_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_20_item_i_item_sk_bloom_filter))) and cs_sold_date_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_sold_date_sk is not null and (cs_item_sk BETWEEN DynamicValue(RS_20_item_i_item_sk_min) AND DynamicValue(RS_20_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_20_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_order_number","cs_sales_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out index 66fe357562..6302e6f773 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out @@ -101,7 +101,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 1998)) + predicate:((d_year = 1998) and (d_moy = 12)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,dt,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -110,7 +110,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out index d467fd6968..4a4a406794 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out @@ -106,7 +106,7 @@ Stage-0 Select Operator [SEL_65] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_64] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query44.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query44.q.out index cfd99fbaed..80a9cdc356 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query44.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query44.q.out @@ -186,7 +186,7 @@ Stage-0 Select Operator [SEL_173] (rows=287946 width=114) Output:["_col1"] Filter Operator [FIL_172] (rows=287946 width=114) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_15] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk","ss_net_profit"] <-Reducer 3 [CUSTOM_SIMPLE_EDGE] vectorized @@ -210,7 +210,7 @@ Stage-0 Output:["_col0"],keys:true Select Operator [SEL_161] (rows=287946 width=7) Filter Operator [FIL_160] (rows=287946 width=7) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk"] <-Reducer 6 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query45.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query45.q.out index 419a8a10ae..18219d10a2 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query45.q.out @@ -86,7 +86,7 @@ Stage-0 Select Operator [SEL_39] (rows=10246864 width=302) Output:["_col3","_col7","_col8"] Filter Operator [FIL_38] (rows=10246864 width=302) - predicate:((substr(_col8, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792') or _col15 is not null) + predicate:(_col15 is not null or (substr(_col8, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792')) Select Operator [SEL_37] (rows=10246864 width=302) Output:["_col3","_col7","_col8","_col15"] Merge Join Operator [MERGEJOIN_119] (rows=10246864 width=302) @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_135] (rows=130 width=12) Output:["_col0"] Filter Operator [FIL_134] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_qoy = 2)) TableScan [TS_17] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -145,7 +145,7 @@ Stage-0 Select Operator [SEL_143] (rows=143930993 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_142] (rows=143930993 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_14] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_sales_price"] <-Reducer 14 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out index 6d0933abc0..5198074ae0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_165] (rows=1855 width=4) Output:["_col0"] Filter Operator [FIL_164] (rows=1855 width=12) - predicate:((hd_dep_count = 2) or (hd_vehicle_count = 1)) + predicate:((hd_vehicle_count = 1) or (hd_dep_count = 2)) TableScan [TS_14] (rows=7200 width=12) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"] <-Reducer 10 [SIMPLE_EDGE] @@ -190,7 +190,7 @@ Stage-0 Select Operator [SEL_151] (rows=783 width=4) Output:["_col0"] Filter Operator [FIL_150] (rows=783 width=12) - predicate:((d_dow) IN (6, 0) and (d_year) IN (1998, 1999, 2000)) + predicate:((d_year) IN (1998, 1999, 2000) and (d_dow) IN (6, 0)) TableScan [TS_8] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dow"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_159] (rows=457565061 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_158] (rows=457565061 width=237) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_5] (rows=575995635 width=237) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query47.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query47.q.out index 77441a33df..2efaa9b8b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query47.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query47.q.out @@ -169,7 +169,7 @@ Stage-0 Select Operator [SEL_294] (rows=462000 width=194) Output:["_col0","_col1","_col2"] Filter Operator [FIL_293] (rows=462000 width=194) - predicate:(i_brand is not null and i_category is not null) + predicate:(i_category is not null and i_brand is not null) TableScan [TS_79] (rows=462000 width=194) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_category"] <-Reducer 3 [SIMPLE_EDGE] @@ -183,7 +183,7 @@ Stage-0 Select Operator [SEL_291] (rows=1704 width=183) Output:["_col0","_col1","_col2"] Filter Operator [FIL_290] (rows=1704 width=183) - predicate:(s_company_name is not null and s_store_name is not null) + predicate:(s_store_name is not null and s_company_name is not null) TableScan [TS_76] (rows=1704 width=183) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_name","s_company_name"] <-Reducer 2 [SIMPLE_EDGE] @@ -197,7 +197,7 @@ Stage-0 Select Operator [SEL_280] (rows=564 width=12) Output:["_col0","_col1","_col2"] Filter Operator [FIL_279] (rows=564 width=12) - predicate:(((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001)) + predicate:((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) TableScan [TS_73] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_288] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_287] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_70] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -245,7 +245,7 @@ Stage-0 Select Operator [SEL_315] (rows=482909 width=601) Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_314] (rows=482909 width=601) - predicate:((_col0 > 0) and (_col1 = 2000) and rank_window_1 is not null) + predicate:((_col0 > 0) and rank_window_1 is not null and (_col1 = 2000)) PTF Operator [PTF_313] (rows=162257387 width=601) Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS LAST, _col2 ASC NULLS LAST","partition by:":"_col6, _col5, _col3, _col4"}] Select Operator [SEL_312] (rows=162257387 width=601) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out index 038a91a838..79bd9cfe43 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out @@ -174,7 +174,7 @@ Stage-0 Select Operator [SEL_89] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_88] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States')) TableScan [TS_9] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Reducer 3 [SIMPLE_EDGE] @@ -188,7 +188,7 @@ Stage-0 Select Operator [SEL_86] (rows=29552 width=4) Output:["_col0"] Filter Operator [FIL_85] (rows=29552 width=183) - predicate:((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M')) + predicate:((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree')) TableScan [TS_6] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 2 [SIMPLE_EDGE] @@ -208,10 +208,10 @@ Stage-0 <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_84] PartitionCols:_col0 - Select Operator [SEL_83] (rows=159705893 width=27) + Select Operator [SEL_83] (rows=159705894 width=27) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] - Filter Operator [FIL_82] (rows=159705893 width=233) - predicate:(((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + Filter Operator [FIL_82] (rows=159705894 width=233) + predicate:((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_addr_sk is not null and ss_store_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query49.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query49.q.out index 324eef20d0..ebd232ca35 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query49.q.out @@ -369,7 +369,7 @@ Stage-0 Select Operator [SEL_267] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_266] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 12)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 29 [SIMPLE_EDGE] vectorized @@ -378,7 +378,7 @@ Stage-0 Select Operator [SEL_334] (rows=61119617 width=229) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_333] (rows=61119617 width=229) - predicate:((ss_net_paid > 0) and (ss_net_profit > 1) and (ss_quantity > 0) and (ss_sold_date_sk BETWEEN DynamicValue(RS_81_date_dim_d_date_sk_min) AND DynamicValue(RS_81_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_81_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:((ss_net_profit > 1) and (ss_net_paid > 0) and (ss_quantity > 0) and ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_81_date_dim_d_date_sk_min) AND DynamicValue(RS_81_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_81_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_71] (rows=575995635 width=229) default@store_sales,sts,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_net_paid","ss_net_profit"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -464,7 +464,7 @@ Stage-0 Select Operator [SEL_314] (rows=31838858 width=239) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_313] (rows=31838858 width=239) - predicate:((cs_net_paid > 0) and (cs_net_profit > 1) and (cs_quantity > 0) and (cs_sold_date_sk BETWEEN DynamicValue(RS_42_date_dim_d_date_sk_min) AND DynamicValue(RS_42_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:((cs_net_profit > 1) and (cs_net_paid > 0) and (cs_quantity > 0) and cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_42_date_dim_d_date_sk_min) AND DynamicValue(RS_42_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_32] (rows=287989836 width=239) default@catalog_sales,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_net_paid","cs_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -538,7 +538,7 @@ Stage-0 Select Operator [SEL_283] (rows=15996318 width=239) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_282] (rows=15996318 width=239) - predicate:((ws_net_paid > 0) and (ws_net_profit > 1) and (ws_quantity > 0) and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:((ws_net_profit > 1) and (ws_net_paid > 0) and (ws_quantity > 0) and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=239) default@web_sales,ws,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_net_paid","ws_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query5.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query5.q.out index ee794ad6f0..0f1e477793 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query5.q.out @@ -361,7 +361,7 @@ Stage-0 Select Operator [SEL_321] (rows=285117694 width=455) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_320] (rows=285117694 width=231) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_38_date_dim_d_date_sk_min) AND DynamicValue(RS_38_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_38_date_dim_d_date_sk_bloom_filter))) and cs_catalog_page_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_catalog_page_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_38_date_dim_d_date_sk_min) AND DynamicValue(RS_38_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_38_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_250] (rows=287989836 width=231) Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_ext_sales_price","cs_net_profit"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -425,7 +425,7 @@ Stage-0 Select Operator [SEL_329] (rows=143930874 width=455) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_328] (rows=143930874 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_260] (rows=144002668 width=231) Output:["ws_sold_date_sk","ws_web_site_sk","ws_ext_sales_price","ws_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -505,7 +505,7 @@ Stage-0 Select Operator [SEL_286] (rows=525329897 width=445) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_285] (rows=525329897 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_14_date_dim_d_date_sk_min) AND DynamicValue(RS_14_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_14_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_14_date_dim_d_date_sk_min) AND DynamicValue(RS_14_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_14_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_222] (rows=575995635 width=221) Output:["ss_sold_date_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -525,7 +525,7 @@ Stage-0 Select Operator [SEL_302] (rows=53634860 width=447) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_301] (rows=53634860 width=223) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_233] (rows=57591150 width=223) Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out index 9eebd05c54..986c800afe 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out @@ -192,7 +192,7 @@ Stage-0 Select Operator [SEL_101] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_100] (rows=50 width=12) - predicate:((d_moy = 9) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 9)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,d2,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 9 [SIMPLE_EDGE] vectorized @@ -201,7 +201,7 @@ Stage-0 Select Operator [SEL_106] (rows=501694138 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_105] (rows=501694138 width=19) - predicate:((ss_ticket_number BETWEEN DynamicValue(RS_14_store_returns_sr_ticket_number_min) AND DynamicValue(RS_14_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_14_store_returns_sr_ticket_number_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_ticket_number BETWEEN DynamicValue(RS_14_store_returns_sr_ticket_number_min) AND DynamicValue(RS_14_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_14_store_returns_sr_ticket_number_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query51.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query51.q.out index 98625598bb..2fcf46be5b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query51.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query51.q.out @@ -165,7 +165,7 @@ Stage-0 Select Operator [SEL_107] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_106] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_27_date_dim_d_date_sk_min) AND DynamicValue(RS_27_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_27_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_27_date_dim_d_date_sk_min) AND DynamicValue(RS_27_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_27_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_sales_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -205,7 +205,7 @@ Stage-0 Select Operator [SEL_101] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_100] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query52.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query52.q.out index 47b94752c1..a9a6327ddd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query52.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query52.q.out @@ -101,7 +101,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 1998)) + predicate:((d_year = 1998) and (d_moy = 12)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,dt,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -110,7 +110,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query53.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query53.q.out index a569e0473c..296e853b99 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query53.q.out @@ -123,7 +123,7 @@ Stage-0 Select Operator [SEL_64] (rows=52 width=8) Output:["_col0","_col1"] Filter Operator [FIL_63] (rows=52 width=290) - predicate:((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants')) + predicate:((i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) TableScan [TS_3] (rows=462000 width=289) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -132,7 +132,7 @@ Stage-0 Select Operator [SEL_72] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_71] (rows=525329897 width=118) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query54.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query54.q.out index 34023f78c3..b8c38dbf01 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query54.q.out @@ -227,7 +227,7 @@ Stage-0 Select Operator [SEL_301] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_297] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_month_seq","d_year","d_moy"] <-Reducer 18 [CUSTOM_SIMPLE_EDGE] vectorized @@ -242,7 +242,7 @@ Stage-0 Select Operator [SEL_302] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_298] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) Please refer to the previous TableScan [TS_3] <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_114] @@ -313,7 +313,7 @@ Stage-0 Select Operator [SEL_352] (rows=453 width=4) Output:["_col0"] Filter Operator [FIL_351] (rows=453 width=186) - predicate:((i_category = 'Jewelry') and (i_class = 'consignment')) + predicate:((i_class = 'consignment') and (i_category = 'Jewelry')) TableScan [TS_50] (rows=462000 width=186) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_class","i_category"] <-Reducer 25 [SIMPLE_EDGE] @@ -327,7 +327,7 @@ Stage-0 Select Operator [SEL_346] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_345] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 3)) TableScan [TS_47] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Union 24 [SIMPLE_EDGE] @@ -337,7 +337,7 @@ Stage-0 Select Operator [SEL_374] (rows=285117831 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_373] (rows=285117831 width=11) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_286] (rows=287989836 width=11) Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"] <-Reducer 31 [BROADCAST_EDGE] vectorized @@ -357,7 +357,7 @@ Stage-0 Select Operator [SEL_377] (rows=143930993 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_376] (rows=143930993 width=11) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_291] (rows=144002668 width=11) Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk"] <-Reducer 31 [BROADCAST_EDGE] vectorized @@ -390,7 +390,7 @@ Stage-0 Select Operator [SEL_300] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_296] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 3)) Please refer to the previous TableScan [TS_3] <-Reducer 2 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_108] @@ -401,7 +401,7 @@ Stage-0 Select Operator [SEL_321] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_320] (rows=525327388 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_115_date_dim_d_date_sk_min) AND DynamicValue(RS_115_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_115_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_115_date_dim_d_date_sk_min) AND DynamicValue(RS_115_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_115_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query55.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query55.q.out index 6ccb65ab1c..9074514f3c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query55.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query55.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001)) + predicate:((d_year = 2001) and (d_moy = 12)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -94,7 +94,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query56.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query56.q.out index 3524e43f98..5f300a11e4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query56.q.out @@ -256,7 +256,7 @@ Stage-0 Select Operator [SEL_323] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_322] (rows=50 width=12) - predicate:((d_moy = 1) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 1)) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -265,7 +265,7 @@ Stage-0 Select Operator [SEL_365] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_364] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_92_date_dim_d_date_sk_min) AND DynamicValue(RS_92_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_92_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_92_date_dim_d_date_sk_min) AND DynamicValue(RS_92_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_92_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_82] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -323,7 +323,7 @@ Stage-0 Select Operator [SEL_339] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_338] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -381,7 +381,7 @@ Stage-0 Select Operator [SEL_357] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_356] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_55_date_dim_d_date_sk_min) AND DynamicValue(RS_55_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_55_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_55_date_dim_d_date_sk_min) AND DynamicValue(RS_55_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_55_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_45] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query57.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query57.q.out index 85a82fa62c..dd6ab5cf2a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query57.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query57.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_294] (rows=462000 width=194) Output:["_col0","_col1","_col2"] Filter Operator [FIL_293] (rows=462000 width=194) - predicate:(i_brand is not null and i_category is not null) + predicate:(i_category is not null and i_brand is not null) TableScan [TS_79] (rows=462000 width=194) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_category"] <-Reducer 3 [SIMPLE_EDGE] @@ -191,7 +191,7 @@ Stage-0 Select Operator [SEL_280] (rows=564 width=12) Output:["_col0","_col1","_col2"] Filter Operator [FIL_279] (rows=564 width=12) - predicate:(((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001)) + predicate:((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1)))) TableScan [TS_73] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -200,7 +200,7 @@ Stage-0 Select Operator [SEL_288] (rows=285117980 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_287] (rows=285117980 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter))) and cs_call_center_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_call_center_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_70] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_call_center_sk","cs_item_sk","cs_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -239,7 +239,7 @@ Stage-0 Select Operator [SEL_315] (rows=260242 width=520) Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_314] (rows=260242 width=520) - predicate:((_col0 > 0) and (_col1 = 2000) and rank_window_1 is not null) + predicate:((_col0 > 0) and rank_window_1 is not null and (_col1 = 2000)) PTF Operator [PTF_313] (rows=87441185 width=520) Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col1 ASC NULLS LAST, _col2 ASC NULLS LAST","partition by:":"_col5, _col4, _col3"}] Select Operator [SEL_312] (rows=87441185 width=520) diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query58.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query58.q.out index daeda3fdc6..98d35295ba 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query58.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query58.q.out @@ -181,7 +181,7 @@ Stage-0 Select Operator [SEL_156] (rows=1 width=884) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_152] (rows=1 width=660) - predicate:(_col1 BETWEEN _col6 AND _col7 and _col3 BETWEEN _col6 AND _col7 and _col5 BETWEEN (0.9 * _col1) AND (1.1 * _col1) and _col5 BETWEEN (0.9 * _col3) AND (1.1 * _col3)) + predicate:(_col5 BETWEEN (0.9 * _col1) AND (1.1 * _col1) and _col5 BETWEEN (0.9 * _col3) AND (1.1 * _col3) and _col1 BETWEEN _col6 AND _col7 and _col3 BETWEEN _col6 AND _col7) Merge Join Operator [MERGEJOIN_422] (rows=384 width=660) Conds:RS_149._col0=RS_467._col0(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7"] <-Reducer 16 [ONE_TO_ONE_EDGE] vectorized @@ -242,7 +242,7 @@ Stage-0 Select Operator [SEL_436] (rows=73049 width=98) Output:["_col0","_col1"] Filter Operator [FIL_434] (rows=73049 width=98) - predicate:(d_date is not null and d_week_seq is not null) + predicate:(d_week_seq is not null and d_date is not null) TableScan [TS_15] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date","d_week_seq"] <-Reducer 20 [SIMPLE_EDGE] @@ -279,7 +279,7 @@ Stage-0 Select Operator [SEL_463] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_462] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_133_date_dim_d_date_sk_min) AND DynamicValue(RS_133_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_133_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_133_date_dim_d_date_sk_min) AND DynamicValue(RS_133_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_133_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_125] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -331,7 +331,7 @@ Stage-0 Select Operator [SEL_456] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_455] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_85_date_dim_d_date_sk_min) AND DynamicValue(RS_85_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_85_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_85_date_dim_d_date_sk_min) AND DynamicValue(RS_85_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_85_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_77] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -376,7 +376,7 @@ Stage-0 Select Operator [SEL_445] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_444] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_37_date_dim_d_date_sk_min) AND DynamicValue(RS_37_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_37_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_37_date_dim_d_date_sk_min) AND DynamicValue(RS_37_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_37_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_29] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out index e4443fef4a..752fbc32f9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out @@ -119,7 +119,7 @@ Stage-0 Select Operator [SEL_184] (rows=50 width=12) Output:["d_month_seq"] Filter Operator [FIL_182] (rows=50 width=12) - predicate:((d_moy = 2) and (d_year = 2000) and d_month_seq is not null) + predicate:((d_year = 2000) and (d_moy = 2) and d_month_seq is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_month_seq","d_year","d_moy"] <-Select Operator [SEL_218] (rows=73049 width=8) @@ -165,7 +165,7 @@ Stage-0 <-Select Operator [SEL_211] (rows=460833 width=205) Output:["_col0","_col1","_col2"] Filter Operator [FIL_210] (rows=460833 width=205) - predicate:(i_category is not null and i_current_price is not null) + predicate:(i_current_price is not null and i_category is not null) TableScan [TS_19] (rows=462000 width=205) default@item,i,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_current_price","i_category"] <-Map 14 [SIMPLE_EDGE] vectorized @@ -174,7 +174,7 @@ Stage-0 Select Operator [SEL_227] (rows=525327388 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_226] (rows=525327388 width=11) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_65_d_d_date_sk_min) AND DynamicValue(RS_65_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_65_d_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_65_d_d_date_sk_min) AND DynamicValue(RS_65_d_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_65_d_d_date_sk_bloom_filter)))) TableScan [TS_30] (rows=575995635 width=11) default@store_sales,s,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -210,7 +210,7 @@ Stage-0 Select Operator [SEL_183] (rows=50 width=12) Output:["d_month_seq"] Filter Operator [FIL_181] (rows=50 width=12) - predicate:((d_moy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 2)) Please refer to the previous TableScan [TS_3] <-Select Operator [SEL_198] (rows=80000000 width=8) Output:["_col0","_col1"] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out index 4e68dcafbd..7752268e72 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out @@ -278,7 +278,7 @@ Stage-0 Select Operator [SEL_327] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_326] (rows=50 width=12) - predicate:((d_moy = 9) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 9)) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -287,7 +287,7 @@ Stage-0 Select Operator [SEL_371] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_370] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_92_date_dim_d_date_sk_min) AND DynamicValue(RS_92_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_92_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_92_date_dim_d_date_sk_min) AND DynamicValue(RS_92_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_92_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_82] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -347,7 +347,7 @@ Stage-0 Select Operator [SEL_343] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_342] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -407,7 +407,7 @@ Stage-0 Select Operator [SEL_362] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_361] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_55_date_dim_d_date_sk_min) AND DynamicValue(RS_55_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_55_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_55_date_dim_d_date_sk_min) AND DynamicValue(RS_55_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_55_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_45] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query61.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query61.q.out index 4c4851c30e..de5551de4e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query61.q.out @@ -176,7 +176,7 @@ Stage-0 Select Operator [SEL_294] (rows=2300 width=4) Output:["_col0"] Filter Operator [FIL_293] (rows=2300 width=259) - predicate:((p_channel_dmail = 'Y') or (p_channel_email = 'Y') or (p_channel_tv = 'Y')) + predicate:((p_channel_email = 'Y') or (p_channel_tv = 'Y') or (p_channel_dmail = 'Y')) TableScan [TS_18] (rows=2300 width=259) default@promotion,promotion,Tbl:COMPLETE,Col:COMPLETE,Output:["p_promo_sk","p_channel_dmail","p_channel_email","p_channel_tv"] <-Reducer 12 [SIMPLE_EDGE] @@ -218,16 +218,16 @@ Stage-0 Select Operator [SEL_271] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_270] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 11)) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 9 [SIMPLE_EDGE] vectorized SHUFFLE [RS_284] PartitionCols:_col0 - Select Operator [SEL_283] (rows=479120970 width=126) + Select Operator [SEL_283] (rows=479120969 width=126) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] - Filter Operator [FIL_282] (rows=479120970 width=126) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + Filter Operator [FIL_282] (rows=479120969 width=126) + predicate:(ss_sold_date_sk is not null and ss_promo_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=126) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_promo_sk","ss_ext_sales_price"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -288,7 +288,7 @@ Stage-0 Select Operator [SEL_301] (rows=501694138 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_300] (rows=501694138 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_51] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"] <-Reducer 19 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query63.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query63.q.out index 000aecd8ea..07aae320db 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query63.q.out @@ -125,7 +125,7 @@ Stage-0 Select Operator [SEL_64] (rows=52 width=8) Output:["_col0","_col1"] Filter Operator [FIL_63] (rows=52 width=290) - predicate:((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants')) + predicate:((i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1')))) TableScan [TS_3] (rows=462000 width=289) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category","i_manager_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -134,7 +134,7 @@ Stage-0 Select Operator [SEL_72] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_71] (rows=525329897 width=118) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query64.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query64.q.out index 502a46ccfd..25d6e06584 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query64.q.out @@ -316,33 +316,33 @@ Stage-0 Stage-1 Reducer 18 vectorized File Output Operator [FS_1079] - Select Operator [SEL_1078] (rows=104583667777 width=1702) + Select Operator [SEL_1078] (rows=104628491644 width=1702) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"] <-Reducer 17 [SIMPLE_EDGE] SHUFFLE [RS_201] - Select Operator [SEL_200] (rows=104583667777 width=1694) + Select Operator [SEL_200] (rows=104628491644 width=1694) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"] - Filter Operator [FIL_199] (rows=104583667777 width=1694) + Filter Operator [FIL_199] (rows=104628491644 width=1694) predicate:(_col3 <= _col19) - Merge Join Operator [MERGEJOIN_977] (rows=313751003333 width=1694) + Merge Join Operator [MERGEJOIN_977] (rows=313885474933 width=1694) Conds:RS_1052._col1, _col0, _col2=RS_1077._col2, _col1, _col3(Inner),Output:["_col3","_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22"] <-Reducer 16 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1052] PartitionCols:_col1, _col0, _col2 - Select Operator [SEL_1051] (rows=21299858 width=525) + Select Operator [SEL_1051] (rows=21304422 width=525) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] - Filter Operator [FIL_1050] (rows=21299858 width=1255) + Filter Operator [FIL_1050] (rows=21304422 width=1255) predicate:_col13 is not null - Select Operator [SEL_1049] (rows=21299858 width=1255) + Select Operator [SEL_1049] (rows=21304422 width=1255) Output:["_col0","_col1","_col2","_col13","_col14","_col15","_col16"] - Group By Operator [GBY_1048] (rows=21299858 width=1255) + Group By Operator [GBY_1048] (rows=21304422 width=1255) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12 <-Reducer 15 [SIMPLE_EDGE] SHUFFLE [RS_93] PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Group By Operator [GBY_92] (rows=21299858 width=1255) + Group By Operator [GBY_92] (rows=21304422 width=1255) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16"],aggregations:["count()","sum(_col8)","sum(_col9)","sum(_col10)"],keys:_col24, _col11, _col25, _col29, _col31, _col37, _col38, _col39, _col40, _col42, _col43, _col44, _col45 - Merge Join Operator [MERGEJOIN_961] (rows=21299858 width=1048) + Merge Join Operator [MERGEJOIN_961] (rows=21304422 width=1048) Conds:RS_88._col17=RS_1045._col0(Inner),Output:["_col8","_col9","_col10","_col11","_col24","_col25","_col29","_col31","_col37","_col38","_col39","_col40","_col42","_col43","_col44","_col45"] <-Map 49 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1045] @@ -354,7 +354,7 @@ Stage-0 <-Reducer 14 [SIMPLE_EDGE] SHUFFLE [RS_88] PartitionCols:_col17 - Merge Join Operator [MERGEJOIN_960] (rows=21299858 width=691) + Merge Join Operator [MERGEJOIN_960] (rows=21304422 width=691) Conds:RS_85._col5=RS_1044._col0(Inner),Output:["_col8","_col9","_col10","_col11","_col17","_col24","_col25","_col29","_col31","_col37","_col38","_col39","_col40"] <-Map 49 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1044] @@ -363,9 +363,9 @@ Stage-0 <-Reducer 13 [SIMPLE_EDGE] SHUFFLE [RS_85] PartitionCols:_col5 - Filter Operator [FIL_84] (rows=21299858 width=502) + Filter Operator [FIL_84] (rows=21304422 width=502) predicate:(_col33 <> _col35) - Merge Join Operator [MERGEJOIN_959] (rows=21299858 width=502) + Merge Join Operator [MERGEJOIN_959] (rows=21304422 width=502) Conds:RS_81._col15=RS_1040._col0(Inner),Output:["_col5","_col8","_col9","_col10","_col11","_col17","_col24","_col25","_col29","_col31","_col33","_col35"] <-Map 48 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1040] @@ -377,7 +377,7 @@ Stage-0 <-Reducer 12 [SIMPLE_EDGE] SHUFFLE [RS_81] PartitionCols:_col15 - Merge Join Operator [MERGEJOIN_958] (rows=21002853 width=418) + Merge Join Operator [MERGEJOIN_958] (rows=21007353 width=418) Conds:RS_78._col3=RS_1039._col0(Inner),Output:["_col5","_col8","_col9","_col10","_col11","_col15","_col17","_col24","_col25","_col29","_col31","_col33"] <-Map 48 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1039] @@ -386,7 +386,7 @@ Stage-0 <-Reducer 11 [SIMPLE_EDGE] SHUFFLE [RS_78] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_957] (rows=20709989 width=331) + Merge Join Operator [MERGEJOIN_957] (rows=20714426 width=331) Conds:RS_75._col18=RS_984._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col15","_col17","_col24","_col25","_col29","_col31"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_984] @@ -398,7 +398,7 @@ Stage-0 <-Reducer 10 [SIMPLE_EDGE] SHUFFLE [RS_75] PartitionCols:_col18 - Merge Join Operator [MERGEJOIN_956] (rows=20709989 width=331) + Merge Join Operator [MERGEJOIN_956] (rows=20714426 width=331) Conds:RS_72._col19=RS_986._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col15","_col17","_col18","_col24","_col25","_col29"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_986] @@ -409,7 +409,7 @@ Stage-0 <-Reducer 9 [SIMPLE_EDGE] SHUFFLE [RS_72] PartitionCols:_col19 - Merge Join Operator [MERGEJOIN_955] (rows=20709989 width=330) + Merge Join Operator [MERGEJOIN_955] (rows=20714426 width=330) Conds:RS_69._col16=RS_1035._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col15","_col17","_col18","_col19","_col24","_col25"] <-Map 43 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1035] @@ -423,7 +423,7 @@ Stage-0 <-Reducer 8 [SIMPLE_EDGE] SHUFFLE [RS_69] PartitionCols:_col16 - Merge Join Operator [MERGEJOIN_954] (rows=20709989 width=334) + Merge Join Operator [MERGEJOIN_954] (rows=20714426 width=334) Conds:RS_66._col4=RS_1034._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19","_col24","_col25"] <-Map 43 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1034] @@ -432,7 +432,7 @@ Stage-0 <-Reducer 7 [SIMPLE_EDGE] SHUFFLE [RS_66] PartitionCols:_col4 - Merge Join Operator [MERGEJOIN_953] (rows=20709989 width=336) + Merge Join Operator [MERGEJOIN_953] (rows=20714426 width=336) Conds:RS_63._col6=RS_1030._col0(Inner),Output:["_col3","_col4","_col5","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19","_col24","_col25"] <-Map 42 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1030] @@ -446,7 +446,7 @@ Stage-0 <-Reducer 6 [SIMPLE_EDGE] SHUFFLE [RS_63] PartitionCols:_col6 - Merge Join Operator [MERGEJOIN_952] (rows=20709989 width=160) + Merge Join Operator [MERGEJOIN_952] (rows=20714426 width=160) Conds:RS_60._col1, _col7=RS_1026._col0, _col1(Inner),Output:["_col3","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19"] <-Map 41 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1026] @@ -458,7 +458,7 @@ Stage-0 <-Reducer 5 [SIMPLE_EDGE] SHUFFLE [RS_60] PartitionCols:_col1, _col7 - Merge Join Operator [MERGEJOIN_951] (rows=12561347 width=28) + Merge Join Operator [MERGEJOIN_951] (rows=12564038 width=28) Conds:RS_57._col1=RS_1024._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19"] <-Reducer 37 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1024] @@ -500,18 +500,18 @@ Stage-0 PARTITION_ONLY_SHUFFLE [RS_1008] Group By Operator [GBY_1007] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] - Select Operator [SEL_1006] (rows=4666 width=4) + Select Operator [SEL_1006] (rows=4667 width=4) Output:["_col0"] - Select Operator [SEL_1004] (rows=4666 width=4) + Select Operator [SEL_1004] (rows=4667 width=4) Output:["_col0"] - Filter Operator [FIL_1003] (rows=4666 width=204) - predicate:((i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate') and i_current_price BETWEEN 36 AND 45) + Filter Operator [FIL_1003] (rows=4667 width=204) + predicate:(i_current_price BETWEEN 36 AND 45 and (i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate')) TableScan [TS_3] (rows=462000 width=204) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_current_price","i_color"] <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_57] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_949] (rows=12561347 width=28) + Merge Join Operator [MERGEJOIN_949] (rows=12564038 width=28) Conds:RS_54._col2=RS_1011._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col19"] <-Map 21 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1011] @@ -519,13 +519,13 @@ Stage-0 Select Operator [SEL_1010] (rows=69376329 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_1009] (rows=69376329 width=23) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null and c_first_sales_date_sk is not null and c_first_shipto_date_sk is not null) + predicate:(c_first_shipto_date_sk is not null and c_first_sales_date_sk is not null and c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_9] (rows=80000000 width=23) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk","c_first_shipto_date_sk","c_first_sales_date_sk"] <-Reducer 3 [SIMPLE_EDGE] SHUFFLE [RS_54] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_948] (rows=14484878 width=12) + Merge Join Operator [MERGEJOIN_948] (rows=14487982 width=12) Conds:RS_51._col0=RS_990._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_990] @@ -538,7 +538,7 @@ Stage-0 <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_51] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_947] (rows=40567099 width=205) + Merge Join Operator [MERGEJOIN_947] (rows=40575792 width=205) Conds:RS_1002._col1=RS_1005._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] <-Map 19 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1005] @@ -550,7 +550,7 @@ Stage-0 Select Operator [SEL_1001] (rows=417313408 width=351) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] Filter Operator [FIL_1000] (rows=417313408 width=355) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_52_d1_d_date_sk_min) AND DynamicValue(RS_52_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_52_d1_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_52_d1_d_date_sk_min) AND DynamicValue(RS_52_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_52_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=355) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 45 [BROADCAST_EDGE] vectorized @@ -567,20 +567,20 @@ Stage-0 <-Reducer 34 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1077] PartitionCols:_col2, _col1, _col3 - Select Operator [SEL_1076] (rows=21299858 width=1354) + Select Operator [SEL_1076] (rows=21304422 width=1354) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15"] - Filter Operator [FIL_1075] (rows=21299858 width=1362) + Filter Operator [FIL_1075] (rows=21304422 width=1362) predicate:_col14 is not null - Select Operator [SEL_1074] (rows=21299858 width=1362) + Select Operator [SEL_1074] (rows=21304422 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col14","_col15","_col16","_col17"] - Group By Operator [GBY_1073] (rows=21299858 width=1362) + Group By Operator [GBY_1073] (rows=21304422 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12, KEY._col13 <-Reducer 33 [SIMPLE_EDGE] SHUFFLE [RS_191] PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 - Group By Operator [GBY_190] (rows=21299858 width=1362) + Group By Operator [GBY_190] (rows=21304422 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count()","sum(_col8)","sum(_col9)","sum(_col10)"],keys:_col24, _col11, _col25, _col12, _col29, _col31, _col37, _col38, _col39, _col40, _col42, _col43, _col44, _col45 - Merge Join Operator [MERGEJOIN_976] (rows=21299858 width=1155) + Merge Join Operator [MERGEJOIN_976] (rows=21304422 width=1155) Conds:RS_186._col17=RS_1047._col0(Inner),Output:["_col8","_col9","_col10","_col11","_col12","_col24","_col25","_col29","_col31","_col37","_col38","_col39","_col40","_col42","_col43","_col44","_col45"] <-Map 49 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1047] @@ -589,7 +589,7 @@ Stage-0 <-Reducer 32 [SIMPLE_EDGE] SHUFFLE [RS_186] PartitionCols:_col17 - Merge Join Operator [MERGEJOIN_975] (rows=21299858 width=798) + Merge Join Operator [MERGEJOIN_975] (rows=21304422 width=798) Conds:RS_183._col5=RS_1046._col0(Inner),Output:["_col8","_col9","_col10","_col11","_col12","_col17","_col24","_col25","_col29","_col31","_col37","_col38","_col39","_col40"] <-Map 49 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1046] @@ -598,9 +598,9 @@ Stage-0 <-Reducer 31 [SIMPLE_EDGE] SHUFFLE [RS_183] PartitionCols:_col5 - Filter Operator [FIL_182] (rows=21299858 width=609) + Filter Operator [FIL_182] (rows=21304422 width=609) predicate:(_col33 <> _col35) - Merge Join Operator [MERGEJOIN_974] (rows=21299858 width=609) + Merge Join Operator [MERGEJOIN_974] (rows=21304422 width=609) Conds:RS_179._col15=RS_1042._col0(Inner),Output:["_col5","_col8","_col9","_col10","_col11","_col12","_col17","_col24","_col25","_col29","_col31","_col33","_col35"] <-Map 48 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1042] @@ -609,7 +609,7 @@ Stage-0 <-Reducer 30 [SIMPLE_EDGE] SHUFFLE [RS_179] PartitionCols:_col15 - Merge Join Operator [MERGEJOIN_973] (rows=21002853 width=525) + Merge Join Operator [MERGEJOIN_973] (rows=21007353 width=525) Conds:RS_176._col3=RS_1041._col0(Inner),Output:["_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col17","_col24","_col25","_col29","_col31","_col33"] <-Map 48 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1041] @@ -618,7 +618,7 @@ Stage-0 <-Reducer 29 [SIMPLE_EDGE] SHUFFLE [RS_176] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_972] (rows=20709989 width=438) + Merge Join Operator [MERGEJOIN_972] (rows=20714426 width=438) Conds:RS_173._col18=RS_988._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col17","_col24","_col25","_col29","_col31"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_988] @@ -629,7 +629,7 @@ Stage-0 <-Reducer 28 [SIMPLE_EDGE] SHUFFLE [RS_173] PartitionCols:_col18 - Merge Join Operator [MERGEJOIN_971] (rows=20709989 width=438) + Merge Join Operator [MERGEJOIN_971] (rows=20714426 width=438) Conds:RS_170._col19=RS_987._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col17","_col18","_col24","_col25","_col29"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_987] @@ -640,7 +640,7 @@ Stage-0 <-Reducer 27 [SIMPLE_EDGE] SHUFFLE [RS_170] PartitionCols:_col19 - Merge Join Operator [MERGEJOIN_970] (rows=20709989 width=437) + Merge Join Operator [MERGEJOIN_970] (rows=20714426 width=437) Conds:RS_167._col16=RS_1037._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col17","_col18","_col19","_col24","_col25"] <-Map 43 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1037] @@ -649,7 +649,7 @@ Stage-0 <-Reducer 26 [SIMPLE_EDGE] SHUFFLE [RS_167] PartitionCols:_col16 - Merge Join Operator [MERGEJOIN_969] (rows=20709989 width=441) + Merge Join Operator [MERGEJOIN_969] (rows=20714426 width=441) Conds:RS_164._col4=RS_1036._col0(Inner),Output:["_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col19","_col24","_col25"] <-Map 43 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1036] @@ -658,7 +658,7 @@ Stage-0 <-Reducer 25 [SIMPLE_EDGE] SHUFFLE [RS_164] PartitionCols:_col4 - Merge Join Operator [MERGEJOIN_968] (rows=20709989 width=443) + Merge Join Operator [MERGEJOIN_968] (rows=20714426 width=443) Conds:RS_161._col6=RS_1031._col0(Inner),Output:["_col3","_col4","_col5","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col19","_col24","_col25"] <-Map 42 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1031] @@ -667,7 +667,7 @@ Stage-0 <-Reducer 24 [SIMPLE_EDGE] SHUFFLE [RS_161] PartitionCols:_col6 - Merge Join Operator [MERGEJOIN_967] (rows=20709989 width=267) + Merge Join Operator [MERGEJOIN_967] (rows=20714426 width=267) Conds:RS_158._col1, _col7=RS_1027._col0, _col1(Inner),Output:["_col3","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col19"] <-Map 41 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1027] @@ -676,12 +676,12 @@ Stage-0 <-Reducer 23 [SIMPLE_EDGE] SHUFFLE [RS_158] PartitionCols:_col1, _col7 - Merge Join Operator [MERGEJOIN_966] (rows=12561347 width=135) + Merge Join Operator [MERGEJOIN_966] (rows=12564038 width=135) Conds:RS_155._col1=RS_1072._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col19"] <-Reducer 22 [SIMPLE_EDGE] SHUFFLE [RS_155] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_964] (rows=12561347 width=135) + Merge Join Operator [MERGEJOIN_964] (rows=12564038 width=135) Conds:RS_152._col2=RS_1012._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col15","_col16","_col17","_col18","_col19"] <-Map 21 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1012] @@ -690,7 +690,7 @@ Stage-0 <-Reducer 46 [SIMPLE_EDGE] SHUFFLE [RS_152] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_963] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_963] (rows=14487982 width=119) Conds:RS_149._col0=RS_992._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12"] <-Map 44 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_992] @@ -703,15 +703,15 @@ Stage-0 <-Reducer 51 [SIMPLE_EDGE] SHUFFLE [RS_149] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_962] (rows=40567099 width=312) + Merge Join Operator [MERGEJOIN_962] (rows=40575792 width=312) Conds:RS_1057._col1=RS_1060._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12"] <-Map 52 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1060] PartitionCols:_col0 - Select Operator [SEL_1059] (rows=4666 width=111) + Select Operator [SEL_1059] (rows=4667 width=111) Output:["_col0","_col1"] - Filter Operator [FIL_1058] (rows=4666 width=311) - predicate:((i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate') and i_current_price BETWEEN 36 AND 45) + Filter Operator [FIL_1058] (rows=4667 width=311) + predicate:(i_current_price BETWEEN 36 AND 45 and (i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate')) TableScan [TS_101] (rows=462000 width=311) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_current_price","i_color","i_product_name"] <-Map 50 [SIMPLE_EDGE] vectorized @@ -720,7 +720,7 @@ Stage-0 Select Operator [SEL_1056] (rows=417313408 width=351) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] Filter Operator [FIL_1055] (rows=417313408 width=355) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_150_d1_d_date_sk_min) AND DynamicValue(RS_150_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_150_d1_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_150_d1_d_date_sk_min) AND DynamicValue(RS_150_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_150_d1_d_date_sk_bloom_filter)))) TableScan [TS_98] (rows=575995635 width=355) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 47 [BROADCAST_EDGE] vectorized @@ -771,7 +771,7 @@ Stage-0 PARTITION_ONLY_SHUFFLE [RS_1063] Group By Operator [GBY_1062] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] - Select Operator [SEL_1061] (rows=4666 width=4) + Select Operator [SEL_1061] (rows=4667 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_1059] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query65.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query65.q.out index 40ab3b721d..5302a06773 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query65.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query65.q.out @@ -148,7 +148,7 @@ Stage-0 Select Operator [SEL_147] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_146] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query66.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query66.q.out index 91def71cd3..e4cb5b0c46 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query66.q.out @@ -566,7 +566,7 @@ Stage-0 Select Operator [SEL_255] (rows=282272460 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_254] (rows=282272460 width=243) - predicate:((cs_ship_mode_sk BETWEEN DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_bloom_filter))) and cs_ship_mode_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_ship_mode_sk is not null and (cs_ship_mode_sk BETWEEN DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_53_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_32] (rows=287989836 width=243) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_sold_time_sk","cs_ship_mode_sk","cs_warehouse_sk","cs_quantity","cs_ext_sales_price","cs_net_paid_inc_ship_tax"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -637,7 +637,7 @@ Stage-0 Select Operator [SEL_228] (rows=143859154 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_227] (rows=143859154 width=243) - predicate:((ws_ship_mode_sk BETWEEN DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(ws_ship_mode_sk, DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_bloom_filter))) and ws_ship_mode_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null and ws_warehouse_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_warehouse_sk is not null and ws_sold_date_sk is not null and ws_ship_mode_sk is not null and (ws_ship_mode_sk BETWEEN DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(ws_ship_mode_sk, DynamicValue(RS_21_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_sold_time_sk","ws_ship_mode_sk","ws_warehouse_sk","ws_quantity","ws_sales_price","ws_net_paid_inc_tax"] <-Reducer 18 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query67.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query67.q.out index f629767368..27521bc305 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query67.q.out @@ -179,7 +179,7 @@ Stage-0 Select Operator [SEL_91] (rows=525329897 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_90] (rows=525329897 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_11_date_dim_d_date_sk_min) AND DynamicValue(RS_11_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_11_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_11_date_dim_d_date_sk_min) AND DynamicValue(RS_11_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_11_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_quantity","ss_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query68.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query68.q.out index 137139f87e..7113d89cad 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query68.q.out @@ -176,7 +176,7 @@ Stage-0 Select Operator [SEL_165] (rows=1855 width=4) Output:["_col0"] Filter Operator [FIL_164] (rows=1855 width=12) - predicate:((hd_dep_count = 2) or (hd_vehicle_count = 1)) + predicate:((hd_vehicle_count = 1) or (hd_dep_count = 2)) TableScan [TS_14] (rows=7200 width=12) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"] <-Reducer 10 [SIMPLE_EDGE] @@ -204,7 +204,7 @@ Stage-0 Select Operator [SEL_151] (rows=170 width=4) Output:["_col0"] Filter Operator [FIL_150] (rows=170 width=12) - predicate:((d_year) IN (1998, 1999, 2000) and d_dom BETWEEN 1 AND 2) + predicate:(d_dom BETWEEN 1 AND 2 and (d_year) IN (1998, 1999, 2000)) TableScan [TS_8] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -213,7 +213,7 @@ Stage-0 Select Operator [SEL_159] (rows=457565061 width=343) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_158] (rows=457565061 width=343) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_5] (rows=575995635 width=343) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_ext_sales_price","ss_ext_list_price","ss_ext_tax"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query69.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query69.q.out index 3cf67ee76d..6cda2352a4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query69.q.out @@ -195,7 +195,7 @@ Stage-0 Select Operator [SEL_203] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_202] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_8] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -232,7 +232,7 @@ Stage-0 Select Operator [SEL_185] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_184] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -268,7 +268,7 @@ Stage-0 Select Operator [SEL_208] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_207] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_43_c_c_customer_sk_min) AND DynamicValue(RS_43_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_43_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_43_c_c_customer_sk_min) AND DynamicValue(RS_43_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_43_c_c_customer_sk_bloom_filter)))) TableScan [TS_18] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -306,7 +306,7 @@ Stage-0 Select Operator [SEL_216] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_215] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_62_c_c_customer_sk_min) AND DynamicValue(RS_62_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_62_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_62_c_c_customer_sk_min) AND DynamicValue(RS_62_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_62_c_c_customer_sk_bloom_filter)))) TableScan [TS_48] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query7.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query7.q.out index ed7f029a0e..2e2585ea74 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query7.q.out @@ -133,7 +133,7 @@ Stage-0 Select Operator [SEL_100] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_99] (rows=14776 width=268) - predicate:((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W')) + predicate:((cd_marital_status = 'W') and (cd_education_status = 'Primary') and (cd_gender = 'F')) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -142,7 +142,7 @@ Stage-0 Select Operator [SEL_108] (rows=501686735 width=340) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_107] (rows=501686735 width=340) - predicate:((ss_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter))) and ss_cdemo_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and (ss_cdemo_sk BETWEEN DynamicValue(RS_15_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_15_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_15_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=340) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_cdemo_sk","ss_promo_sk","ss_quantity","ss_list_price","ss_sales_price","ss_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query70.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query70.q.out index 9aa000cf06..8c58b6ff1d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query70.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query70.q.out @@ -149,7 +149,7 @@ Stage-0 Select Operator [SEL_147] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_146] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_42_d1_d_date_sk_min) AND DynamicValue(RS_42_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_42_d1_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_42_d1_d_date_sk_min) AND DynamicValue(RS_42_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_42_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query71.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query71.q.out index 8c60eeaf48..0dec375893 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query71.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_176] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_175] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001)) + predicate:((d_year = 2001) and (d_moy = 12)) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 10 [SIMPLE_EDGE] vectorized @@ -172,7 +172,7 @@ Stage-0 Select Operator [SEL_184] (rows=285116947 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_183] (rows=285116947 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_17_date_dim_d_date_sk_min) AND DynamicValue(RS_17_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_17_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null and cs_sold_time_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_sold_time_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_17_date_dim_d_date_sk_min) AND DynamicValue(RS_17_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_17_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_sold_time_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_187] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_186] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001)) + predicate:((d_year = 2001) and (d_moy = 12)) TableScan [TS_24] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 14 [SIMPLE_EDGE] vectorized @@ -208,7 +208,7 @@ Stage-0 Select Operator [SEL_195] (rows=525325345 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_194] (rows=525325345 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_28_date_dim_d_date_sk_min) AND DynamicValue(RS_28_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_28_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_sold_time_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_sold_time_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_28_date_dim_d_date_sk_min) AND DynamicValue(RS_28_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_28_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_21] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_sold_time_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -235,7 +235,7 @@ Stage-0 Select Operator [SEL_154] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_153] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001)) + predicate:((d_year = 2001) and (d_moy = 12)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -244,7 +244,7 @@ Stage-0 Select Operator [SEL_162] (rows=143930836 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_161] (rows=143930836 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_sold_time_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_sold_time_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query72.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query72.q.out index 3eff568e58..9c282a280b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query72.q.out @@ -221,7 +221,7 @@ Stage-0 Select Operator [SEL_252] (rows=652 width=16) Output:["_col0","_col1","_col2"] Filter Operator [FIL_251] (rows=652 width=106) - predicate:((d_year = 2001) and UDFToDouble(d_date) is not null and d_week_seq is not null) + predicate:((d_year = 2001) and d_week_seq is not null and UDFToDouble(d_date) is not null) TableScan [TS_12] (rows=73049 width=106) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date","d_week_seq","d_year"] <-Reducer 3 [SIMPLE_EDGE] @@ -241,15 +241,15 @@ Stage-0 <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_34] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_238] (rows=40690728 width=27) + Merge Join Operator [MERGEJOIN_238] (rows=40690727 width=27) Conds:RS_258._col2=RS_261._col0(Inner),Output:["_col0","_col1","_col3","_col4","_col5","_col6","_col7"] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_258] PartitionCols:_col2 - Select Operator [SEL_257] (rows=280863799 width=31) + Select Operator [SEL_257] (rows=280863798 width=31) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] - Filter Operator [FIL_256] (rows=280863799 width=31) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_38_d1_d_date_sk_min) AND DynamicValue(RS_38_d1_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_38_d1_d_date_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_bill_hdemo_sk is not null and cs_quantity is not null and cs_ship_date_sk is not null and cs_sold_date_sk is not null) + Filter Operator [FIL_256] (rows=280863798 width=31) + predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_ship_date_sk is not null and cs_quantity is not null and cs_bill_hdemo_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_38_d1_d_date_sk_min) AND DynamicValue(RS_38_d1_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_38_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=31) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_date_sk","cs_bill_cdemo_sk","cs_bill_hdemo_sk","cs_item_sk","cs_promo_sk","cs_order_number","cs_quantity"] <-Reducer 17 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query73.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query73.q.out index 8257ac1894..fcc01d7c87 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query73.q.out @@ -133,7 +133,7 @@ Stage-0 Select Operator [SEL_114] (rows=480 width=4) Output:["_col0"] Filter Operator [FIL_113] (rows=480 width=104) - predicate:((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END) + predicate:((hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END and (hd_buy_potential) IN ('>10000', 'unknown')) TableScan [TS_8] (rows=7200 width=104) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"] <-Reducer 5 [SIMPLE_EDGE] @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_103] (rows=170 width=4) Output:["_col0"] Filter Operator [FIL_102] (rows=170 width=12) - predicate:((d_year) IN (2000, 2001, 2002) and d_dom BETWEEN 1 AND 2) + predicate:(d_dom BETWEEN 1 AND 2 and (d_year) IN (2000, 2001, 2002)) TableScan [TS_5] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 4 [SIMPLE_EDGE] vectorized @@ -156,7 +156,7 @@ Stage-0 Select Operator [SEL_111] (rows=479121995 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_110] (rows=479121995 width=19) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_2] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_store_sk","ss_ticket_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query74.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query74.q.out index 35ebfab7d9..3e22dc0539 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query74.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query74.q.out @@ -213,7 +213,7 @@ Stage-0 Select Operator [SEL_342] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_341] (rows=525327388 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_68_date_dim_d_date_sk_min) AND DynamicValue(RS_68_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_68_date_dim_d_date_sk_min) AND DynamicValue(RS_68_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_59] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_net_paid"] <-Reducer 22 [BROADCAST_EDGE] vectorized @@ -265,7 +265,7 @@ Stage-0 Select Operator [SEL_334] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_333] (rows=143930993 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_49_date_dim_d_date_sk_min) AND DynamicValue(RS_49_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_49_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_40] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_net_paid"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -325,7 +325,7 @@ Stage-0 Select Operator [SEL_324] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_323] (rows=525327388 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_29_date_dim_d_date_sk_min) AND DynamicValue(RS_29_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_net_paid"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -380,7 +380,7 @@ Stage-0 Select Operator [SEL_309] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_308] (rows=143930993 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_net_paid"] <-Reducer 24 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query75.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query75.q.out index d3e036be14..0a5e976766 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query75.q.out @@ -257,7 +257,7 @@ Stage-0 Select Operator [SEL_589] (rows=45745 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_588] (rows=45745 width=109) - predicate:((i_category = 'Sports') and i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_manufact_id is not null) + predicate:((i_category = 'Sports') and i_manufact_id is not null and i_category_id is not null and i_brand_id is not null and i_class_id is not null) TableScan [TS_6] (rows=462000 width=109) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"] <-Reducer 21 [SIMPLE_EDGE] @@ -280,7 +280,7 @@ Stage-0 Select Operator [SEL_631] (rows=286549727 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_630] (rows=286549727 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_94_date_dim_d_date_sk_min) AND DynamicValue(RS_94_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_94_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_94_date_dim_d_date_sk_min) AND DynamicValue(RS_94_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_94_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_82] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_ext_sales_price"] <-Reducer 28 [BROADCAST_EDGE] vectorized @@ -338,7 +338,7 @@ Stage-0 Select Operator [SEL_639] (rows=550076554 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_638] (rows=550076554 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_115_date_dim_d_date_sk_min) AND DynamicValue(RS_115_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_115_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_115_date_dim_d_date_sk_min) AND DynamicValue(RS_115_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_115_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_103] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_ext_sales_price"] <-Reducer 32 [BROADCAST_EDGE] vectorized @@ -396,7 +396,7 @@ Stage-0 Select Operator [SEL_644] (rows=143966864 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_643] (rows=143966864 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_143_date_dim_d_date_sk_min) AND DynamicValue(RS_143_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_143_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_143_date_dim_d_date_sk_min) AND DynamicValue(RS_143_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_143_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_131] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_ext_sales_price"] <-Reducer 36 [BROADCAST_EDGE] vectorized @@ -459,7 +459,7 @@ Stage-0 Select Operator [SEL_623] (rows=143966864 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_622] (rows=143966864 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_49] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_ext_sales_price"] <-Reducer 20 [BROADCAST_EDGE] vectorized @@ -518,7 +518,7 @@ Stage-0 Select Operator [SEL_615] (rows=550076554 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_614] (rows=550076554 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_21] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_ext_sales_price"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -569,7 +569,7 @@ Stage-0 Select Operator [SEL_586] (rows=286549727 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_585] (rows=286549727 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_12_date_dim_d_date_sk_min) AND DynamicValue(RS_12_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_12_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_12_date_dim_d_date_sk_min) AND DynamicValue(RS_12_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_12_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_ext_sales_price"] <-Reducer 12 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query76.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query76.q.out index f6d78256e2..c134e630bc 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query76.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query76.q.out @@ -119,7 +119,7 @@ Stage-0 Select Operator [SEL_182] (rows=1433911 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_181] (rows=1433911 width=123) - predicate:(cs_sold_date_sk is not null and cs_warehouse_sk is null) + predicate:(cs_warehouse_sk is null and cs_sold_date_sk is not null) TableScan [TS_29] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 3 [CONTAINS] @@ -191,7 +191,7 @@ Stage-0 Select Operator [SEL_177] (rows=35728 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_176] (rows=35728 width=123) - predicate:(ws_sold_date_sk is not null and ws_web_page_sk is null) + predicate:(ws_web_page_sk is null and ws_sold_date_sk is not null) TableScan [TS_14] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_page_sk","ws_ext_sales_price"] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query77.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query77.q.out index 2e09c26c51..b847dc7891 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query77.q.out @@ -312,7 +312,7 @@ Stage-0 Select Operator [SEL_275] (rows=286549727 width=231) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_274] (rows=286549727 width=231) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_41_date_dim_d_date_sk_min) AND DynamicValue(RS_41_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_41_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_41_date_dim_d_date_sk_min) AND DynamicValue(RS_41_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_41_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_34] (rows=287989836 width=231) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_call_center_sk","cs_ext_sales_price","cs_net_profit"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -384,7 +384,7 @@ Stage-0 Select Operator [SEL_287] (rows=143931136 width=231) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_286] (rows=143931136 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_74_date_dim_d_date_sk_min) AND DynamicValue(RS_74_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_74_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_web_page_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_web_page_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_74_date_dim_d_date_sk_min) AND DynamicValue(RS_74_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_74_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_67] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_web_page_sk","ws_ext_sales_price","ws_net_profit"] <-Reducer 21 [BROADCAST_EDGE] vectorized @@ -422,7 +422,7 @@ Stage-0 Select Operator [SEL_292] (rows=13129719 width=221) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_291] (rows=13129719 width=221) - predicate:(wr_returned_date_sk is not null and wr_web_page_sk is not null) + predicate:(wr_web_page_sk is not null and wr_returned_date_sk is not null) TableScan [TS_82] (rows=14398467 width=221) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_returned_date_sk","wr_web_page_sk","wr_return_amt","wr_net_loss"] <-Reducer 4 [CONTAINS] @@ -460,7 +460,7 @@ Stage-0 Select Operator [SEL_262] (rows=53634860 width=223) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_261] (rows=53634860 width=223) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_15] (rows=57591150 width=223) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"] <-Reducer 3 [ONE_TO_ONE_EDGE] vectorized @@ -487,7 +487,7 @@ Stage-0 Select Operator [SEL_257] (rows=525329897 width=221) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_256] (rows=525329897 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query78.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query78.q.out index 792540fe49..df54c518df 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query78.q.out @@ -204,7 +204,7 @@ Stage-0 Select Operator [SEL_260] (rows=143930993 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_259] (rows=143930993 width=243) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_order_number","ws_quantity","ws_wholesale_cost","ws_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -263,7 +263,7 @@ Stage-0 Select Operator [SEL_238] (rows=525327388 width=233) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_237] (rows=525327388 width=233) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_3] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_ticket_number","ss_quantity","ss_wholesale_cost","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -321,7 +321,7 @@ Stage-0 Select Operator [SEL_248] (rows=285117831 width=242) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_247] (rows=285117831 width=242) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_34_date_dim_d_date_sk_min) AND DynamicValue(RS_34_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_34_date_dim_d_date_sk_min) AND DynamicValue(RS_34_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_34_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_24] (rows=287989836 width=242) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_order_number","cs_quantity","cs_wholesale_cost","cs_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query79.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query79.q.out index 4406bbcbf1..5ef0350ba6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query79.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query79.q.out @@ -109,7 +109,7 @@ Stage-0 Select Operator [SEL_117] (rows=3055 width=4) Output:["_col0"] Filter Operator [FIL_116] (rows=3055 width=12) - predicate:((hd_dep_count = 8) or (hd_vehicle_count > 0)) + predicate:((hd_vehicle_count > 0) or (hd_dep_count = 8)) TableScan [TS_11] (rows=7200 width=12) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"] <-Reducer 6 [SIMPLE_EDGE] @@ -146,7 +146,7 @@ Stage-0 Select Operator [SEL_111] (rows=479121995 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_110] (rows=479121995 width=237) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_2] (rows=575995635 width=237) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query8.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query8.q.out index f0080995fb..514b6d0137 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query8.q.out @@ -359,7 +359,7 @@ Stage-0 Select Operator [SEL_128] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_127] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2002)) + predicate:((d_year = 2002) and (d_qoy = 1)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -368,7 +368,7 @@ Stage-0 Select Operator [SEL_136] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_135] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_net_profit"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query80.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query80.q.out index 171881487f..5a2f93c5f1 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query80.q.out @@ -341,7 +341,7 @@ Stage-0 Select Operator [SEL_434] (rows=283691906 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_433] (rows=283691906 width=243) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_catalog_page_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_promo_sk is not null and cs_sold_date_sk is not null and cs_catalog_page_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_37] (rows=287989836 width=243) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_item_sk","cs_promo_sk","cs_order_number","cs_ext_sales_price","cs_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -427,7 +427,7 @@ Stage-0 Select Operator [SEL_448] (rows=143894769 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_447] (rows=143894769 width=243) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter))) and ws_promo_sk is not null and ws_sold_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_promo_sk is not null and ws_web_site_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_75] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_site_sk","ws_promo_sk","ws_order_number","ws_ext_sales_price","ws_net_profit"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -513,7 +513,7 @@ Stage-0 Select Operator [SEL_404] (rows=501693263 width=233) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_403] (rows=501693263 width=233) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_promo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_ext_sales_price","ss_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query81.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query81.q.out index 513e38c575..8f62fdea3b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query81.q.out @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_191] (rows=28221532 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_189] (rows=28221532 width=121) - predicate:(cr_returned_date_sk is not null and cr_returning_addr_sk is not null) + predicate:(cr_returning_addr_sk is not null and cr_returned_date_sk is not null) TableScan [TS_6] (rows=28798881 width=121) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_returned_date_sk","cr_returning_customer_sk","cr_returning_addr_sk","cr_return_amt_inc_tax"] <-Reducer 9 [SIMPLE_EDGE] vectorized @@ -196,7 +196,7 @@ Stage-0 Select Operator [SEL_190] (rows=27657410 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_188] (rows=27657410 width=121) - predicate:(cr_returned_date_sk is not null and cr_returning_addr_sk is not null and cr_returning_customer_sk is not null) + predicate:(cr_returning_addr_sk is not null and cr_returning_customer_sk is not null and cr_returned_date_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_62] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query82.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query82.q.out index ffeb3b70d5..2119b77b1f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query82.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_80] (rows=297 width=400) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_79] (rows=297 width=404) - predicate:((i_manufact_id) IN (437, 129, 727, 663) and i_current_price BETWEEN 30 AND 60) + predicate:(i_current_price BETWEEN 30 AND 60 and (i_manufact_id) IN (437, 129, 727, 663)) TableScan [TS_2] (rows=462000 width=403) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -94,7 +94,7 @@ Stage-0 Select Operator [SEL_88] (rows=575995635 width=4) Output:["_col0"] Filter Operator [FIL_87] (rows=575995635 width=4) - predicate:(in_bloom_filter(ss_item_sk, DynamicValue(RS_16_item_i_item_sk_bloom_filter)) and ss_item_sk BETWEEN DynamicValue(RS_16_item_i_item_sk_min) AND DynamicValue(RS_16_item_i_item_sk_max)) + predicate:(ss_item_sk BETWEEN DynamicValue(RS_16_item_i_item_sk_min) AND DynamicValue(RS_16_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_16_item_i_item_sk_bloom_filter))) TableScan [TS_0] (rows=575995635 width=4) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query83.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query83.q.out index 16f85beb14..0214dc7edd 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query83.q.out @@ -235,7 +235,7 @@ Stage-0 Select Operator [SEL_368] (rows=73049 width=98) Output:["_col0","_col1"] Filter Operator [FIL_367] (rows=73049 width=98) - predicate:(d_date is not null and d_week_seq is not null) + predicate:(d_week_seq is not null and d_date is not null) TableScan [TS_3] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date","d_week_seq"] <-Map 18 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query84.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query84.q.out index 2734835b64..d13dfdbd83 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query84.q.out @@ -138,7 +138,7 @@ Stage-0 Select Operator [SEL_126] (rows=74500295 width=295) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_125] (rows=74500295 width=291) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null) + predicate:(c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_5] (rows=80000000 width=291) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_id","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk","c_first_name","c_last_name"] <-Map 9 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query85.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query85.q.out index 0bb5025bce..dfd64e3298 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query85.q.out @@ -228,7 +228,7 @@ Stage-0 SHUFFLE [RS_38] PartitionCols:_col24 Filter Operator [FIL_36] (rows=2912400 width=280) - predicate:(((_col14 and _col15 and _col7) or (_col16 and _col17 and _col8) or (_col18 and _col19 and _col9)) and ((_col29 and _col4) or (_col30 and _col5) or (_col31 and _col6))) + predicate:(((_col29 and _col4) or (_col30 and _col5) or (_col31 and _col6)) and ((_col14 and _col15 and _col7) or (_col16 and _col17 and _col8) or (_col18 and _col19 and _col9))) Merge Join Operator [MERGEJOIN_176] (rows=10355208 width=280) Conds:RS_33._col1, _col2=RS_34._col9, _col14(Inner),Output:["_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col14","_col15","_col16","_col17","_col18","_col19","_col24","_col26","_col27","_col29","_col30","_col31"] <-Reducer 12 [SIMPLE_EDGE] @@ -244,7 +244,7 @@ Stage-0 Select Operator [SEL_196] (rows=265971 width=207) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_195] (rows=265971 width=183) - predicate:((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U')) + predicate:((cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree')) TableScan [TS_15] (rows=1861800 width=183) default@customer_demographics,cd1,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 11 [SIMPLE_EDGE] @@ -269,7 +269,7 @@ Stage-0 Select Operator [SEL_193] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_192] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV')) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States')) TableScan [TS_9] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Map 9 [SIMPLE_EDGE] vectorized @@ -278,7 +278,7 @@ Stage-0 Select Operator [SEL_190] (rows=11975292 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_189] (rows=11975292 width=237) - predicate:(wr_reason_sk is not null and wr_refunded_addr_sk is not null and wr_refunded_cdemo_sk is not null and wr_returning_cdemo_sk is not null) + predicate:(wr_refunded_addr_sk is not null and wr_returning_cdemo_sk is not null and wr_refunded_cdemo_sk is not null and wr_reason_sk is not null) TableScan [TS_6] (rows=14398467 width=237) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_item_sk","wr_refunded_cdemo_sk","wr_refunded_addr_sk","wr_returning_cdemo_sk","wr_reason_sk","wr_order_number","wr_fee","wr_refunded_cash"] <-Reducer 2 [SIMPLE_EDGE] @@ -301,7 +301,7 @@ Stage-0 Select Operator [SEL_187] (rows=143931136 width=39) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"] Filter Operator [FIL_186] (rows=143931136 width=243) - predicate:(((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and (ws_sold_date_sk BETWEEN DynamicValue(RS_31_date_dim_d_date_sk_min) AND DynamicValue(RS_31_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_31_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_web_page_sk is not null) + predicate:(((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ws_sold_date_sk is not null and ws_web_page_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_31_date_dim_d_date_sk_min) AND DynamicValue(RS_31_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_31_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_page_sk","ws_order_number","ws_quantity","ws_sales_price","ws_net_profit"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query86.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query86.q.out index 7c8cd43683..dd843f1d4d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query86.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query86.q.out @@ -128,7 +128,7 @@ Stage-0 Select Operator [SEL_69] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_68] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_9_d1_d_date_sk_min) AND DynamicValue(RS_9_d1_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_d1_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_9_d1_d_date_sk_min) AND DynamicValue(RS_9_d1_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_9_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_net_paid"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query87.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query87.q.out index e747e1e59d..bda5fc319d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query87.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query87.q.out @@ -88,7 +88,7 @@ Stage-0 Output:["_col0"],aggregations:["count()"] Select Operator [SEL_264] (rows=8062883 width=16) Filter Operator [FIL_263] (rows=8062883 width=16) - predicate:(((_col3 * 2L) = _col4) and (_col3 > 0L)) + predicate:((_col3 > 0L) and ((_col3 * 2L) = _col4)) Select Operator [SEL_262] (rows=48377300 width=16) Output:["_col3","_col4"] Group By Operator [GBY_261] (rows=48377300 width=290) @@ -143,7 +143,7 @@ Stage-0 Select Operator [SEL_284] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_283] (rows=143930993 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_61] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -171,7 +171,7 @@ Stage-0 Select Operator [SEL_255] (rows=23390718 width=290) Output:["_col0","_col1","_col2"] Filter Operator [FIL_254] (rows=23390718 width=290) - predicate:(((_col3 * 2L) = _col4) and (_col3 > 0L)) + predicate:((_col3 > 0L) and ((_col3 * 2L) = _col4)) Group By Operator [GBY_253] (rows=140344308 width=290) Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2 <-Union 5 [SIMPLE_EDGE] @@ -216,7 +216,7 @@ Stage-0 Select Operator [SEL_272] (rows=285117831 width=7) Output:["_col0","_col1"] Filter Operator [FIL_271] (rows=285117831 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_33_date_dim_d_date_sk_min) AND DynamicValue(RS_33_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_33_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_24] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -271,7 +271,7 @@ Stage-0 Select Operator [SEL_240] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_239] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_9_date_dim_d_date_sk_min) AND DynamicValue(RS_9_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_9_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 11 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query88.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query88.q.out index ff05345222..d6fdbb693c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query88.q.out @@ -320,7 +320,7 @@ Stage-0 Select Operator [SEL_660] (rows=817 width=4) Output:["_col0"] Filter Operator [FIL_659] (rows=817 width=12) - predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1)) + predicate:((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3))) TableScan [TS_3] (rows=7200 width=12) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"] <-Map 56 [SIMPLE_EDGE] vectorized @@ -329,7 +329,7 @@ Stage-0 Select Operator [SEL_712] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_711] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_146_time_dim_t_time_sk_min) AND DynamicValue(RS_146_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_146_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_146_time_dim_t_time_sk_min) AND DynamicValue(RS_146_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_146_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_130] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 48 [BROADCAST_EDGE] vectorized @@ -389,7 +389,7 @@ Stage-0 Select Operator [SEL_705] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_704] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_120_time_dim_t_time_sk_min) AND DynamicValue(RS_120_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_120_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_120_time_dim_t_time_sk_min) AND DynamicValue(RS_120_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_120_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_104] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 47 [BROADCAST_EDGE] vectorized @@ -449,7 +449,7 @@ Stage-0 Select Operator [SEL_698] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_697] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_94_time_dim_t_time_sk_min) AND DynamicValue(RS_94_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_94_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_94_time_dim_t_time_sk_min) AND DynamicValue(RS_94_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_94_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_78] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 46 [BROADCAST_EDGE] vectorized @@ -509,7 +509,7 @@ Stage-0 Select Operator [SEL_691] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_690] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_68_time_dim_t_time_sk_min) AND DynamicValue(RS_68_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_68_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_68_time_dim_t_time_sk_min) AND DynamicValue(RS_68_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_68_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_52] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 45 [BROADCAST_EDGE] vectorized @@ -569,7 +569,7 @@ Stage-0 Select Operator [SEL_684] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_683] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_42_time_dim_t_time_sk_min) AND DynamicValue(RS_42_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_42_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_42_time_dim_t_time_sk_min) AND DynamicValue(RS_42_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_42_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_26] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 44 [BROADCAST_EDGE] vectorized @@ -625,7 +625,7 @@ Stage-0 Select Operator [SEL_657] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_656] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_16_time_dim_t_time_sk_min) AND DynamicValue(RS_16_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_16_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_16_time_dim_t_time_sk_min) AND DynamicValue(RS_16_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_16_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 43 [BROADCAST_EDGE] vectorized @@ -681,7 +681,7 @@ Stage-0 Select Operator [SEL_719] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_718] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_172_time_dim_t_time_sk_min) AND DynamicValue(RS_172_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_172_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_172_time_dim_t_time_sk_min) AND DynamicValue(RS_172_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_172_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_156] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 49 [BROADCAST_EDGE] vectorized @@ -737,7 +737,7 @@ Stage-0 Select Operator [SEL_726] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_725] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_198_time_dim_t_time_sk_min) AND DynamicValue(RS_198_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_198_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_198_time_dim_t_time_sk_min) AND DynamicValue(RS_198_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_198_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_182] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 50 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query89.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query89.q.out index 387a7e19ca..ed37c4d541 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query89.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_93] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_92] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -160,7 +160,7 @@ Stage-0 Select Operator [SEL_96] (rows=6988 width=286) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_95] (rows=6988 width=286) - predicate:((((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants')) + predicate:((i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants')))) TableScan [TS_3] (rows=462000 width=286) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category"] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query90.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query90.q.out index 33e9427630..0206c87cad 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query90.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query90.q.out @@ -119,7 +119,7 @@ Stage-0 Select Operator [SEL_160] (rows=143895111 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_159] (rows=143895111 width=11) - predicate:((ws_ship_hdemo_sk BETWEEN DynamicValue(RS_19_household_demographics_hd_demo_sk_min) AND DynamicValue(RS_19_household_demographics_hd_demo_sk_max) and in_bloom_filter(ws_ship_hdemo_sk, DynamicValue(RS_19_household_demographics_hd_demo_sk_bloom_filter))) and ws_ship_hdemo_sk is not null and ws_sold_time_sk is not null and ws_web_page_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_ship_hdemo_sk is not null and ws_web_page_sk is not null and (ws_ship_hdemo_sk BETWEEN DynamicValue(RS_19_household_demographics_hd_demo_sk_min) AND DynamicValue(RS_19_household_demographics_hd_demo_sk_max) and in_bloom_filter(ws_ship_hdemo_sk, DynamicValue(RS_19_household_demographics_hd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=11) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_time_sk","ws_ship_hdemo_sk","ws_web_page_sk"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query91.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query91.q.out index 8e0790fcf3..5e9c1e042f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query91.q.out @@ -92,20 +92,20 @@ Stage-0 Stage-1 Reducer 8 vectorized File Output Operator [FS_170] - Select Operator [SEL_169] (rows=5219 width=406) + Select Operator [SEL_169] (rows=115978 width=406) Output:["_col0","_col1","_col2","_col3"] <-Reducer 7 [SIMPLE_EDGE] vectorized SHUFFLE [RS_168] - Select Operator [SEL_167] (rows=5219 width=518) + Select Operator [SEL_167] (rows=115978 width=518) Output:["_col0","_col1","_col2","_col4"] - Group By Operator [GBY_166] (rows=5219 width=585) + Group By Operator [GBY_166] (rows=115978 width=585) Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4 <-Reducer 6 [SIMPLE_EDGE] SHUFFLE [RS_41] PartitionCols:_col0, _col1, _col2, _col3, _col4 - Group By Operator [GBY_40] (rows=5219 width=585) + Group By Operator [GBY_40] (rows=115978 width=585) Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col11)"],keys:_col5, _col6, _col15, _col16, _col17 - Merge Join Operator [MERGEJOIN_145] (rows=10438 width=473) + Merge Join Operator [MERGEJOIN_145] (rows=231957 width=473) Conds:RS_36._col10=RS_165._col0(Inner),Output:["_col5","_col6","_col11","_col15","_col16","_col17"] <-Map 15 [SIMPLE_EDGE] vectorized SHUFFLE [RS_165] @@ -117,7 +117,7 @@ Stage-0 <-Reducer 5 [SIMPLE_EDGE] SHUFFLE [RS_36] PartitionCols:_col10 - Merge Join Operator [MERGEJOIN_144] (rows=10438 width=179) + Merge Join Operator [MERGEJOIN_144] (rows=231957 width=179) Conds:RS_33._col2=RS_163._col0(Inner),Output:["_col5","_col6","_col10","_col11"] <-Map 14 [SIMPLE_EDGE] vectorized SHUFFLE [RS_163] @@ -131,7 +131,7 @@ Stage-0 <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_33] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_143] (rows=20876 width=179) + Merge Join Operator [MERGEJOIN_143] (rows=463913 width=181) Conds:RS_30._col0=RS_31._col1(Inner),Output:["_col2","_col5","_col6","_col10","_col11"] <-Reducer 12 [SIMPLE_EDGE] SHUFFLE [RS_31] @@ -144,7 +144,7 @@ Stage-0 Select Operator [SEL_156] (rows=27658583 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_155] (rows=27658583 width=121) - predicate:(cr_call_center_sk is not null and cr_returned_date_sk is not null and cr_returning_customer_sk is not null) + predicate:(cr_call_center_sk is not null and cr_returning_customer_sk is not null and cr_returned_date_sk is not null) TableScan [TS_9] (rows=28798881 width=121) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_returned_date_sk","cr_returning_customer_sk","cr_call_center_sk","cr_net_loss"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -153,13 +153,13 @@ Stage-0 Select Operator [SEL_159] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_158] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 11)) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Reducer 3 [SIMPLE_EDGE] SHUFFLE [RS_30] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_141] (rows=479709 width=183) + Merge Join Operator [MERGEJOIN_141] (rows=213205 width=183) Conds:RS_27._col3=RS_154._col0(Inner),Output:["_col0","_col2","_col5","_col6"] <-Map 10 [SIMPLE_EDGE] vectorized SHUFFLE [RS_154] @@ -173,7 +173,7 @@ Stage-0 <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_27] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_140] (rows=2398543 width=187) + Merge Join Operator [MERGEJOIN_140] (rows=1066023 width=187) Conds:RS_148._col1=RS_151._col0(Inner),Output:["_col0","_col2","_col3","_col5","_col6"] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_148] @@ -181,16 +181,16 @@ Stage-0 Select Operator [SEL_147] (rows=74500295 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_146] (rows=74500295 width=15) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null) + predicate:(c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=15) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk"] <-Map 9 [SIMPLE_EDGE] vectorized SHUFFLE [RS_151] PartitionCols:_col0 - Select Operator [SEL_150] (rows=59105 width=183) + Select Operator [SEL_150] (rows=26269 width=183) Output:["_col0","_col1","_col2"] - Filter Operator [FIL_149] (rows=59105 width=183) - predicate:((cd_education_status) IN ('Unknown', 'Advanced Degree') and (cd_marital_status) IN ('M', 'W') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree'))) + Filter Operator [FIL_149] (rows=26269 width=183) + predicate:((cd_marital_status) IN ('M', 'W') and (cd_education_status) IN ('Unknown', 'Advanced Degree') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree'))) TableScan [TS_3] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query93.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query93.q.out index 3c45d4389c..8791d37a1f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query93.q.out @@ -102,7 +102,7 @@ Stage-0 Select Operator [SEL_73] (rows=575995635 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_72] (rows=575995635 width=122) - predicate:(in_bloom_filter(ss_ticket_number, DynamicValue(RS_11_store_returns_sr_ticket_number_bloom_filter)) and ss_ticket_number BETWEEN DynamicValue(RS_11_store_returns_sr_ticket_number_min) AND DynamicValue(RS_11_store_returns_sr_ticket_number_max)) + predicate:(ss_ticket_number BETWEEN DynamicValue(RS_11_store_returns_sr_ticket_number_min) AND DynamicValue(RS_11_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_11_store_returns_sr_ticket_number_bloom_filter))) TableScan [TS_6] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_ticket_number","ss_quantity","ss_sales_price"] <-Reducer 6 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query94.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query94.q.out index 3b3db9617a..94370b2c48 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query94.q.out @@ -167,7 +167,7 @@ Stage-0 Select Operator [SEL_135] (rows=143895019 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_134] (rows=143895019 width=243) - predicate:((ws_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter))) and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and (ws_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_ship_date_sk","ws_ship_addr_sk","ws_web_site_sk","ws_warehouse_sk","ws_order_number","ws_ext_ship_cost","ws_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -198,7 +198,7 @@ Stage-0 Select Operator [SEL_146] (rows=143966743 width=7) Output:["_col0","_col1"] Filter Operator [FIL_145] (rows=143966743 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_33_ws1_ws_order_number_min) AND DynamicValue(RS_33_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_33_ws1_ws_order_number_bloom_filter))) and ws_warehouse_sk is not null) + predicate:(ws_warehouse_sk is not null and (ws_order_number BETWEEN DynamicValue(RS_33_ws1_ws_order_number_min) AND DynamicValue(RS_33_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_33_ws1_ws_order_number_bloom_filter)))) TableScan [TS_22] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out index 90114cc417..55d899a2f2 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out @@ -161,7 +161,7 @@ Stage-0 Select Operator [SEL_241] (rows=143895019 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_240] (rows=143895019 width=239) - predicate:((ws_ship_addr_sk BETWEEN DynamicValue(RS_47_customer_address_ca_address_sk_min) AND DynamicValue(RS_47_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_47_customer_address_ca_address_sk_bloom_filter))) and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and (ws_ship_addr_sk BETWEEN DynamicValue(RS_47_customer_address_ca_address_sk_min) AND DynamicValue(RS_47_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_47_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=239) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_ship_date_sk","ws_ship_addr_sk","ws_web_site_sk","ws_order_number","ws_ext_ship_cost","ws_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_253] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_252] (rows=144002668 width=7) - predicate:(in_bloom_filter(ws_order_number, DynamicValue(RS_52_ws1_ws_order_number_bloom_filter)) and ws_order_number BETWEEN DynamicValue(RS_52_ws1_ws_order_number_min) AND DynamicValue(RS_52_ws1_ws_order_number_max)) + predicate:(ws_order_number BETWEEN DynamicValue(RS_52_ws1_ws_order_number_min) AND DynamicValue(RS_52_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_52_ws1_ws_order_number_bloom_filter))) TableScan [TS_12] (rows=144002668 width=7) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -226,7 +226,7 @@ Stage-0 Select Operator [SEL_256] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_255] (rows=144002668 width=7) - predicate:(in_bloom_filter(ws_order_number, DynamicValue(RS_52_ws1_ws_order_number_bloom_filter)) and ws_order_number BETWEEN DynamicValue(RS_52_ws1_ws_order_number_min) AND DynamicValue(RS_52_ws1_ws_order_number_max)) + predicate:(ws_order_number BETWEEN DynamicValue(RS_52_ws1_ws_order_number_min) AND DynamicValue(RS_52_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_52_ws1_ws_order_number_bloom_filter))) TableScan [TS_14] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -264,7 +264,7 @@ Stage-0 Select Operator [SEL_264] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_263] (rows=144002668 width=7) - predicate:(in_bloom_filter(ws_order_number, DynamicValue(RS_55_ws1_ws_order_number_bloom_filter)) and ws_order_number BETWEEN DynamicValue(RS_55_ws1_ws_order_number_min) AND DynamicValue(RS_55_ws1_ws_order_number_max)) + predicate:(ws_order_number BETWEEN DynamicValue(RS_55_ws1_ws_order_number_min) AND DynamicValue(RS_55_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_55_ws1_ws_order_number_bloom_filter))) TableScan [TS_25] (rows=144002668 width=7) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized @@ -284,7 +284,7 @@ Stage-0 Select Operator [SEL_267] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_266] (rows=144002668 width=7) - predicate:(in_bloom_filter(ws_order_number, DynamicValue(RS_55_ws1_ws_order_number_bloom_filter)) and ws_order_number BETWEEN DynamicValue(RS_55_ws1_ws_order_number_min) AND DynamicValue(RS_55_ws1_ws_order_number_max)) + predicate:(ws_order_number BETWEEN DynamicValue(RS_55_ws1_ws_order_number_min) AND DynamicValue(RS_55_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_55_ws1_ws_order_number_bloom_filter))) TableScan [TS_27] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query96.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query96.q.out index 7947605f6c..1136007c08 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query96.q.out @@ -105,7 +105,7 @@ Stage-0 Select Operator [SEL_82] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_81] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_13_time_dim_t_time_sk_min) AND DynamicValue(RS_13_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_13_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_13_time_dim_t_time_sk_min) AND DynamicValue(RS_13_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_13_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query97.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query97.q.out index dfa0760a92..08b614150b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query97.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query97.q.out @@ -111,7 +111,7 @@ Stage-0 Select Operator [SEL_82] (rows=550076554 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_81] (rows=550076554 width=11) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_89] (rows=286549727 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_88] (rows=286549727 width=11) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_14] (rows=287989836 width=11) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query98.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query98.q.out index d1e7d20e27..5afb76ebd7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query98.q.out @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_67] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_66] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query99.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query99.q.out index 5f84036715..b212a5c9ab 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/query99.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query99.q.out @@ -157,7 +157,7 @@ Stage-0 Select Operator [SEL_106] (rows=282273729 width=35) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_105] (rows=282273729 width=19) - predicate:((cs_ship_mode_sk BETWEEN DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_bloom_filter))) and cs_call_center_sk is not null and cs_ship_date_sk is not null and cs_ship_mode_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_ship_date_sk is not null and cs_ship_mode_sk is not null and cs_call_center_sk is not null and (cs_ship_mode_sk BETWEEN DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_16_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=19) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_date_sk","cs_call_center_sk","cs_ship_mode_sk","cs_warehouse_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query1.q.out b/ql/src/test/results/clientpositive/perf/tez/query1.q.out index c6bff1d9b7..efccffea0e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query1.q.out @@ -121,7 +121,7 @@ Stage-0 Select Operator [SEL_143] (rows=53634860 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_141] (rows=53634860 width=119) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_3] (rows=57591150 width=119) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_customer_sk","sr_store_sk","sr_fee"] <-Reducer 3 [SIMPLE_EDGE] @@ -178,6 +178,6 @@ Stage-0 Select Operator [SEL_142] (rows=51757026 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_140] (rows=51757026 width=119) - predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_customer_sk is not null and sr_store_sk is not null and sr_returned_date_sk is not null) Please refer to the previous TableScan [TS_3] diff --git a/ql/src/test/results/clientpositive/perf/tez/query10.q.out b/ql/src/test/results/clientpositive/perf/tez/query10.q.out index 210144d8ee..60d0c4bfc0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query10.q.out @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_192] (rows=201 width=4) Output:["_col0"] Filter Operator [FIL_191] (rows=201 width=12) - predicate:((d_year = 2002) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) + predicate:((d_year = 2002) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_202] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_201] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -254,7 +254,7 @@ Stage-0 Select Operator [SEL_183] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_182] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null and c_customer_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -290,7 +290,7 @@ Stage-0 Select Operator [SEL_207] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_206] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_58_c_c_customer_sk_min) AND DynamicValue(RS_58_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_58_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_58_c_c_customer_sk_min) AND DynamicValue(RS_58_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_58_c_c_customer_sk_bloom_filter)))) TableScan [TS_19] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -328,7 +328,7 @@ Stage-0 Select Operator [SEL_215] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_214] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_61_c_c_customer_sk_min) AND DynamicValue(RS_61_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_61_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_61_c_c_customer_sk_min) AND DynamicValue(RS_61_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_61_c_c_customer_sk_bloom_filter)))) TableScan [TS_33] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query11.q.out b/ql/src/test/results/clientpositive/perf/tez/query11.q.out index 34e455b396..4589db5013 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query11.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query11.q.out @@ -222,7 +222,7 @@ Stage-0 Select Operator [SEL_316] (rows=80000000 width=656) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_315] (rows=80000000 width=656) - predicate:(c_customer_id is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_customer_id is not null) TableScan [TS_68] (rows=80000000 width=656) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_customer_id","c_first_name","c_last_name","c_preferred_cust_flag","c_birth_country","c_login","c_email_address"] <-Reducer 18 [SIMPLE_EDGE] @@ -245,7 +245,7 @@ Stage-0 Select Operator [SEL_347] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_346] (rows=525327388 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_62] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_list_price"] <-Reducer 22 [BROADCAST_EDGE] vectorized @@ -305,7 +305,7 @@ Stage-0 Select Operator [SEL_337] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_336] (rows=143930993 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_41] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_list_price"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -365,7 +365,7 @@ Stage-0 Select Operator [SEL_327] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_326] (rows=525327388 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_list_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -412,7 +412,7 @@ Stage-0 Select Operator [SEL_313] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_312] (rows=143930993 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_list_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query12.q.out b/ql/src/test/results/clientpositive/perf/tez/query12.q.out index ef9a1f4680..6ae96d307a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query12.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_68] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_67] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query13.q.out b/ql/src/test/results/clientpositive/perf/tez/query13.q.out index 8344aa05d9..c430520cb2 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query13.q.out @@ -176,7 +176,7 @@ Stage-0 Select Operator [SEL_137] (rows=265971 width=28) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_136] (rows=265971 width=183) - predicate:((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) + predicate:((cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and cd_demo_sk is not null) TableScan [TS_9] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 3 [SIMPLE_EDGE] @@ -192,7 +192,7 @@ Stage-0 Select Operator [SEL_134] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_133] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) TableScan [TS_6] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Reducer 2 [SIMPLE_EDGE] @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_131] (rows=457561292 width=260) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] Filter Operator [FIL_130] (rows=457561292 width=450) - predicate:(((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_addr_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 100) or (ss_net_profit <= 200) or (ss_net_profit >= 150) or (ss_net_profit <= 300) or (ss_net_profit >= 50) or (ss_net_profit <= 250)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_19_date_dim_d_date_sk_min) AND DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=450) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_ext_sales_price","ss_ext_wholesale_cost","ss_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query14.q.out b/ql/src/test/results/clientpositive/perf/tez/query14.q.out index b567424605..e73e4735b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query14.q.out @@ -361,7 +361,7 @@ Stage-0 Select Operator [SEL_1285] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_1284] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_moy = 11) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 79 [SIMPLE_EDGE] vectorized @@ -370,7 +370,7 @@ Stage-0 Select Operator [SEL_1350] (rows=286549727 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1349] (rows=286549727 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_231_date_dim_d_date_sk_min) AND DynamicValue(RS_231_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_231_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_231_date_dim_d_date_sk_min) AND DynamicValue(RS_231_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_231_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_146] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_quantity","cs_list_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -397,7 +397,7 @@ Stage-0 Select Operator [SEL_1318] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1309] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 32 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1355] @@ -429,7 +429,7 @@ Stage-0 Select Operator [SEL_1314] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1305] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 47 [SIMPLE_EDGE] SHUFFLE [RS_24] @@ -442,7 +442,7 @@ Stage-0 Select Operator [SEL_1380] (rows=1957 width=4) Output:["_col0"] Filter Operator [FIL_1379] (rows=1957 width=8) - predicate:(d_date_sk is not null and d_year BETWEEN 1999 AND 2001) + predicate:(d_year BETWEEN 1999 AND 2001 and d_date_sk is not null) TableScan [TS_15] (rows=73049 width=8) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"] <-Map 46 [SIMPLE_EDGE] vectorized @@ -451,7 +451,7 @@ Stage-0 Select Operator [SEL_1402] (rows=550076554 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1401] (rows=550076554 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_d1_d_date_sk_min) AND DynamicValue(RS_22_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_d1_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_d1_d_date_sk_min) AND DynamicValue(RS_22_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_d1_d_date_sk_bloom_filter)))) TableScan [TS_12] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk"] <-Reducer 49 [BROADCAST_EDGE] vectorized @@ -485,7 +485,7 @@ Stage-0 Select Operator [SEL_1315] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1306] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 50 [SIMPLE_EDGE] SHUFFLE [RS_44] @@ -502,7 +502,7 @@ Stage-0 Select Operator [SEL_1416] (rows=286549727 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1415] (rows=286549727 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_42_d2_d_date_sk_min) AND DynamicValue(RS_42_d2_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_d2_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_42_d2_d_date_sk_min) AND DynamicValue(RS_42_d2_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_d2_d_date_sk_bloom_filter)))) TableScan [TS_32] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk"] <-Reducer 51 [BROADCAST_EDGE] vectorized @@ -536,7 +536,7 @@ Stage-0 Select Operator [SEL_1316] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1307] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 52 [SIMPLE_EDGE] SHUFFLE [RS_65] @@ -553,7 +553,7 @@ Stage-0 Select Operator [SEL_1430] (rows=143966864 width=7) Output:["_col0","_col1"] Filter Operator [FIL_1429] (rows=143966864 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_63_d3_d_date_sk_min) AND DynamicValue(RS_63_d3_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_63_d3_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_63_d3_d_date_sk_min) AND DynamicValue(RS_63_d3_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_63_d3_d_date_sk_bloom_filter)))) TableScan [TS_53] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk"] <-Reducer 53 [BROADCAST_EDGE] vectorized @@ -596,7 +596,7 @@ Stage-0 Select Operator [SEL_1444] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1443] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_109_date_dim_d_date_sk_min) AND DynamicValue(RS_109_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_109_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_109_date_dim_d_date_sk_min) AND DynamicValue(RS_109_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_109_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_102] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_quantity","ss_list_price"] <-Reducer 57 [BROADCAST_EDGE] vectorized @@ -626,7 +626,7 @@ Stage-0 Select Operator [SEL_1449] (rows=1957 width=4) Output:["_col0"] Filter Operator [FIL_1448] (rows=1957 width=8) - predicate:(d_date_sk is not null and d_year BETWEEN 1998 AND 2000) + predicate:(d_year BETWEEN 1998 AND 2000 and d_date_sk is not null) TableScan [TS_115] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"] <-Map 67 [SIMPLE_EDGE] vectorized @@ -635,7 +635,7 @@ Stage-0 Select Operator [SEL_1459] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1458] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_119_date_dim_d_date_sk_min) AND DynamicValue(RS_119_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_119_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_119_date_dim_d_date_sk_min) AND DynamicValue(RS_119_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_119_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_112] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_quantity","cs_list_price"] <-Reducer 72 [BROADCAST_EDGE] vectorized @@ -665,7 +665,7 @@ Stage-0 Select Operator [SEL_1464] (rows=1957 width=4) Output:["_col0"] Filter Operator [FIL_1463] (rows=1957 width=8) - predicate:(d_date_sk is not null and d_year BETWEEN 1998 AND 2000) + predicate:(d_year BETWEEN 1998 AND 2000 and d_date_sk is not null) TableScan [TS_126] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"] <-Map 73 [SIMPLE_EDGE] vectorized @@ -674,7 +674,7 @@ Stage-0 Select Operator [SEL_1474] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1473] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_130_date_dim_d_date_sk_min) AND DynamicValue(RS_130_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_130_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_130_date_dim_d_date_sk_min) AND DynamicValue(RS_130_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_130_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_123] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_quantity","ws_list_price"] <-Reducer 78 [BROADCAST_EDGE] vectorized @@ -744,7 +744,7 @@ Stage-0 Select Operator [SEL_1366] (rows=143966864 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1365] (rows=143966864 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_378_date_dim_d_date_sk_min) AND DynamicValue(RS_378_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_378_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_378_date_dim_d_date_sk_min) AND DynamicValue(RS_378_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_378_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_293] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_quantity","ws_list_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -771,7 +771,7 @@ Stage-0 Select Operator [SEL_1320] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1311] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 36 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1371] @@ -920,7 +920,7 @@ Stage-0 Select Operator [SEL_1313] (rows=458612 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1304] (rows=458612 width=15) - predicate:(i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null) + predicate:(i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 29 [ONE_TO_ONE_EDGE] vectorized FORWARD [RS_1333] @@ -993,7 +993,7 @@ Stage-0 Select Operator [SEL_1301] (rows=550076554 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_1300] (rows=550076554 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_85_date_dim_d_date_sk_min) AND DynamicValue(RS_85_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_85_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_85_date_dim_d_date_sk_min) AND DynamicValue(RS_85_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_85_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_quantity","ss_list_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query15.q.out b/ql/src/test/results/clientpositive/perf/tez/query15.q.out index c3c08a1d6b..df87696887 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query15.q.out @@ -81,7 +81,7 @@ Stage-0 Select Operator [SEL_23] (rows=20154874 width=205) Output:["_col3","_col8"] Filter Operator [FIL_22] (rows=20154874 width=205) - predicate:(_col4 or _col5 or _col9) + predicate:(_col9 or _col4 or _col5) Merge Join Operator [MERGEJOIN_77] (rows=20154874 width=205) Conds:RS_19._col0=RS_20._col1(Inner),Output:["_col3","_col4","_col5","_col8","_col9"] <-Reducer 2 [SIMPLE_EDGE] @@ -95,7 +95,7 @@ Stage-0 Select Operator [SEL_79] (rows=80000000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_78] (rows=80000000 width=8) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=8) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk"] <-Map 6 [SIMPLE_EDGE] vectorized @@ -118,7 +118,7 @@ Stage-0 Select Operator [SEL_85] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_84] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 2) and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 7 [SIMPLE_EDGE] vectorized @@ -127,7 +127,7 @@ Stage-0 Select Operator [SEL_93] (rows=285117831 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_92] (rows=285117831 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query16.q.out b/ql/src/test/results/clientpositive/perf/tez/query16.q.out index 8f53c1cbf0..243a93659f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query16.q.out @@ -173,7 +173,7 @@ Stage-0 Select Operator [SEL_136] (rows=283695062 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_135] (rows=283695062 width=243) - predicate:((cs_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(cs_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter))) and cs_call_center_sk is not null and cs_order_number is not null and cs_ship_addr_sk is not null and cs_ship_date_sk is not null) + predicate:(cs_ship_date_sk is not null and cs_call_center_sk is not null and cs_ship_addr_sk is not null and cs_order_number is not null and (cs_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(cs_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=243) default@catalog_sales,cs1,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_ship_date_sk","cs_ship_addr_sk","cs_call_center_sk","cs_warehouse_sk","cs_order_number","cs_ext_ship_cost","cs_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -204,7 +204,7 @@ Stage-0 Select Operator [SEL_147] (rows=286548719 width=7) Output:["_col0","_col1"] Filter Operator [FIL_146] (rows=286548719 width=7) - predicate:((cs_order_number BETWEEN DynamicValue(RS_34_cs1_cs_order_number_min) AND DynamicValue(RS_34_cs1_cs_order_number_max) and in_bloom_filter(cs_order_number, DynamicValue(RS_34_cs1_cs_order_number_bloom_filter))) and cs_order_number is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_order_number is not null and (cs_order_number BETWEEN DynamicValue(RS_34_cs1_cs_order_number_min) AND DynamicValue(RS_34_cs1_cs_order_number_max) and in_bloom_filter(cs_order_number, DynamicValue(RS_34_cs1_cs_order_number_bloom_filter)))) TableScan [TS_22] (rows=287989836 width=7) default@catalog_sales,cs2,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_warehouse_sk","cs_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query17.q.out b/ql/src/test/results/clientpositive/perf/tez/query17.q.out index 5f3fbaf89a..6a34c65dca 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query17.q.out @@ -183,7 +183,7 @@ Stage-0 Select Operator [SEL_240] (rows=285117831 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_239] (rows=285117831 width=15) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_26_d3_d_date_sk_min) AND DynamicValue(RS_26_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_26_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_26_d3_d_date_sk_min) AND DynamicValue(RS_26_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_26_d3_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=287989836 width=15) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -216,7 +216,7 @@ Stage-0 Select Operator [SEL_243] (rows=53632139 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_242] (rows=53632139 width=19) - predicate:(sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) + predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_item_sk is not null and sr_ticket_number is not null) TableScan [TS_15] (rows=57591150 width=19) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"] <-Reducer 3 [SIMPLE_EDGE] @@ -252,7 +252,7 @@ Stage-0 Select Operator [SEL_232] (rows=501694138 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_231] (rows=501694138 width=23) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_36_d1_d_date_sk_min) AND DynamicValue(RS_36_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_36_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_36_d1_d_date_sk_min) AND DynamicValue(RS_36_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_36_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=23) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query18.q.out b/ql/src/test/results/clientpositive/perf/tez/query18.q.out index 18f497e775..dc5c180ff3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query18.q.out @@ -100,27 +100,27 @@ Stage-0 File Output Operator [FS_174] Limit [LIM_173] (rows=100 width=1165) Number of rows:100 - Select Operator [SEL_172] (rows=10969055 width=1165) + Select Operator [SEL_172] (rows=10969165 width=1165) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] <-Reducer 5 [SIMPLE_EDGE] vectorized SHUFFLE [RS_171] - Select Operator [SEL_170] (rows=10969055 width=1165) + Select Operator [SEL_170] (rows=10969165 width=1165) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] - Group By Operator [GBY_169] (rows=10969055 width=1229) + Group By Operator [GBY_169] (rows=10969165 width=1229) Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(VALUE._col0)","count(VALUE._col1)","sum(VALUE._col2)","count(VALUE._col3)","sum(VALUE._col4)","count(VALUE._col5)","sum(VALUE._col6)","count(VALUE._col7)","sum(VALUE._col8)","count(VALUE._col9)","sum(VALUE._col10)","count(VALUE._col11)","sum(VALUE._col12)","count(VALUE._col13)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4 <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_42] PartitionCols:_col0, _col1, _col2, _col3, _col4 - Group By Operator [GBY_41] (rows=10969055 width=1229) + Group By Operator [GBY_41] (rows=10969165 width=1229) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(_col15)","count(_col15)","sum(_col16)","count(_col16)","sum(_col17)","count(_col17)","sum(_col18)","count(_col18)","sum(_col19)","count(_col19)","sum(_col3)","count(_col3)","sum(_col22)","count(_col22)"],keys:_col5, _col6, _col7, _col10, 0L - Merge Join Operator [MERGEJOIN_142] (rows=2193811 width=811) + Merge Join Operator [MERGEJOIN_142] (rows=2193833 width=811) Conds:RS_37._col0=RS_38._col3(Inner),Output:["_col3","_col5","_col6","_col7","_col10","_col15","_col16","_col17","_col18","_col19","_col22"] <-Reducer 12 [SIMPLE_EDGE] SHUFFLE [RS_38] PartitionCols:_col3 - Select Operator [SEL_30] (rows=15983481 width=735) + Select Operator [SEL_30] (rows=15983636 width=735) Output:["_col1","_col3","_col6","_col7","_col8","_col9","_col10","_col13"] - Merge Join Operator [MERGEJOIN_141] (rows=15983481 width=735) + Merge Join Operator [MERGEJOIN_141] (rows=15983636 width=735) Conds:RS_27._col3=RS_168._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col11","_col13"] <-Map 16 [SIMPLE_EDGE] vectorized SHUFFLE [RS_168] @@ -134,14 +134,14 @@ Stage-0 <-Reducer 11 [SIMPLE_EDGE] SHUFFLE [RS_27] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_140] (rows=15983481 width=639) + Merge Join Operator [MERGEJOIN_140] (rows=15983636 width=639) Conds:RS_24._col2=RS_165._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col11"] <-Map 15 [SIMPLE_EDGE] vectorized SHUFFLE [RS_165] PartitionCols:_col0 - Select Operator [SEL_164] (rows=103433 width=116) + Select Operator [SEL_164] (rows=103434 width=116) Output:["_col0","_col1"] - Filter Operator [FIL_163] (rows=103433 width=187) + Filter Operator [FIL_163] (rows=103434 width=187) predicate:((cd_education_status = 'College') and (cd_gender = 'M') and cd_demo_sk is not null) TableScan [TS_15] (rows=1861800 width=187) default@customer_demographics,cd1,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_education_status","cd_dep_count"] @@ -165,7 +165,7 @@ Stage-0 Select Operator [SEL_161] (rows=283692098 width=573) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_160] (rows=283692098 width=466) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=287989836 width=466) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_bill_cdemo_sk","cs_item_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt","cs_net_profit"] <-Reducer 14 [BROADCAST_EDGE] vectorized @@ -204,7 +204,7 @@ Stage-0 Select Operator [SEL_144] (rows=35631408 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_143] (rows=35631408 width=19) - predicate:((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null) + predicate:((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_current_cdemo_sk is not null and c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=19) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk","c_birth_month","c_birth_year"] <-Map 7 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query19.q.out b/ql/src/test/results/clientpositive/perf/tez/query19.q.out index b61a28eb21..a304f0cb5a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query19.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query19.q.out @@ -139,7 +139,7 @@ Stage-0 Select Operator [SEL_131] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_130] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -148,7 +148,7 @@ Stage-0 Select Operator [SEL_139] (rows=501694138 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_138] (rows=501694138 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -173,7 +173,7 @@ Stage-0 Select Operator [SEL_125] (rows=80000000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_124] (rows=80000000 width=8) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=8) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk"] <-Map 7 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query20.q.out b/ql/src/test/results/clientpositive/perf/tez/query20.q.out index d801c2f0ab..4886011f16 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query20.q.out @@ -132,7 +132,7 @@ Stage-0 Select Operator [SEL_68] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_67] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query21.q.out b/ql/src/test/results/clientpositive/perf/tez/query21.q.out index 28ead06f35..5e158834d7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query21.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query21.q.out @@ -88,7 +88,7 @@ Stage-0 <-Reducer 5 [SIMPLE_EDGE] vectorized SHUFFLE [RS_92] Filter Operator [FIL_91] (rows=115991 width=216) - predicate:(CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END) + predicate:(CASE WHEN ((_col2 > 0L)) THEN ((0.666667D <= (UDFToDouble(_col3) / UDFToDouble(_col2)))) ELSE (false) END and CASE WHEN ((_col2 > 0L)) THEN (((UDFToDouble(_col3) / UDFToDouble(_col2)) <= 1.5D)) ELSE (false) END) Group By Operator [GBY_90] (rows=463966 width=216) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1 <-Reducer 4 [SIMPLE_EDGE] @@ -134,7 +134,7 @@ Stage-0 Select Operator [SEL_79] (rows=37584000 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_78] (rows=37584000 width=15) - predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) + predicate:(inv_warehouse_sk is not null and inv_item_sk is not null and inv_date_sk is not null) TableScan [TS_0] (rows=37584000 width=15) default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"] <-Map 7 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query22.q.out b/ql/src/test/results/clientpositive/perf/tez/query22.q.out index 2d88d8f6af..e721f09f82 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query22.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query22.q.out @@ -125,7 +125,7 @@ Stage-0 Select Operator [SEL_80] (rows=317 width=4) Output:["_col0"] Filter Operator [FIL_79] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query23.q.out b/ql/src/test/results/clientpositive/perf/tez/query23.q.out index 7468c3a5ca..14a44c85c7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query23.q.out @@ -223,7 +223,7 @@ Stage-0 Select Operator [SEL_492] (rows=550076554 width=7) Output:["_col0","_col1"] Filter Operator [FIL_491] (rows=550076554 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk"] <-Reducer 20 [BROADCAST_EDGE] vectorized @@ -248,7 +248,7 @@ Stage-0 Select Operator [SEL_469] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_468] (rows=50 width=12) - predicate:((d_moy = 1) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 1) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 37 [SIMPLE_EDGE] vectorized @@ -257,7 +257,7 @@ Stage-0 Select Operator [SEL_542] (rows=143930993 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_541] (rows=143930993 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_171_date_dim_d_date_sk_min) AND DynamicValue(RS_171_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_171_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_171_date_dim_d_date_sk_min) AND DynamicValue(RS_171_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_171_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_91] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_quantity","ws_list_price"] <-Reducer 14 [BROADCAST_EDGE] vectorized @@ -334,7 +334,7 @@ Stage-0 Select Operator [SEL_526] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_525] (rows=525327388 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 36 [BROADCAST_EDGE] vectorized @@ -371,7 +371,7 @@ Stage-0 Select Operator [SEL_547] (rows=550080312 width=115) Output:["_col0","_col1"] Filter Operator [FIL_546] (rows=550080312 width=114) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_178_web_sales_ws_bill_customer_sk_min) AND DynamicValue(RS_178_web_sales_ws_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_178_web_sales_ws_bill_customer_sk_bloom_filter))) and ss_customer_sk is not null) + predicate:(ss_customer_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_178_web_sales_ws_bill_customer_sk_min) AND DynamicValue(RS_178_web_sales_ws_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_178_web_sales_ws_bill_customer_sk_bloom_filter)))) TableScan [TS_123] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -417,7 +417,7 @@ Stage-0 Select Operator [SEL_481] (rows=285117831 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_480] (rows=285117831 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_80_date_dim_d_date_sk_min) AND DynamicValue(RS_80_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_80_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_80_date_dim_d_date_sk_min) AND DynamicValue(RS_80_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_80_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity","cs_list_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized @@ -468,7 +468,7 @@ Stage-0 Select Operator [SEL_507] (rows=550080312 width=115) Output:["_col0","_col1"] Filter Operator [FIL_506] (rows=550080312 width=114) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_min) AND DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_bloom_filter))) and ss_customer_sk is not null) + predicate:(ss_customer_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_min) AND DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_87_catalog_sales_cs_bill_customer_sk_bloom_filter)))) TableScan [TS_32] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_customer_sk","ss_quantity","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query24.q.out b/ql/src/test/results/clientpositive/perf/tez/query24.q.out index 3c14858e78..2eece9d681 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query24.q.out @@ -174,7 +174,7 @@ Stage-0 Select Operator [SEL_330] (rows=57591150 width=8) Output:["_col0","_col1"] Filter Operator [FIL_329] (rows=57591150 width=8) - predicate:(sr_item_sk is not null and sr_ticket_number is not null) + predicate:(sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_23] (rows=57591150 width=8) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_ticket_number"] <-Reducer 9 [SIMPLE_EDGE] @@ -209,7 +209,7 @@ Stage-0 Select Operator [SEL_327] (rows=80000000 width=280) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_326] (rows=80000000 width=280) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_12] (rows=80000000 width=280) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk","c_first_name","c_last_name","c_birth_country"] <-Reducer 14 [SIMPLE_EDGE] @@ -241,7 +241,7 @@ Stage-0 Select Operator [SEL_342] (rows=525333486 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_341] (rows=525333486 width=122) - predicate:((ss_customer_sk BETWEEN DynamicValue(RS_72_customer_c_customer_sk_min) AND DynamicValue(RS_72_customer_c_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_72_customer_c_customer_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_customer_sk is not null and ss_store_sk is not null and ss_ticket_number is not null and ss_item_sk is not null and (ss_customer_sk BETWEEN DynamicValue(RS_72_customer_c_customer_sk_min) AND DynamicValue(RS_72_customer_c_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_72_customer_c_customer_sk_bloom_filter)))) TableScan [TS_56] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -308,7 +308,7 @@ Stage-0 Select Operator [SEL_318] (rows=525333486 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_317] (rows=525333486 width=122) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_27_item_i_item_sk_min) AND DynamicValue(RS_27_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_27_item_i_item_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_customer_sk is not null and ss_store_sk is not null and ss_ticket_number is not null and ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_27_item_i_item_sk_min) AND DynamicValue(RS_27_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_27_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query25.q.out b/ql/src/test/results/clientpositive/perf/tez/query25.q.out index bd4561732f..3d6413f72d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query25.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query25.q.out @@ -190,7 +190,7 @@ Stage-0 Select Operator [SEL_219] (rows=351 width=4) Output:["_col0"] Filter Operator [FIL_216] (rows=351 width=12) - predicate:((d_year = 2000) and d_date_sk is not null and d_moy BETWEEN 4 AND 10) + predicate:((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 14 [SIMPLE_EDGE] vectorized @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_238] (rows=285117831 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_237] (rows=285117831 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_23_d3_d_date_sk_min) AND DynamicValue(RS_23_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_23_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_23_d3_d_date_sk_min) AND DynamicValue(RS_23_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_23_d3_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -224,7 +224,7 @@ Stage-0 Select Operator [SEL_220] (rows=351 width=4) Output:["_col0"] Filter Operator [FIL_217] (rows=351 width=12) - predicate:((d_year = 2000) and d_date_sk is not null and d_moy BETWEEN 4 AND 10) + predicate:((d_year = 2000) and d_moy BETWEEN 4 AND 10 and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 15 [SIMPLE_EDGE] vectorized SHUFFLE [RS_242] @@ -232,7 +232,7 @@ Stage-0 Select Operator [SEL_241] (rows=53632139 width=123) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_240] (rows=53632139 width=123) - predicate:(sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) + predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_item_sk is not null and sr_ticket_number is not null) TableScan [TS_12] (rows=57591150 width=123) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_net_loss"] <-Reducer 2 [SIMPLE_EDGE] @@ -246,7 +246,7 @@ Stage-0 Select Operator [SEL_218] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_215] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_moy = 4) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_234] @@ -254,7 +254,7 @@ Stage-0 Select Operator [SEL_233] (rows=501694138 width=126) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_232] (rows=501694138 width=126) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_36_d1_d_date_sk_min) AND DynamicValue(RS_36_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_36_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_36_d1_d_date_sk_min) AND DynamicValue(RS_36_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_36_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=126) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query26.q.out b/ql/src/test/results/clientpositive/perf/tez/query26.q.out index da448c6689..2d28a22cc0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query26.q.out @@ -135,7 +135,7 @@ Stage-0 Select Operator [SEL_101] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_100] (rows=14776 width=268) - predicate:((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W') and cd_demo_sk is not null) + predicate:((cd_marital_status = 'W') and (cd_education_status = 'Primary') and (cd_gender = 'F') and cd_demo_sk is not null) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -144,7 +144,7 @@ Stage-0 Select Operator [SEL_109] (rows=283691050 width=354) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_108] (rows=283691050 width=354) - predicate:((cs_bill_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(cs_bill_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_item_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_promo_sk is not null and cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_item_sk is not null and (cs_bill_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(cs_bill_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=354) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_cdemo_sk","cs_item_sk","cs_promo_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query27.q.out b/ql/src/test/results/clientpositive/perf/tez/query27.q.out index c9ab29f543..89cb835678 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query27.q.out @@ -141,7 +141,7 @@ Stage-0 Select Operator [SEL_102] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_101] (rows=14776 width=268) - predicate:((cd_education_status = '2 yr Degree') and (cd_gender = 'M') and (cd_marital_status = 'U') and cd_demo_sk is not null) + predicate:((cd_marital_status = 'U') and (cd_education_status = '2 yr Degree') and (cd_gender = 'M') and cd_demo_sk is not null) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -150,7 +150,7 @@ Stage-0 Select Operator [SEL_110] (rows=501690006 width=340) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_109] (rows=501690006 width=340) - predicate:((ss_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter))) and ss_cdemo_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=340) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_cdemo_sk","ss_store_sk","ss_quantity","ss_list_price","ss_sales_price","ss_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query28.q.out b/ql/src/test/results/clientpositive/perf/tez/query28.q.out index e010dc784a..0cb5d232c7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query28.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query28.q.out @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_117] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_111] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52) and ss_quantity BETWEEN 6 AND 10) + predicate:(ss_quantity BETWEEN 6 AND 10 and (ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52)) TableScan [TS_0] (rows=575995635 width=324) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_quantity","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 7 [CUSTOM_SIMPLE_EDGE] @@ -189,7 +189,7 @@ Stage-0 Select Operator [SEL_116] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_110] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24) and ss_quantity BETWEEN 11 AND 15) + predicate:(ss_quantity BETWEEN 11 AND 15 and (ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24)) Please refer to the previous TableScan [TS_0] <-Reducer 6 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_51] @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_115] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_109] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100) and ss_quantity BETWEEN 16 AND 20) + predicate:(ss_quantity BETWEEN 16 AND 20 and (ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100)) Please refer to the previous TableScan [TS_0] <-Reducer 5 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_48] @@ -241,7 +241,7 @@ Stage-0 Select Operator [SEL_114] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_108] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58) and ss_quantity BETWEEN 21 AND 25) + predicate:(ss_quantity BETWEEN 21 AND 25 and (ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 58)) Please refer to the previous TableScan [TS_0] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_45] @@ -267,7 +267,7 @@ Stage-0 Select Operator [SEL_113] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_107] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62) and ss_quantity BETWEEN 26 AND 30) + predicate:(ss_quantity BETWEEN 26 AND 30 and (ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62)) Please refer to the previous TableScan [TS_0] <-Reducer 3 [CUSTOM_SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_135] @@ -289,6 +289,6 @@ Stage-0 Select Operator [SEL_112] (rows=15237978 width=324) Output:["ss_list_price"] Filter Operator [FIL_106] (rows=15237978 width=324) - predicate:((ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34) and ss_quantity BETWEEN 0 AND 5) + predicate:(ss_quantity BETWEEN 0 AND 5 and (ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34)) Please refer to the previous TableScan [TS_0] diff --git a/ql/src/test/results/clientpositive/perf/tez/query29.q.out b/ql/src/test/results/clientpositive/perf/tez/query29.q.out index 71477d5e86..c12af390e6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query29.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query29.q.out @@ -190,7 +190,7 @@ Stage-0 Select Operator [SEL_220] (rows=201 width=4) Output:["_col0"] Filter Operator [FIL_218] (rows=201 width=12) - predicate:((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 4 AND 7) + predicate:((d_year = 1999) and d_moy BETWEEN 4 AND 7 and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 16 [SIMPLE_EDGE] vectorized @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_232] (rows=53632139 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_231] (rows=53632139 width=19) - predicate:(sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) + predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_item_sk is not null and sr_ticket_number is not null) TableScan [TS_12] (rows=57591150 width=19) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"] <-Reducer 9 [SIMPLE_EDGE] @@ -213,7 +213,7 @@ Stage-0 Select Operator [SEL_219] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_217] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) Please refer to the previous TableScan [TS_9] <-Map 8 [SIMPLE_EDGE] vectorized SHUFFLE [RS_230] @@ -221,7 +221,7 @@ Stage-0 Select Operator [SEL_229] (rows=501694138 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_228] (rows=501694138 width=23) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_29_d1_d_date_sk_min) AND DynamicValue(RS_29_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_d1_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_29_d1_d_date_sk_min) AND DynamicValue(RS_29_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_29_d1_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=23) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"] <-Reducer 14 [BROADCAST_EDGE] vectorized @@ -255,7 +255,7 @@ Stage-0 Select Operator [SEL_215] (rows=285117831 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_214] (rows=285117831 width=15) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_42_d3_d_date_sk_min) AND DynamicValue(RS_42_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_d3_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_42_d3_d_date_sk_min) AND DynamicValue(RS_42_d3_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_42_d3_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=15) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query3.q.out b/ql/src/test/results/clientpositive/perf/tez/query3.q.out index a647ab5e8c..6f26557e13 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query3.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query3.q.out @@ -106,7 +106,7 @@ Stage-0 Select Operator [SEL_63] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_62] (rows=550076554 width=114) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_10_item_i_item_sk_min) AND DynamicValue(RS_10_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_10_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query30.q.out b/ql/src/test/results/clientpositive/perf/tez/query30.q.out index 08d785697b..42c09533d3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query30.q.out @@ -213,10 +213,10 @@ Stage-0 <-Map 11 [SIMPLE_EDGE] vectorized SHUFFLE [RS_197] PartitionCols:_col0 - Select Operator [SEL_195] (rows=12539215 width=118) + Select Operator [SEL_195] (rows=12539214 width=118) Output:["_col0","_col1","_col2","_col3"] - Filter Operator [FIL_193] (rows=12539215 width=118) - predicate:(wr_returned_date_sk is not null and wr_returning_addr_sk is not null and wr_returning_customer_sk is not null) + Filter Operator [FIL_193] (rows=12539214 width=118) + predicate:(wr_returning_customer_sk is not null and wr_returned_date_sk is not null and wr_returning_addr_sk is not null) Please refer to the previous TableScan [TS_6] <-Map 14 [SIMPLE_EDGE] vectorized SHUFFLE [RS_201] diff --git a/ql/src/test/results/clientpositive/perf/tez/query31.q.out b/ql/src/test/results/clientpositive/perf/tez/query31.q.out index 32fe126d3b..67ae219469 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query31.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query31.q.out @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_138] (rows=110 width=550) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_136] (rows=110 width=778) - predicate:(CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END) + predicate:(CASE WHEN ((_col9 > 0)) THEN (CASE WHEN (_col7) THEN (((_col4 / _col6) > (_col13 / _col9))) ELSE (false) END) ELSE (false) END and CASE WHEN ((_col11 > 0)) THEN (CASE WHEN (_col2) THEN (((_col6 / _col1) > (_col9 / _col11))) ELSE (false) END) ELSE (false) END) Merge Join Operator [MERGEJOIN_450] (rows=440 width=778) Conds:RS_133._col0=RS_134._col0(Inner),Output:["_col1","_col2","_col4","_col6","_col7","_col8","_col9","_col11","_col13"] <-Reducer 22 [ONE_TO_ONE_EDGE] @@ -203,7 +203,7 @@ Stage-0 Select Operator [SEL_460] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_454] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 2) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 35 [SIMPLE_EDGE] vectorized @@ -212,7 +212,7 @@ Stage-0 Select Operator [SEL_521] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_520] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_70_date_dim_d_date_sk_min) AND DynamicValue(RS_70_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_70_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_60] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 23 [BROADCAST_EDGE] vectorized @@ -253,7 +253,7 @@ Stage-0 Select Operator [SEL_461] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_455] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 1) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 36 [SIMPLE_EDGE] vectorized SHUFFLE [RS_529] @@ -261,7 +261,7 @@ Stage-0 Select Operator [SEL_528] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_527] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_90_date_dim_d_date_sk_min) AND DynamicValue(RS_90_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_90_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_90_date_dim_d_date_sk_min) AND DynamicValue(RS_90_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_90_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_80] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 27 [BROADCAST_EDGE] vectorized @@ -302,7 +302,7 @@ Stage-0 Select Operator [SEL_462] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_456] (rows=130 width=12) - predicate:((d_qoy = 3) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 3) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 37 [SIMPLE_EDGE] vectorized SHUFFLE [RS_536] @@ -310,7 +310,7 @@ Stage-0 Select Operator [SEL_535] (rows=525327191 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_534] (rows=525327191 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_110_date_dim_d_date_sk_min) AND DynamicValue(RS_110_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_110_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_110_date_dim_d_date_sk_min) AND DynamicValue(RS_110_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_110_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_100] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 31 [BROADCAST_EDGE] vectorized @@ -358,7 +358,7 @@ Stage-0 Select Operator [SEL_459] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_453] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 2) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 34 [SIMPLE_EDGE] vectorized SHUFFLE [RS_514] @@ -366,7 +366,7 @@ Stage-0 Select Operator [SEL_513] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_512] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_40] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -412,7 +412,7 @@ Stage-0 Select Operator [SEL_458] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_452] (rows=130 width=12) - predicate:((d_qoy = 3) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 3) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 33 [SIMPLE_EDGE] vectorized SHUFFLE [RS_507] @@ -420,7 +420,7 @@ Stage-0 Select Operator [SEL_506] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_505] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -463,7 +463,7 @@ Stage-0 Select Operator [SEL_457] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_451] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 1) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_491] @@ -471,7 +471,7 @@ Stage-0 Select Operator [SEL_490] (rows=143931246 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_489] (rows=143931246 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query32.q.out b/ql/src/test/results/clientpositive/perf/tez/query32.q.out index 8c1d129551..8d52f5ea17 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query32.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query32.q.out @@ -115,7 +115,7 @@ Stage-0 Select Operator [SEL_114] (rows=285116600 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_112] (rows=285116600 width=119) - predicate:(cs_ext_discount_amt is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ext_discount_amt is not null and cs_sold_date_sk is not null and cs_item_sk is not null) TableScan [TS_0] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_discount_amt"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -160,7 +160,7 @@ Stage-0 Select Operator [SEL_115] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_113] (rows=286549727 width=119) - predicate:(cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null) Please refer to the previous TableScan [TS_0] <-Map 8 [SIMPLE_EDGE] vectorized SHUFFLE [RS_121] diff --git a/ql/src/test/results/clientpositive/perf/tez/query33.q.out b/ql/src/test/results/clientpositive/perf/tez/query33.q.out index 123fe17b66..e0c982b727 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query33.q.out @@ -226,7 +226,7 @@ Stage-0 Select Operator [SEL_318] (rows=460848 width=7) Output:["_col0","_col1"] Filter Operator [FIL_317] (rows=460848 width=7) - predicate:(i_item_sk is not null and i_manufact_id is not null) + predicate:(i_manufact_id is not null and i_item_sk is not null) TableScan [TS_0] (rows=462000 width=7) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_manufact_id"] <-Reducer 13 [ONE_TO_ONE_EDGE] vectorized @@ -272,7 +272,7 @@ Stage-0 Select Operator [SEL_327] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_326] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -281,7 +281,7 @@ Stage-0 Select Operator [SEL_369] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_368] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_85] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -339,7 +339,7 @@ Stage-0 Select Operator [SEL_343] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_342] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -397,7 +397,7 @@ Stage-0 Select Operator [SEL_361] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_360] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query34.q.out b/ql/src/test/results/clientpositive/perf/tez/query34.q.out index 07de8e4410..35fa81ebf9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query34.q.out @@ -141,7 +141,7 @@ Stage-0 Select Operator [SEL_116] (rows=480 width=4) Output:["_col0"] Filter Operator [FIL_115] (rows=480 width=104) - predicate:((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END and hd_demo_sk is not null) + predicate:((hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (false) END and (hd_buy_potential) IN ('>10000', 'unknown') and hd_demo_sk is not null) TableScan [TS_9] (rows=7200 width=104) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"] <-Reducer 5 [SIMPLE_EDGE] @@ -155,7 +155,7 @@ Stage-0 Select Operator [SEL_105] (rows=595 width=4) Output:["_col0"] Filter Operator [FIL_104] (rows=595 width=12) - predicate:(((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28)) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and (d_year) IN (2000, 2001, 2002) and d_date_sk is not null) + predicate:((d_year) IN (2000, 2001, 2002) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and ((d_dom >= 1) or (d_dom <= 3) or (d_dom >= 25) or (d_dom <= 28)) and d_date_sk is not null) TableScan [TS_6] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 4 [SIMPLE_EDGE] vectorized @@ -164,7 +164,7 @@ Stage-0 Select Operator [SEL_113] (rows=479121995 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_112] (rows=479121995 width=19) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_3] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_store_sk","ss_ticket_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query35.q.out b/ql/src/test/results/clientpositive/perf/tez/query35.q.out index 3b0f7cffbd..3f6d0c98c3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query35.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query35.q.out @@ -202,7 +202,7 @@ Stage-0 Select Operator [SEL_193] (rows=217 width=4) Output:["_col0"] Filter Operator [FIL_192] (rows=217 width=12) - predicate:((d_qoy < 4) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_qoy < 4) and d_date_sk is not null) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -211,7 +211,7 @@ Stage-0 Select Operator [SEL_203] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_202] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -250,7 +250,7 @@ Stage-0 Select Operator [SEL_184] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_183] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null and c_customer_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -286,7 +286,7 @@ Stage-0 Select Operator [SEL_208] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_207] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_58_c_c_customer_sk_min) AND DynamicValue(RS_58_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_58_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_58_c_c_customer_sk_min) AND DynamicValue(RS_58_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_58_c_c_customer_sk_bloom_filter)))) TableScan [TS_19] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -324,7 +324,7 @@ Stage-0 Select Operator [SEL_216] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_215] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_61_c_c_customer_sk_min) AND DynamicValue(RS_61_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_61_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_61_c_c_customer_sk_min) AND DynamicValue(RS_61_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_61_c_c_customer_sk_bloom_filter)))) TableScan [TS_33] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query36.q.out b/ql/src/test/results/clientpositive/perf/tez/query36.q.out index 2204a6e1d9..56de8fd505 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query36.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query36.q.out @@ -155,7 +155,7 @@ Stage-0 Select Operator [SEL_92] (rows=525329897 width=225) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_91] (rows=525329897 width=225) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_13_d1_d_date_sk_min) AND DynamicValue(RS_13_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_d1_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_13_d1_d_date_sk_min) AND DynamicValue(RS_13_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=225) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query37.q.out b/ql/src/test/results/clientpositive/perf/tez/query37.q.out index 768febcd0d..50d005fab3 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query37.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_81] (rows=297 width=400) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_80] (rows=297 width=404) - predicate:((i_manufact_id) IN (678, 964, 918, 849) and i_current_price BETWEEN 22 AND 52 and i_item_sk is not null) + predicate:(i_current_price BETWEEN 22 AND 52 and (i_manufact_id) IN (678, 964, 918, 849) and i_item_sk is not null) TableScan [TS_3] (rows=462000 width=403) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -94,7 +94,7 @@ Stage-0 Select Operator [SEL_89] (rows=287989836 width=4) Output:["_col0"] Filter Operator [FIL_88] (rows=287989836 width=4) - predicate:((cs_item_sk BETWEEN DynamicValue(RS_17_item_i_item_sk_min) AND DynamicValue(RS_17_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_17_item_i_item_sk_bloom_filter))) and cs_item_sk is not null) + predicate:(cs_item_sk is not null and (cs_item_sk BETWEEN DynamicValue(RS_17_item_i_item_sk_min) AND DynamicValue(RS_17_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_17_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=4) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_item_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -128,7 +128,7 @@ Stage-0 Select Operator [SEL_92] (rows=4176000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_91] (rows=4176000 width=11) - predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand BETWEEN 100 AND 500) + predicate:(inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) TableScan [TS_6] (rows=37584000 width=11) default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_quantity_on_hand"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query38.q.out b/ql/src/test/results/clientpositive/perf/tez/query38.q.out index 5a137e3bd4..77dfa32bc6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query38.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query38.q.out @@ -133,7 +133,7 @@ Stage-0 Select Operator [SEL_199] (rows=317 width=98) Output:["_col0","_col1"] Filter Operator [FIL_198] (rows=317 width=102) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=102) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date","d_month_seq"] <-Map 19 [SIMPLE_EDGE] vectorized @@ -142,7 +142,7 @@ Stage-0 Select Operator [SEL_238] (rows=285117831 width=7) Output:["_col0","_col1"] Filter Operator [FIL_237] (rows=285117831 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_25] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -193,7 +193,7 @@ Stage-0 Select Operator [SEL_248] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_247] (rows=143930993 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_51] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -244,7 +244,7 @@ Stage-0 Select Operator [SEL_215] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_214] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query39.q.out b/ql/src/test/results/clientpositive/perf/tez/query39.q.out index 691e30109b..0681f0520b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query39.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query39.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_204] (rows=37584000 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_203] (rows=37584000 width=15) - predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) + predicate:(inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) TableScan [TS_0] (rows=37584000 width=15) default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"] <-Map 12 [SIMPLE_EDGE] vectorized @@ -149,7 +149,7 @@ Stage-0 Select Operator [SEL_210] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_208] (rows=50 width=12) - predicate:((d_moy = 5) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 5) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Reducer 5 [SIMPLE_EDGE] vectorized @@ -200,7 +200,7 @@ Stage-0 Select Operator [SEL_209] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_207] (rows=50 width=12) - predicate:((d_moy = 4) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) Please refer to the previous TableScan [TS_3] PREHOOK: query: with inv as diff --git a/ql/src/test/results/clientpositive/perf/tez/query4.q.out b/ql/src/test/results/clientpositive/perf/tez/query4.q.out index 37780e832a..946a931257 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query4.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query4.q.out @@ -304,7 +304,7 @@ Stage-0 Select Operator [SEL_509] (rows=80000000 width=656) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_508] (rows=80000000 width=656) - predicate:(c_customer_id is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_customer_id is not null) TableScan [TS_109] (rows=80000000 width=656) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_customer_id","c_first_name","c_last_name","c_preferred_cust_flag","c_birth_country","c_login","c_email_address"] <-Reducer 28 [SIMPLE_EDGE] @@ -327,7 +327,7 @@ Stage-0 Select Operator [SEL_105] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_250] (rows=525327388 width=435) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_113_date_dim_d_date_sk_min) AND DynamicValue(RS_113_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_113_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_113_date_dim_d_date_sk_min) AND DynamicValue(RS_113_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_113_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_103] (rows=575995635 width=435) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_sales_price","ss_ext_wholesale_cost","ss_ext_list_price"] <-Reducer 32 [BROADCAST_EDGE] vectorized @@ -381,7 +381,7 @@ Stage-0 Select Operator [SEL_85] (rows=285117831 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_247] (rows=285117831 width=453) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_93_date_dim_d_date_sk_min) AND DynamicValue(RS_93_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_93_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_93_date_dim_d_date_sk_min) AND DynamicValue(RS_93_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_93_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_83] (rows=287989836 width=453) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_ext_discount_amt","cs_ext_sales_price","cs_ext_wholesale_cost","cs_ext_list_price"] <-Reducer 33 [BROADCAST_EDGE] vectorized @@ -441,7 +441,7 @@ Stage-0 Select Operator [SEL_64] (rows=285117831 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_244] (rows=285117831 width=453) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_62] (rows=287989836 width=453) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_ext_discount_amt","cs_ext_sales_price","cs_ext_wholesale_cost","cs_ext_list_price"] <-Reducer 37 [BROADCAST_EDGE] vectorized @@ -501,7 +501,7 @@ Stage-0 Select Operator [SEL_43] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_241] (rows=143930993 width=455) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_41] (rows=144002668 width=455) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_sales_price","ws_ext_wholesale_cost","ws_ext_list_price"] <-Reducer 36 [BROADCAST_EDGE] vectorized @@ -561,7 +561,7 @@ Stage-0 Select Operator [SEL_22] (rows=525327388 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_238] (rows=525327388 width=435) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=435) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_discount_amt","ss_ext_sales_price","ss_ext_wholesale_cost","ss_ext_list_price"] <-Reducer 35 [BROADCAST_EDGE] vectorized @@ -608,7 +608,7 @@ Stage-0 Select Operator [SEL_2] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_235] (rows=143930993 width=455) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=455) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_ext_discount_amt","ws_ext_sales_price","ws_ext_wholesale_cost","ws_ext_list_price"] <-Reducer 34 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query40.q.out b/ql/src/test/results/clientpositive/perf/tez/query40.q.out index fd5f97d133..d2c90d54d8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query40.q.out @@ -149,7 +149,7 @@ Stage-0 Select Operator [SEL_111] (rows=285115816 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_110] (rows=285115816 width=127) - predicate:((cs_item_sk BETWEEN DynamicValue(RS_22_item_i_item_sk_min) AND DynamicValue(RS_22_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_22_item_i_item_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null and (cs_item_sk BETWEEN DynamicValue(RS_22_item_i_item_sk_min) AND DynamicValue(RS_22_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_22_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_order_number","cs_sales_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -169,7 +169,7 @@ Stage-0 Select Operator [SEL_114] (rows=28798881 width=117) Output:["_col0","_col1","_col2"] Filter Operator [FIL_113] (rows=28798881 width=117) - predicate:(cr_item_sk is not null and cr_order_number is not null) + predicate:(cr_order_number is not null and cr_item_sk is not null) TableScan [TS_3] (rows=28798881 width=117) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_item_sk","cr_order_number","cr_refunded_cash"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query42.q.out b/ql/src/test/results/clientpositive/perf/tez/query42.q.out index 922a58cca7..207d63c8f0 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query42.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query42.q.out @@ -101,7 +101,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 1998) and d_date_sk is not null) + predicate:((d_year = 1998) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,dt,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -110,7 +110,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query43.q.out b/ql/src/test/results/clientpositive/perf/tez/query43.q.out index 25c394ec81..3d1d8805be 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query43.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query43.q.out @@ -106,7 +106,7 @@ Stage-0 Select Operator [SEL_65] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_64] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query44.q.out b/ql/src/test/results/clientpositive/perf/tez/query44.q.out index 9b6f761674..0017e66090 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query44.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query44.q.out @@ -179,7 +179,7 @@ Stage-0 Select Operator [SEL_175] (rows=287946 width=114) Output:["_col1"] Filter Operator [FIL_174] (rows=287946 width=114) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_18] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk","ss_net_profit"] <-Reducer 8 [CUSTOM_SIMPLE_EDGE] vectorized @@ -203,7 +203,7 @@ Stage-0 Output:["_col0"],keys:true Select Operator [SEL_163] (rows=287946 width=7) Filter Operator [FIL_162] (rows=287946 width=7) - predicate:((ss_store_sk = 410) and ss_hdemo_sk is null) + predicate:(ss_hdemo_sk is null and (ss_store_sk = 410)) TableScan [TS_3] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_hdemo_sk","ss_store_sk"] <-Reducer 5 [SIMPLE_EDGE] diff --git a/ql/src/test/results/clientpositive/perf/tez/query45.q.out b/ql/src/test/results/clientpositive/perf/tez/query45.q.out index 6a14e4fcac..c7a31be921 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query45.q.out @@ -127,7 +127,7 @@ Stage-0 Select Operator [SEL_151] (rows=130 width=12) Output:["_col0"] Filter Operator [FIL_150] (rows=130 width=12) - predicate:((d_qoy = 2) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_qoy = 2) and d_date_sk is not null) TableScan [TS_19] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 12 [SIMPLE_EDGE] vectorized @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_159] (rows=143930993 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_158] (rows=143930993 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_23_date_dim_d_date_sk_min) AND DynamicValue(RS_23_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_23_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_23_date_dim_d_date_sk_min) AND DynamicValue(RS_23_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_23_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_16] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_sales_price"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -192,7 +192,7 @@ Stage-0 Select Operator [SEL_135] (rows=80000000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_134] (rows=80000000 width=8) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=8) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk"] <-Map 7 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query46.q.out b/ql/src/test/results/clientpositive/perf/tez/query46.q.out index 36abad4fab..d84fe43d68 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query46.q.out @@ -132,7 +132,7 @@ Stage-0 Select Operator [SEL_147] (rows=80000000 width=188) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_146] (rows=80000000 width=188) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=188) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk","c_first_name","c_last_name"] <-Reducer 7 [SIMPLE_EDGE] vectorized @@ -192,7 +192,7 @@ Stage-0 Select Operator [SEL_154] (rows=783 width=4) Output:["_col0"] Filter Operator [FIL_153] (rows=783 width=12) - predicate:((d_dow) IN (6, 0) and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) + predicate:((d_year) IN (1998, 1999, 2000) and (d_dow) IN (6, 0) and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dow"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -201,7 +201,7 @@ Stage-0 Select Operator [SEL_162] (rows=457565061 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_161] (rows=457565061 width=237) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=237) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query47.q.out b/ql/src/test/results/clientpositive/perf/tez/query47.q.out index c5d35fbe8d..06a26d5211 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query47.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query47.q.out @@ -169,7 +169,7 @@ Stage-0 Select Operator [SEL_294] (rows=1704 width=183) Output:["_col0","_col1","_col2"] Filter Operator [FIL_293] (rows=1704 width=183) - predicate:(s_company_name is not null and s_store_name is not null and s_store_sk is not null) + predicate:(s_store_sk is not null and s_store_name is not null and s_company_name is not null) TableScan [TS_79] (rows=1704 width=183) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_name","s_company_name"] <-Reducer 3 [SIMPLE_EDGE] @@ -183,7 +183,7 @@ Stage-0 Select Operator [SEL_291] (rows=462000 width=194) Output:["_col0","_col1","_col2"] Filter Operator [FIL_290] (rows=462000 width=194) - predicate:(i_brand is not null and i_category is not null and i_item_sk is not null) + predicate:(i_item_sk is not null and i_category is not null and i_brand is not null) TableScan [TS_76] (rows=462000 width=194) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_category"] <-Reducer 2 [SIMPLE_EDGE] @@ -197,7 +197,7 @@ Stage-0 Select Operator [SEL_280] (rows=564 width=12) Output:["_col0","_col1","_col2"] Filter Operator [FIL_279] (rows=564 width=12) - predicate:(((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) + predicate:((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) TableScan [TS_73] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_288] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_287] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_70] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -245,7 +245,7 @@ Stage-0 Select Operator [SEL_315] (rows=482909 width=601) Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_314] (rows=482909 width=601) - predicate:((_col0 > 0) and (_col3 = 2000) and rank_window_1 is not null) + predicate:((_col0 > 0) and rank_window_1 is not null and (_col3 = 2000)) PTF Operator [PTF_313] (rows=162257387 width=601) Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS LAST, _col4 ASC NULLS LAST","partition by:":"_col2, _col1, _col5, _col6"}] Select Operator [SEL_312] (rows=162257387 width=601) diff --git a/ql/src/test/results/clientpositive/perf/tez/query48.q.out b/ql/src/test/results/clientpositive/perf/tez/query48.q.out index 980b69906f..ab2d26305a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query48.q.out @@ -187,7 +187,7 @@ Stage-0 Select Operator [SEL_112] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_111] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) TableScan [TS_9] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Reducer 3 [SIMPLE_EDGE] @@ -201,7 +201,7 @@ Stage-0 Select Operator [SEL_109] (rows=29552 width=4) Output:["_col0"] Filter Operator [FIL_108] (rows=29552 width=183) - predicate:((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M') and cd_demo_sk is not null) + predicate:((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree') and cd_demo_sk is not null) TableScan [TS_6] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 2 [SIMPLE_EDGE] @@ -221,10 +221,10 @@ Stage-0 <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_107] PartitionCols:_col0 - Select Operator [SEL_106] (rows=159705893 width=31) + Select Operator [SEL_106] (rows=159705894 width=31) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] - Filter Operator [FIL_105] (rows=159705893 width=233) - predicate:(((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + Filter Operator [FIL_105] (rows=159705894 width=233) + predicate:((ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_addr_sk is not null and ss_store_sk is not null and ((ss_sales_price >= 100) or (ss_sales_price <= 150) or (ss_sales_price >= 50) or (ss_sales_price <= 100) or (ss_sales_price >= 150) or (ss_sales_price <= 200)) and ((ss_net_profit >= 0) or (ss_net_profit <= 2000) or (ss_net_profit >= 150) or (ss_net_profit <= 3000) or (ss_net_profit >= 50) or (ss_net_profit <= 25000)) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query49.q.out b/ql/src/test/results/clientpositive/perf/tez/query49.q.out index 31c98a778c..bcb536082f 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query49.q.out @@ -353,7 +353,7 @@ Stage-0 Select Operator [SEL_334] (rows=19197050 width=124) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_333] (rows=19197050 width=119) - predicate:((sr_return_amt > 10000) and sr_item_sk is not null and sr_ticket_number is not null) + predicate:((sr_return_amt > 10000) and sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_75] (rows=57591150 width=119) default@store_returns,sr,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_ticket_number","sr_return_quantity","sr_return_amt"] <-Reducer 20 [SIMPLE_EDGE] @@ -367,7 +367,7 @@ Stage-0 Select Operator [SEL_264] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_263] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 29 [SIMPLE_EDGE] vectorized @@ -376,7 +376,7 @@ Stage-0 Select Operator [SEL_331] (rows=61119617 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_330] (rows=61119617 width=229) - predicate:((ss_net_paid > 0) and (ss_net_profit > 1) and (ss_quantity > 0) and (ss_sold_date_sk BETWEEN DynamicValue(RS_79_date_dim_d_date_sk_min) AND DynamicValue(RS_79_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_79_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_ticket_number is not null) + predicate:((ss_net_profit > 1) and (ss_net_paid > 0) and (ss_quantity > 0) and ss_sold_date_sk is not null and ss_ticket_number is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_79_date_dim_d_date_sk_min) AND DynamicValue(RS_79_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_79_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_69] (rows=575995635 width=229) default@store_sales,sts,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_net_paid","ss_net_profit"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -442,7 +442,7 @@ Stage-0 Select Operator [SEL_314] (rows=9599627 width=124) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_313] (rows=9599627 width=121) - predicate:((cr_return_amount > 10000) and cr_item_sk is not null and cr_order_number is not null) + predicate:((cr_return_amount > 10000) and cr_order_number is not null and cr_item_sk is not null) TableScan [TS_37] (rows=28798881 width=121) default@catalog_returns,cr,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_item_sk","cr_order_number","cr_return_quantity","cr_return_amount"] <-Reducer 14 [SIMPLE_EDGE] @@ -460,7 +460,7 @@ Stage-0 Select Operator [SEL_311] (rows=31838858 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_310] (rows=31838858 width=239) - predicate:((cs_net_paid > 0) and (cs_net_profit > 1) and (cs_quantity > 0) and (cs_sold_date_sk BETWEEN DynamicValue(RS_41_date_dim_d_date_sk_min) AND DynamicValue(RS_41_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_41_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_order_number is not null and cs_sold_date_sk is not null) + predicate:((cs_net_profit > 1) and (cs_net_paid > 0) and (cs_quantity > 0) and cs_sold_date_sk is not null and cs_order_number is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_41_date_dim_d_date_sk_min) AND DynamicValue(RS_41_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_41_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_31] (rows=287989836 width=239) default@catalog_sales,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_net_paid","cs_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -514,7 +514,7 @@ Stage-0 Select Operator [SEL_283] (rows=4799489 width=124) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_282] (rows=4799489 width=118) - predicate:((wr_return_amt > 10000) and wr_item_sk is not null and wr_order_number is not null) + predicate:((wr_return_amt > 10000) and wr_order_number is not null and wr_item_sk is not null) TableScan [TS_6] (rows=14398467 width=118) default@web_returns,wr,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_item_sk","wr_order_number","wr_return_quantity","wr_return_amt"] <-Reducer 2 [SIMPLE_EDGE] @@ -532,7 +532,7 @@ Stage-0 Select Operator [SEL_280] (rows=15996318 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_279] (rows=15996318 width=239) - predicate:((ws_net_paid > 0) and (ws_net_profit > 1) and (ws_quantity > 0) and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_order_number is not null and ws_sold_date_sk is not null) + predicate:((ws_net_profit > 1) and (ws_net_paid > 0) and (ws_quantity > 0) and ws_sold_date_sk is not null and ws_order_number is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=239) default@web_sales,ws,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_net_paid","ws_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query5.q.out b/ql/src/test/results/clientpositive/perf/tez/query5.q.out index 35acfc82b3..abae6417d5 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query5.q.out @@ -363,7 +363,7 @@ Stage-0 Select Operator [SEL_327] (rows=285117694 width=455) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_326] (rows=285117694 width=231) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_40_date_dim_d_date_sk_min) AND DynamicValue(RS_40_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_40_date_dim_d_date_sk_bloom_filter))) and cs_catalog_page_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_catalog_page_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_40_date_dim_d_date_sk_min) AND DynamicValue(RS_40_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_40_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_253] (rows=287989836 width=231) Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_ext_sales_price","cs_net_profit"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -429,7 +429,7 @@ Stage-0 Select Operator [SEL_335] (rows=143930874 width=455) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_334] (rows=143930874 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_73_date_dim_d_date_sk_min) AND DynamicValue(RS_73_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_73_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_73_date_dim_d_date_sk_min) AND DynamicValue(RS_73_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_73_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_263] (rows=144002668 width=231) Output:["ws_sold_date_sk","ws_web_site_sk","ws_ext_sales_price","ws_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -456,7 +456,7 @@ Stage-0 Select Operator [SEL_338] (rows=143966669 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_337] (rows=143966669 width=11) - predicate:(ws_item_sk is not null and ws_order_number is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_item_sk is not null and ws_order_number is not null) TableScan [TS_54] (rows=144002668 width=11) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_item_sk","ws_web_site_sk","ws_order_number"] <-Map 29 [SIMPLE_EDGE] vectorized @@ -465,7 +465,7 @@ Stage-0 Select Operator [SEL_341] (rows=13749816 width=225) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_340] (rows=13749816 width=225) - predicate:(wr_item_sk is not null and wr_order_number is not null and wr_returned_date_sk is not null) + predicate:(wr_returned_date_sk is not null and wr_item_sk is not null and wr_order_number is not null) TableScan [TS_57] (rows=14398467 width=225) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_returned_date_sk","wr_item_sk","wr_order_number","wr_return_amt","wr_net_loss"] <-Reducer 5 [CONTAINS] vectorized @@ -511,7 +511,7 @@ Stage-0 Select Operator [SEL_289] (rows=525329897 width=445) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_288] (rows=525329897 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_15_date_dim_d_date_sk_min) AND DynamicValue(RS_15_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_15_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_225] (rows=575995635 width=221) Output:["ss_sold_date_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -531,7 +531,7 @@ Stage-0 Select Operator [SEL_306] (rows=53634860 width=447) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_305] (rows=53634860 width=223) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_236] (rows=57591150 width=223) Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query50.q.out b/ql/src/test/results/clientpositive/perf/tez/query50.q.out index 62eca3a3ce..a777abe6f6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query50.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query50.q.out @@ -200,7 +200,7 @@ Stage-0 Select Operator [SEL_122] (rows=53632139 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_121] (rows=53632139 width=15) - predicate:(sr_customer_sk is not null and sr_item_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null) + predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null and sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_0] (rows=57591150 width=15) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number"] <-Map 9 [SIMPLE_EDGE] vectorized @@ -209,7 +209,7 @@ Stage-0 Select Operator [SEL_125] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_124] (rows=50 width=12) - predicate:((d_moy = 9) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_moy = 9) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,d2,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 10 [SIMPLE_EDGE] vectorized @@ -218,7 +218,7 @@ Stage-0 Select Operator [SEL_130] (rows=501694138 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_129] (rows=501694138 width=19) - predicate:((ss_ticket_number BETWEEN DynamicValue(RS_18_store_returns_sr_ticket_number_min) AND DynamicValue(RS_18_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_18_store_returns_sr_ticket_number_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_ticket_number is not null and ss_item_sk is not null and (ss_ticket_number BETWEEN DynamicValue(RS_18_store_returns_sr_ticket_number_min) AND DynamicValue(RS_18_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_18_store_returns_sr_ticket_number_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query51.q.out b/ql/src/test/results/clientpositive/perf/tez/query51.q.out index a872cdedf0..601d8cdb0b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query51.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query51.q.out @@ -156,7 +156,7 @@ Stage-0 Select Operator [SEL_89] (rows=317 width=98) Output:["_col0","_col1"] Filter Operator [FIL_88] (rows=317 width=102) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=102) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date","d_month_seq"] <-Map 12 [SIMPLE_EDGE] vectorized @@ -165,7 +165,7 @@ Stage-0 Select Operator [SEL_107] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_106] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_27_date_dim_d_date_sk_min) AND DynamicValue(RS_27_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_27_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_27_date_dim_d_date_sk_min) AND DynamicValue(RS_27_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_27_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_sales_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized @@ -205,7 +205,7 @@ Stage-0 Select Operator [SEL_101] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_100] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query52.q.out b/ql/src/test/results/clientpositive/perf/tez/query52.q.out index 3576e8a6a1..501d152946 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query52.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query52.q.out @@ -101,7 +101,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 1998) and d_date_sk is not null) + predicate:((d_year = 1998) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,dt,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -110,7 +110,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query53.q.out b/ql/src/test/results/clientpositive/perf/tez/query53.q.out index 6cd8a7dd2d..a24f4bc80c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query53.q.out @@ -138,7 +138,7 @@ Stage-0 Select Operator [SEL_86] (rows=52 width=8) Output:["_col0","_col1"] Filter Operator [FIL_85] (rows=52 width=290) - predicate:((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and i_item_sk is not null) + predicate:((i_class) IN ('personal', 'portable', 'reference', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and i_item_sk is not null) TableScan [TS_3] (rows=462000 width=289) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_94] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_93] (rows=525329897 width=118) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_13_item_i_item_sk_min) AND DynamicValue(RS_13_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_13_item_i_item_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_13_item_i_item_sk_min) AND DynamicValue(RS_13_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_13_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query54.q.out b/ql/src/test/results/clientpositive/perf/tez/query54.q.out index a347e95e3e..c51ef31237 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query54.q.out @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_316] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_312] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) TableScan [TS_50] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_month_seq","d_year","d_moy"] <-Reducer 6 [CUSTOM_SIMPLE_EDGE] @@ -227,7 +227,7 @@ Stage-0 Select Operator [SEL_315] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_311] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_month_seq is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_month_seq is not null) Please refer to the previous TableScan [TS_50] <-Reducer 5 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_108] @@ -255,7 +255,7 @@ Stage-0 Select Operator [SEL_314] (rows=50 width=12) Output:["_col0"] Filter Operator [FIL_310] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999)) + predicate:((d_year = 1999) and (d_moy = 3)) Please refer to the previous TableScan [TS_50] <-Reducer 4 [CUSTOM_SIMPLE_EDGE] PARTITION_ONLY_SHUFFLE [RS_105] @@ -335,7 +335,7 @@ Stage-0 Select Operator [SEL_305] (rows=80000000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_304] (rows=80000000 width=8) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_26] (rows=80000000 width=8) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk"] <-Reducer 19 [SIMPLE_EDGE] @@ -349,7 +349,7 @@ Stage-0 Select Operator [SEL_302] (rows=453 width=4) Output:["_col0"] Filter Operator [FIL_301] (rows=453 width=186) - predicate:((i_category = 'Jewelry') and (i_class = 'consignment') and i_item_sk is not null) + predicate:((i_class = 'consignment') and (i_category = 'Jewelry') and i_item_sk is not null) TableScan [TS_23] (rows=462000 width=186) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_class","i_category"] <-Reducer 18 [SIMPLE_EDGE] @@ -363,7 +363,7 @@ Stage-0 Select Operator [SEL_296] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_295] (rows=50 width=12) - predicate:((d_moy = 3) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) TableScan [TS_20] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Union 17 [SIMPLE_EDGE] @@ -373,7 +373,7 @@ Stage-0 Select Operator [SEL_359] (rows=285117831 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_358] (rows=285117831 width=11) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_273] (rows=287989836 width=11) Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -393,7 +393,7 @@ Stage-0 Select Operator [SEL_362] (rows=143930993 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_361] (rows=143930993 width=11) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_278] (rows=144002668 width=11) Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -410,7 +410,7 @@ Stage-0 Select Operator [SEL_284] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_283] (rows=525327388 width=114) - predicate:(ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_sales_price"] <-Map 11 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query55.q.out b/ql/src/test/results/clientpositive/perf/tez/query55.q.out index 1789738680..a30bb98e39 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query55.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query55.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_56] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_55] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null) + predicate:((d_year = 2001) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -94,7 +94,7 @@ Stage-0 Select Operator [SEL_64] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_63] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query56.q.out b/ql/src/test/results/clientpositive/perf/tez/query56.q.out index 677f8fb0cc..d99c57b928 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query56.q.out @@ -258,7 +258,7 @@ Stage-0 Select Operator [SEL_327] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_326] (rows=50 width=12) - predicate:((d_moy = 1) and (d_year = 2000) and d_date_sk is not null) + predicate:((d_year = 2000) and (d_moy = 1) and d_date_sk is not null) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -267,7 +267,7 @@ Stage-0 Select Operator [SEL_369] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_368] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_85] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -325,7 +325,7 @@ Stage-0 Select Operator [SEL_343] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_342] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -383,7 +383,7 @@ Stage-0 Select Operator [SEL_361] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_360] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query57.q.out b/ql/src/test/results/clientpositive/perf/tez/query57.q.out index a85df5665b..259453fb34 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query57.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query57.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_294] (rows=462000 width=194) Output:["_col0","_col1","_col2"] Filter Operator [FIL_293] (rows=462000 width=194) - predicate:(i_brand is not null and i_category is not null and i_item_sk is not null) + predicate:(i_item_sk is not null and i_category is not null and i_brand is not null) TableScan [TS_79] (rows=462000 width=194) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_category"] <-Reducer 3 [SIMPLE_EDGE] @@ -191,7 +191,7 @@ Stage-0 Select Operator [SEL_280] (rows=564 width=12) Output:["_col0","_col1","_col2"] Filter Operator [FIL_279] (rows=564 width=12) - predicate:(((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and (d_year) IN (2000, 1999, 2001) and d_date_sk is not null) + predicate:((d_year) IN (2000, 1999, 2001) and ((d_year = 2000) or (struct(d_year,d_moy)) IN (const struct(1999,12), const struct(2001,1))) and d_date_sk is not null) TableScan [TS_73] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -200,7 +200,7 @@ Stage-0 Select Operator [SEL_288] (rows=285117980 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_287] (rows=285117980 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter))) and cs_call_center_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_call_center_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_83_date_dim_d_date_sk_min) AND DynamicValue(RS_83_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_83_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_70] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_call_center_sk","cs_item_sk","cs_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -239,7 +239,7 @@ Stage-0 Select Operator [SEL_315] (rows=260242 width=520) Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_314] (rows=260242 width=520) - predicate:((_col0 > 0) and (_col3 = 2000) and rank_window_1 is not null) + predicate:((_col0 > 0) and rank_window_1 is not null and (_col3 = 2000)) PTF Operator [PTF_313] (rows=87441185 width=520) Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS LAST, _col4 ASC NULLS LAST","partition by:":"_col2, _col1, _col5"}] Select Operator [SEL_312] (rows=87441185 width=520) diff --git a/ql/src/test/results/clientpositive/perf/tez/query58.q.out b/ql/src/test/results/clientpositive/perf/tez/query58.q.out index bff619a052..b1790db674 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query58.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query58.q.out @@ -181,7 +181,7 @@ Stage-0 Select Operator [SEL_162] (rows=1 width=884) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_158] (rows=1 width=1108) - predicate:(_col1 BETWEEN _col10 AND _col11 and _col5 BETWEEN _col10 AND _col11 and _col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND _col7) + predicate:(_col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND _col7 and _col1 BETWEEN _col10 AND _col11 and _col5 BETWEEN _col10 AND _col11) Merge Join Operator [MERGEJOIN_419] (rows=1 width=1108) Conds:RS_155._col0=RS_467._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col9","_col10","_col11"] <-Reducer 14 [ONE_TO_ONE_EDGE] vectorized @@ -230,7 +230,7 @@ Stage-0 Select Operator [SEL_433] (rows=73049 width=98) Output:["_col0","_col1"] Filter Operator [FIL_431] (rows=73049 width=98) - predicate:(d_date is not null and d_week_seq is not null) + predicate:(d_week_seq is not null and d_date is not null) TableScan [TS_21] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date","d_week_seq"] <-Reducer 22 [SIMPLE_EDGE] @@ -272,7 +272,7 @@ Stage-0 Select Operator [SEL_445] (rows=462000 width=104) Output:["_col0","_col1"] Filter Operator [FIL_444] (rows=462000 width=104) - predicate:(i_item_id is not null and i_item_sk is not null) + predicate:(i_item_sk is not null and i_item_id is not null) TableScan [TS_3] (rows=462000 width=104) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -281,7 +281,7 @@ Stage-0 Select Operator [SEL_463] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_462] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_143_date_dim_d_date_sk_min) AND DynamicValue(RS_143_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_143_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_143_date_dim_d_date_sk_min) AND DynamicValue(RS_143_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_143_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_100] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -335,7 +335,7 @@ Stage-0 Select Operator [SEL_455] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_454] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_93_date_dim_d_date_sk_min) AND DynamicValue(RS_93_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_93_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_93_date_dim_d_date_sk_min) AND DynamicValue(RS_93_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_93_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_50] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -382,7 +382,7 @@ Stage-0 Select Operator [SEL_442] (rows=286549727 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_441] (rows=286549727 width=119) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_43_date_dim_d_date_sk_min) AND DynamicValue(RS_43_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_43_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_43_date_dim_d_date_sk_min) AND DynamicValue(RS_43_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_43_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query59.q.out b/ql/src/test/results/clientpositive/perf/tez/query59.q.out index d325a95213..3c3cd2dc78 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query59.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query59.q.out @@ -135,7 +135,7 @@ Stage-0 Select Operator [SEL_207] (rows=1704 width=104) Output:["_col0","_col1"] Filter Operator [FIL_206] (rows=1704 width=104) - predicate:(s_store_id is not null and s_store_sk is not null) + predicate:(s_store_sk is not null and s_store_id is not null) TableScan [TS_39] (rows=1704 width=104) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_id"] <-Reducer 10 [SIMPLE_EDGE] @@ -195,7 +195,7 @@ Stage-0 Select Operator [SEL_202] (rows=1704 width=192) Output:["_col0","_col1","_col2"] Filter Operator [FIL_201] (rows=1704 width=192) - predicate:(s_store_id is not null and s_store_sk is not null) + predicate:(s_store_sk is not null and s_store_id is not null) TableScan [TS_18] (rows=1704 width=192) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_id","s_store_name"] <-Reducer 4 [SIMPLE_EDGE] diff --git a/ql/src/test/results/clientpositive/perf/tez/query6.q.out b/ql/src/test/results/clientpositive/perf/tez/query6.q.out index 24d8ce125f..fd6a537771 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query6.q.out @@ -137,7 +137,7 @@ Stage-0 Select Operator [SEL_183] (rows=50 width=12) Output:["d_month_seq"] Filter Operator [FIL_181] (rows=50 width=12) - predicate:((d_moy = 2) and (d_year = 2000)) + predicate:((d_year = 2000) and (d_moy = 2)) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_month_seq","d_year","d_moy"] <-Select Operator [SEL_207] (rows=10 width=202) @@ -158,7 +158,7 @@ Stage-0 <-Select Operator [SEL_211] (rows=460833 width=205) Output:["_col0","_col1","_col2"] Filter Operator [FIL_210] (rows=460833 width=205) - predicate:(i_category is not null and i_current_price is not null and i_item_sk is not null) + predicate:(i_current_price is not null and i_item_sk is not null and i_category is not null) TableScan [TS_45] (rows=462000 width=205) default@item,i,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_current_price","i_category"] <-Reducer 7 [SIMPLE_EDGE] @@ -189,7 +189,7 @@ Stage-0 Select Operator [SEL_182] (rows=50 width=12) Output:["d_month_seq"] Filter Operator [FIL_180] (rows=50 width=12) - predicate:((d_moy = 2) and (d_year = 2000) and d_month_seq is not null) + predicate:((d_year = 2000) and (d_moy = 2) and d_month_seq is not null) Please refer to the previous TableScan [TS_3] <-Select Operator [SEL_191] (rows=73049 width=8) Output:["_col0","_col1"] @@ -200,7 +200,7 @@ Stage-0 <-Select Operator [SEL_222] (rows=525327388 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_221] (rows=525327388 width=11) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_66_i_i_item_sk_min) AND DynamicValue(RS_66_i_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_66_i_i_item_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_66_i_i_item_sk_min) AND DynamicValue(RS_66_i_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_66_i_i_item_sk_bloom_filter)))) TableScan [TS_10] (rows=575995635 width=11) default@store_sales,s,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk"] <-Reducer 17 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query60.q.out b/ql/src/test/results/clientpositive/perf/tez/query60.q.out index 520c3b9b57..3654e3ecba 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query60.q.out @@ -280,7 +280,7 @@ Stage-0 Select Operator [SEL_331] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_330] (rows=50 width=12) - predicate:((d_moy = 9) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 9) and d_date_sk is not null) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 27 [SIMPLE_EDGE] vectorized @@ -289,7 +289,7 @@ Stage-0 Select Operator [SEL_375] (rows=143931246 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_374] (rows=143931246 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_95_date_dim_d_date_sk_min) AND DynamicValue(RS_95_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_95_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_85] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -349,7 +349,7 @@ Stage-0 Select Operator [SEL_347] (rows=525327191 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_346] (rows=525327191 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_20_date_dim_d_date_sk_min) AND DynamicValue(RS_20_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_20_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 18 [BROADCAST_EDGE] vectorized @@ -409,7 +409,7 @@ Stage-0 Select Operator [SEL_366] (rows=285117733 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_365] (rows=285117733 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_57_date_dim_d_date_sk_min) AND DynamicValue(RS_57_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_57_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_47] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 21 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query61.q.out b/ql/src/test/results/clientpositive/perf/tez/query61.q.out index 1be31feca6..b9f9bbbf86 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query61.q.out @@ -153,7 +153,7 @@ Stage-0 Select Operator [SEL_265] (rows=80000000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_264] (rows=80000000 width=8) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=8) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -218,16 +218,16 @@ Stage-0 Select Operator [SEL_271] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_270] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 9 [SIMPLE_EDGE] vectorized SHUFFLE [RS_284] PartitionCols:_col0 - Select Operator [SEL_283] (rows=479120970 width=126) + Select Operator [SEL_283] (rows=479120969 width=126) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] - Filter Operator [FIL_282] (rows=479120970 width=126) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + Filter Operator [FIL_282] (rows=479120969 width=126) + predicate:(ss_sold_date_sk is not null and ss_promo_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=126) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_promo_sk","ss_ext_sales_price"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -288,7 +288,7 @@ Stage-0 Select Operator [SEL_301] (rows=501694138 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_300] (rows=501694138 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_51] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"] <-Reducer 19 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query63.q.out b/ql/src/test/results/clientpositive/perf/tez/query63.q.out index 2627d805e3..7bec5851f8 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query63.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_86] (rows=52 width=8) Output:["_col0","_col1"] Filter Operator [FIL_85] (rows=52 width=290) - predicate:((((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and i_item_sk is not null) + predicate:((i_class) IN ('personal', 'portable', 'refernece', 'self-help', 'accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9', 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1') and (i_category) IN ('Books', 'Children', 'Electronics', 'Women', 'Music', 'Men') and (((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 'refernece', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and i_item_sk is not null) TableScan [TS_3] (rows=462000 width=289) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category","i_manager_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -149,7 +149,7 @@ Stage-0 Select Operator [SEL_94] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_93] (rows=525329897 width=118) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_13_item_i_item_sk_min) AND DynamicValue(RS_13_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_13_item_i_item_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_13_item_i_item_sk_min) AND DynamicValue(RS_13_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_13_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query64.q.out b/ql/src/test/results/clientpositive/perf/tez/query64.q.out index fe47585fd7..f0b921e724 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query64.q.out @@ -316,33 +316,33 @@ Stage-0 Stage-1 Reducer 12 vectorized File Output Operator [FS_1216] - Select Operator [SEL_1215] (rows=98871277768 width=1702) + Select Operator [SEL_1215] (rows=98913657102 width=1702) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"] <-Reducer 11 [SIMPLE_EDGE] SHUFFLE [RS_259] - Select Operator [SEL_258] (rows=98871277768 width=1694) + Select Operator [SEL_258] (rows=98913657102 width=1694) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"] - Filter Operator [FIL_257] (rows=98871277768 width=1694) + Filter Operator [FIL_257] (rows=98913657102 width=1694) predicate:(_col19 <= _col12) - Merge Join Operator [MERGEJOIN_1111] (rows=296613833305 width=1694) + Merge Join Operator [MERGEJOIN_1111] (rows=296740971306 width=1694) Conds:RS_1195._col2, _col1, _col3=RS_1214._col1, _col0, _col2(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col19","_col20","_col21","_col22"] <-Reducer 10 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1195] PartitionCols:_col2, _col1, _col3 - Select Operator [SEL_1194] (rows=20709988 width=1354) + Select Operator [SEL_1194] (rows=20714426 width=1354) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15"] - Filter Operator [FIL_1193] (rows=20709988 width=1362) + Filter Operator [FIL_1193] (rows=20714426 width=1362) predicate:_col14 is not null - Select Operator [SEL_1192] (rows=20709988 width=1362) + Select Operator [SEL_1192] (rows=20714426 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col14","_col15","_col16","_col17"] - Group By Operator [GBY_1191] (rows=20709988 width=1362) + Group By Operator [GBY_1191] (rows=20714426 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12, KEY._col13 <-Reducer 9 [SIMPLE_EDGE] SHUFFLE [RS_122] PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 - Group By Operator [GBY_121] (rows=20709988 width=1362) + Group By Operator [GBY_121] (rows=20714426 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count()","sum(_col42)","sum(_col43)","sum(_col44)"],keys:_col28, _col45, _col29, _col7, _col9, _col14, _col15, _col16, _col17, _col23, _col24, _col25, _col26, _col46 - Merge Join Operator [MERGEJOIN_1092] (rows=21002852 width=1122) + Merge Join Operator [MERGEJOIN_1092] (rows=21007353 width=1122) Conds:RS_117._col31=RS_1139._col0(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col23","_col24","_col25","_col26","_col28","_col29","_col42","_col43","_col44","_col45","_col46"] <-Map 36 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1139] @@ -356,9 +356,9 @@ Stage-0 <-Reducer 8 [SIMPLE_EDGE] SHUFFLE [RS_117] PartitionCols:_col31 - Filter Operator [FIL_116] (rows=21002852 width=1296) + Filter Operator [FIL_116] (rows=21007353 width=1296) predicate:(_col50 <> _col19) - Merge Join Operator [MERGEJOIN_1091] (rows=21002852 width=1296) + Merge Join Operator [MERGEJOIN_1091] (rows=21007353 width=1296) Conds:RS_113._col36=RS_1148._col0(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col19","_col23","_col24","_col25","_col26","_col28","_col29","_col31","_col42","_col43","_col44","_col45","_col46","_col50"] <-Map 53 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1148] @@ -372,7 +372,7 @@ Stage-0 <-Reducer 7 [SIMPLE_EDGE] SHUFFLE [RS_113] PartitionCols:_col36 - Merge Join Operator [MERGEJOIN_1090] (rows=20709988 width=1209) + Merge Join Operator [MERGEJOIN_1090] (rows=20714426 width=1209) Conds:RS_110._col0=RS_111._col15(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col19","_col23","_col24","_col25","_col26","_col28","_col29","_col31","_col36","_col42","_col43","_col44","_col45","_col46"] <-Reducer 6 [SIMPLE_EDGE] SHUFFLE [RS_110] @@ -431,7 +431,7 @@ Stage-0 Select Operator [SEL_1113] (rows=69376329 width=23) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_1112] (rows=69376329 width=23) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null and c_customer_sk is not null and c_first_sales_date_sk is not null and c_first_shipto_date_sk is not null) + predicate:(c_first_shipto_date_sk is not null and c_first_sales_date_sk is not null and c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=23) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk","c_first_shipto_date_sk","c_first_sales_date_sk"] <-Reducer 35 [SIMPLE_EDGE] @@ -455,9 +455,9 @@ Stage-0 <-Reducer 24 [SIMPLE_EDGE] SHUFFLE [RS_111] PartitionCols:_col15 - Select Operator [SEL_88] (rows=23881330 width=788) + Select Operator [SEL_88] (rows=23886447 width=788) Output:["_col3","_col4","_col5","_col6","_col8","_col9","_col11","_col15","_col16","_col22","_col23","_col24","_col25","_col26"] - Merge Join Operator [MERGEJOIN_1089] (rows=23881330 width=788) + Merge Join Operator [MERGEJOIN_1089] (rows=23886447 width=788) Conds:RS_85._col1, _col8=RS_1189._col0, _col1(Inner),Output:["_col2","_col3","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21","_col23","_col24","_col25","_col26"] <-Map 52 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1189] @@ -471,7 +471,7 @@ Stage-0 <-Reducer 23 [SIMPLE_EDGE] SHUFFLE [RS_85] PartitionCols:_col1, _col8 - Merge Join Operator [MERGEJOIN_1088] (rows=14484878 width=661) + Merge Join Operator [MERGEJOIN_1088] (rows=14487982 width=661) Conds:RS_82._col5=RS_1144._col0(Inner),Output:["_col1","_col2","_col3","_col8","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21","_col23","_col24","_col25","_col26"] <-Map 37 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1144] @@ -480,7 +480,7 @@ Stage-0 <-Reducer 22 [SIMPLE_EDGE] SHUFFLE [RS_82] PartitionCols:_col5 - Merge Join Operator [MERGEJOIN_1087] (rows=14484878 width=300) + Merge Join Operator [MERGEJOIN_1087] (rows=14487982 width=300) Conds:RS_79._col6=RS_1185._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21"] <-Map 51 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1185] @@ -488,13 +488,13 @@ Stage-0 Select Operator [SEL_1184] (rows=1704 width=181) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1183] (rows=1704 width=181) - predicate:(s_store_name is not null and s_store_sk is not null and s_zip is not null) + predicate:(s_store_sk is not null and s_store_name is not null and s_zip is not null) TableScan [TS_55] (rows=1704 width=181) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_name","s_zip"] <-Reducer 21 [SIMPLE_EDGE] SHUFFLE [RS_79] PartitionCols:_col6 - Merge Join Operator [MERGEJOIN_1086] (rows=14484878 width=123) + Merge Join Operator [MERGEJOIN_1086] (rows=14487982 width=123) Conds:RS_76._col4=RS_1134._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col18"] <-Map 34 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1134] @@ -503,7 +503,7 @@ Stage-0 <-Reducer 20 [SIMPLE_EDGE] SHUFFLE [RS_76] PartitionCols:_col4 - Merge Join Operator [MERGEJOIN_1085] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1085] (rows=14487982 width=119) Conds:RS_73._col7=RS_1181._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 50 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1181] @@ -517,12 +517,12 @@ Stage-0 <-Reducer 19 [SIMPLE_EDGE] SHUFFLE [RS_73] PartitionCols:_col7 - Merge Join Operator [MERGEJOIN_1084] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1084] (rows=14487982 width=119) Conds:RS_70._col1=RS_1178._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Reducer 18 [SIMPLE_EDGE] SHUFFLE [RS_70] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_1082] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1082] (rows=14487982 width=119) Conds:RS_67._col0=RS_1123._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 17 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1123] @@ -535,15 +535,15 @@ Stage-0 <-Reducer 39 [SIMPLE_EDGE] SHUFFLE [RS_67] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_1081] (rows=40567099 width=314) + Merge Join Operator [MERGEJOIN_1081] (rows=40575792 width=314) Conds:RS_1155._col1=RS_1158._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 40 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1158] PartitionCols:_col0 - Select Operator [SEL_1157] (rows=4666 width=111) + Select Operator [SEL_1157] (rows=4667 width=111) Output:["_col0","_col1"] - Filter Operator [FIL_1156] (rows=4666 width=311) - predicate:((i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate') and i_current_price BETWEEN 36 AND 45 and i_item_sk is not null) + Filter Operator [FIL_1156] (rows=4667 width=311) + predicate:(i_current_price BETWEEN 36 AND 45 and (i_color) IN ('maroon', 'burnished', 'dim', 'steel', 'navajo', 'chocolate') and i_item_sk is not null) TableScan [TS_28] (rows=462000 width=311) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_current_price","i_color","i_product_name"] <-Map 38 [SIMPLE_EDGE] vectorized @@ -552,7 +552,7 @@ Stage-0 Select Operator [SEL_1154] (rows=417313408 width=355) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_1153] (rows=417313408 width=355) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_68_d1_d_date_sk_min) AND DynamicValue(RS_68_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_d1_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_68_d1_d_date_sk_min) AND DynamicValue(RS_68_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_68_d1_d_date_sk_bloom_filter)))) TableScan [TS_25] (rows=575995635 width=355) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -597,7 +597,7 @@ Stage-0 Select Operator [SEL_1169] (rows=287989836 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1168] (rows=287989836 width=119) - predicate:((cs_item_sk BETWEEN DynamicValue(RS_65_item_i_item_sk_min) AND DynamicValue(RS_65_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_65_item_i_item_sk_bloom_filter))) and cs_item_sk is not null and cs_order_number is not null) + predicate:(cs_item_sk is not null and cs_order_number is not null and (cs_item_sk BETWEEN DynamicValue(RS_65_item_i_item_sk_min) AND DynamicValue(RS_65_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_65_item_i_item_sk_bloom_filter)))) TableScan [TS_34] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_item_sk","cs_order_number","cs_ext_list_price"] <-Reducer 41 [BROADCAST_EDGE] vectorized @@ -608,26 +608,26 @@ Stage-0 PARTITION_ONLY_SHUFFLE [RS_1164] Group By Operator [GBY_1162] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] - Select Operator [SEL_1159] (rows=4666 width=4) + Select Operator [SEL_1159] (rows=4667 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_1157] <-Reducer 16 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1214] PartitionCols:_col1, _col0, _col2 - Select Operator [SEL_1213] (rows=20709988 width=525) + Select Operator [SEL_1213] (rows=20714426 width=525) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] - Filter Operator [FIL_1212] (rows=20709988 width=1362) + Filter Operator [FIL_1212] (rows=20714426 width=1362) predicate:_col14 is not null - Select Operator [SEL_1211] (rows=20709988 width=1362) + Select Operator [SEL_1211] (rows=20714426 width=1362) Output:["_col1","_col2","_col3","_col14","_col15","_col16","_col17"] - Group By Operator [GBY_1210] (rows=20709988 width=1362) + Group By Operator [GBY_1210] (rows=20714426 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12, KEY._col13 <-Reducer 15 [SIMPLE_EDGE] SHUFFLE [RS_249] PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 - Group By Operator [GBY_248] (rows=20709988 width=1362) + Group By Operator [GBY_248] (rows=20714426 width=1362) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count()","sum(_col42)","sum(_col43)","sum(_col44)"],keys:_col28, _col45, _col29, _col7, _col9, _col14, _col15, _col16, _col17, _col23, _col24, _col25, _col26, _col46 - Merge Join Operator [MERGEJOIN_1110] (rows=21002852 width=1122) + Merge Join Operator [MERGEJOIN_1110] (rows=21007353 width=1122) Conds:RS_244._col31=RS_1140._col0(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col23","_col24","_col25","_col26","_col28","_col29","_col42","_col43","_col44","_col45","_col46"] <-Map 36 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1140] @@ -636,9 +636,9 @@ Stage-0 <-Reducer 14 [SIMPLE_EDGE] SHUFFLE [RS_244] PartitionCols:_col31 - Filter Operator [FIL_243] (rows=21002852 width=1296) + Filter Operator [FIL_243] (rows=21007353 width=1296) predicate:(_col50 <> _col19) - Merge Join Operator [MERGEJOIN_1109] (rows=21002852 width=1296) + Merge Join Operator [MERGEJOIN_1109] (rows=21007353 width=1296) Conds:RS_240._col36=RS_1150._col0(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col19","_col23","_col24","_col25","_col26","_col28","_col29","_col31","_col42","_col43","_col44","_col45","_col46","_col50"] <-Map 53 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1150] @@ -647,7 +647,7 @@ Stage-0 <-Reducer 13 [SIMPLE_EDGE] SHUFFLE [RS_240] PartitionCols:_col36 - Merge Join Operator [MERGEJOIN_1108] (rows=20709988 width=1209) + Merge Join Operator [MERGEJOIN_1108] (rows=20714426 width=1209) Conds:RS_237._col0=RS_238._col15(Inner),Output:["_col7","_col9","_col14","_col15","_col16","_col17","_col19","_col23","_col24","_col25","_col26","_col28","_col29","_col31","_col36","_col42","_col43","_col44","_col45","_col46"] <-Reducer 6 [SIMPLE_EDGE] SHUFFLE [RS_237] @@ -656,9 +656,9 @@ Stage-0 <-Reducer 32 [SIMPLE_EDGE] SHUFFLE [RS_238] PartitionCols:_col15 - Select Operator [SEL_215] (rows=23881330 width=788) + Select Operator [SEL_215] (rows=23886447 width=788) Output:["_col3","_col4","_col5","_col6","_col8","_col9","_col11","_col15","_col16","_col22","_col23","_col24","_col25","_col26"] - Merge Join Operator [MERGEJOIN_1107] (rows=23881330 width=788) + Merge Join Operator [MERGEJOIN_1107] (rows=23886447 width=788) Conds:RS_212._col1, _col8=RS_1190._col0, _col1(Inner),Output:["_col2","_col3","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21","_col23","_col24","_col25","_col26"] <-Map 52 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1190] @@ -667,7 +667,7 @@ Stage-0 <-Reducer 31 [SIMPLE_EDGE] SHUFFLE [RS_212] PartitionCols:_col1, _col8 - Merge Join Operator [MERGEJOIN_1106] (rows=14484878 width=661) + Merge Join Operator [MERGEJOIN_1106] (rows=14487982 width=661) Conds:RS_209._col5=RS_1145._col0(Inner),Output:["_col1","_col2","_col3","_col8","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21","_col23","_col24","_col25","_col26"] <-Map 37 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1145] @@ -676,7 +676,7 @@ Stage-0 <-Reducer 30 [SIMPLE_EDGE] SHUFFLE [RS_209] PartitionCols:_col5 - Merge Join Operator [MERGEJOIN_1105] (rows=14484878 width=300) + Merge Join Operator [MERGEJOIN_1105] (rows=14487982 width=300) Conds:RS_206._col6=RS_1186._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col8","_col9","_col10","_col11","_col12","_col13","_col18","_col20","_col21"] <-Map 51 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1186] @@ -685,7 +685,7 @@ Stage-0 <-Reducer 29 [SIMPLE_EDGE] SHUFFLE [RS_206] PartitionCols:_col6 - Merge Join Operator [MERGEJOIN_1104] (rows=14484878 width=123) + Merge Join Operator [MERGEJOIN_1104] (rows=14487982 width=123) Conds:RS_203._col4=RS_1135._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13","_col18"] <-Map 34 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1135] @@ -694,7 +694,7 @@ Stage-0 <-Reducer 28 [SIMPLE_EDGE] SHUFFLE [RS_203] PartitionCols:_col4 - Merge Join Operator [MERGEJOIN_1103] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1103] (rows=14487982 width=119) Conds:RS_200._col7=RS_1182._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 50 [SIMPLE_EDGE] vectorized SHUFFLE [RS_1182] @@ -703,12 +703,12 @@ Stage-0 <-Reducer 27 [SIMPLE_EDGE] SHUFFLE [RS_200] PartitionCols:_col7 - Merge Join Operator [MERGEJOIN_1102] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1102] (rows=14487982 width=119) Conds:RS_197._col1=RS_1209._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Reducer 26 [SIMPLE_EDGE] SHUFFLE [RS_197] PartitionCols:_col1 - Merge Join Operator [MERGEJOIN_1100] (rows=14484878 width=119) + Merge Join Operator [MERGEJOIN_1100] (rows=14487982 width=119) Conds:RS_194._col0=RS_1125._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 17 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1125] @@ -721,7 +721,7 @@ Stage-0 <-Reducer 42 [SIMPLE_EDGE] SHUFFLE [RS_194] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_1099] (rows=40567099 width=314) + Merge Join Operator [MERGEJOIN_1099] (rows=40575792 width=314) Conds:RS_1200._col1=RS_1160._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"] <-Map 40 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_1160] @@ -733,7 +733,7 @@ Stage-0 Select Operator [SEL_1199] (rows=417313408 width=355) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_1198] (rows=417313408 width=355) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_195_d1_d_date_sk_min) AND DynamicValue(RS_195_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_195_d1_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null and ss_ticket_number is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and ss_item_sk is not null and ss_ticket_number is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_195_d1_d_date_sk_min) AND DynamicValue(RS_195_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_195_d1_d_date_sk_bloom_filter)))) TableScan [TS_152] (rows=575995635 width=355) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_wholesale_cost","ss_list_price","ss_coupon_amt"] <-Reducer 33 [BROADCAST_EDGE] vectorized @@ -773,7 +773,7 @@ Stage-0 Select Operator [SEL_1204] (rows=287989836 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_1203] (rows=287989836 width=119) - predicate:((cs_item_sk BETWEEN DynamicValue(RS_192_item_i_item_sk_min) AND DynamicValue(RS_192_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_192_item_i_item_sk_bloom_filter))) and cs_item_sk is not null and cs_order_number is not null) + predicate:(cs_item_sk is not null and cs_order_number is not null and (cs_item_sk BETWEEN DynamicValue(RS_192_item_i_item_sk_min) AND DynamicValue(RS_192_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_192_item_i_item_sk_bloom_filter)))) TableScan [TS_161] (rows=287989836 width=119) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_item_sk","cs_order_number","cs_ext_list_price"] <-Reducer 43 [BROADCAST_EDGE] vectorized @@ -784,7 +784,7 @@ Stage-0 PARTITION_ONLY_SHUFFLE [RS_1165] Group By Operator [GBY_1163] (rows=1 width=12) Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"] - Select Operator [SEL_1161] (rows=4666 width=4) + Select Operator [SEL_1161] (rows=4667 width=4) Output:["_col0"] Please refer to the previous Select Operator [SEL_1157] diff --git a/ql/src/test/results/clientpositive/perf/tez/query65.q.out b/ql/src/test/results/clientpositive/perf/tez/query65.q.out index de6f606f81..d1b0abd421 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query65.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query65.q.out @@ -144,7 +144,7 @@ Stage-0 Select Operator [SEL_141] (rows=317 width=4) Output:["_col0"] Filter Operator [FIL_140] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -153,7 +153,7 @@ Stage-0 Select Operator [SEL_151] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_149] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 11 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query66.q.out b/ql/src/test/results/clientpositive/perf/tez/query66.q.out index 2d4b6ae1d5..4867e1eb86 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query66.q.out @@ -568,7 +568,7 @@ Stage-0 Select Operator [SEL_258] (rows=282272460 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_257] (rows=282272460 width=243) - predicate:((cs_ship_mode_sk BETWEEN DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_bloom_filter))) and cs_ship_mode_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_ship_mode_sk is not null and (cs_ship_mode_sk BETWEEN DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_55_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_33] (rows=287989836 width=243) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_sold_time_sk","cs_ship_mode_sk","cs_warehouse_sk","cs_quantity","cs_ext_sales_price","cs_net_paid_inc_ship_tax"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -639,7 +639,7 @@ Stage-0 Select Operator [SEL_230] (rows=143859154 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_229] (rows=143859154 width=243) - predicate:((ws_ship_mode_sk BETWEEN DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(ws_ship_mode_sk, DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_bloom_filter))) and ws_ship_mode_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null and ws_warehouse_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_warehouse_sk is not null and ws_sold_date_sk is not null and ws_ship_mode_sk is not null and (ws_ship_mode_sk BETWEEN DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(ws_ship_mode_sk, DynamicValue(RS_22_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_sold_time_sk","ws_ship_mode_sk","ws_warehouse_sk","ws_quantity","ws_sales_price","ws_net_paid_inc_tax"] <-Reducer 18 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query67.q.out b/ql/src/test/results/clientpositive/perf/tez/query67.q.out index 442abc8345..1604d1e8aa 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query67.q.out @@ -174,7 +174,7 @@ Stage-0 Select Operator [SEL_85] (rows=317 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_84] (rows=317 width=20) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=20) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq","d_year","d_moy","d_qoy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -183,7 +183,7 @@ Stage-0 Select Operator [SEL_93] (rows=525329897 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_92] (rows=525329897 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_quantity","ss_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query68.q.out b/ql/src/test/results/clientpositive/perf/tez/query68.q.out index 21462c2ca5..adcced8572 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query68.q.out @@ -146,7 +146,7 @@ Stage-0 Select Operator [SEL_147] (rows=80000000 width=188) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_146] (rows=80000000 width=188) - predicate:(c_current_addr_sk is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=188) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk","c_first_name","c_last_name"] <-Reducer 7 [SIMPLE_EDGE] vectorized @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_154] (rows=170 width=4) Output:["_col0"] Filter Operator [FIL_153] (rows=170 width=12) - predicate:((d_year) IN (1998, 1999, 2000) and d_date_sk is not null and d_dom BETWEEN 1 AND 2) + predicate:(d_dom BETWEEN 1 AND 2 and (d_year) IN (1998, 1999, 2000) and d_date_sk is not null) TableScan [TS_9] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 8 [SIMPLE_EDGE] vectorized @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_162] (rows=457565061 width=343) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_161] (rows=457565061 width=343) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=343) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_ext_sales_price","ss_ext_list_price","ss_ext_tax"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query69.q.out b/ql/src/test/results/clientpositive/perf/tez/query69.q.out index 21e5523299..63b13996eb 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query69.q.out @@ -186,7 +186,7 @@ Stage-0 Select Operator [SEL_195] (rows=150 width=4) Output:["_col0"] Filter Operator [FIL_194] (rows=150 width=12) - predicate:((d_year = 1999) and d_date_sk is not null and d_moy BETWEEN 1 AND 3) + predicate:((d_year = 1999) and d_moy BETWEEN 1 AND 3 and d_date_sk is not null) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -195,7 +195,7 @@ Stage-0 Select Operator [SEL_205] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_204] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_9] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -234,7 +234,7 @@ Stage-0 Select Operator [SEL_186] (rows=77201384 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_185] (rows=77201384 width=11) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null) + predicate:(c_current_cdemo_sk is not null and c_current_addr_sk is not null and c_customer_sk is not null) TableScan [TS_0] (rows=80000000 width=11) default@customer,c,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk"] <-Map 11 [SIMPLE_EDGE] vectorized @@ -270,7 +270,7 @@ Stage-0 Select Operator [SEL_210] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_209] (rows=143930993 width=7) - predicate:((ws_bill_customer_sk BETWEEN DynamicValue(RS_44_c_c_customer_sk_min) AND DynamicValue(RS_44_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_44_c_c_customer_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_bill_customer_sk BETWEEN DynamicValue(RS_44_c_c_customer_sk_min) AND DynamicValue(RS_44_c_c_customer_sk_max) and in_bloom_filter(ws_bill_customer_sk, DynamicValue(RS_44_c_c_customer_sk_bloom_filter)))) TableScan [TS_19] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -308,7 +308,7 @@ Stage-0 Select Operator [SEL_218] (rows=285115246 width=7) Output:["_col0","_col1"] Filter Operator [FIL_217] (rows=285115246 width=7) - predicate:((cs_ship_customer_sk BETWEEN DynamicValue(RS_63_c_c_customer_sk_min) AND DynamicValue(RS_63_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_63_c_c_customer_sk_bloom_filter))) and cs_ship_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_ship_customer_sk is not null and cs_sold_date_sk is not null and (cs_ship_customer_sk BETWEEN DynamicValue(RS_63_c_c_customer_sk_min) AND DynamicValue(RS_63_c_c_customer_sk_max) and in_bloom_filter(cs_ship_customer_sk, DynamicValue(RS_63_c_c_customer_sk_bloom_filter)))) TableScan [TS_49] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_customer_sk"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query7.q.out b/ql/src/test/results/clientpositive/perf/tez/query7.q.out index 7f1576ac70..8d8deee5e4 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query7.q.out @@ -135,7 +135,7 @@ Stage-0 Select Operator [SEL_101] (rows=14776 width=4) Output:["_col0"] Filter Operator [FIL_100] (rows=14776 width=268) - predicate:((cd_education_status = 'Primary') and (cd_gender = 'F') and (cd_marital_status = 'W') and cd_demo_sk is not null) + predicate:((cd_marital_status = 'W') and (cd_education_status = 'Primary') and (cd_gender = 'F') and cd_demo_sk is not null) TableScan [TS_3] (rows=1861800 width=268) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -144,7 +144,7 @@ Stage-0 Select Operator [SEL_109] (rows=501686735 width=340) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_108] (rows=501686735 width=340) - predicate:((ss_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter))) and ss_cdemo_sk is not null and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_promo_sk is not null and ss_item_sk is not null and (ss_cdemo_sk BETWEEN DynamicValue(RS_16_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_16_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_16_customer_demographics_cd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=340) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_cdemo_sk","ss_promo_sk","ss_quantity","ss_list_price","ss_sales_price","ss_coupon_amt"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query70.q.out b/ql/src/test/results/clientpositive/perf/tez/query70.q.out index de4ac53e9b..875c5fa105 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query70.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query70.q.out @@ -165,7 +165,7 @@ Stage-0 Select Operator [SEL_137] (rows=317 width=8) Output:["_col0"] Filter Operator [FIL_136] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -174,7 +174,7 @@ Stage-0 Select Operator [SEL_145] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_144] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_38_d1_d_date_sk_min) AND DynamicValue(RS_38_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_38_d1_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_38_d1_d_date_sk_min) AND DynamicValue(RS_38_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_38_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -194,7 +194,7 @@ Stage-0 Select Operator [SEL_151] (rows=1704 width=90) Output:["_col0","_col1"] Filter Operator [FIL_150] (rows=1704 width=90) - predicate:(s_state is not null and s_store_sk is not null) + predicate:(s_store_sk is not null and s_state is not null) TableScan [TS_15] (rows=1704 width=90) default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_state"] <-Reducer 3 [SIMPLE_EDGE] diff --git a/ql/src/test/results/clientpositive/perf/tez/query71.q.out b/ql/src/test/results/clientpositive/perf/tez/query71.q.out index 43a2319338..cc4204f3c6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query71.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_176] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_175] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null) + predicate:((d_year = 2001) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_13] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 10 [SIMPLE_EDGE] vectorized @@ -172,7 +172,7 @@ Stage-0 Select Operator [SEL_184] (rows=285116947 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_183] (rows=285116947 width=123) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_17_date_dim_d_date_sk_min) AND DynamicValue(RS_17_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_17_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null and cs_sold_time_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_sold_time_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_17_date_dim_d_date_sk_min) AND DynamicValue(RS_17_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_17_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_10] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_sold_time_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_187] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_186] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null) + predicate:((d_year = 2001) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_24] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 14 [SIMPLE_EDGE] vectorized @@ -208,7 +208,7 @@ Stage-0 Select Operator [SEL_195] (rows=525325345 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_194] (rows=525325345 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_28_date_dim_d_date_sk_min) AND DynamicValue(RS_28_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_28_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_sold_time_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_sold_time_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_28_date_dim_d_date_sk_min) AND DynamicValue(RS_28_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_28_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_21] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_sold_time_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -235,7 +235,7 @@ Stage-0 Select Operator [SEL_154] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_153] (rows=50 width=12) - predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null) + predicate:((d_year = 2001) and (d_moy = 12) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -244,7 +244,7 @@ Stage-0 Select Operator [SEL_162] (rows=143930836 width=123) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_161] (rows=143930836 width=123) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null and ws_sold_time_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_sold_time_sk","ws_item_sk","ws_ext_sales_price"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query72.q.out b/ql/src/test/results/clientpositive/perf/tez/query72.q.out index 3e1e38e929..e7da14de1e 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query72.q.out @@ -166,7 +166,7 @@ Stage-0 Select Operator [SEL_283] (rows=73049 width=12) Output:["_col0","_col1"] Filter Operator [FIL_282] (rows=73049 width=98) - predicate:(UDFToDouble(d_date) is not null and d_date_sk is not null) + predicate:(d_date_sk is not null and UDFToDouble(d_date) is not null) TableScan [TS_24] (rows=73049 width=98) default@date_dim,d3,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"] <-Reducer 14 [SIMPLE_EDGE] @@ -214,7 +214,7 @@ Stage-0 <-Reducer 11 [SIMPLE_EDGE] SHUFFLE [RS_33] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_245] (rows=40690692 width=35) + Merge Join Operator [MERGEJOIN_245] (rows=40690691 width=35) Conds:RS_30._col2=RS_272._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col9","_col10"] <-Map 18 [SIMPLE_EDGE] vectorized SHUFFLE [RS_272] @@ -228,7 +228,7 @@ Stage-0 <-Reducer 10 [SIMPLE_EDGE] SHUFFLE [RS_30] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_244] (rows=99576238 width=39) + Merge Join Operator [MERGEJOIN_244] (rows=99576237 width=39) Conds:RS_269._col0=RS_261._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col9","_col10"] <-Map 16 [SIMPLE_EDGE] vectorized PARTITION_ONLY_SHUFFLE [RS_261] @@ -236,16 +236,16 @@ Stage-0 Select Operator [SEL_260] (rows=652 width=16) Output:["_col0","_col1","_col2"] Filter Operator [FIL_259] (rows=652 width=106) - predicate:((d_year = 2001) and UDFToDouble(d_date) is not null and d_date_sk is not null and d_week_seq is not null) + predicate:((d_year = 2001) and d_date_sk is not null and d_week_seq is not null and UDFToDouble(d_date) is not null) TableScan [TS_9] (rows=73049 width=106) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date","d_week_seq","d_year"] <-Map 9 [SIMPLE_EDGE] vectorized SHUFFLE [RS_269] PartitionCols:_col0 - Select Operator [SEL_268] (rows=280863799 width=31) + Select Operator [SEL_268] (rows=280863798 width=31) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] - Filter Operator [FIL_267] (rows=280863799 width=31) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_28_d1_d_date_sk_min) AND DynamicValue(RS_28_d1_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_28_d1_d_date_sk_bloom_filter))) and cs_bill_cdemo_sk is not null and cs_bill_hdemo_sk is not null and cs_item_sk is not null and cs_quantity is not null and cs_ship_date_sk is not null and cs_sold_date_sk is not null) + Filter Operator [FIL_267] (rows=280863798 width=31) + predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_ship_date_sk is not null and cs_quantity is not null and cs_bill_hdemo_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_28_d1_d_date_sk_min) AND DynamicValue(RS_28_d1_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_28_d1_d_date_sk_bloom_filter)))) TableScan [TS_6] (rows=287989836 width=31) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_date_sk","cs_bill_cdemo_sk","cs_bill_hdemo_sk","cs_item_sk","cs_promo_sk","cs_order_number","cs_quantity"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -270,7 +270,7 @@ Stage-0 Select Operator [SEL_254] (rows=35703276 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_253] (rows=35703276 width=15) - predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand is not null and inv_warehouse_sk is not null) + predicate:(inv_quantity_on_hand is not null and inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) TableScan [TS_0] (rows=37584000 width=15) default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"] <-Map 8 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query73.q.out b/ql/src/test/results/clientpositive/perf/tez/query73.q.out index 8f5fae69ac..f027086f27 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query73.q.out @@ -135,7 +135,7 @@ Stage-0 Select Operator [SEL_116] (rows=480 width=4) Output:["_col0"] Filter Operator [FIL_115] (rows=480 width=104) - predicate:((hd_buy_potential) IN ('>10000', 'unknown') and (hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END and hd_demo_sk is not null) + predicate:((hd_vehicle_count > 0) and CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (false) END and (hd_buy_potential) IN ('>10000', 'unknown') and hd_demo_sk is not null) TableScan [TS_9] (rows=7200 width=104) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"] <-Reducer 5 [SIMPLE_EDGE] @@ -149,7 +149,7 @@ Stage-0 Select Operator [SEL_105] (rows=170 width=4) Output:["_col0"] Filter Operator [FIL_104] (rows=170 width=12) - predicate:((d_year) IN (2000, 2001, 2002) and d_date_sk is not null and d_dom BETWEEN 1 AND 2) + predicate:(d_dom BETWEEN 1 AND 2 and (d_year) IN (2000, 2001, 2002) and d_date_sk is not null) TableScan [TS_6] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dom"] <-Map 4 [SIMPLE_EDGE] vectorized @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_113] (rows=479121995 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_112] (rows=479121995 width=19) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_3] (rows=575995635 width=19) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_store_sk","ss_ticket_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query74.q.out b/ql/src/test/results/clientpositive/perf/tez/query74.q.out index e5d4fb3daa..133625c555 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query74.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query74.q.out @@ -192,7 +192,7 @@ Stage-0 Select Operator [SEL_316] (rows=80000000 width=284) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_315] (rows=80000000 width=284) - predicate:(c_customer_id is not null and c_customer_sk is not null) + predicate:(c_customer_sk is not null and c_customer_id is not null) TableScan [TS_68] (rows=80000000 width=284) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_customer_id","c_first_name","c_last_name"] <-Reducer 18 [SIMPLE_EDGE] @@ -215,7 +215,7 @@ Stage-0 Select Operator [SEL_347] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_346] (rows=525327388 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_72_date_dim_d_date_sk_min) AND DynamicValue(RS_72_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_72_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_62] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_net_paid"] <-Reducer 22 [BROADCAST_EDGE] vectorized @@ -275,7 +275,7 @@ Stage-0 Select Operator [SEL_337] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_336] (rows=143930993 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_41] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_net_paid"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -335,7 +335,7 @@ Stage-0 Select Operator [SEL_327] (rows=525327388 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_326] (rows=525327388 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_30_date_dim_d_date_sk_min) AND DynamicValue(RS_30_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_30_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_20] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_net_paid"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -382,7 +382,7 @@ Stage-0 Select Operator [SEL_313] (rows=143930993 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_312] (rows=143930993 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk","ws_net_paid"] <-Reducer 23 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query75.q.out b/ql/src/test/results/clientpositive/perf/tez/query75.q.out index ccde4c59a2..98a72edc74 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query75.q.out @@ -245,7 +245,7 @@ Stage-0 Select Operator [SEL_603] (rows=28798881 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_602] (rows=28798881 width=121) - predicate:(cr_item_sk is not null and cr_order_number is not null) + predicate:(cr_order_number is not null and cr_item_sk is not null) TableScan [TS_9] (rows=28798881 width=121) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_item_sk","cr_order_number","cr_return_quantity","cr_return_amount"] <-Reducer 22 [SIMPLE_EDGE] @@ -259,7 +259,7 @@ Stage-0 Select Operator [SEL_595] (rows=45745 width=19) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_594] (rows=45745 width=109) - predicate:((i_category = 'Sports') and i_brand_id is not null and i_category_id is not null and i_class_id is not null and i_item_sk is not null and i_manufact_id is not null) + predicate:((i_category = 'Sports') and i_manufact_id is not null and i_category_id is not null and i_brand_id is not null and i_class_id is not null and i_item_sk is not null) TableScan [TS_6] (rows=462000 width=109) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand_id","i_class_id","i_category_id","i_category","i_manufact_id"] <-Reducer 21 [SIMPLE_EDGE] @@ -282,7 +282,7 @@ Stage-0 Select Operator [SEL_640] (rows=286549727 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_639] (rows=286549727 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_98_date_dim_d_date_sk_min) AND DynamicValue(RS_98_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_98_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_98_date_dim_d_date_sk_min) AND DynamicValue(RS_98_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_98_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_85] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_ext_sales_price"] <-Reducer 28 [BROADCAST_EDGE] vectorized @@ -311,7 +311,7 @@ Stage-0 Select Operator [SEL_625] (rows=57591150 width=119) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_624] (rows=57591150 width=119) - predicate:(sr_item_sk is not null and sr_ticket_number is not null) + predicate:(sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_31] (rows=57591150 width=119) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_ticket_number","sr_return_quantity","sr_return_amt"] <-Reducer 30 [SIMPLE_EDGE] @@ -342,7 +342,7 @@ Stage-0 Select Operator [SEL_648] (rows=550076554 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_647] (rows=550076554 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_120_date_dim_d_date_sk_min) AND DynamicValue(RS_120_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_120_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_120_date_dim_d_date_sk_min) AND DynamicValue(RS_120_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_120_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_107] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_ext_sales_price"] <-Reducer 32 [BROADCAST_EDGE] vectorized @@ -371,7 +371,7 @@ Stage-0 Select Operator [SEL_634] (rows=14398467 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_633] (rows=14398467 width=118) - predicate:(wr_item_sk is not null and wr_order_number is not null) + predicate:(wr_order_number is not null and wr_item_sk is not null) TableScan [TS_60] (rows=14398467 width=118) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_item_sk","wr_order_number","wr_return_quantity","wr_return_amt"] <-Reducer 34 [SIMPLE_EDGE] @@ -402,7 +402,7 @@ Stage-0 Select Operator [SEL_653] (rows=143966864 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_652] (rows=143966864 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_149_date_dim_d_date_sk_min) AND DynamicValue(RS_149_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_149_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_149_date_dim_d_date_sk_min) AND DynamicValue(RS_149_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_149_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_136] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_ext_sales_price"] <-Reducer 36 [BROADCAST_EDGE] vectorized @@ -465,7 +465,7 @@ Stage-0 Select Operator [SEL_631] (rows=143966864 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_630] (rows=143966864 width=127) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_64_date_dim_d_date_sk_min) AND DynamicValue(RS_64_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_64_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_51] (rows=144002668 width=127) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_ext_sales_price"] <-Reducer 20 [BROADCAST_EDGE] vectorized @@ -524,7 +524,7 @@ Stage-0 Select Operator [SEL_622] (rows=550076554 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_621] (rows=550076554 width=122) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_22] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_ext_sales_price"] <-Reducer 16 [BROADCAST_EDGE] vectorized @@ -575,7 +575,7 @@ Stage-0 Select Operator [SEL_592] (rows=286549727 width=127) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_591] (rows=286549727 width=127) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter))) and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_13_date_dim_d_date_sk_min) AND DynamicValue(RS_13_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_13_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=127) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_ext_sales_price"] <-Reducer 12 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query76.q.out b/ql/src/test/results/clientpositive/perf/tez/query76.q.out index 2e426a21b1..d5afd5de17 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query76.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query76.q.out @@ -123,7 +123,7 @@ Stage-0 Select Operator [SEL_191] (rows=1433911 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_190] (rows=1433911 width=123) - predicate:(cs_item_sk is not null and cs_sold_date_sk is not null and cs_warehouse_sk is null) + predicate:(cs_warehouse_sk is null and cs_sold_date_sk is not null and cs_item_sk is not null) TableScan [TS_33] (rows=287989836 width=123) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_ext_sales_price"] <-Reducer 3 [CONTAINS] @@ -161,7 +161,7 @@ Stage-0 Select Operator [SEL_174] (rows=24749363 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_173] (rows=24749363 width=118) - predicate:(ss_addr_sk is null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_addr_sk is null and ss_sold_date_sk is not null and ss_item_sk is not null) TableScan [TS_3] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"] <-Reducer 8 [CONTAINS] @@ -199,7 +199,7 @@ Stage-0 Select Operator [SEL_185] (rows=35728 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_184] (rows=35728 width=123) - predicate:(ws_item_sk is not null and ws_sold_date_sk is not null and ws_web_page_sk is null) + predicate:(ws_web_page_sk is null and ws_sold_date_sk is not null and ws_item_sk is not null) TableScan [TS_16] (rows=144002668 width=123) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_page_sk","ws_ext_sales_price"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query77.q.out b/ql/src/test/results/clientpositive/perf/tez/query77.q.out index 545c01d372..535a2aad05 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query77.q.out @@ -316,7 +316,7 @@ Stage-0 Select Operator [SEL_371] (rows=286549727 width=231) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_370] (rows=286549727 width=231) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_51_date_dim_d_date_sk_min) AND DynamicValue(RS_51_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_51_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_44] (rows=287989836 width=231) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_call_center_sk","cs_ext_sales_price","cs_net_profit"] <-Reducer 17 [BROADCAST_EDGE] vectorized @@ -400,7 +400,7 @@ Stage-0 Select Operator [SEL_383] (rows=143931136 width=231) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_382] (rows=143931136 width=231) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_87_date_dim_d_date_sk_min) AND DynamicValue(RS_87_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_87_date_dim_d_date_sk_bloom_filter))) and ws_sold_date_sk is not null and ws_web_page_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_web_page_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_87_date_dim_d_date_sk_min) AND DynamicValue(RS_87_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_87_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_77] (rows=144002668 width=231) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_web_page_sk","ws_ext_sales_price","ws_net_profit"] <-Reducer 24 [BROADCAST_EDGE] vectorized @@ -445,7 +445,7 @@ Stage-0 Select Operator [SEL_392] (rows=13129719 width=221) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_391] (rows=13129719 width=221) - predicate:(wr_returned_date_sk is not null and wr_web_page_sk is not null) + predicate:(wr_web_page_sk is not null and wr_returned_date_sk is not null) TableScan [TS_97] (rows=14398467 width=221) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_returned_date_sk","wr_web_page_sk","wr_return_amt","wr_net_loss"] <-Reducer 5 [CONTAINS] @@ -495,7 +495,7 @@ Stage-0 Select Operator [SEL_358] (rows=53634860 width=223) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_357] (rows=53634860 width=223) - predicate:(sr_returned_date_sk is not null and sr_store_sk is not null) + predicate:(sr_store_sk is not null and sr_returned_date_sk is not null) TableScan [TS_20] (rows=57591150 width=223) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"] <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized @@ -529,7 +529,7 @@ Stage-0 Select Operator [SEL_349] (rows=525329897 width=221) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_348] (rows=525329897 width=221) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=221) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query78.q.out b/ql/src/test/results/clientpositive/perf/tez/query78.q.out index 9ce2cdba16..c8d9c000ed 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query78.q.out @@ -208,7 +208,7 @@ Stage-0 Select Operator [SEL_264] (rows=285117831 width=242) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_263] (rows=285117831 width=242) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_59_date_dim_d_date_sk_min) AND DynamicValue(RS_59_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_59_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_59_date_dim_d_date_sk_min) AND DynamicValue(RS_59_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_59_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_48] (rows=287989836 width=242) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_order_number","cs_quantity","cs_wholesale_cost","cs_sales_price"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -228,7 +228,7 @@ Stage-0 Select Operator [SEL_267] (rows=28798881 width=8) Output:["_col0","_col1"] Filter Operator [FIL_266] (rows=28798881 width=8) - predicate:(cr_item_sk is not null and cr_order_number is not null) + predicate:(cr_order_number is not null and cr_item_sk is not null) TableScan [TS_51] (rows=28798881 width=8) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_item_sk","cr_order_number"] <-Reducer 4 [SIMPLE_EDGE] @@ -269,7 +269,7 @@ Stage-0 Select Operator [SEL_241] (rows=525327388 width=233) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_240] (rows=525327388 width=233) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_14_date_dim_d_date_sk_min) AND DynamicValue(RS_14_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_14_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_14_date_dim_d_date_sk_min) AND DynamicValue(RS_14_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_14_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_3] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_ticket_number","ss_quantity","ss_wholesale_cost","ss_sales_price"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -289,7 +289,7 @@ Stage-0 Select Operator [SEL_244] (rows=57591150 width=8) Output:["_col0","_col1"] Filter Operator [FIL_243] (rows=57591150 width=8) - predicate:(sr_item_sk is not null and sr_ticket_number is not null) + predicate:(sr_ticket_number is not null and sr_item_sk is not null) TableScan [TS_6] (rows=57591150 width=8) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_ticket_number"] <-Reducer 9 [ONE_TO_ONE_EDGE] vectorized @@ -327,7 +327,7 @@ Stage-0 Select Operator [SEL_252] (rows=143930993 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_251] (rows=143930993 width=243) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_36_date_dim_d_date_sk_min) AND DynamicValue(RS_36_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_36_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_36_date_dim_d_date_sk_min) AND DynamicValue(RS_36_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_36_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_25] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_order_number","ws_quantity","ws_wholesale_cost","ws_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -347,7 +347,7 @@ Stage-0 Select Operator [SEL_255] (rows=14398467 width=8) Output:["_col0","_col1"] Filter Operator [FIL_254] (rows=14398467 width=8) - predicate:(wr_item_sk is not null and wr_order_number is not null) + predicate:(wr_order_number is not null and wr_item_sk is not null) TableScan [TS_28] (rows=14398467 width=8) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_item_sk","wr_order_number"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query79.q.out b/ql/src/test/results/clientpositive/perf/tez/query79.q.out index ce5a8bc49f..eb27749420 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query79.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query79.q.out @@ -148,7 +148,7 @@ Stage-0 Select Operator [SEL_113] (rows=479121995 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_112] (rows=479121995 width=237) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_3] (rows=575995635 width=237) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query8.q.out b/ql/src/test/results/clientpositive/perf/tez/query8.q.out index da49d2edb3..2874fe398c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query8.q.out @@ -359,7 +359,7 @@ Stage-0 Select Operator [SEL_128] (rows=130 width=4) Output:["_col0"] Filter Operator [FIL_127] (rows=130 width=12) - predicate:((d_qoy = 1) and (d_year = 2002) and d_date_sk is not null) + predicate:((d_year = 2002) and (d_qoy = 1) and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_qoy"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -368,7 +368,7 @@ Stage-0 Select Operator [SEL_136] (rows=525329897 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_135] (rows=525329897 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_50_date_dim_d_date_sk_min) AND DynamicValue(RS_50_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_50_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_net_profit"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query80.q.out b/ql/src/test/results/clientpositive/perf/tez/query80.q.out index d74ac0db89..051e784919 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query80.q.out @@ -343,7 +343,7 @@ Stage-0 Select Operator [SEL_442] (rows=283691906 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_441] (rows=283691906 width=243) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter))) and cs_catalog_page_sk is not null and cs_item_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_promo_sk is not null and cs_sold_date_sk is not null and cs_catalog_page_sk is not null and cs_item_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_61_date_dim_d_date_sk_min) AND DynamicValue(RS_61_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_61_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_39] (rows=287989836 width=243) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_item_sk","cs_promo_sk","cs_order_number","cs_ext_sales_price","cs_net_profit"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -433,7 +433,7 @@ Stage-0 Select Operator [SEL_458] (rows=143894769 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_457] (rows=143894769 width=243) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_101_date_dim_d_date_sk_min) AND DynamicValue(RS_101_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_101_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_promo_sk is not null and ws_sold_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_promo_sk is not null and ws_web_site_sk is not null and ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_101_date_dim_d_date_sk_min) AND DynamicValue(RS_101_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_101_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_79] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_site_sk","ws_promo_sk","ws_order_number","ws_ext_sales_price","ws_net_profit"] <-Reducer 25 [BROADCAST_EDGE] vectorized @@ -523,7 +523,7 @@ Stage-0 Select Operator [SEL_410] (rows=501693263 width=233) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_409] (rows=501693263 width=233) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_promo_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=233) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_promo_sk","ss_ticket_number","ss_ext_sales_price","ss_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query81.q.out b/ql/src/test/results/clientpositive/perf/tez/query81.q.out index 1e980c7339..fd239220ed 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query81.q.out @@ -158,7 +158,7 @@ Stage-0 Select Operator [SEL_191] (rows=28221532 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_189] (rows=28221532 width=121) - predicate:(cr_returned_date_sk is not null and cr_returning_addr_sk is not null) + predicate:(cr_returning_addr_sk is not null and cr_returned_date_sk is not null) TableScan [TS_6] (rows=28798881 width=121) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_returned_date_sk","cr_returning_customer_sk","cr_returning_addr_sk","cr_return_amt_inc_tax"] <-Reducer 9 [SIMPLE_EDGE] vectorized @@ -196,7 +196,7 @@ Stage-0 Select Operator [SEL_190] (rows=27657410 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_188] (rows=27657410 width=121) - predicate:(cr_returned_date_sk is not null and cr_returning_addr_sk is not null and cr_returning_customer_sk is not null) + predicate:(cr_returning_addr_sk is not null and cr_returning_customer_sk is not null and cr_returned_date_sk is not null) Please refer to the previous TableScan [TS_6] <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_62] diff --git a/ql/src/test/results/clientpositive/perf/tez/query82.q.out b/ql/src/test/results/clientpositive/perf/tez/query82.q.out index 72f247b0ad..5706fa9d66 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query82.q.out @@ -85,7 +85,7 @@ Stage-0 Select Operator [SEL_81] (rows=297 width=400) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_80] (rows=297 width=404) - predicate:((i_manufact_id) IN (437, 129, 727, 663) and i_current_price BETWEEN 30 AND 60 and i_item_sk is not null) + predicate:(i_current_price BETWEEN 30 AND 60 and (i_manufact_id) IN (437, 129, 727, 663) and i_item_sk is not null) TableScan [TS_3] (rows=462000 width=403) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_manufact_id"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -94,7 +94,7 @@ Stage-0 Select Operator [SEL_89] (rows=575995635 width=4) Output:["_col0"] Filter Operator [FIL_88] (rows=575995635 width=4) - predicate:((ss_item_sk BETWEEN DynamicValue(RS_17_item_i_item_sk_min) AND DynamicValue(RS_17_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_17_item_i_item_sk_bloom_filter))) and ss_item_sk is not null) + predicate:(ss_item_sk is not null and (ss_item_sk BETWEEN DynamicValue(RS_17_item_i_item_sk_min) AND DynamicValue(RS_17_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_17_item_i_item_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=4) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -128,7 +128,7 @@ Stage-0 Select Operator [SEL_92] (rows=4176000 width=8) Output:["_col0","_col1"] Filter Operator [FIL_91] (rows=4176000 width=11) - predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_quantity_on_hand BETWEEN 100 AND 500) + predicate:(inv_quantity_on_hand BETWEEN 100 AND 500 and inv_item_sk is not null and inv_date_sk is not null) TableScan [TS_6] (rows=37584000 width=11) default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_quantity_on_hand"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query83.q.out b/ql/src/test/results/clientpositive/perf/tez/query83.q.out index cb9810b179..950e99715a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query83.q.out @@ -223,7 +223,7 @@ Stage-0 Select Operator [SEL_376] (rows=73049 width=98) Output:["_col0","_col1"] Filter Operator [FIL_375] (rows=73049 width=98) - predicate:(d_date is not null and d_week_seq is not null) + predicate:(d_week_seq is not null and d_date is not null) TableScan [TS_9] (rows=73049 width=98) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date","d_week_seq"] <-Map 20 [SIMPLE_EDGE] vectorized @@ -248,7 +248,7 @@ Stage-0 Select Operator [SEL_368] (rows=462000 width=104) Output:["_col0","_col1"] Filter Operator [FIL_367] (rows=462000 width=104) - predicate:(i_item_id is not null and i_item_sk is not null) + predicate:(i_item_sk is not null and i_item_id is not null) TableScan [TS_3] (rows=462000 width=104) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"] <-Map 22 [SIMPLE_EDGE] vectorized @@ -257,7 +257,7 @@ Stage-0 Select Operator [SEL_394] (rows=13749816 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_393] (rows=13749816 width=11) - predicate:(wr_item_sk is not null and wr_returned_date_sk is not null) + predicate:(wr_returned_date_sk is not null and wr_item_sk is not null) TableScan [TS_80] (rows=14398467 width=11) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_returned_date_sk","wr_item_sk","wr_return_quantity"] <-Reducer 5 [ONE_TO_ONE_EDGE] @@ -298,7 +298,7 @@ Stage-0 Select Operator [SEL_388] (rows=55578005 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_387] (rows=55578005 width=11) - predicate:(sr_item_sk is not null and sr_returned_date_sk is not null) + predicate:(sr_returned_date_sk is not null and sr_item_sk is not null) TableScan [TS_40] (rows=57591150 width=11) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_return_quantity"] <-Reducer 4 [ONE_TO_ONE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query84.q.out b/ql/src/test/results/clientpositive/perf/tez/query84.q.out index 9adcf860ab..35cf670285 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query84.q.out @@ -140,7 +140,7 @@ Stage-0 Select Operator [SEL_128] (rows=74500295 width=295) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_127] (rows=74500295 width=291) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null) + predicate:(c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_current_addr_sk is not null) TableScan [TS_6] (rows=80000000 width=291) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_id","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk","c_first_name","c_last_name"] <-Map 9 [SIMPLE_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query85.q.out b/ql/src/test/results/clientpositive/perf/tez/query85.q.out index 69d2750445..9414486602 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query85.q.out @@ -231,7 +231,7 @@ Stage-0 SHUFFLE [RS_45] PartitionCols:_col2 Filter Operator [FIL_43] (rows=2912400 width=377) - predicate:(((_col15 and _col16 and _col8) or (_col17 and _col18 and _col9) or (_col19 and _col20 and _col10)) and ((_col30 and _col5) or (_col31 and _col6) or (_col32 and _col7))) + predicate:(((_col30 and _col5) or (_col31 and _col6) or (_col32 and _col7)) and ((_col15 and _col16 and _col8) or (_col17 and _col18 and _col9) or (_col19 and _col20 and _col10))) Merge Join Operator [MERGEJOIN_202] (rows=10355208 width=377) Conds:RS_40._col1, _col3=RS_41._col9, _col14(Inner),Output:["_col2","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col15","_col16","_col17","_col18","_col19","_col20","_col27","_col28","_col30","_col31","_col32","_col37"] <-Reducer 13 [SIMPLE_EDGE] @@ -261,7 +261,7 @@ Stage-0 Select Operator [SEL_222] (rows=265971 width=207) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_221] (rows=265971 width=183) - predicate:((cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and (cd_marital_status) IN ('M', 'D', 'U') and cd_demo_sk is not null) + predicate:((cd_marital_status) IN ('M', 'D', 'U') and (cd_education_status) IN ('4 yr Degree', 'Primary', 'Advanced Degree') and cd_demo_sk is not null) TableScan [TS_15] (rows=1861800 width=183) default@customer_demographics,cd1,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] <-Reducer 11 [SIMPLE_EDGE] @@ -286,7 +286,7 @@ Stage-0 Select Operator [SEL_219] (rows=3529412 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_218] (rows=3529412 width=187) - predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and ca_address_sk is not null) + predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null) TableScan [TS_9] (rows=40000000 width=187) default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"] <-Map 9 [SIMPLE_EDGE] vectorized @@ -295,7 +295,7 @@ Stage-0 Select Operator [SEL_216] (rows=11975292 width=237) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"] Filter Operator [FIL_215] (rows=11975292 width=237) - predicate:(wr_item_sk is not null and wr_order_number is not null and wr_reason_sk is not null and wr_refunded_addr_sk is not null and wr_refunded_cdemo_sk is not null and wr_returning_cdemo_sk is not null) + predicate:(wr_refunded_addr_sk is not null and wr_returning_cdemo_sk is not null and wr_refunded_cdemo_sk is not null and wr_reason_sk is not null and wr_item_sk is not null and wr_order_number is not null) TableScan [TS_6] (rows=14398467 width=237) default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_item_sk","wr_refunded_cdemo_sk","wr_refunded_addr_sk","wr_returning_cdemo_sk","wr_reason_sk","wr_order_number","wr_fee","wr_refunded_cash"] <-Reducer 2 [SIMPLE_EDGE] @@ -318,7 +318,7 @@ Stage-0 Select Operator [SEL_213] (rows=143931136 width=43) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"] Filter Operator [FIL_212] (rows=143931136 width=243) - predicate:(((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and (ws_sold_date_sk BETWEEN DynamicValue(RS_38_date_dim_d_date_sk_min) AND DynamicValue(RS_38_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_38_date_dim_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_order_number is not null and ws_sold_date_sk is not null and ws_web_page_sk is not null) + predicate:(((ws_sales_price >= 100) or (ws_sales_price <= 150) or (ws_sales_price >= 50) or (ws_sales_price <= 100) or (ws_sales_price >= 150) or (ws_sales_price <= 200)) and ((ws_net_profit >= 100) or (ws_net_profit <= 200) or (ws_net_profit >= 150) or (ws_net_profit <= 300) or (ws_net_profit >= 50) or (ws_net_profit <= 250)) and ws_sold_date_sk is not null and ws_web_page_sk is not null and ws_item_sk is not null and ws_order_number is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_38_date_dim_d_date_sk_min) AND DynamicValue(RS_38_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_38_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_page_sk","ws_order_number","ws_quantity","ws_sales_price","ws_net_profit"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query86.q.out b/ql/src/test/results/clientpositive/perf/tez/query86.q.out index 9942845e97..effb99c699 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query86.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query86.q.out @@ -121,7 +121,7 @@ Stage-0 Select Operator [SEL_62] (rows=317 width=4) Output:["_col0"] Filter Operator [FIL_61] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -130,7 +130,7 @@ Stage-0 Select Operator [SEL_70] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_69] (rows=143966864 width=119) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_10_d1_d_date_sk_min) AND DynamicValue(RS_10_d1_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_d1_d_date_sk_bloom_filter))) and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_10_d1_d_date_sk_min) AND DynamicValue(RS_10_d1_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_10_d1_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_net_paid"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query87.q.out b/ql/src/test/results/clientpositive/perf/tez/query87.q.out index e00a6b123e..fa433e3054 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query87.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query87.q.out @@ -88,7 +88,7 @@ Stage-0 Output:["_col0"],aggregations:["count()"] Select Operator [SEL_268] (rows=8062883 width=16) Filter Operator [FIL_267] (rows=8062883 width=16) - predicate:(((_col3 * 2L) = _col4) and (_col3 > 0L)) + predicate:((_col3 > 0L) and ((_col3 * 2L) = _col4)) Select Operator [SEL_266] (rows=48377300 width=16) Output:["_col3","_col4"] Group By Operator [GBY_265] (rows=48377300 width=290) @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_227] (rows=317 width=98) Output:["_col0","_col1"] Filter Operator [FIL_226] (rows=317 width=102) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=102) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date","d_month_seq"] <-Map 22 [SIMPLE_EDGE] vectorized @@ -145,7 +145,7 @@ Stage-0 Select Operator [SEL_288] (rows=143930993 width=7) Output:["_col0","_col1"] Filter Operator [FIL_287] (rows=143930993 width=7) - predicate:((ws_sold_date_sk BETWEEN DynamicValue(RS_73_date_dim_d_date_sk_min) AND DynamicValue(RS_73_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_73_date_dim_d_date_sk_bloom_filter))) and ws_bill_customer_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null and (ws_sold_date_sk BETWEEN DynamicValue(RS_73_date_dim_d_date_sk_min) AND DynamicValue(RS_73_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, DynamicValue(RS_73_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_63] (rows=144002668 width=7) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_bill_customer_sk"] <-Reducer 19 [BROADCAST_EDGE] vectorized @@ -173,7 +173,7 @@ Stage-0 Select Operator [SEL_259] (rows=23390718 width=290) Output:["_col0","_col1","_col2"] Filter Operator [FIL_258] (rows=23390718 width=290) - predicate:(((_col3 * 2L) = _col4) and (_col3 > 0L)) + predicate:((_col3 > 0L) and ((_col3 * 2L) = _col4)) Group By Operator [GBY_257] (rows=140344308 width=290) Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2 <-Union 5 [SIMPLE_EDGE] @@ -218,7 +218,7 @@ Stage-0 Select Operator [SEL_276] (rows=285117831 width=7) Output:["_col0","_col1"] Filter Operator [FIL_275] (rows=285117831 width=7) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter))) and cs_bill_customer_sk is not null and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and cs_bill_customer_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_35_date_dim_d_date_sk_min) AND DynamicValue(RS_35_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_35_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_25] (rows=287989836 width=7) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk"] <-Reducer 15 [BROADCAST_EDGE] vectorized @@ -273,7 +273,7 @@ Stage-0 Select Operator [SEL_243] (rows=525327388 width=7) Output:["_col0","_col1"] Filter Operator [FIL_242] (rows=525327388 width=7) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_customer_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=7) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk"] <-Reducer 11 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query88.q.out b/ql/src/test/results/clientpositive/perf/tez/query88.q.out index c8e2e6fba4..23ebd4bb6c 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query88.q.out @@ -320,7 +320,7 @@ Stage-0 Select Operator [SEL_660] (rows=817 width=4) Output:["_col0"] Filter Operator [FIL_659] (rows=817 width=12) - predicate:((((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and (hd_dep_count) IN (3, 0, 1) and hd_demo_sk is not null) + predicate:((hd_dep_count) IN (3, 0, 1) and (((hd_dep_count = 3) and (hd_vehicle_count <= 5)) or ((hd_dep_count = 0) and (hd_vehicle_count <= 2)) or ((hd_dep_count = 1) and (hd_vehicle_count <= 3))) and ((hd_vehicle_count <= 5) or (hd_vehicle_count <= 2) or (hd_vehicle_count <= 3)) and hd_demo_sk is not null) TableScan [TS_3] (rows=7200 width=12) default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"] <-Map 56 [SIMPLE_EDGE] vectorized @@ -329,7 +329,7 @@ Stage-0 Select Operator [SEL_712] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_711] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_146_time_dim_t_time_sk_min) AND DynamicValue(RS_146_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_146_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_146_time_dim_t_time_sk_min) AND DynamicValue(RS_146_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_146_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_130] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 48 [BROADCAST_EDGE] vectorized @@ -389,7 +389,7 @@ Stage-0 Select Operator [SEL_705] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_704] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_120_time_dim_t_time_sk_min) AND DynamicValue(RS_120_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_120_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_120_time_dim_t_time_sk_min) AND DynamicValue(RS_120_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_120_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_104] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 47 [BROADCAST_EDGE] vectorized @@ -449,7 +449,7 @@ Stage-0 Select Operator [SEL_698] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_697] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_94_time_dim_t_time_sk_min) AND DynamicValue(RS_94_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_94_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_94_time_dim_t_time_sk_min) AND DynamicValue(RS_94_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_94_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_78] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 46 [BROADCAST_EDGE] vectorized @@ -509,7 +509,7 @@ Stage-0 Select Operator [SEL_691] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_690] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_68_time_dim_t_time_sk_min) AND DynamicValue(RS_68_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_68_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_68_time_dim_t_time_sk_min) AND DynamicValue(RS_68_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_68_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_52] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 45 [BROADCAST_EDGE] vectorized @@ -569,7 +569,7 @@ Stage-0 Select Operator [SEL_684] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_683] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_42_time_dim_t_time_sk_min) AND DynamicValue(RS_42_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_42_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_42_time_dim_t_time_sk_min) AND DynamicValue(RS_42_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_42_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_26] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 44 [BROADCAST_EDGE] vectorized @@ -625,7 +625,7 @@ Stage-0 Select Operator [SEL_657] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_656] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_16_time_dim_t_time_sk_min) AND DynamicValue(RS_16_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_16_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_16_time_dim_t_time_sk_min) AND DynamicValue(RS_16_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_16_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 43 [BROADCAST_EDGE] vectorized @@ -681,7 +681,7 @@ Stage-0 Select Operator [SEL_719] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_718] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_172_time_dim_t_time_sk_min) AND DynamicValue(RS_172_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_172_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_172_time_dim_t_time_sk_min) AND DynamicValue(RS_172_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_172_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_156] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 49 [BROADCAST_EDGE] vectorized @@ -737,7 +737,7 @@ Stage-0 Select Operator [SEL_726] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_725] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_198_time_dim_t_time_sk_min) AND DynamicValue(RS_198_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_198_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_198_time_dim_t_time_sk_min) AND DynamicValue(RS_198_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_198_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_182] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 50 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query89.q.out b/ql/src/test/results/clientpositive/perf/tez/query89.q.out index 015600e312..21a43977af 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query89.q.out @@ -142,7 +142,7 @@ Stage-0 Select Operator [SEL_94] (rows=525329897 width=118) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_93] (rows=525329897 width=118) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=118) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_sales_price"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -162,7 +162,7 @@ Stage-0 Select Operator [SEL_97] (rows=6988 width=286) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_96] (rows=6988 width=286) - predicate:((((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and i_item_sk is not null) + predicate:((i_class) IN ('wallpaper', 'parenting', 'musical', 'womens', 'birdal', 'pants') and (i_category) IN ('Home', 'Books', 'Electronics', 'Shoes', 'Jewelry', 'Men') and (((i_category) IN ('Home', 'Books', 'Electronics') and (i_class) IN ('wallpaper', 'parenting', 'musical')) or ((i_category) IN ('Shoes', 'Jewelry', 'Men') and (i_class) IN ('womens', 'birdal', 'pants'))) and i_item_sk is not null) TableScan [TS_3] (rows=462000 width=286) default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_brand","i_class","i_category"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query90.q.out b/ql/src/test/results/clientpositive/perf/tez/query90.q.out index 9fd41d0593..2892bfb9b7 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query90.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query90.q.out @@ -119,7 +119,7 @@ Stage-0 Select Operator [SEL_160] (rows=143895111 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_159] (rows=143895111 width=11) - predicate:((ws_ship_hdemo_sk BETWEEN DynamicValue(RS_19_household_demographics_hd_demo_sk_min) AND DynamicValue(RS_19_household_demographics_hd_demo_sk_max) and in_bloom_filter(ws_ship_hdemo_sk, DynamicValue(RS_19_household_demographics_hd_demo_sk_bloom_filter))) and ws_ship_hdemo_sk is not null and ws_sold_time_sk is not null and ws_web_page_sk is not null) + predicate:(ws_sold_time_sk is not null and ws_ship_hdemo_sk is not null and ws_web_page_sk is not null and (ws_ship_hdemo_sk BETWEEN DynamicValue(RS_19_household_demographics_hd_demo_sk_min) AND DynamicValue(RS_19_household_demographics_hd_demo_sk_max) and in_bloom_filter(ws_ship_hdemo_sk, DynamicValue(RS_19_household_demographics_hd_demo_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=11) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_time_sk","ws_ship_hdemo_sk","ws_web_page_sk"] <-Reducer 13 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query91.q.out b/ql/src/test/results/clientpositive/perf/tez/query91.q.out index 98e8adf135..6bd534b21b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query91.q.out @@ -92,20 +92,20 @@ Stage-0 Stage-1 Reducer 7 vectorized File Output Operator [FS_170] - Select Operator [SEL_169] (rows=1 width=406) + Select Operator [SEL_169] (rows=9504 width=406) Output:["_col0","_col1","_col2","_col3"] <-Reducer 6 [SIMPLE_EDGE] vectorized SHUFFLE [RS_168] - Select Operator [SEL_167] (rows=1 width=518) + Select Operator [SEL_167] (rows=9504 width=518) Output:["_col0","_col1","_col2","_col4"] - Group By Operator [GBY_166] (rows=1 width=585) + Group By Operator [GBY_166] (rows=9504 width=585) Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4 <-Reducer 5 [SIMPLE_EDGE] SHUFFLE [RS_42] PartitionCols:_col0, _col1, _col2, _col3, _col4 - Group By Operator [GBY_41] (rows=1 width=585) + Group By Operator [GBY_41] (rows=9504 width=585) Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col11)"],keys:_col5, _col6, _col14, _col15, _col16 - Merge Join Operator [MERGEJOIN_144] (rows=10438 width=473) + Merge Join Operator [MERGEJOIN_144] (rows=231957 width=473) Conds:RS_37._col2=RS_165._col0(Inner),Output:["_col5","_col6","_col11","_col14","_col15","_col16"] <-Map 15 [SIMPLE_EDGE] vectorized SHUFFLE [RS_165] @@ -119,7 +119,7 @@ Stage-0 <-Reducer 4 [SIMPLE_EDGE] SHUFFLE [RS_37] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_143] (rows=20876 width=473) + Merge Join Operator [MERGEJOIN_143] (rows=463913 width=475) Conds:RS_34._col0=RS_35._col1(Inner),Output:["_col2","_col5","_col6","_col11","_col14","_col15","_col16"] <-Reducer 12 [SIMPLE_EDGE] SHUFFLE [RS_35] @@ -146,7 +146,7 @@ Stage-0 Select Operator [SEL_155] (rows=27658583 width=121) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_154] (rows=27658583 width=121) - predicate:(cr_call_center_sk is not null and cr_returned_date_sk is not null and cr_returning_customer_sk is not null) + predicate:(cr_call_center_sk is not null and cr_returning_customer_sk is not null and cr_returned_date_sk is not null) TableScan [TS_9] (rows=28798881 width=121) default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_returned_date_sk","cr_returning_customer_sk","cr_call_center_sk","cr_net_loss"] <-Map 13 [SIMPLE_EDGE] vectorized @@ -155,13 +155,13 @@ Stage-0 Select Operator [SEL_158] (rows=50 width=4) Output:["_col0"] Filter Operator [FIL_157] (rows=50 width=12) - predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null) + predicate:((d_year = 1999) and (d_moy = 11) and d_date_sk is not null) TableScan [TS_12] (rows=73049 width=12) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"] <-Reducer 3 [SIMPLE_EDGE] SHUFFLE [RS_34] PartitionCols:_col0 - Merge Join Operator [MERGEJOIN_140] (rows=479709 width=183) + Merge Join Operator [MERGEJOIN_140] (rows=213205 width=183) Conds:RS_31._col3=RS_153._col0(Inner),Output:["_col0","_col2","_col5","_col6"] <-Map 9 [SIMPLE_EDGE] vectorized SHUFFLE [RS_153] @@ -175,7 +175,7 @@ Stage-0 <-Reducer 2 [SIMPLE_EDGE] SHUFFLE [RS_31] PartitionCols:_col3 - Merge Join Operator [MERGEJOIN_139] (rows=2398543 width=187) + Merge Join Operator [MERGEJOIN_139] (rows=1066023 width=187) Conds:RS_147._col1=RS_150._col0(Inner),Output:["_col0","_col2","_col3","_col5","_col6"] <-Map 1 [SIMPLE_EDGE] vectorized SHUFFLE [RS_147] @@ -183,16 +183,16 @@ Stage-0 Select Operator [SEL_146] (rows=74500295 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_145] (rows=74500295 width=15) - predicate:(c_current_addr_sk is not null and c_current_cdemo_sk is not null and c_current_hdemo_sk is not null and c_customer_sk is not null) + predicate:(c_current_hdemo_sk is not null and c_current_cdemo_sk is not null and c_customer_sk is not null and c_current_addr_sk is not null) TableScan [TS_0] (rows=80000000 width=15) default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_hdemo_sk","c_current_addr_sk"] <-Map 8 [SIMPLE_EDGE] vectorized SHUFFLE [RS_150] PartitionCols:_col0 - Select Operator [SEL_149] (rows=59105 width=183) + Select Operator [SEL_149] (rows=26269 width=183) Output:["_col0","_col1","_col2"] - Filter Operator [FIL_148] (rows=59105 width=183) - predicate:((cd_education_status) IN ('Unknown', 'Advanced Degree') and (cd_marital_status) IN ('M', 'W') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree')) and cd_demo_sk is not null) + Filter Operator [FIL_148] (rows=26269 width=183) + predicate:((cd_marital_status) IN ('M', 'W') and (cd_education_status) IN ('Unknown', 'Advanced Degree') and (struct(cd_marital_status,cd_education_status)) IN (const struct('M','Unknown'), const struct('W','Advanced Degree')) and cd_demo_sk is not null) TableScan [TS_3] (rows=1861800 width=183) default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"] diff --git a/ql/src/test/results/clientpositive/perf/tez/query92.q.out b/ql/src/test/results/clientpositive/perf/tez/query92.q.out index 10134c6659..223a605525 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query92.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query92.q.out @@ -119,7 +119,7 @@ Stage-0 Select Operator [SEL_114] (rows=143930905 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_112] (rows=143930905 width=119) - predicate:(ws_ext_discount_amt is not null and ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_ext_discount_amt is not null and ws_sold_date_sk is not null and ws_item_sk is not null) TableScan [TS_0] (rows=144002668 width=119) default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_discount_amt"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -164,7 +164,7 @@ Stage-0 Select Operator [SEL_115] (rows=143966864 width=119) Output:["_col0","_col1","_col2"] Filter Operator [FIL_113] (rows=143966864 width=119) - predicate:(ws_item_sk is not null and ws_sold_date_sk is not null) + predicate:(ws_sold_date_sk is not null and ws_item_sk is not null) Please refer to the previous TableScan [TS_0] <-Map 8 [SIMPLE_EDGE] vectorized SHUFFLE [RS_121] diff --git a/ql/src/test/results/clientpositive/perf/tez/query93.q.out b/ql/src/test/results/clientpositive/perf/tez/query93.q.out index 6a5c241ca6..16392cf9b9 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query93.q.out @@ -84,7 +84,7 @@ Stage-0 Select Operator [SEL_66] (rows=55574563 width=15) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_65] (rows=55574563 width=15) - predicate:(sr_item_sk is not null and sr_reason_sk is not null and sr_ticket_number is not null) + predicate:(sr_reason_sk is not null and sr_item_sk is not null and sr_ticket_number is not null) TableScan [TS_0] (rows=57591150 width=15) default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_item_sk","sr_reason_sk","sr_ticket_number","sr_return_quantity"] <-Map 7 [SIMPLE_EDGE] vectorized @@ -102,7 +102,7 @@ Stage-0 Select Operator [SEL_74] (rows=575995635 width=122) Output:["_col0","_col1","_col2","_col3","_col4"] Filter Operator [FIL_73] (rows=575995635 width=122) - predicate:((ss_ticket_number BETWEEN DynamicValue(RS_12_store_returns_sr_ticket_number_min) AND DynamicValue(RS_12_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_12_store_returns_sr_ticket_number_bloom_filter))) and ss_item_sk is not null and ss_ticket_number is not null) + predicate:(ss_item_sk is not null and ss_ticket_number is not null and (ss_ticket_number BETWEEN DynamicValue(RS_12_store_returns_sr_ticket_number_min) AND DynamicValue(RS_12_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_12_store_returns_sr_ticket_number_bloom_filter)))) TableScan [TS_6] (rows=575995635 width=122) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_item_sk","ss_customer_sk","ss_ticket_number","ss_quantity","ss_sales_price"] <-Reducer 6 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query94.q.out b/ql/src/test/results/clientpositive/perf/tez/query94.q.out index e9b8db975f..33445ffa54 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query94.q.out @@ -169,7 +169,7 @@ Stage-0 Select Operator [SEL_136] (rows=143895019 width=243) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"] Filter Operator [FIL_135] (rows=143895019 width=243) - predicate:((ws_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter))) and ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_order_number is not null and (ws_ship_addr_sk BETWEEN DynamicValue(RS_16_customer_address_ca_address_sk_min) AND DynamicValue(RS_16_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_16_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=243) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_ship_date_sk","ws_ship_addr_sk","ws_web_site_sk","ws_warehouse_sk","ws_order_number","ws_ext_ship_cost","ws_net_profit"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -200,7 +200,7 @@ Stage-0 Select Operator [SEL_147] (rows=143966743 width=7) Output:["_col0","_col1"] Filter Operator [FIL_146] (rows=143966743 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_34_ws1_ws_order_number_min) AND DynamicValue(RS_34_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_34_ws1_ws_order_number_bloom_filter))) and ws_order_number is not null and ws_warehouse_sk is not null) + predicate:(ws_warehouse_sk is not null and ws_order_number is not null and (ws_order_number BETWEEN DynamicValue(RS_34_ws1_ws_order_number_min) AND DynamicValue(RS_34_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_34_ws1_ws_order_number_bloom_filter)))) TableScan [TS_22] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query95.q.out b/ql/src/test/results/clientpositive/perf/tez/query95.q.out index 1665538f2f..6ce982b8de 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query95.q.out @@ -161,7 +161,7 @@ Stage-0 Select Operator [SEL_247] (rows=143895019 width=239) Output:["_col0","_col1","_col2","_col3","_col4","_col5"] Filter Operator [FIL_246] (rows=143895019 width=239) - predicate:((ws_ship_addr_sk BETWEEN DynamicValue(RS_53_customer_address_ca_address_sk_min) AND DynamicValue(RS_53_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_53_customer_address_ca_address_sk_bloom_filter))) and ws_order_number is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_web_site_sk is not null) + predicate:(ws_web_site_sk is not null and ws_ship_addr_sk is not null and ws_ship_date_sk is not null and ws_order_number is not null and (ws_ship_addr_sk BETWEEN DynamicValue(RS_53_customer_address_ca_address_sk_min) AND DynamicValue(RS_53_customer_address_ca_address_sk_max) and in_bloom_filter(ws_ship_addr_sk, DynamicValue(RS_53_customer_address_ca_address_sk_bloom_filter)))) TableScan [TS_0] (rows=144002668 width=239) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_ship_date_sk","ws_ship_addr_sk","ws_web_site_sk","ws_order_number","ws_ext_ship_cost","ws_net_profit"] <-Reducer 13 [BROADCAST_EDGE] vectorized @@ -206,7 +206,7 @@ Stage-0 Select Operator [SEL_259] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_258] (rows=144002668 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_58_ws1_ws_order_number_min) AND DynamicValue(RS_58_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_58_ws1_ws_order_number_bloom_filter))) and ws_order_number is not null) + predicate:(ws_order_number is not null and (ws_order_number BETWEEN DynamicValue(RS_58_ws1_ws_order_number_min) AND DynamicValue(RS_58_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_58_ws1_ws_order_number_bloom_filter)))) TableScan [TS_12] (rows=144002668 width=7) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -226,7 +226,7 @@ Stage-0 Select Operator [SEL_262] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_261] (rows=144002668 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_58_ws1_ws_order_number_min) AND DynamicValue(RS_58_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_58_ws1_ws_order_number_bloom_filter))) and ws_order_number is not null) + predicate:(ws_order_number is not null and (ws_order_number BETWEEN DynamicValue(RS_58_ws1_ws_order_number_min) AND DynamicValue(RS_58_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_58_ws1_ws_order_number_bloom_filter)))) TableScan [TS_15] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 10 [BROADCAST_EDGE] vectorized @@ -268,7 +268,7 @@ Stage-0 Select Operator [SEL_270] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_269] (rows=144002668 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_61_ws1_ws_order_number_min) AND DynamicValue(RS_61_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_61_ws1_ws_order_number_bloom_filter))) and ws_order_number is not null) + predicate:(ws_order_number is not null and (ws_order_number BETWEEN DynamicValue(RS_61_ws1_ws_order_number_min) AND DynamicValue(RS_61_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_61_ws1_ws_order_number_bloom_filter)))) TableScan [TS_27] (rows=144002668 width=7) default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized @@ -288,7 +288,7 @@ Stage-0 Select Operator [SEL_273] (rows=144002668 width=7) Output:["_col0","_col1"] Filter Operator [FIL_272] (rows=144002668 width=7) - predicate:((ws_order_number BETWEEN DynamicValue(RS_61_ws1_ws_order_number_min) AND DynamicValue(RS_61_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_61_ws1_ws_order_number_bloom_filter))) and ws_order_number is not null) + predicate:(ws_order_number is not null and (ws_order_number BETWEEN DynamicValue(RS_61_ws1_ws_order_number_min) AND DynamicValue(RS_61_ws1_ws_order_number_max) and in_bloom_filter(ws_order_number, DynamicValue(RS_61_ws1_ws_order_number_bloom_filter)))) TableScan [TS_30] (rows=144002668 width=7) default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"] <-Reducer 9 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query96.q.out b/ql/src/test/results/clientpositive/perf/tez/query96.q.out index 9dbce55450..1c51dcce53 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query96.q.out @@ -105,7 +105,7 @@ Stage-0 Select Operator [SEL_82] (rows=501695814 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_81] (rows=501695814 width=11) - predicate:((ss_sold_time_sk BETWEEN DynamicValue(RS_13_time_dim_t_time_sk_min) AND DynamicValue(RS_13_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_13_time_dim_t_time_sk_bloom_filter))) and ss_hdemo_sk is not null and ss_sold_time_sk is not null and ss_store_sk is not null) + predicate:(ss_sold_time_sk is not null and ss_hdemo_sk is not null and ss_store_sk is not null and (ss_sold_time_sk BETWEEN DynamicValue(RS_13_time_dim_t_time_sk_min) AND DynamicValue(RS_13_time_dim_t_time_sk_max) and in_bloom_filter(ss_sold_time_sk, DynamicValue(RS_13_time_dim_t_time_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_time_sk","ss_hdemo_sk","ss_store_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query97.q.out b/ql/src/test/results/clientpositive/perf/tez/query97.q.out index 5862edbe1e..d3cb1fee2a 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query97.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query97.q.out @@ -102,7 +102,7 @@ Stage-0 Select Operator [SEL_70] (rows=317 width=4) Output:["_col0"] Filter Operator [FIL_69] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] <-Map 1 [SIMPLE_EDGE] vectorized @@ -111,7 +111,7 @@ Stage-0 Select Operator [SEL_82] (rows=550076554 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_81] (rows=550076554 width=11) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_7_date_dim_d_date_sk_min) AND DynamicValue(RS_7_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_7_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=11) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk"] <-Reducer 7 [BROADCAST_EDGE] vectorized @@ -147,7 +147,7 @@ Stage-0 Select Operator [SEL_89] (rows=286549727 width=11) Output:["_col0","_col1","_col2"] Filter Operator [FIL_88] (rows=286549727 width=11) - predicate:((cs_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null) + predicate:(cs_sold_date_sk is not null and (cs_sold_date_sk BETWEEN DynamicValue(RS_21_date_dim_d_date_sk_min) AND DynamicValue(RS_21_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_21_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_14] (rows=287989836 width=11) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"] <-Reducer 10 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query98.q.out b/ql/src/test/results/clientpositive/perf/tez/query98.q.out index e0a5ff83da..4385954fb6 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query98.q.out @@ -136,7 +136,7 @@ Stage-0 Select Operator [SEL_67] (rows=550076554 width=114) Output:["_col0","_col1","_col2"] Filter Operator [FIL_66] (rows=550076554 width=114) - predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_item_sk is not null and ss_sold_date_sk is not null) + predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter)))) TableScan [TS_0] (rows=575995635 width=114) default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"] <-Reducer 8 [BROADCAST_EDGE] vectorized diff --git a/ql/src/test/results/clientpositive/perf/tez/query99.q.out b/ql/src/test/results/clientpositive/perf/tez/query99.q.out index 9536704ca5..ccbbd1bb5d 100644 --- a/ql/src/test/results/clientpositive/perf/tez/query99.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/query99.q.out @@ -163,7 +163,7 @@ Stage-0 Select Operator [SEL_110] (rows=282273729 width=35) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"] Filter Operator [FIL_109] (rows=282273729 width=19) - predicate:((cs_ship_mode_sk BETWEEN DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_bloom_filter))) and cs_call_center_sk is not null and cs_ship_date_sk is not null and cs_ship_mode_sk is not null and cs_warehouse_sk is not null) + predicate:(cs_warehouse_sk is not null and cs_ship_date_sk is not null and cs_ship_mode_sk is not null and cs_call_center_sk is not null and (cs_ship_mode_sk BETWEEN DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_min) AND DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_max) and in_bloom_filter(cs_ship_mode_sk, DynamicValue(RS_25_ship_mode_sm_ship_mode_sk_bloom_filter)))) TableScan [TS_0] (rows=287989836 width=19) default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_ship_date_sk","cs_call_center_sk","cs_ship_mode_sk","cs_warehouse_sk"] <-Reducer 12 [BROADCAST_EDGE] vectorized @@ -183,7 +183,7 @@ Stage-0 Select Operator [SEL_113] (rows=317 width=4) Output:["_col0"] Filter Operator [FIL_112] (rows=317 width=8) - predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223) + predicate:(d_month_seq BETWEEN 1212 AND 1223 and d_date_sk is not null) TableScan [TS_3] (rows=73049 width=8) default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"] diff --git a/ql/src/test/results/clientpositive/pointlookup.q.out b/ql/src/test/results/clientpositive/pointlookup.q.out index 13047f0e51..a3c4a74a87 100644 --- a/ql/src/test/results/clientpositive/pointlookup.q.out +++ b/ql/src/test/results/clientpositive/pointlookup.q.out @@ -47,7 +47,7 @@ STAGE PLANS: filterExpr: (((key = '0') and (value = 'val_0')) or ((key = '1') and (value = 'val_1')) or ((key = '2') and (value = 'val_2')) or ((key = '3') and (value = 'val_3')) or ((key = '4') and (value = 'val_4')) or ((key = '5') and (value = 'val_5')) or ((key = '6') and (value = 'val_6')) or ((key = '7') and (value = 'val_7')) or ((key = '8') and (value = 'val_8')) or ((key = '9') and (value = 'val_9')) or ((key = '10') and (value = 'val_10'))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = '0') and (value = 'val_0')) or ((key = '1') and (value = 'val_1')) or ((key = '10') and (value = 'val_10')) or ((key = '2') and (value = 'val_2')) or ((key = '3') and (value = 'val_3')) or ((key = '4') and (value = 'val_4')) or ((key = '5') and (value = 'val_5')) or ((key = '6') and (value = 'val_6')) or ((key = '7') and (value = 'val_7')) or ((key = '8') and (value = 'val_8')) or ((key = '9') and (value = 'val_9'))) (type: boolean) + predicate: (((key = '0') and (value = 'val_0')) or ((key = '1') and (value = 'val_1')) or ((key = '2') and (value = 'val_2')) or ((key = '3') and (value = 'val_3')) or ((key = '4') and (value = 'val_4')) or ((key = '5') and (value = 'val_5')) or ((key = '6') and (value = 'val_6')) or ((key = '7') and (value = 'val_7')) or ((key = '8') and (value = 'val_8')) or ((key = '9') and (value = 'val_9')) or ((key = '10') and (value = 'val_10'))) (type: boolean) Statistics: Num rows: 11 Data size: 1958 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/pointlookup3.q.out b/ql/src/test/results/clientpositive/pointlookup3.q.out index b4bbc27bbc..dfa625b23d 100644 --- a/ql/src/test/results/clientpositive/pointlookup3.q.out +++ b/ql/src/test/results/clientpositive/pointlookup3.q.out @@ -253,7 +253,7 @@ POSTHOOK: Input: default@pcr_t1_n1@ds1=2000-04-08/ds2=2001-04-08 OPTIMIZED SQL: SELECT `key`, `value`, `ds1`, CAST('2001-04-08' AS STRING) AS `ds2` FROM (SELECT `key`, `value`, `ds1` FROM `default`.`pcr_t1_n1` -WHERE `ds2` = '2001-04-08' AND (`ds1` = '2000-04-08' AND `key` = 1 OR `ds1` = '2000-04-09' AND `key` = 2) +WHERE (`ds1` = '2000-04-08' AND `key` = 1 OR `ds1` = '2000-04-09' AND `key` = 2) AND `ds2` = '2001-04-08' ORDER BY `key`, `value`, `ds1`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -265,7 +265,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1_n1 - filterExpr: ((ds2 = '2001-04-08') and (((ds1 = '2000-04-08') and (key = 1)) or ((ds1 = '2000-04-09') and (key = 2)))) (type: boolean) + filterExpr: ((((ds1 = '2000-04-08') and (key = 1)) or ((ds1 = '2000-04-09') and (key = 2))) and (ds2 = '2001-04-08')) (type: boolean) Statistics: Num rows: 20 Data size: 5560 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/ppd_clusterby.q.out b/ql/src/test/results/clientpositive/ppd_clusterby.q.out index d551bb1383..b41f723554 100644 --- a/ql/src/test/results/clientpositive/ppd_clusterby.q.out +++ b/ql/src/test/results/clientpositive/ppd_clusterby.q.out @@ -86,7 +86,7 @@ STAGE PLANS: filterExpr: (key = 20) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key = 20) and key is not null) (type: boolean) + predicate: (key is not null and (key = 20)) (type: boolean) Statistics: Num rows: 2 Data size: 356 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -99,7 +99,7 @@ STAGE PLANS: filterExpr: (key = 20) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key = 20) and key is not null) (type: boolean) + predicate: (key is not null and (key = 20)) (type: boolean) Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_gby.q.out b/ql/src/test/results/clientpositive/ppd_gby.q.out index 96f3612eb3..09d3383dbf 100644 --- a/ql/src/test/results/clientpositive/ppd_gby.q.out +++ b/ql/src/test/results/clientpositive/ppd_gby.q.out @@ -51,7 +51,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 83 Data size: 8217 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean) + predicate: ((_col1 > 30L) or (_col0 < 'val_400')) (type: boolean) Statistics: Num rows: 54 Data size: 5346 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) @@ -267,7 +267,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 83 Data size: 8217 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean) + predicate: ((_col1 > 30L) or (_col0 < 'val_400')) (type: boolean) Statistics: Num rows: 54 Data size: 5346 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_gby2.q.out b/ql/src/test/results/clientpositive/ppd_gby2.q.out index b1a8ca1178..52b4ec0452 100644 --- a/ql/src/test/results/clientpositive/ppd_gby2.q.out +++ b/ql/src/test/results/clientpositive/ppd_gby2.q.out @@ -54,7 +54,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 83 Data size: 8217 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean) + predicate: ((_col1 > 30L) or (_col0 < 'val_400')) (type: boolean) Statistics: Num rows: 54 Data size: 5346 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: max(_col0) @@ -183,7 +183,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 83 Data size: 8217 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean) + predicate: ((_col1 > 30L) or (_col0 < 'val_400')) (type: boolean) Statistics: Num rows: 54 Data size: 5346 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: max(_col0) diff --git a/ql/src/test/results/clientpositive/ppd_gby_join.q.out b/ql/src/test/results/clientpositive/ppd_gby_join.q.out index 7343f7e8a1..eba3c9b342 100644 --- a/ql/src/test/results/clientpositive/ppd_gby_join.q.out +++ b/ql/src/test/results/clientpositive/ppd_gby_join.q.out @@ -33,10 +33,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -49,10 +49,10 @@ STAGE PLANS: Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -71,14 +71,14 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: _col0 (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: @@ -94,7 +94,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Execution mode: vectorized Reduce Operator Tree: @@ -103,10 +103,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -304,10 +304,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -320,10 +320,10 @@ STAGE PLANS: Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -342,14 +342,14 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0 - Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: _col0 (type: string) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false table: @@ -365,7 +365,7 @@ STAGE PLANS: key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Execution mode: vectorized Reduce Operator Tree: @@ -374,10 +374,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 27 Data size: 2565 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 18 Data size: 1710 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/ppd_join.q.out b/ql/src/test/results/clientpositive/ppd_join.q.out index 4fbce44f53..c45867799f 100644 --- a/ql/src/test/results/clientpositive/ppd_join.q.out +++ b/ql/src/test/results/clientpositive/ppd_join.q.out @@ -30,10 +30,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -46,10 +46,10 @@ STAGE PLANS: Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -69,14 +69,14 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0, _col2 - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col2 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -558,10 +558,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -574,10 +574,10 @@ STAGE PLANS: Statistics: Num rows: 36 Data size: 3132 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -597,14 +597,14 @@ STAGE PLANS: 0 _col0 (type: string) 1 _col0 (type: string) outputColumnNames: _col0, _col2 - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col2 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 36 Data size: 6408 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/ppd_join2.q.out b/ql/src/test/results/clientpositive/ppd_join2.q.out index 415d312e3c..cf3457e970 100644 --- a/ql/src/test/results/clientpositive/ppd_join2.q.out +++ b/ql/src/test/results/clientpositive/ppd_join2.q.out @@ -37,10 +37,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '305') and (key <> '302') and (key < '400') and (key <> '14') and (key <> '311')) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311')) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -54,10 +54,10 @@ STAGE PLANS: value expressions: _col1 (type: string) TableScan alias: src - filterExpr: ((key <> '302') and (key < '400') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> '14') and value is not null) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and value is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value <> 'val_50') or (key > '1')) and (key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and value is not null) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and value is not null) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1724,10 +1724,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '305') and (key <> '302') and (key < '400') and (key <> '14') and (key <> '311')) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311')) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1741,10 +1741,10 @@ STAGE PLANS: value expressions: _col1 (type: string) TableScan alias: src - filterExpr: ((key <> '302') and (key < '400') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> '14') and value is not null) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and value is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value <> 'val_50') or (key > '1')) and (key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and value is not null) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and value is not null) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_join3.q.out b/ql/src/test/results/clientpositive/ppd_join3.q.out index 6b19607e80..a7820aa0b5 100644 --- a/ql/src/test/results/clientpositive/ppd_join3.q.out +++ b/ql/src/test/results/clientpositive/ppd_join3.q.out @@ -37,10 +37,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '13') and (key <> '11') and (key < '400') and (key <> '12') and (key <> '1') and (key > '0') and (key <> '4')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -53,10 +53,10 @@ STAGE PLANS: Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key <> '11') and (key < '400') and (key <> '12') and (key <> '13') and (key > '0') and ((value <> 'val_500') or (key > '1')) and (key <> '4') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value <> 'val_500') or (key > '1')) and (key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -94,10 +94,10 @@ STAGE PLANS: Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key <> '12') and (key <> '11') and (key < '400') and (key <> '13') and (key <> '4') and (key > '0') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -119,7 +119,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3 Statistics: Num rows: 55 Data size: 14575 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col1 <> '10') or (_col2 > '10')) (type: boolean) + predicate: ((_col2 > '10') or (_col1 <> '10')) (type: boolean) Statistics: Num rows: 55 Data size: 14575 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col3 (type: string) @@ -1779,10 +1779,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '13') and (key <> '11') and (key < '400') and (key <> '12') and (key <> '1') and (key > '0') and (key <> '4')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -1795,10 +1795,10 @@ STAGE PLANS: Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key <> '11') and (key < '400') and (key <> '12') and (key <> '13') and (key > '0') and ((value <> 'val_500') or (key > '1')) and (key <> '4') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value <> 'val_500') or (key > '1')) and (key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string) @@ -1836,10 +1836,10 @@ STAGE PLANS: Statistics: Num rows: 55 Data size: 4785 Basic stats: COMPLETE Column stats: COMPLETE TableScan alias: src - filterExpr: ((key <> '12') and (key <> '11') and (key < '400') and (key <> '13') and (key <> '4') and (key > '0') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1861,7 +1861,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3 Statistics: Num rows: 55 Data size: 14575 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((_col1 <> '10') or (_col2 > '10')) (type: boolean) + predicate: ((_col2 > '10') or (_col1 <> '10')) (type: boolean) Statistics: Num rows: 55 Data size: 14575 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col3 (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_join4.q.out b/ql/src/test/results/clientpositive/ppd_join4.q.out index 7032a41932..efd357be31 100644 --- a/ql/src/test/results/clientpositive/ppd_join4.q.out +++ b/ql/src/test/results/clientpositive/ppd_join4.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: ((name = 'c') and (id = 'a')) (type: boolean) Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((id = 'a') and (name = 'c')) (type: boolean) + predicate: ((name = 'c') and (id = 'a')) (type: boolean) Statistics: Num rows: 1 Data size: 168 Basic stats: COMPLETE Column stats: COMPLETE Select Operator Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/ppd_multi_insert.q.out b/ql/src/test/results/clientpositive/ppd_multi_insert.q.out index 6be8c5e868..d396be3d21 100644 --- a/ql/src/test/results/clientpositive/ppd_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/ppd_multi_insert.q.out @@ -137,7 +137,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col0 < 200) and (_col0 >= 100)) (type: boolean) + predicate: ((_col0 >= 100) and (_col0 < 200)) (type: boolean) Statistics: Num rows: 87 Data size: 15486 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int), _col1 (type: string) @@ -168,7 +168,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col0 < 300) and (_col0 >= 200)) (type: boolean) + predicate: ((_col0 >= 200) and (_col0 < 300)) (type: boolean) Statistics: Num rows: 87 Data size: 15486 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int) @@ -1557,7 +1557,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col0 < 200) and (_col0 >= 100)) (type: boolean) + predicate: ((_col0 >= 100) and (_col0 < 200)) (type: boolean) Statistics: Num rows: 87 Data size: 15486 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int), _col1 (type: string) @@ -1588,7 +1588,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Filter Operator - predicate: ((_col0 < 300) and (_col0 >= 200)) (type: boolean) + predicate: ((_col0 >= 200) and (_col0 < 300)) (type: boolean) Statistics: Num rows: 87 Data size: 15486 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(_col0) (type: int) diff --git a/ql/src/test/results/clientpositive/ppd_outer_join1.q.out b/ql/src/test/results/clientpositive/ppd_outer_join1.q.out index 7cb6b5b2f2..e330f995a1 100644 --- a/ql/src/test/results/clientpositive/ppd_outer_join1.q.out +++ b/ql/src/test/results/clientpositive/ppd_outer_join1.q.out @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -163,7 +163,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_outer_join2.q.out b/ql/src/test/results/clientpositive/ppd_outer_join2.q.out index 7d6c4184ff..f803eb46d9 100644 --- a/ql/src/test/results/clientpositive/ppd_outer_join2.q.out +++ b/ql/src/test/results/clientpositive/ppd_outer_join2.q.out @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_outer_join3.q.out b/ql/src/test/results/clientpositive/ppd_outer_join3.q.out index 846cd7a771..9edeaeb4ad 100644 --- a/ql/src/test/results/clientpositive/ppd_outer_join3.q.out +++ b/ql/src/test/results/clientpositive/ppd_outer_join3.q.out @@ -50,7 +50,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out index d6e5988cf9..f0fe2c24f8 100644 --- a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out +++ b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out @@ -54,7 +54,7 @@ STAGE PLANS: value expressions: _col1 (type: string) TableScan alias: c - filterExpr: ((sqrt(key) <> 13.0D) and (key < '20') and (key > '15')) (type: boolean) + filterExpr: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) @@ -99,7 +99,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) + predicate: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -450,7 +450,7 @@ STAGE PLANS: value expressions: _col1 (type: string) TableScan alias: c - filterExpr: ((sqrt(key) <> 13.0D) and (key < '20') and (key > '15')) (type: boolean) + filterExpr: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) @@ -495,7 +495,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) + predicate: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/ppd_udf_case.q.out b/ql/src/test/results/clientpositive/ppd_udf_case.q.out index ac276554f7..9a87b2de04 100644 --- a/ql/src/test/results/clientpositive/ppd_udf_case.q.out +++ b/ql/src/test/results/clientpositive/ppd_udf_case.q.out @@ -44,10 +44,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + filterExpr: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 546000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + predicate: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 3 Data size: 1638 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), hr (type: string) @@ -59,10 +59,10 @@ STAGE PLANS: value expressions: _col0 (type: string), _col1 (type: string) TableScan alias: b - filterExpr: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + filterExpr: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 546000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + predicate: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 3 Data size: 1638 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), hr (type: string) @@ -199,7 +199,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + filterExpr: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = '27') (type: boolean) @@ -214,7 +214,7 @@ STAGE PLANS: value expressions: _col0 (type: string), _col1 (type: string) TableScan alias: b - filterExpr: ((ds = '2008-04-08') and (key = '27')) (type: boolean) + filterExpr: ((key = '27') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 362000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = '27') (type: boolean) diff --git a/ql/src/test/results/clientpositive/ppd_udf_col.q.out b/ql/src/test/results/clientpositive/ppd_udf_col.q.out index 12c6dda70f..7346ecf9f4 100644 --- a/ql/src/test/results/clientpositive/ppd_udf_col.q.out +++ b/ql/src/test/results/clientpositive/ppd_udf_col.q.out @@ -174,7 +174,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) = 100.0D) and ((UDFToDouble(value) * 10.0D) <= 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(value) * 10.0D) <= 200.0D) and (UDFToDouble(key) = 100.0D)) (type: boolean) + predicate: ((UDFToDouble(key) = 100.0D) and ((UDFToDouble(value) * 10.0D) <= 200.0D)) (type: boolean) Statistics: Num rows: 83 Data size: 14774 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), rand() (type: double), (UDFToDouble(value) * 10.0D) (type: double) @@ -371,7 +371,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) = 100.0D) and ((UDFToDouble(value) * 10.0D) <= 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(value) * 10.0D) <= 200.0D) and (UDFToDouble(key) = 100.0D)) (type: boolean) + predicate: ((UDFToDouble(key) = 100.0D) and ((UDFToDouble(value) * 10.0D) <= 200.0D)) (type: boolean) Statistics: Num rows: 83 Data size: 14774 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), rand() (type: double), (UDFToDouble(value) * 10.0D) (type: double) @@ -583,7 +583,7 @@ STAGE PLANS: filterExpr: ((key = 100) and ((value * 10) <= 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value * 10) <= 200.0D) and (key = 100)) (type: boolean) + predicate: ((key = 100) and ((value * 10) <= 200.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), rand() (type: double), (value * 10) (type: double) @@ -805,7 +805,7 @@ STAGE PLANS: filterExpr: ((key = 100) and ((value * 10) <= 200.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((value * 10) <= 200.0D) and (key = 100)) (type: boolean) + predicate: ((key = 100) and ((value * 10) <= 200.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), rand() (type: double), (value * 10) (type: double) diff --git a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out index 5f63ac7a0e..5649fb6662 100644 --- a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out +++ b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out @@ -26,7 +26,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST(`key` AS INTEGER) AS `user_id`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND (`value` LIKE 'aaa%' OR `value` LIKE 'vvv%') +WHERE (`value` LIKE 'aaa%' OR `value` LIKE 'vvv%') AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -37,7 +37,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and ((value like 'aaa%') or (value like 'vvv%'))) (type: boolean) + filterExpr: (((value like 'aaa%') or (value like 'vvv%')) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -238,7 +238,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST(`key` AS INTEGER) AS `user_id`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND (`value` LIKE 'aaa%' OR `value` LIKE 'vvv%') +WHERE (`value` LIKE 'aaa%' OR `value` LIKE 'vvv%') AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/push_or.q.out b/ql/src/test/results/clientpositive/push_or.q.out index 2f2cd760f5..5cf34aec09 100644 --- a/ql/src/test/results/clientpositive/push_or.q.out +++ b/ql/src/test/results/clientpositive/push_or.q.out @@ -44,7 +44,7 @@ POSTHOOK: Input: default@push_or@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`push_or` -WHERE `ds` = '2000-04-09' OR `key` = 5 +WHERE `key` = 5 OR `ds` = '2000-04-09' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -56,12 +56,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: push_or - filterExpr: ((ds = '2000-04-09') or (key = 5)) (type: boolean) + filterExpr: ((key = 5) or (ds = '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 11120 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2000-04-09') or (key = 5)) (type: boolean) + predicate: ((key = 5) or (ds = '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 11120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/quote1.q.out b/ql/src/test/results/clientpositive/quote1.q.out index e42a16175e..e681bf5779 100644 --- a/ql/src/test/results/clientpositive/quote1.q.out +++ b/ql/src/test/results/clientpositive/quote1.q.out @@ -37,7 +37,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) >= 200.0D) and (UDFToDouble(key) < 300.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 300.0D) and (UDFToDouble(key) >= 200.0D)) (type: boolean) + predicate: ((UDFToDouble(key) >= 200.0D) and (UDFToDouble(key) < 300.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string) @@ -167,14 +167,14 @@ STAGE PLANS: TableScan alias: int filterExpr: (table = '2008-04-08') (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (table = '2008-04-08') (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: location (type: int), type (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 178 Basic stats: COMPLETE Column stats: COMPLETE ListSink PREHOOK: query: FROM src diff --git a/ql/src/test/results/clientpositive/quotedid_partition.q.out b/ql/src/test/results/clientpositive/quotedid_partition.q.out index 27f5dfda6e..fef3541e89 100644 --- a/ql/src/test/results/clientpositive/quotedid_partition.q.out +++ b/ql/src/test/results/clientpositive/quotedid_partition.q.out @@ -47,7 +47,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src_p - filterExpr: ((!@#$%^&*()_q = 'a') and (x+1 = '10')) (type: boolean) + filterExpr: ((x+1 = '10') and (!@#$%^&*()_q = 'a')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (x+1 = '10') (type: boolean) diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out index a394efa2bb..27fcc2d1b0 100644 --- a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out +++ b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out @@ -10,7 +10,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM `default`.`srcpart` -WHERE RAND(1) < 0.1 AND `ds` = '2008-04-08' AND CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND `hr` LIKE '%2' +WHERE CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND RAND(1) < 0.1 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -25,7 +25,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((rand(1) < 0.1D) and UDFToDouble(key) BETWEEN 10.0D AND 50.0D) (type: boolean) + predicate: (UDFToDouble(key) BETWEEN 10.0D AND 50.0D and (rand(1) < 0.1D)) (type: boolean) Statistics: Num rows: 18 Data size: 6516 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), '2008-04-08' (type: string), hr (type: string) @@ -125,11 +125,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### -42 val_42 2008-04-08 12 -44 val_44 2008-04-08 12 -26 val_26 2008-04-08 12 -18 val_18 2008-04-08 12 -37 val_37 2008-04-08 12 +47 val_47 2008-04-08 12 +35 val_35 2008-04-08 12 PREHOOK: query: explain extended select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -142,7 +139,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND `hr` LIKE '%2' +WHERE CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -153,7 +150,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and UDFToDouble(key) BETWEEN 10.0D AND 50.0D and (hr like '%2')) (type: boolean) + filterExpr: (UDFToDouble(key) BETWEEN 10.0D AND 50.0D and (ds = '2008-04-08') and (hr like '%2')) (type: boolean) Statistics: Num rows: 500 Data size: 181000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/rcfile_null_value.q.out b/ql/src/test/results/clientpositive/rcfile_null_value.q.out index f370ddc8a1..f3c02ba5ca 100644 --- a/ql/src/test/results/clientpositive/rcfile_null_value.q.out +++ b/ql/src/test/results/clientpositive/rcfile_null_value.q.out @@ -123,7 +123,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/router_join_ppr.q.out b/ql/src/test/results/clientpositive/router_join_ppr.q.out index b565168750..0d99feb6d7 100644 --- a/ql/src/test/results/clientpositive/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/router_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -70,7 +70,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -346,7 +346,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `key` < 20 AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -387,7 +387,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -666,7 +666,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -704,7 +704,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 19758 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -980,7 +980,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -1021,7 +1021,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/sample8.q.out b/ql/src/test/results/clientpositive/sample8.q.out index 8c24451027..955c77f90e 100644 --- a/ql/src/test/results/clientpositive/sample8.q.out +++ b/ql/src/test/results/clientpositive/sample8.q.out @@ -37,7 +37,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: true - predicate: ((((hash(key) & 2147483647) % 1) = 0) and (((hash(key) & 2147483647) % 10) = 0) and value is not null) (type: boolean) + predicate: ((((hash(key) & 2147483647) % 10) = 0) and value is not null and (((hash(key) & 2147483647) % 1) = 0)) (type: boolean) Statistics: Num rows: 125 Data size: 22250 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string), value (type: string) @@ -53,7 +53,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: true - predicate: ((((hash(key) & 2147483647) % 1) = 0) and (((hash(key) & 2147483647) % 10) = 0) and value is not null) (type: boolean) + predicate: ((((hash(key) & 2147483647) % 1) = 0) and value is not null and (((hash(key) & 2147483647) % 10) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/select_unquote_and.q.out b/ql/src/test/results/clientpositive/select_unquote_and.q.out index ea95b1ee72..23aeccfc21 100644 --- a/ql/src/test/results/clientpositive/select_unquote_and.q.out +++ b/ql/src/test/results/clientpositive/select_unquote_and.q.out @@ -64,7 +64,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(ds) > 1970.0D) and (UDFToDouble(ds) < 1985.0D)) (type: boolean) Statistics: Num rows: 498 Data size: 180276 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(ds) < 1985.0D) and (UDFToDouble(ds) > 1970.0D)) (type: boolean) + predicate: ((UDFToDouble(ds) > 1970.0D) and (UDFToDouble(ds) < 1985.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 19910 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/semijoin2.q.out b/ql/src/test/results/clientpositive/semijoin2.q.out index 66ddc081a5..8ce7fb7d4d 100644 --- a/ql/src/test/results/clientpositive/semijoin2.q.out +++ b/ql/src/test/results/clientpositive/semijoin2.q.out @@ -69,7 +69,7 @@ STAGE PLANS: filterExpr: (bigint_col_22 is not null and decimal1709_col_26 is not null and tinyint_col_8 is not null and timestamp_col_10 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (bigint_col_22 is not null and decimal1709_col_26 is not null and timestamp_col_10 is not null and tinyint_col_8 is not null) (type: boolean) + predicate: (bigint_col_22 is not null and decimal1709_col_26 is not null and tinyint_col_8 is not null and timestamp_col_10 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: bigint_col_22 (type: bigint), decimal1709_col_26 (type: decimal(38,23)), tinyint_col_8 (type: tinyint) @@ -82,7 +82,7 @@ STAGE PLANS: filterExpr: (UDFToLong(tinyint_col_6) is not null and decimal0504_col_37 is not null and tinyint_col_33 is not null and UDFToInteger(smallint_col_38) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 128 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToInteger(smallint_col_38) is not null and UDFToLong(tinyint_col_6) is not null and decimal0504_col_37 is not null and tinyint_col_33 is not null) (type: boolean) + predicate: (UDFToLong(tinyint_col_6) is not null and decimal0504_col_37 is not null and tinyint_col_33 is not null and UDFToInteger(smallint_col_38) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 128 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: UDFToLong(tinyint_col_6) (type: bigint), decimal0504_col_37 (type: decimal(38,23)), tinyint_col_33 (type: tinyint) diff --git a/ql/src/test/results/clientpositive/semijoin5.q.out b/ql/src/test/results/clientpositive/semijoin5.q.out index 3d41ca6360..8b34eef7c3 100644 --- a/ql/src/test/results/clientpositive/semijoin5.q.out +++ b/ql/src/test/results/clientpositive/semijoin5.q.out @@ -68,7 +68,7 @@ STAGE PLANS: filterExpr: (bigint_col_7 is not null and decimal2016_col_26 is not null and tinyint_col_3 is not null and timestamp_col_9 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (bigint_col_7 is not null and decimal2016_col_26 is not null and timestamp_col_9 is not null and tinyint_col_3 is not null) (type: boolean) + predicate: (bigint_col_7 is not null and decimal2016_col_26 is not null and tinyint_col_3 is not null and timestamp_col_9 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: tinyint_col_3 (type: tinyint), bigint_col_7 (type: bigint), timestamp_col_9 (type: timestamp), double_col_16 (type: double), decimal2016_col_26 (type: decimal(20,16)), smallint_col_50 (type: smallint) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: (UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null and UDFToInteger(smallint_col_19) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 128 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToInteger(smallint_col_19) is not null and UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) (type: boolean) + predicate: (UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null and UDFToInteger(smallint_col_19) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 128 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal2709_col_9 (type: decimal(27,9)), int_col_10 (type: int), tinyint_col_15 (type: tinyint), smallint_col_19 (type: smallint), tinyint_col_20 (type: tinyint) @@ -201,7 +201,7 @@ STAGE PLANS: filterExpr: (timestamp_col_18 is not null and decimal1911_col_16 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 152 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (decimal1911_col_16 is not null and timestamp_col_18 is not null) (type: boolean) + predicate: (timestamp_col_18 is not null and decimal1911_col_16 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 152 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal1911_col_16 (type: decimal(19,11)), timestamp_col_18 (type: timestamp) diff --git a/ql/src/test/results/clientpositive/skewjoin.q.out b/ql/src/test/results/clientpositive/skewjoin.q.out index 98f908426d..cdce8153b7 100644 --- a/ql/src/test/results/clientpositive/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/skewjoin.q.out @@ -1013,7 +1013,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(substring(value, 5)) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -1029,7 +1029,7 @@ STAGE PLANS: filterExpr: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((substring(value, 5) + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out index d16a67a596..6699608aa6 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out @@ -68,7 +68,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -129,7 +129,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -213,7 +213,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -228,7 +228,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -359,7 +359,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -374,7 +374,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -393,7 +393,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -422,7 +422,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -514,7 +514,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -529,7 +529,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out index bca34babe1..723f81b662 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out @@ -100,7 +100,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -115,7 +115,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -134,7 +134,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -161,7 +161,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -245,7 +245,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -260,7 +260,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string) @@ -391,7 +391,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -406,7 +406,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -425,7 +425,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -454,7 +454,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -546,7 +546,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) @@ -561,7 +561,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((not ((key = 2) or (key = 3))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean) Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin11.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin11.q.out index 5f860cd1e6..5fc405ba9a 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin11.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin11.q.out @@ -68,7 +68,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -129,7 +129,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out index 242bcdc0ee..aa8bebcfa3 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out @@ -68,7 +68,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -129,7 +129,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin3.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin3.q.out index 77aa67d382..42c9319940 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin3.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin3.q.out @@ -68,7 +68,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -129,7 +129,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin4.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin4.q.out index b3cc2a0f04..9c8fa2ce73 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin4.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin4.q.out @@ -89,7 +89,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -120,7 +120,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -139,7 +139,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -174,7 +174,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out index 88fda74caa..bdebe7e34d 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out @@ -70,7 +70,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '8') and key is not null) (type: boolean) + predicate: (key is not null and (key = '8')) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: @@ -81,7 +81,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: @@ -96,7 +96,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '8') and key is not null) (type: boolean) + predicate: (key is not null and (key = '8')) (type: boolean) Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: @@ -149,7 +149,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 2104 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out index 53d26c186e..b62203aeca 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -94,7 +94,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -113,7 +113,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -143,7 +143,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -212,7 +212,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -227,7 +227,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -246,7 +246,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -276,7 +276,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin9.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin9.q.out index a947a57b10..5035aa48f4 100644 --- a/ql/src/test/results/clientpositive/skewjoin_mapjoin9.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin9.q.out @@ -95,7 +95,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -126,7 +126,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -145,7 +145,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -180,7 +180,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out b/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out index aae0223ae6..220c7344d9 100644 --- a/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out @@ -60,7 +60,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -113,7 +113,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -129,7 +129,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -208,7 +208,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -260,7 +260,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -367,7 +367,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -384,7 +384,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -431,7 +431,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -447,7 +447,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -537,7 +537,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -600,7 +600,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out b/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out index 40a5b298a0..fe5dd16662 100644 --- a/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -96,7 +96,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -186,7 +186,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -202,7 +202,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt1.q.out b/ql/src/test/results/clientpositive/skewjoinopt1.q.out index 4f13d8e744..8590092e73 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt1.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt1.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -232,7 +232,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -307,7 +307,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -404,7 +404,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -420,7 +420,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -496,7 +496,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -511,7 +511,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -581,7 +581,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -672,7 +672,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt10.q.out b/ql/src/test/results/clientpositive/skewjoinopt10.q.out index 449d197591..b5be50e8ae 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt10.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt10.q.out @@ -63,7 +63,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '8') and key is not null) (type: boolean) + predicate: (key is not null and (key = '8')) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -75,7 +75,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '8') and key is not null) (type: boolean) + predicate: (key is not null and (key = '8')) (type: boolean) Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -186,7 +186,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -197,7 +197,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 12624 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 2104 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt11.q.out b/ql/src/test/results/clientpositive/skewjoinopt11.q.out index 8dde563a03..bef788792f 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt11.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt11.q.out @@ -73,7 +73,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -90,7 +90,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -176,7 +176,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -193,7 +193,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -254,7 +254,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -270,7 +270,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -309,7 +309,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -325,7 +325,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt12.q.out b/ql/src/test/results/clientpositive/skewjoinopt12.q.out index e2ba700020..c99ce8d099 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt12.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt12.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -135,7 +135,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -150,7 +150,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt14.q.out b/ql/src/test/results/clientpositive/skewjoinopt14.q.out index ad5a632b03..87ba7b7f2e 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt14.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt14.q.out @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -192,7 +192,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -208,7 +208,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt16.q.out b/ql/src/test/results/clientpositive/skewjoinopt16.q.out index 10cc3d9fcf..047632d7f7 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt16.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt16.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -135,7 +135,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') and (val = '12')) or (key = '3'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -150,7 +150,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') and (val = '12')) or (key = '3'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt17.q.out b/ql/src/test/results/clientpositive/skewjoinopt17.q.out index afc3eaa7ba..4bf68fa37e 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt17.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt17.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -284,7 +284,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -300,7 +300,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -358,7 +358,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') and (val = '12')) or (key = '2'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (((key = '2') and (val = '12')) or (key = '2')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -373,7 +373,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') and (val = '12')) or (key = '2'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not (((key = '2') and (val = '12')) or (key = '2')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt19.q.out b/ql/src/test/results/clientpositive/skewjoinopt19.q.out index 52097eed49..3ab545f75d 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt19.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt19.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt2.q.out b/ql/src/test/results/clientpositive/skewjoinopt2.q.out index fd88f425dd..0db35feef0 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt2.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt2.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -135,7 +135,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -150,7 +150,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -240,7 +240,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -313,7 +313,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -392,7 +392,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -408,7 +408,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -492,7 +492,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -507,7 +507,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -594,7 +594,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -693,7 +693,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (not ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt20.q.out b/ql/src/test/results/clientpositive/skewjoinopt20.q.out index 24dac7ad01..5b88f42aad 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt20.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt20.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt21.q.out b/ql/src/test/results/clientpositive/skewjoinopt21.q.out index 9cd9db9353..afae1cfd8f 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt21.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt21.q.out @@ -71,7 +71,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -88,7 +88,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -147,7 +147,7 @@ STAGE PLANS: alias: t1_n63 Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -163,7 +163,7 @@ STAGE PLANS: alias: t2_n38 Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt3.q.out b/ql/src/test/results/clientpositive/skewjoinopt3.q.out index 9f6952e5ef..4ded3e0a55 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt3.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt3.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt4.q.out b/ql/src/test/results/clientpositive/skewjoinopt4.q.out index 000a06100a..2ab542a2e8 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt4.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt4.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -76,7 +76,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -135,7 +135,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -151,7 +151,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -230,7 +230,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -247,7 +247,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and key is not null) (type: boolean) + predicate: (key is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -306,7 +306,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -322,7 +322,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (key = '2')) and key is not null) (type: boolean) + predicate: (key is not null and (not (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt5.q.out b/ql/src/test/results/clientpositive/skewjoinopt5.q.out index e2875a20d7..b05385dea3 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt5.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt5.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '2') or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt6.q.out b/ql/src/test/results/clientpositive/skewjoinopt6.q.out index 57f2d52f95..d34d102eb8 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt6.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt6.q.out @@ -61,7 +61,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -78,7 +78,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -137,7 +137,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -153,7 +153,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt7.q.out b/ql/src/test/results/clientpositive/skewjoinopt7.q.out index 9f490b4b7a..3875d0e611 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt7.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt7.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -96,7 +96,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -186,7 +186,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -202,7 +202,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not (((key = '2') or (key = '8')) or (key = '3'))) and key is not null) (type: boolean) + predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/skewjoinopt8.q.out b/ql/src/test/results/clientpositive/skewjoinopt8.q.out index 4d6b31fd24..d935227522 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt8.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt8.q.out @@ -77,7 +77,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '3') or (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '3') or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -94,7 +94,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '3') or (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '3') or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -184,7 +184,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '3') or (key = '8'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '3') or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -200,7 +200,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((not ((key = '3') or (key = '8'))) and key is not null) (type: boolean) + predicate: (key is not null and (not ((key = '3') or (key = '8')))) (type: boolean) Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out index 62b351d2ae..d057842b7c 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out @@ -47,7 +47,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2010-10-15') and key is not null) (type: boolean) + predicate: (key is not null and (ds = '2010-10-15')) (type: boolean) Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: PARTIAL Sorted Merge Bucket Map Join Operator condition map: @@ -138,7 +138,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2010-10-15') and key is not null) (type: boolean) + predicate: (key is not null and (ds = '2010-10-15')) (type: boolean) Statistics: Num rows: 1 Data size: 282 Basic stats: COMPLETE Column stats: PARTIAL Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out index e374b5999c..d902155a7e 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out @@ -89,7 +89,7 @@ STAGE PLANS: filterExpr: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 6688 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (pageid is not null and postid is not null and type is not null and userid is not null) (type: boolean) + predicate: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 6688 Basic stats: PARTIAL Column stats: NONE Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out index 3acadcb3a6..f3fb0472be 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out @@ -114,10 +114,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test1_n8 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 6 Data size: 572 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 2 Data size: 192 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_1 (type: string) diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out index 168501be76..7ad609fabd 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out @@ -73,7 +73,7 @@ STAGE PLANS: filterExpr: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value is not null) (type: boolean) + predicate: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out index bd17b90227..a7da82283d 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out @@ -73,7 +73,7 @@ STAGE PLANS: filterExpr: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value is not null) (type: boolean) + predicate: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out index 6576e704e4..e724f3e0ae 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value is not null) (type: boolean) + predicate: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: @@ -94,7 +94,7 @@ STAGE PLANS: filterExpr: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value is not null) (type: boolean) + predicate: (value is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out index 91f7da4bf6..ee95be3197 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out @@ -202,7 +202,7 @@ STAGE PLANS: filterExpr: (value2 is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 90000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value2 is not null) (type: boolean) + predicate: (value2 is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29880 Basic stats: COMPLETE Column stats: COMPLETE HashTable Sink Operator keys: @@ -217,7 +217,7 @@ STAGE PLANS: filterExpr: (value2 is not null and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 90000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 10) and value2 is not null) (type: boolean) + predicate: (value2 is not null and (key < 10)) (type: boolean) Statistics: Num rows: 166 Data size: 29880 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/spark/auto_join14.q.out b/ql/src/test/results/clientpositive/spark/auto_join14.q.out index 957883dd2e..0c80c13889 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join14.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join14.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) > 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) > 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (UDFToDouble(key) > 100.0D) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/auto_join19.q.out b/ql/src/test/results/clientpositive/spark/auto_join19.q.out index 9ab1b8b3d8..fcd92cbd8b 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join19.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join19.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: ((ds) IN ('2008-04-08', '2008-04-09') and (hr) IN ('12', '11') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds) IN ('2008-04-08', '2008-04-09') and (hr) IN ('12', '11')) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/auto_join2.q.out b/ql/src/test/results/clientpositive/spark/auto_join2.q.out index 01b310e04a..80c90cf0d8 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join2.q.out @@ -36,7 +36,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -81,7 +81,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/auto_join20.q.out b/ql/src/test/results/clientpositive/spark/auto_join20.q.out index bc95bcb8e0..297ea355a9 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join20.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join20.q.out @@ -194,7 +194,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: diff --git a/ql/src/test/results/clientpositive/spark/auto_join28.q.out b/ql/src/test/results/clientpositive/spark/auto_join28.q.out index ee1a93d785..fe9561cd4b 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join28.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join28.q.out @@ -165,7 +165,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: diff --git a/ql/src/test/results/clientpositive/spark/auto_join29.q.out b/ql/src/test/results/clientpositive/spark/auto_join29.q.out index 969e04ee00..bca0bf30c5 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join29.q.out @@ -673,7 +673,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: @@ -2582,7 +2582,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: @@ -2606,7 +2606,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: @@ -2688,7 +2688,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: @@ -3340,7 +3340,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: @@ -3624,7 +3624,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: @@ -3648,7 +3648,7 @@ STAGE PLANS: filterExpr: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/spark/auto_join4.q.out b/ql/src/test/results/clientpositive/spark/auto_join4.q.out index f434f415ec..b92b014eb2 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join4.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join4.q.out @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/auto_join5.q.out b/ql/src/test/results/clientpositive/spark/auto_join5.q.out index beec8920f7..e631e0871a 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join5.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join5.q.out @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/auto_join6.q.out b/ql/src/test/results/clientpositive/spark/auto_join6.q.out index 354000e5ee..09eb515e14 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join6.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join6.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/auto_join7.q.out b/ql/src/test/results/clientpositive/spark/auto_join7.q.out index f1256bce31..22babbc2ea 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join7.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join7.q.out @@ -69,7 +69,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -89,7 +89,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -109,7 +109,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/auto_join8.q.out b/ql/src/test/results/clientpositive/spark/auto_join8.q.out index af94f7196c..d69445d325 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join8.q.out @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/auto_join9.q.out b/ql/src/test/results/clientpositive/spark/auto_join9.q.out index e14fb06ae4..aa3ac9ee53 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join9.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join9.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: ((ds = '2008-04-08') and (hr = '12') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (hr = '12')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out index 615c393975..b140252f03 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out @@ -126,7 +126,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (cityid is not null and date is not null and dealid is not null and userid is not null) (type: boolean) + predicate: (date is not null and dealid is not null and cityid is not null and userid is not null) (type: boolean) Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: dealid (type: int), date (type: string), cityid (type: int), userid (type: int) diff --git a/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out b/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out index bc1e277615..cf73d8436e 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out @@ -76,7 +76,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -96,7 +96,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -263,7 +263,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -283,7 +283,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out b/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out index 132d2fbf63..4dab601028 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out @@ -62,7 +62,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -87,7 +87,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -203,7 +203,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -270,7 +270,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out index 804377467b..0985cd47d0 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out @@ -224,7 +224,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: bucket_small_n17 - filterExpr: (pri BETWEEN 1L AND 2L and key is not null) (type: boolean) + filterExpr: (key is not null and pri BETWEEN 1L AND 2L) (type: boolean) Statistics: Num rows: 236 Data size: 2244 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark index bf97d7e3b9..a5cd8642d0 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark @@ -224,7 +224,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: bucket_small_n17 - filterExpr: (pri BETWEEN 1L AND 2L and key is not null) (type: boolean) + filterExpr: (key is not null and pri BETWEEN 1L AND 2L) (type: boolean) Statistics: Num rows: 236 Data size: 2244 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out index 1c82f9d2fe..984c24767b 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out @@ -470,7 +470,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), UDFToDouble(key) (type: double) @@ -929,7 +929,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out index b951591063..b3af10ff82 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out @@ -132,7 +132,7 @@ FROM `default`.`srcbucket_mapjoin_part_n19` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -148,7 +148,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -463,7 +463,7 @@ FROM `default`.`srcbucket_mapjoin_part_n19` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n16` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -479,7 +479,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out index 7752b4c365..216db7a7d6 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n12` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n10` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -132,7 +132,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -447,7 +447,7 @@ FROM `default`.`srcbucket_mapjoin_part_n12` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n10` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -463,7 +463,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out index fe81ef5b2a..fad85b853d 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n4` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n3` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -218,7 +218,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -447,7 +447,7 @@ FROM `default`.`srcbucket_mapjoin_part_n4` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n3` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -544,7 +544,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out index ab226bf4d3..4854667e6e 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out @@ -2405,7 +2405,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(accounting_period) = 10.0D) and (fiscal_year = '2015') and join_col is not null) (type: boolean) + predicate: ((fiscal_year = '2015') and (UDFToDouble(accounting_period) = 10.0D) and join_col is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: bucket_col (type: string), join_col (type: string), accounting_period (type: string) diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out index e3160d8216..65fd95e033 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out @@ -346,7 +346,7 @@ FROM `default`.`srcbucket_mapjoin_n1` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n1` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -440,7 +440,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -724,7 +724,7 @@ FROM `default`.`srcbucket_mapjoin_n1` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n1` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -818,7 +818,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out index 5d154a1d6f..d1c44950bc 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out @@ -116,7 +116,7 @@ FROM `default`.`srcbucket_mapjoin_part_n6` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n5` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -211,7 +211,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -501,7 +501,7 @@ FROM `default`.`srcbucket_mapjoin_part_n6` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n5` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -596,7 +596,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out index 272c4c1a51..53e5bd4ebe 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out @@ -137,10 +137,10 @@ POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n11` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n13` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -157,7 +157,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -235,7 +235,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -522,10 +522,10 @@ POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_2_n11` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcbucket_mapjoin_part_n13` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -542,7 +542,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 78 Data size: 30620 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator @@ -620,7 +620,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 149 Data size: 58120 Basic stats: PARTIAL Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out index dafaa014bd..e8828d2c37 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out @@ -115,7 +115,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '1') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '1')) (type: boolean) Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -323,7 +323,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '1') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '1')) (type: boolean) Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out index fb4f192560..f4c84d7d39 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out @@ -426,7 +426,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test_table1_n20 - filterExpr: ((key) IN (0, 5) and (key < 8)) (type: boolean) + filterExpr: ((key < 8) and (key) IN (0, 5)) (type: boolean) Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key < 8) and (key) IN (0, 5)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out index 3e2bee314a..38d72268ac 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out @@ -115,7 +115,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '1') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '1')) (type: boolean) Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -305,7 +305,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: ((ds = '1') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '1')) (type: boolean) Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out b/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out index 3aa929d13c..8f0ba6c077 100644 --- a/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out +++ b/ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out @@ -880,7 +880,7 @@ STAGE PLANS: alias: cbo_t2 filterExpr: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Filter Operator - predicate: ((c_int = (2 * c_int)) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = (2 * c_int))) (type: boolean) Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 @@ -910,7 +910,7 @@ STAGE PLANS: alias: cbo_t2 filterExpr: (c_int is not null or (c_int = 0)) (type: boolean) Filter Operator - predicate: ((c_int = 0) or c_int is not null) (type: boolean) + predicate: (c_int is not null or (c_int = 0)) (type: boolean) Select Operator expressions: key (type: string), value (type: string), c_int (type: int), c_float (type: float), c_boolean (type: boolean), dt (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 diff --git a/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out b/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out index 41c6199e47..4b256b2ea7 100644 --- a/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out +++ b/ql/src/test/results/clientpositive/spark/constprog_partitioner.q.out @@ -134,10 +134,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), 1 (type: int) diff --git a/ql/src/test/results/clientpositive/spark/constprog_semijoin.q.out b/ql/src/test/results/clientpositive/spark/constprog_semijoin.q.out index 16c6e3a010..3e5cc1fd4d 100644 --- a/ql/src/test/results/clientpositive/spark/constprog_semijoin.q.out +++ b/ql/src/test/results/clientpositive/spark/constprog_semijoin.q.out @@ -191,7 +191,7 @@ STAGE PLANS: filterExpr: ((val = 't1val01') and id is not null and dimid is not null) (type: boolean) Statistics: Num rows: 10 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((val = 't1val01') and dimid is not null and id is not null) (type: boolean) + predicate: ((val = 't1val01') and id is not null and dimid is not null) (type: boolean) Statistics: Num rows: 5 Data size: 100 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: id (type: int), dimid (type: int) diff --git a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out index 00fcccf524..b60940caa0 100644 --- a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out +++ b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out @@ -751,7 +751,7 @@ STAGE PLANS: filterExpr: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_quantity_on_hand (type: int), inv_warehouse_sk (type: int) @@ -791,7 +791,7 @@ STAGE PLANS: filterExpr: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null) (type: boolean) + predicate: (inv_item_sk is not null and inv_warehouse_sk is not null and inv_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: inv_date_sk (type: int), inv_item_sk (type: int), inv_quantity_on_hand (type: int), inv_warehouse_sk (type: int) @@ -830,7 +830,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((d_moy = 4) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 4) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: d_date_sk (type: int) @@ -888,7 +888,7 @@ STAGE PLANS: filterExpr: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((d_moy = 3) and (d_year = 1999) and d_date_sk is not null) (type: boolean) + predicate: ((d_year = 1999) and (d_moy = 3) and d_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: d_date_sk (type: int) 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 ffa1d7ebf0..74172900e1 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 @@ -134,7 +134,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -204,7 +204,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -290,7 +290,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -358,7 +358,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -494,7 +494,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -564,7 +564,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -650,7 +650,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -718,7 +718,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1240,7 +1240,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1309,7 +1309,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1397,7 +1397,7 @@ STAGE PLANS: Number of rows: 10 Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col0 = 27Y) or _col0 is null) (type: boolean) + predicate: (_col0 is null or (_col0 = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col0 (type: tinyint) @@ -1466,7 +1466,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -1542,7 +1542,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: t (type: tinyint), si (type: smallint), i (type: int), b (type: bigint), f (type: float) @@ -1923,7 +1923,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -1992,7 +1992,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -2704,7 +2704,7 @@ STAGE PLANS: filterExpr: ((t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((s = 'foo') and (t = 27Y)) (type: boolean) + predicate: ((t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), b (type: bigint), f (type: float), 'foo' (type: string), 27Y (type: tinyint), i (type: int) @@ -2772,7 +2772,7 @@ STAGE PLANS: filterExpr: ((i = 100) and (t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((i = 100) and (s = 'foo') and (t = 27Y)) (type: boolean) + predicate: ((i = 100) and (t = 27Y) and (s = 'foo')) (type: boolean) Statistics: Num rows: 1 Data size: 1066360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: si (type: smallint), b (type: bigint), f (type: float), 'foo' (type: string), 27Y (type: tinyint), 100 (type: int) @@ -3220,7 +3220,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: (t is null or (t > 27Y)) (type: boolean) + filterExpr: ((t > 27Y) or t is null) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((t > 27Y) or t is null) (type: boolean) @@ -3293,7 +3293,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -3374,7 +3374,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: (t is null or (t > 27Y)) (type: boolean) + filterExpr: ((t > 27Y) or t is null) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((t > 27Y) or t is null) (type: boolean) @@ -3436,7 +3436,7 @@ STAGE PLANS: filterExpr: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 25160 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((t = 27Y) or t is null) (type: boolean) + predicate: (t is null or (t = 27Y)) (type: boolean) Statistics: Num rows: 11 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: si (type: smallint), i (type: int), b (type: bigint), f (type: float), t (type: tinyint) @@ -3559,7 +3559,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: ((s like 'bob%') and (i > 1)) (type: boolean) + filterExpr: ((i > 1) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 105949 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((i > 1) and (s like 'bob%')) (type: boolean) @@ -3581,7 +3581,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over1k_n3 - filterExpr: ((s like 'bob%') and (i > 1)) (type: boolean) + filterExpr: ((i > 1) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 105949 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: ((i > 1) and (s like 'bob%')) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out index 0ce54c5c4a..f194923dda 100644 --- a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out @@ -37,13 +37,13 @@ POSTHOOK: Input: default@filter_join_breaktask@ds=2008-04-08 OPTIMIZED SQL: SELECT `t4`.`key`, `t0`.`value` FROM (SELECT `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '') AS `t0` +WHERE `value` <> '' AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `value` <> '' AND `key` IS NOT NULL) AS `t2` ON `t0`.`value` = `t2`.`value` +WHERE `key` IS NOT NULL AND `value` <> '' AND `ds` = '2008-04-08') AS `t2` ON `t0`.`value` = `t2`.`value` INNER JOIN (SELECT `key` FROM `default`.`filter_join_breaktask` -WHERE `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t4` ON `t2`.`key` = `t4`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08') AS `t4` ON `t2`.`key` = `t4`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -60,7 +60,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: g - filterExpr: ((ds = '2008-04-08') and (value <> '')) (type: boolean) + filterExpr: ((value <> '') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -137,12 +137,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: m - filterExpr: ((value <> '') and key is not null) (type: boolean) + filterExpr: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((value <> '') and key is not null) (type: boolean) + predicate: (key is not null and (value <> '')) (type: boolean) Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) @@ -215,7 +215,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: f - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 25 Data size: 211 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out index 074b56dbc8..aa0d6b5309 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out @@ -63,7 +63,7 @@ STAGE PLANS: filterExpr: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200))) or (((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450)))) (type: boolean) + predicate: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -77,7 +77,7 @@ STAGE PLANS: Forward Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200)) and ((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300')) and ((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -98,7 +98,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.e1_n1 Filter Operator - predicate: (((KEY._col0 = 400) or (KEY._col0 = 450)) and ((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500')) and ((KEY._col0 = 400) or (KEY._col0 = 450))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -245,7 +245,7 @@ STAGE PLANS: filterExpr: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 500) and value is not null))) (type: boolean) + predicate: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: value (type: string) @@ -280,7 +280,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.e1_n1 Filter Operator - predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean) + predicate: (((VALUE._col0 + VALUE._col0) = 400) or (((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -426,7 +426,7 @@ STAGE PLANS: alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200))) or (((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450)))) (type: boolean) + predicate: ((((value = 'val_400') or (value = 'val_500')) and ((key = 400) or (key = 450))) or (((value = 'val_100') or (value = 'val_200') or (value = 'val_300')) and ((key = 100) or (key = 150) or (key = 200)))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -440,7 +440,7 @@ STAGE PLANS: Forward Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200)) and ((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_100') or (VALUE._col0 = 'val_200') or (VALUE._col0 = 'val_300')) and ((KEY._col0 = 100) or (KEY._col0 = 150) or (KEY._col0 = 200))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -461,7 +461,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.e1_n1 Filter Operator - predicate: (((KEY._col0 = 400) or (KEY._col0 = 450)) and ((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500'))) (type: boolean) + predicate: (((VALUE._col0 = 'val_400') or (VALUE._col0 = 'val_500')) and ((KEY._col0 = 400) or (KEY._col0 = 450))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -607,7 +607,7 @@ STAGE PLANS: alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 500) and value is not null))) (type: boolean) + predicate: ((((key + key) = 400) or (((key - 100) = 500) and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key = 300) and value is not null))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: value (type: string) @@ -642,7 +642,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.e1_n1 Filter Operator - predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean) + predicate: (((VALUE._col0 + VALUE._col0) = 400) or (((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/spark/groupby_position.q.out b/ql/src/test/results/clientpositive/spark/groupby_position.q.out index 0a5db81d9b..ea8c9ae0a1 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_position.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_position.q.out @@ -607,7 +607,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out b/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out index 8160412e02..11dcc6d860 100644 --- a/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out +++ b/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out @@ -37,7 +37,7 @@ STAGE PLANS: filterExpr: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '105') and (value = 'val_105')) (type: boolean) + predicate: ((value = 'val_105') and (key = '105')) (type: boolean) Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/spark/input12.q.out b/ql/src/test/results/clientpositive/spark/input12.q.out index 3ecd4f1d9b..58cebef5bc 100644 --- a/ql/src/test/results/clientpositive/spark/input12.q.out +++ b/ql/src/test/results/clientpositive/spark/input12.q.out @@ -77,7 +77,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.dest1_n122 Filter Operator - predicate: ((key < 200) and (key >= 100)) (type: boolean) + predicate: ((key >= 100) and (key < 200)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/input13.q.out b/ql/src/test/results/clientpositive/spark/input13.q.out index 1f3d75bde3..8605fe9ac3 100644 --- a/ql/src/test/results/clientpositive/spark/input13.q.out +++ b/ql/src/test/results/clientpositive/spark/input13.q.out @@ -82,7 +82,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.dest1_n77 Filter Operator - predicate: ((key < 200) and (key >= 100)) (type: boolean) + predicate: ((key >= 100) and (key < 200)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string) @@ -97,7 +97,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.dest2_n16 Filter Operator - predicate: ((key < 300) and (key >= 200)) (type: boolean) + predicate: ((key >= 200) and (key < 300)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(key) (type: int) diff --git a/ql/src/test/results/clientpositive/spark/input_part2.q.out b/ql/src/test/results/clientpositive/spark/input_part2.q.out index b4a707cccc..712c85d8c4 100644 --- a/ql/src/test/results/clientpositive/spark/input_part2.q.out +++ b/ql/src/test/results/clientpositive/spark/input_part2.q.out @@ -54,7 +54,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-08') and (key < 100)) (type: boolean) + predicate: ((key < 100) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string), '12' (type: string), '2008-04-08' (type: string) @@ -95,7 +95,7 @@ STAGE PLANS: MultiFileSpray: false Filter Operator isSamplingPred: false - predicate: ((ds = '2008-04-09') and (key < 100)) (type: boolean) + predicate: ((key < 100) and (ds = '2008-04-09')) (type: boolean) Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(key) (type: int), value (type: string), '12' (type: string), '2008-04-09' (type: string) diff --git a/ql/src/test/results/clientpositive/spark/insert1.q.out b/ql/src/test/results/clientpositive/spark/insert1.q.out index 96ec6fe413..176a77289b 100644 --- a/ql/src/test/results/clientpositive/spark/insert1.q.out +++ b/ql/src/test/results/clientpositive/spark/insert1.q.out @@ -307,7 +307,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.insert1 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: key (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join14.q.out b/ql/src/test/results/clientpositive/spark/join14.q.out index a1df2ff045..0507de0267 100644 --- a/ql/src/test/results/clientpositive/spark/join14.q.out +++ b/ql/src/test/results/clientpositive/spark/join14.q.out @@ -59,7 +59,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((ds = '2008-04-08') and (UDFToDouble(key) > 100.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) > 100.0D) and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (UDFToDouble(key) > 100.0D) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/join19.q.out b/ql/src/test/results/clientpositive/spark/join19.q.out index bfa3b40581..82b263718c 100644 --- a/ql/src/test/results/clientpositive/spark/join19.q.out +++ b/ql/src/test/results/clientpositive/spark/join19.q.out @@ -144,7 +144,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null and object is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and object is not null and subject is not null) (type: boolean) + predicate: ((predicate = 'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null and object is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: subject (type: string), object (type: string) @@ -164,7 +164,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is not null) (type: boolean) + predicate: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Citation') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: subject (type: string) @@ -223,7 +223,7 @@ STAGE PLANS: filterExpr: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and (predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is not null) (type: boolean) + predicate: ((predicate = 'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 'http://ontos/OntosMiner/Common.English/ontology#Author') and subject is not null) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: subject (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join2.q.out b/ql/src/test/results/clientpositive/spark/join2.q.out index 4341f07e58..d8e004a090 100644 --- a/ql/src/test/results/clientpositive/spark/join2.q.out +++ b/ql/src/test/results/clientpositive/spark/join2.q.out @@ -38,7 +38,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/join20.q.out b/ql/src/test/results/clientpositive/spark/join20.q.out index 59d8d72a68..48de49e338 100644 --- a/ql/src/test/results/clientpositive/spark/join20.q.out +++ b/ql/src/test/results/clientpositive/spark/join20.q.out @@ -700,7 +700,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join26.q.out b/ql/src/test/results/clientpositive/spark/join26.q.out index 1133cca1d3..d60593dc04 100644 --- a/ql/src/test/results/clientpositive/spark/join26.q.out +++ b/ql/src/test/results/clientpositive/spark/join26.q.out @@ -31,7 +31,7 @@ POSTHOOK: Output: default@dest_j1_n10 OPTIMIZED SQL: SELECT `t4`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` @@ -130,7 +130,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/join28.q.out b/ql/src/test/results/clientpositive/spark/join28.q.out index 7148e31d2b..19335dd7ce 100644 --- a/ql/src/test/results/clientpositive/spark/join28.q.out +++ b/ql/src/test/results/clientpositive/spark/join28.q.out @@ -68,7 +68,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/join32.q.out b/ql/src/test/results/clientpositive/spark/join32.q.out index d0c72b786f..8f49e73cbe 100644 --- a/ql/src/test/results/clientpositive/spark/join32.q.out +++ b/ql/src/test/results/clientpositive/spark/join32.q.out @@ -34,7 +34,7 @@ FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t2` +WHERE `value` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t2` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` WHERE `key` IS NOT NULL AND `value` IS NOT NULL) AS `t4` ON `t2`.`value` = `t4`.`value`) ON `t0`.`key` = `t4`.`key` @@ -210,7 +210,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out index 9d8fac96ea..d754fc822f 100644 --- a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out @@ -42,7 +42,7 @@ FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t2` +WHERE `value` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t2` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` WHERE `key` IS NOT NULL AND `value` IS NOT NULL) AS `t4` ON `t2`.`value` = `t4`.`value`) ON `t0`.`key` = `t4`.`key` @@ -144,7 +144,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -562,7 +562,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1106,7 +1106,7 @@ POSTHOOK: Output: default@dest_j2_n1 OPTIMIZED SQL: SELECT `t4`.`key`, `t0`.`value`, `t4`.`value` AS `value1` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `value` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t0` INNER JOIN ((SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` @@ -1302,7 +1302,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -1600,7 +1600,7 @@ POSTHOOK: Output: default@dest_j2_n1 OPTIMIZED SQL: SELECT `t2`.`key`, `t0`.`value`, `t2`.`value` AS `value1` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `value` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src1` WHERE `value` IS NOT NULL) AS `t2` @@ -1779,7 +1779,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -2180,7 +2180,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: value is not null (type: boolean) @@ -2444,7 +2444,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: y - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: value is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/join33.q.out b/ql/src/test/results/clientpositive/spark/join33.q.out index 9d1d5a3ec9..1a389e7e8d 100644 --- a/ql/src/test/results/clientpositive/spark/join33.q.out +++ b/ql/src/test/results/clientpositive/spark/join33.q.out @@ -34,7 +34,7 @@ FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t2` +WHERE `value` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = 11) AS `t2` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` WHERE `key` IS NOT NULL AND `value` IS NOT NULL) AS `t4` ON `t2`.`value` = `t4`.`value`) ON `t0`.`key` = `t4`.`key` @@ -210,7 +210,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out b/ql/src/test/results/clientpositive/spark/join34.q.out index 74447deff8..98dd32c447 100644 --- a/ql/src/test/results/clientpositive/spark/join34.q.out +++ b/ql/src/test/results/clientpositive/spark/join34.q.out @@ -35,11 +35,11 @@ POSTHOOK: Output: default@dest_j1_n1 OPTIMIZED SQL: SELECT `t5`.`key`, `t5`.`value`, `t3`.`value` AS `value1` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` < 20 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` < 20 UNION ALL SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 100 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100) AS `t3` +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` > 100) AS `t3` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` IS NOT NULL) AS `t5` ON `t3`.`key` = `t5`.`key` @@ -59,12 +59,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 1572 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -137,12 +137,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 1572 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out b/ql/src/test/results/clientpositive/spark/join35.q.out index 40d516094c..46d2a89d44 100644 --- a/ql/src/test/results/clientpositive/spark/join35.q.out +++ b/ql/src/test/results/clientpositive/spark/join35.q.out @@ -35,12 +35,12 @@ POSTHOOK: Output: default@dest_j1_n24 OPTIMIZED SQL: SELECT `t5`.`key`, `t5`.`value`, `t3`.`$f1` AS `cnt` FROM (SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` < 20 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` < 20 GROUP BY `key` UNION ALL SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` > 100 AND CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 +WHERE CAST(`key` AS DOUBLE) BETWEEN 20 AND 100 AND `key` > 100 GROUP BY `key`) AS `t3` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` @@ -63,12 +63,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 1572 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() @@ -144,12 +144,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x1 - filterExpr: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + filterExpr: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) > 100.0D) and UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D) (type: boolean) + predicate: (UDFToDouble(key) NOT BETWEEN 20.0D AND 100.0D and (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 148 Data size: 1572 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/spark/join4.q.out b/ql/src/test/results/clientpositive/spark/join4.q.out index c638d90561..ea1a2c4175 100644 --- a/ql/src/test/results/clientpositive/spark/join4.q.out +++ b/ql/src/test/results/clientpositive/spark/join4.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join40.q.out b/ql/src/test/results/clientpositive/spark/join40.q.out index 2c94a8b1fc..8f25208191 100644 --- a/ql/src/test/results/clientpositive/spark/join40.q.out +++ b/ql/src/test/results/clientpositive/spark/join40.q.out @@ -2483,7 +2483,7 @@ STAGE PLANS: filterExpr: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key < 15)) (type: boolean) + predicate: ((key < 15) and (key < 10)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join5.q.out b/ql/src/test/results/clientpositive/spark/join5.q.out index caeb634216..89ab09b13e 100644 --- a/ql/src/test/results/clientpositive/spark/join5.q.out +++ b/ql/src/test/results/clientpositive/spark/join5.q.out @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join6.q.out b/ql/src/test/results/clientpositive/spark/join6.q.out index 091e410c5f..8b83162a2b 100644 --- a/ql/src/test/results/clientpositive/spark/join6.q.out +++ b/ql/src/test/results/clientpositive/spark/join6.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join7.q.out b/ql/src/test/results/clientpositive/spark/join7.q.out index 0bdad39131..e9a40d080e 100644 --- a/ql/src/test/results/clientpositive/spark/join7.q.out +++ b/ql/src/test/results/clientpositive/spark/join7.q.out @@ -69,7 +69,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -89,7 +89,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -109,7 +109,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 25.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join8.q.out b/ql/src/test/results/clientpositive/spark/join8.q.out index e0cf2f7053..440d3c6b48 100644 --- a/ql/src/test/results/clientpositive/spark/join8.q.out +++ b/ql/src/test/results/clientpositive/spark/join8.q.out @@ -59,7 +59,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 10.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 10.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -79,7 +79,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join9.q.out b/ql/src/test/results/clientpositive/spark/join9.q.out index 9d3e0cb47b..a218c8cccf 100644 --- a/ql/src/test/results/clientpositive/spark/join9.q.out +++ b/ql/src/test/results/clientpositive/spark/join9.q.out @@ -25,7 +25,7 @@ POSTHOOK: Output: default@dest1_n39 OPTIMIZED SQL: SELECT `t0`.`key`, `t2`.`value` FROM (SELECT `key` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = '12' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2008-04-08' AND `hr` = '12') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -45,7 +45,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: ((ds = '2008-04-08') and (hr = '12') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (hr = '12')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out b/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out index ba80eb5223..3a9eddd576 100644 --- a/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out +++ b/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out @@ -438,10 +438,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string) @@ -457,10 +457,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p2 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string) @@ -602,10 +602,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string) @@ -621,10 +621,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p2 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out index 6b481bcddc..a1058cc867 100644 --- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out +++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out @@ -175,10 +175,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -195,10 +195,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p2 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out index b0fd6c9bbf..737dcb1427 100644 --- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out +++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out @@ -179,10 +179,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -199,10 +199,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p2 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out index 7f206aa013..7c00d46ea9 100644 --- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out +++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out @@ -264,10 +264,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out index 3d1003ebe6..766f56518b 100644 --- a/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out +++ b/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out @@ -268,10 +268,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p1 - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_hive_626.q.out b/ql/src/test/results/clientpositive/spark/join_hive_626.q.out index 14e6069bd2..c0cc97a131 100644 --- a/ql/src/test/results/clientpositive/spark/join_hive_626.q.out +++ b/ql/src/test/results/clientpositive/spark/join_hive_626.q.out @@ -91,7 +91,7 @@ STAGE PLANS: filterExpr: (foo_id is not null and bar_id is not null) (type: boolean) Statistics: Num rows: 1 Data size: 230 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (bar_id is not null and foo_id is not null) (type: boolean) + predicate: (foo_id is not null and bar_id is not null) (type: boolean) Statistics: Num rows: 1 Data size: 230 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: bar_id (type: int), foo_id (type: int), bar_name (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out b/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out index 7edad17c08..d142e98714 100644 --- a/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out +++ b/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: (hr is not null and key is not null) (type: boolean) + filterExpr: (key is not null and hr is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/join_reorder2.q.out b/ql/src/test/results/clientpositive/spark/join_reorder2.q.out index e6239d5ca4..9ac29848ab 100644 --- a/ql/src/test/results/clientpositive/spark/join_reorder2.q.out +++ b/ql/src/test/results/clientpositive/spark/join_reorder2.q.out @@ -254,7 +254,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -270,7 +270,7 @@ STAGE PLANS: filterExpr: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/join_reorder3.q.out b/ql/src/test/results/clientpositive/spark/join_reorder3.q.out index b9bd7976fa..64668073fc 100644 --- a/ql/src/test/results/clientpositive/spark/join_reorder3.q.out +++ b/ql/src/test/results/clientpositive/spark/join_reorder3.q.out @@ -254,7 +254,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -270,7 +270,7 @@ STAGE PLANS: filterExpr: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (key + 1) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out index 212b16327a..32e0516066 100644 --- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out +++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out @@ -323,7 +323,7 @@ POSTHOOK: Input: default@list_bucketing_static_part_n4@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `$f0`, CAST('val_484' AS STRING) AS `$f1`, CAST('2008-04-08' AS STRING) AS `$f2`, CAST('11' AS STRING) AS `$f3` FROM `default`.`list_bucketing_static_part_n4` -WHERE `ds` = '2008-04-08' AND `hr` = '11' AND `key` = '484' AND `value` = 'val_484' +WHERE `key` = '484' AND `value` = 'val_484' AND `ds` = '2008-04-08' AND `hr` = '11' STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out index 3217755f27..7e6fdc8115 100644 --- a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out +++ b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out @@ -97,7 +97,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 40.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 40.0D) and (UDFToDouble(key) > 20.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(key) < 40.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string), '33' (type: string) diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out index 6e6387bb0f..50e8b31b41 100644 --- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -131,7 +131,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -360,7 +360,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -513,7 +513,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -694,7 +694,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -793,7 +793,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1022,7 +1022,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -1175,7 +1175,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out index 462b61db47..fa5f508471 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out @@ -32,7 +32,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -60,7 +60,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -190,7 +190,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -217,7 +217,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -334,7 +334,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -362,7 +362,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -486,7 +486,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -513,7 +513,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((ds = '2008-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out index 1ea84d1854..e8360e4eda 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out @@ -71,7 +71,7 @@ STAGE PLANS: filterExpr: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key < 300)) (type: boolean) + predicate: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: @@ -245,7 +245,7 @@ STAGE PLANS: filterExpr: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 10) and (key < 300)) (type: boolean) + predicate: ((key < 300) and (key < 10)) (type: boolean) Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator filter predicates: diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out index 339bd443bf..06ac175573 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out @@ -204,7 +204,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -679,7 +679,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string), ds (type: string) diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_subquery.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_subquery.q.out index c957d91978..3f26b52602 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_subquery.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_subquery.q.out @@ -57,7 +57,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) @@ -314,7 +314,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: z - filterExpr: ((ds = '2008-04-08') and (11.0D = 11.0D) and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2008-04-08') and (11.0D = 11.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/multi_insert.q.out b/ql/src/test/results/clientpositive/spark/multi_insert.q.out index 05cbb7f74d..8b7582b13c 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert.q.out @@ -63,7 +63,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -209,7 +209,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -355,7 +355,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -501,7 +501,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -664,7 +664,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -820,7 +820,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -976,7 +976,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1132,7 +1132,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1271,7 +1271,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1303,7 +1303,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1464,7 +1464,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1496,7 +1496,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1657,7 +1657,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1689,7 +1689,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1850,7 +1850,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1882,7 +1882,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n5 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out index f648d661e3..309e17e097 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out @@ -53,7 +53,7 @@ STAGE PLANS: filterExpr: ((key > 500) or (key > 450)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key > 450) or (key > 500)) (type: boolean) + predicate: ((key > 500) or (key > 450)) (type: boolean) Statistics: Num rows: 332 Data size: 3527 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out index d1cb120a16..fe27959519 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out @@ -64,7 +64,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -214,7 +214,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -364,7 +364,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -514,7 +514,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -681,7 +681,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -841,7 +841,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1001,7 +1001,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1161,7 +1161,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -1304,7 +1304,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1336,7 +1336,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1501,7 +1501,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1533,7 +1533,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1698,7 +1698,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1730,7 +1730,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1895,7 +1895,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -1927,7 +1927,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((_col0 < 20) and (_col0 > 10)) (type: boolean) + predicate: ((_col0 > 10) and (_col0 < 20)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false @@ -2528,7 +2528,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -2644,7 +2644,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -2760,7 +2760,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -2876,7 +2876,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -2990,7 +2990,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -3033,7 +3033,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -3222,7 +3222,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -3265,7 +3265,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -3454,7 +3454,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -3497,7 +3497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) @@ -3686,7 +3686,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.src_multi1_n4 Filter Operator - predicate: ((key < 20) and (key > 10)) (type: boolean) + predicate: ((key > 10) and (key < 20)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -3729,7 +3729,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Filter Operator - predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: boolean) + predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: boolean) Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string) diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out index 051ea8742a..7f7dd0c83d 100644 --- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -131,7 +131,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -363,7 +363,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -462,7 +462,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out index 7805fe84e5..861ed91329 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out @@ -1018,7 +1018,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cstring2 like '%b%') or (CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble)) (type: boolean) + filterExpr: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1026,7 +1026,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double)) + predicateExpression: FilterExprOrExpr(children: FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)) predicate: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator @@ -1211,7 +1211,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0)) or (cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%')) (type: boolean) + predicate: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or ((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE @@ -30030,7 +30030,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) and (cfloat = 3.02)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 49) and (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) and (cfloat = 3.5)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 45) and (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 9216 Data size: 445313 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -30277,7 +30277,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) or (cfloat = 3.02)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 49) or (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) or (cfloat = 3.5)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 45) or (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_1.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_1.q.out index 6226d1dea6..43106bbe42 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_1.q.out @@ -63,7 +63,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or (cboolean1 < 0)) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -71,8 +71,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0)), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColLessLongScalar(col 10:boolean, val 0)) - predicate: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (UDFToLong(cint) > cbigint) or (cbigint < UDFToLong(ctinyint)) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0))) + predicate: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), cfloat (type: float), cint (type: int), cdouble (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out index a0cbcbdc43..65fa5c123d 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out @@ -76,7 +76,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(6,2), val -5638.15)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(6,2))), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) -> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern %a)))) - predicate: (((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= '10')) (type: boolean) + predicate: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a')))) (type: boolean) Statistics: Num rows: 9557 Data size: 461790 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cdouble (type: double), ctimestamp1 (type: timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 (type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) (type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), (UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), (- (- cdouble)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_12.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_12.q.out index a04b97606c..337a1b2da5 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_12.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_12.q.out @@ -86,7 +86,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (ctimestamp1 is null and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean) + filterExpr: (ctimestamp1 is null and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -94,8 +94,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint)))) - predicate: (((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ctimestamp1 is null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint))) + predicate: (ctimestamp1 is null and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint))) (type: boolean) Statistics: Num rows: 3754 Data size: 181391 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint), cboolean1 (type: boolean), cstring1 (type: string), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_13.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_13.q.out index 4d0362e712..4504219f96 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_13.q.out @@ -97,7 +97,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28789.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28788.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 2730 Data size: 131912 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -431,7 +431,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28801.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28801.336)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 2730 Data size: 131912 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_14.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_14.q.out index 92bdc309f6..173aca3646 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_14.q.out @@ -88,7 +88,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToLong(ctinyint) <= cbigint) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) (type: boolean) + filterExpr: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -96,8 +96,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), FilterDoubleColLessDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float))) - predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and (UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 14:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 14:float)), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp))) + predicate: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 606 Data size: 29281 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), (- (-26.28D + cdouble)) (type: double), ((- (-26.28D + cdouble)) * (- (-26.28D + cdouble))) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_15.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_15.q.out index 7e35eaf4df..e2309304de 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_15.q.out @@ -84,7 +84,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) + filterExpr: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -92,8 +92,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) - predicate: (((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 like '%ss%')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) + predicate: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cfloat (type: float), cboolean1 (type: boolean), cdouble (type: double), cstring1 (type: string), ctinyint (type: tinyint), cint (type: int), ctimestamp1 (type: timestamp), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_16.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_16.q.out index cb1ebb2403..56c7ecec34 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_16.q.out @@ -70,7 +70,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 197917 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_17.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_17.q.out index 757592683b..b7372bb48a 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_17.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_17.q.out @@ -69,7 +69,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: boolean) + filterExpr: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -77,8 +77,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float))) - predicate: (((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float)), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)))) + predicate: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 4096 Data size: 197917 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cfloat (type: float), cstring1 (type: string), cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_2.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_2.q.out index c4c43c91c1..f38476965f 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_2.q.out @@ -67,7 +67,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean) + filterExpr: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -75,7 +75,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375)), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359)))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359))), FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375))) predicate: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 4778 Data size: 230870 Basic stats: COMPLETE Column stats: NONE Select Operator diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_3.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_3.q.out index 0f794950b5..0d56ff9e59 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_3.q.out @@ -72,7 +72,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean) + filterExpr: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -80,7 +80,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), FilterDecimalColNotEqualDecimalScalar(col 14:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 15:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 16:double), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 13:double), FilterDecimalColGreaterEqualDecimalScalar(col 14:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 14:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float), FilterDecimalColNotEqualDecimalScalar(col 16:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 17:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 17:double))) predicate: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) Statistics: Num rows: 2503 Data size: 120943 Basic stats: COMPLETE Column stats: NONE Select Operator diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_4.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_4.q.out index b0fd5cff80..f2ee082436 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_4.q.out @@ -67,7 +67,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToInteger(csmallint) >= cint) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: boolean) + filterExpr: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -75,8 +75,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0)))) - predicate: (((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or (UDFToInteger(csmallint) >= cint)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0))), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553))) + predicate: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cdouble (type: double), ctinyint (type: tinyint), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_5.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_5.q.out index 82c51cba78..a95545220b 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_5.q.out @@ -70,7 +70,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %b%), SelectColumnIsNotNull(col 11:boolean)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterStringColLikeStringScalar(col 7:string, pattern a), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null) or ((cstring1 like '%b%') and cboolean2 is not null)) (type: boolean) + predicate: (((cstring1 like '%b%') and cboolean2 is not null) or ((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null)) (type: boolean) Statistics: Num rows: 9216 Data size: 445313 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_6.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_6.q.out index 6db02c3517..2f0004403b 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_6.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_6.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null))) (type: boolean) + filterExpr: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -69,7 +69,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint))), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 11605 Data size: 560748 Basic stats: COMPLETE Column stats: NONE Select Operator diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out index 0f0345193b..a3ebddf00f 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out @@ -75,7 +75,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -83,8 +83,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 263873 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) @@ -312,7 +312,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -320,8 +320,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 263873 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out index e0135e05e4..4f345b58fd 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out @@ -71,7 +71,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -79,8 +79,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) @@ -295,7 +295,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -303,8 +303,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_9.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_9.q.out index cb1ebb2403..56c7ecec34 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_9.q.out @@ -70,7 +70,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 197917 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_decimal_date.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_decimal_date.q.out index c0bfa4d4ba..2ba16e2bbf 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_decimal_date.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_decimal_date.q.out @@ -46,7 +46,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:double)) - predicate: (cdouble is not null and cint is not null) (type: boolean) + predicate: (cint is not null and cdouble is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 176614 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cdate (type: date), cdecimal (type: decimal(20,10)) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_div0.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_div0.q.out index 65ff389a49..72cc8a75ac 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_div0.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_div0.q.out @@ -218,7 +218,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val 0), FilterLongColLessLongScalar(col 3:bigint, val 100000000)) - predicate: ((cbigint < 100000000L) and (cbigint > 0L)) (type: boolean) + predicate: ((cbigint > 0L) and (cbigint < 100000000L)) (type: boolean) Statistics: Num rows: 1365 Data size: 65956 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cbigint - 988888L) (type: bigint), (cdouble / UDFToDouble((cbigint - 988888L))) (type: double), (1.2 / CAST( (cbigint - 988888L) AS decimal(19,0))) (type: decimal(22,21)) @@ -439,7 +439,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -500.0), FilterDoubleColLessDoubleScalar(col 5:double, val -199.0)) - predicate: ((cdouble < -199.0D) and (cdouble >= -500.0D)) (type: boolean) + predicate: ((cdouble >= -500.0D) and (cdouble < -199.0D)) (type: boolean) Statistics: Num rows: 1365 Data size: 65956 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdouble + 200.0D) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), ((cdouble + 200.0D) / (cdouble + 200.0D)) (type: double), (3.0D / (cdouble + 200.0D)) (type: double), (1.2D / (cdouble + 200.0D)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_limit.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_limit.q.out index 3a6f37dec5..502fe65b40 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_limit.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_limit.q.out @@ -24,10 +24,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 65956 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_offset_limit.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_offset_limit.q.out index 51d2386e39..a69b9ac3fc 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_offset_limit.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_offset_limit.q.out @@ -24,10 +24,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 593751 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 65956 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out b/ql/src/test/results/clientpositive/spark/pcr.q.out index 3523929317..ef0cabe061 100644 --- a/ql/src/test/results/clientpositive/spark/pcr.q.out +++ b/ql/src/test/results/clientpositive/spark/pcr.q.out @@ -62,7 +62,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' AND `key` < 5 +WHERE `key` < 5 AND `ds` <= '2000-04-09' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -79,7 +79,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds <= '2000-04-09') and (key < 5)) (type: boolean) + filterExpr: ((key < 5) and (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -276,7 +276,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-10 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' OR `key` < 5 +WHERE `key` < 5 OR `ds` <= '2000-04-09' ORDER BY `key` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -293,12 +293,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds <= '2000-04-09') or (key < 5)) (type: boolean) + filterExpr: ((key < 5) or (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 60 Data size: 480 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((ds <= '2000-04-09') or (key < 5)) (type: boolean) + predicate: ((key < 5) or (ds <= '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string) @@ -574,7 +574,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds` FROM `default`.`pcr_t1` -WHERE `ds` <= '2000-04-09' AND `key` < 5 AND `value` <> 'val_2' +WHERE `key` < 5 AND `value` <> 'val_2' AND `ds` <= '2000-04-09' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1567,7 +1567,7 @@ POSTHOOK: Input: default@pcr_t1@ds=2000-04-09 OPTIMIZED SQL: SELECT CAST(14 AS INTEGER) AS `key`, `value` FROM (SELECT `value` FROM `default`.`pcr_t1` -WHERE `ds` IN ('2000-04-08', '2000-04-09') AND `key` = 14 +WHERE `key` = 14 AND `ds` IN ('2000-04-08', '2000-04-09') ORDER BY `value`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1584,7 +1584,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pcr_t1 - filterExpr: ((ds) IN ('2000-04-08', '2000-04-09') and (key = 14)) (type: boolean) + filterExpr: ((key = 14) and (ds) IN ('2000-04-08', '2000-04-09')) (type: boolean) Statistics: Num rows: 40 Data size: 320 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -2517,10 +2517,10 @@ OPTIMIZED SQL: SELECT `t3`.`key`, `t3`.`value`, CAST('2000-04-08' AS STRING) AS FROM (SELECT * FROM (SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` = '2000-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2000-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` = '2000-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2000-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` ORDER BY `t0`.`key`) AS `t3` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2538,7 +2538,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1 - filterExpr: ((ds = '2000-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2000-04-08')) (type: boolean) Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -2616,7 +2616,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: ((ds = '2000-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2000-04-08')) (type: boolean) Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -2810,10 +2810,10 @@ OPTIMIZED SQL: SELECT `t3`.`key`, `t3`.`value`, CAST('2000-04-08' AS STRING) AS FROM (SELECT * FROM (SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` = '2000-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` IS NOT NULL AND `ds` = '2000-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`pcr_t1` -WHERE `ds` = '2000-04-09' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` IS NOT NULL AND `ds` = '2000-04-09') AS `t2` ON `t0`.`key` = `t2`.`key` ORDER BY `t0`.`key`) AS `t3` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2831,7 +2831,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1 - filterExpr: ((ds = '2000-04-08') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2000-04-08')) (type: boolean) Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -2909,7 +2909,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: ((ds = '2000-04-09') and key is not null) (type: boolean) + filterExpr: (key is not null and (ds = '2000-04-09')) (type: boolean) Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -3486,7 +3486,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((ds <= '2000-04-09') and (key = 2)) or (ds > '2000-04-08')) (type: boolean) + predicate: ((ds > '2000-04-08') or ((ds <= '2000-04-09') and (key = 2))) (type: boolean) Statistics: Num rows: 30 Data size: 240 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), ds (type: string) @@ -4438,7 +4438,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`, `hr` FROM (SELECT `key`, `value`, `hr` FROM `default`.`srcpart` -WHERE `hr` IN ('11', '12') AND `ds` = '2008-04-08' AND `key` = 11 +WHERE `key` = 11 AND `hr` IN ('11', '12') AND `ds` = '2008-04-08' ORDER BY `key`, `hr`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -4455,7 +4455,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((hr) IN ('11', '12') and (ds = '2008-04-08') and (UDFToDouble(key) = 11.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) = 11.0D) and (hr) IN ('11', '12') and (ds = '2008-04-08')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator @@ -4645,7 +4645,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 OPTIMIZED SQL: SELECT `key`, `value`, `ds`, CAST('11' AS STRING) AS `hr` FROM (SELECT `key`, `value`, `ds` FROM `default`.`srcpart` -WHERE `hr` = '11' AND `key` = 11 +WHERE `key` = 11 AND `hr` = '11' ORDER BY `key`, `ds`) AS `t1` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -4662,7 +4662,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: ((hr = '11') and (UDFToDouble(key) = 11.0D)) (type: boolean) + filterExpr: ((UDFToDouble(key) = 11.0D) and (hr = '11')) (type: boolean) Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out index 639e31ff07..95483b1f6d 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out @@ -38,10 +38,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 382 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -57,10 +57,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -309,10 +309,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 382 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -328,10 +328,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_join.q.out index 883dda0025..a7b4e570a4 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join.q.out @@ -35,10 +35,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 382 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -54,10 +54,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -573,10 +573,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key > '20') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value < 'val_50') or (key > '2')) and (key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and ((value < 'val_50') or (key > '2')) and (key <> '4')) (type: boolean) Statistics: Num rows: 36 Data size: 382 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -592,10 +592,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + filterExpr: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '4') and (key > '20')) (type: boolean) + predicate: ((key > '20') and (key < '400') and (key <> '4')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out index b235b2f284..3a33cf0e04 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out @@ -42,10 +42,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '305') and (key <> '302') and (key < '400') and (key <> '14') and (key <> '311')) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311')) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -62,10 +62,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '302') and (key < '400') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> '14') and value is not null) (type: boolean) + filterExpr: ((key < '400') and value is not null and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value <> 'val_50') or (key > '1')) and (key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and value is not null) (type: boolean) + predicate: ((key < '400') and value is not null and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1'))) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -82,10 +82,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '306') and (sqrt(key) <> 13.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (key <> '306') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '306') and (sqrt(key) <> 13.0D) and value is not null) (type: boolean) + predicate: (value is not null and (key <> '306') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: value (type: string) @@ -1732,10 +1732,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '305') and (key <> '302') and (key < '400') and (key <> '14') and (key <> '311')) (type: boolean) + filterExpr: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311')) (type: boolean) + predicate: ((key < '400') and (key <> '14') and (key <> '305') and (key <> '302') and (key <> '311')) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1752,10 +1752,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '302') and (key < '400') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> '14') and value is not null) (type: boolean) + filterExpr: ((key < '400') and value is not null and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value <> 'val_50') or (key > '1')) and (key < '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and value is not null) (type: boolean) + predicate: ((key < '400') and value is not null and (key <> '14') and (key <> '302') and (key <> '305') and (key <> '311') and ((value <> 'val_50') or (key > '1'))) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1772,10 +1772,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '306') and (sqrt(key) <> 13.0D) and value is not null) (type: boolean) + filterExpr: (value is not null and (key <> '306') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '306') and (sqrt(key) <> 13.0D) and value is not null) (type: boolean) + predicate: (value is not null and (key <> '306') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out index 68dcb35b59..f8fe264edd 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out @@ -41,10 +41,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '13') and (key <> '11') and (key < '400') and (key <> '12') and (key <> '1') and (key > '0') and (key <> '4')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -60,10 +60,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '11') and (key < '400') and (key <> '12') and (key <> '13') and (key > '0') and ((value <> 'val_500') or (key > '1')) and (key <> '4') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value <> 'val_500') or (key > '1')) and (key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -79,10 +79,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '12') and (key <> '11') and (key < '400') and (key <> '13') and (key <> '4') and (key > '0') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -108,7 +108,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3 Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col1 <> '10') or (_col2 > '10')) (type: boolean) + predicate: ((_col2 > '10') or (_col1 <> '10')) (type: boolean) Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col3 (type: string) @@ -1772,10 +1772,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '13') and (key <> '11') and (key < '400') and (key <> '12') and (key <> '1') and (key > '0') and (key <> '4')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '1') and (key <> '4') and (key <> '13') and (key <> '11') and (key <> '12')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -1791,10 +1791,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '11') and (key < '400') and (key <> '12') and (key <> '13') and (key > '0') and ((value <> 'val_500') or (key > '1')) and (key <> '4') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((value <> 'val_500') or (key > '1')) and (key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and ((value <> 'val_500') or (key > '1'))) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -1810,10 +1810,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key <> '12') and (key <> '11') and (key < '400') and (key <> '13') and (key <> '4') and (key > '0') and (key <> '1')) (type: boolean) + filterExpr: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '400') and (key <> '1') and (key <> '11') and (key <> '12') and (key <> '13') and (key <> '4') and (key > '0')) (type: boolean) + predicate: ((key > '0') and (key < '400') and (key <> '4') and (key <> '1') and (key <> '12') and (key <> '11') and (key <> '13')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1839,7 +1839,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3 Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col1 <> '10') or (_col2 > '10')) (type: boolean) + predicate: ((_col2 > '10') or (_col1 <> '10')) (type: boolean) Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col3 (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_join4.q.out b/ql/src/test/results/clientpositive/spark/ppd_join4.q.out index 60257701cf..c69663eed7 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join4.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join4.q.out @@ -66,7 +66,7 @@ STAGE PLANS: filterExpr: ((name = 'c') and (id = 'a')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((id = 'a') and (name = 'c')) (type: boolean) + predicate: ((name = 'c') and (id = 'a')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE diff --git a/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out b/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out index 0edfe38e27..3f469a166e 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out @@ -128,7 +128,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.mi1 Filter Operator - predicate: ((_col0 < 200) and (_col0 >= 100)) (type: boolean) + predicate: ((_col0 >= 100) and (_col0 < 200)) (type: boolean) Statistics: Num rows: 61 Data size: 648 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int), _col1 (type: string) @@ -143,7 +143,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.mi2 Filter Operator - predicate: ((_col0 < 300) and (_col0 >= 200)) (type: boolean) + predicate: ((_col0 >= 200) and (_col0 < 300)) (type: boolean) Statistics: Num rows: 61 Data size: 648 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int) @@ -1418,7 +1418,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.mi1 Filter Operator - predicate: ((_col0 < 200) and (_col0 >= 100)) (type: boolean) + predicate: ((_col0 >= 100) and (_col0 < 200)) (type: boolean) Statistics: Num rows: 61 Data size: 648 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int), _col1 (type: string) @@ -1433,7 +1433,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.mi2 Filter Operator - predicate: ((_col0 < 300) and (_col0 >= 200)) (type: boolean) + predicate: ((_col0 >= 200) and (_col0 < 300)) (type: boolean) Statistics: Num rows: 61 Data size: 648 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToInteger(_col0) (type: int) diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out index 8c07d80236..706a61c1db 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -181,7 +181,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out index 63819559f8..2c92d097c6 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -301,7 +301,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out index 8c422e1450..12731d2ec5 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out @@ -58,7 +58,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -301,7 +301,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15')) (type: boolean) + predicate: ((key > '15') and (key < '20')) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out index 765e8cca78..d13e57d5de 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((sqrt(key) <> 13.0D) and (key < '20') and (key > '15')) (type: boolean) + filterExpr: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) + predicate: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -445,7 +445,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: c - filterExpr: ((sqrt(key) <> 13.0D) and (key < '20') and (key > '15')) (type: boolean) + filterExpr: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) @@ -467,7 +467,7 @@ STAGE PLANS: filterExpr: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 13.0D)) (type: boolean) + predicate: ((key > '15') and (key < '20') and (sqrt(key) <> 13.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out index 0c564a09ec..060d7f1d12 100644 --- a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out +++ b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out @@ -72,7 +72,7 @@ STAGE PLANS: filterExpr: ((x+1 < '11') and !@#$%^&*()_q is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (!@#$%^&*()_q is not null and (x+1 < '11')) (type: boolean) + predicate: ((x+1 < '11') and !@#$%^&*()_q is not null) (type: boolean) Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: x+1 (type: string), !@#$%^&*()_q (type: string) diff --git a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out index ed56d771ab..a172fbe145 100644 --- a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out @@ -32,7 +32,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -131,7 +131,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -360,7 +360,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `key` < 20 AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -513,7 +513,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -694,7 +694,7 @@ FROM `default`.`src` WHERE `key` < 20 AND `key` > 15) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `ds` = '2008-04-08' AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08') AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -793,7 +793,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1022,7 +1022,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT * FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` < 20 AND `ds` = '2008-04-08' AND `key` > 15) AS `t0` +WHERE `key` < 20 AND `key` > 15 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` WHERE `key` > 15 AND `key` < 20) AS `t2` ON `t0`.`key` = `t2`.`key` @@ -1175,7 +1175,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 15.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 15.0D) and (UDFToDouble(key) < 20.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/sample8.q.out b/ql/src/test/results/clientpositive/spark/sample8.q.out index c5f5612748..99488bfca8 100644 --- a/ql/src/test/results/clientpositive/spark/sample8.q.out +++ b/ql/src/test/results/clientpositive/spark/sample8.q.out @@ -42,7 +42,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: true - predicate: ((((hash(key) & 2147483647) % 1) = 0) and (((hash(key) & 2147483647) % 10) = 0) and value is not null) (type: boolean) + predicate: ((((hash(key) & 2147483647) % 10) = 0) and value is not null and (((hash(key) & 2147483647) % 1) = 0)) (type: boolean) Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), value (type: string) @@ -115,7 +115,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: true - predicate: ((((hash(key) & 2147483647) % 1) = 0) and (((hash(key) & 2147483647) % 10) = 0) and value is not null) (type: boolean) + predicate: ((((hash(key) & 2147483647) % 1) = 0) and value is not null and (((hash(key) & 2147483647) % 10) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/semijoin.q.out b/ql/src/test/results/clientpositive/spark/semijoin.q.out index 4b49fa5065..c42332d964 100644 --- a/ql/src/test/results/clientpositive/spark/semijoin.q.out +++ b/ql/src/test/results/clientpositive/spark/semijoin.q.out @@ -2839,7 +2839,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoin.q.out b/ql/src/test/results/clientpositive/spark/skewjoin.q.out index 1ee47013e2..006a7b6cf1 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin.q.out @@ -868,7 +868,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(substring(value, 5)) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(substring(value, 5)) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -886,7 +886,7 @@ STAGE PLANS: filterExpr: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((substring(value, 5) + 1) is not null and key is not null) (type: boolean) + predicate: (key is not null and (substring(value, 5) + 1) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -1071,7 +1071,7 @@ STAGE PLANS: filterExpr: ((key < 80) and (key < 100)) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < 100) and (key < 80)) (type: boolean) + predicate: ((key < 80) and (key < 100)) (type: boolean) Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out index 42275f8142..e9d4b56984 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -220,7 +220,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -258,7 +258,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -386,7 +386,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -406,7 +406,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -425,7 +425,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -444,7 +444,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -563,7 +563,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -601,7 +601,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out index a00dd3768a..52b91df6c7 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -103,7 +103,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -142,7 +142,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -161,7 +161,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -180,7 +180,7 @@ STAGE PLANS: alias: c Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out index a41987f5bb..29253ee4a2 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -220,7 +220,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -258,7 +258,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -377,7 +377,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -396,7 +396,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -414,7 +414,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -432,7 +432,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -541,7 +541,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) @@ -577,7 +577,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out index 83fb1b07e9..05dfae868e 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out @@ -97,7 +97,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '8') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '8')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) @@ -111,7 +111,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '8') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '8')) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out index 51e8e4c039..e55f4a7e8b 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out @@ -94,7 +94,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -113,7 +113,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out index 9f9ec33cf4..42613401f5 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') or (val <> '12')) and ((key <> '8') or (val <> '18'))) and ((key <> '3') or (val <> '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') or (val <> '12')) and ((key <> '8') or (val <> '18'))) and ((key <> '3') or (val <> '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -120,7 +120,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') or (val <> '12')) and ((key <> '8') or (val <> '18'))) and ((key <> '3') or (val <> '13'))) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') or (val <> '12')) and ((key <> '8') or (val <> '18'))) and ((key <> '3') or (val <> '13')))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out index 75b3d55347..19059aa541 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out @@ -90,7 +90,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key = '2') and val is not null) (type: boolean) + predicate: (val is not null and (key = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -149,7 +149,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -168,7 +168,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out index 3541f00339..d320260ce8 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out @@ -97,7 +97,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -117,7 +117,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -136,7 +136,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -155,7 +155,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -252,7 +252,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -290,7 +290,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), val (type: string) @@ -409,7 +409,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) @@ -428,7 +428,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) @@ -446,7 +446,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) @@ -464,7 +464,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) @@ -573,7 +573,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = 2) or (key = 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) @@ -609,7 +609,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> 2) and (key <> 3)) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> 2) and (key <> 3))) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out index a92d88b314..75efc9a39a 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') or (val <> '12')) and (key <> '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key <> '2') or (val <> '12')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -120,7 +120,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') or (val <> '12')) and (key <> '3')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key <> '2') or (val <> '12')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out index fceca22944..541c2d654a 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -272,7 +272,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -291,7 +291,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') and (val = '12')) or (key = '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key = '2') and (val = '12')) or (key = '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -309,7 +309,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') or (val <> '12')) and (key <> '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key <> '2') or (val <> '12')) and (key <> '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -327,7 +327,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') or (val <> '12')) and (key <> '2')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and (((key <> '2') or (val <> '12')) and (key <> '2'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out index b34e319d66..207bff325f 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out index acde927ad9..3cb9803410 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -102,7 +102,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -120,7 +120,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -231,7 +231,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -267,7 +267,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -365,7 +365,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -384,7 +384,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -402,7 +402,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -420,7 +420,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -557,7 +557,7 @@ STAGE PLANS: filterExpr: (key is not null and val is not null) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key = '2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -593,7 +593,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8')) and key is not null and val is not null) (type: boolean) + predicate: (key is not null and val is not null and ((((key <> '2') and (key <> '7')) and (key <> '3')) and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out index 4f49f6eafe..e3d0ba9497 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out index 5db169a8cb..8a31130a2d 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out index 55cc28081b..1c29257bcd 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out @@ -102,7 +102,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -121,7 +121,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -257,7 +257,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -276,7 +276,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key <> '2') and key is not null) (type: boolean) + predicate: (key is not null and (key <> '2')) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out index 742d81259b..fc8ff53743 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '2') or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '2') and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '2') and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out index 8906319cc2..f6ad61fe7c 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out @@ -65,7 +65,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -85,7 +85,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -104,7 +104,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out index 107475f99d..bab120038c 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out @@ -83,7 +83,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -103,7 +103,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -123,7 +123,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key = '2') or (key = '8')) or (key = '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -142,7 +142,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -161,7 +161,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -180,7 +180,7 @@ STAGE PLANS: alias: c Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((((key <> '2') and (key <> '8')) and (key <> '3')) and key is not null) (type: boolean) + predicate: (key is not null and (((key <> '2') and (key <> '8')) and (key <> '3'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out index 2f605f33d6..0ae17d9382 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out @@ -81,7 +81,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '3') or (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '3') or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -101,7 +101,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '3') or (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '3') or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -121,7 +121,7 @@ STAGE PLANS: filterExpr: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key = '3') or (key = '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key = '3') or (key = '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -140,7 +140,7 @@ STAGE PLANS: alias: a Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '3') and (key <> '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '3') and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -159,7 +159,7 @@ STAGE PLANS: alias: b Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '3') and (key <> '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '3') and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) @@ -178,7 +178,7 @@ STAGE PLANS: alias: c Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((key <> '3') and (key <> '8')) and key is not null) (type: boolean) + predicate: (key is not null and ((key <> '3') and (key <> '8'))) (type: boolean) Statistics: Num rows: 1 Data size: 200 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), val (type: string) diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_10.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_10.q.out index a59bcd56e9..fd4d4b609f 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_10.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_10.q.out @@ -92,7 +92,7 @@ STAGE PLANS: filterExpr: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 4140 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (pageid is not null and postid is not null and type is not null and userid is not null) (type: boolean) + predicate: (userid is not null and pageid is not null and postid is not null and type is not null) (type: boolean) Statistics: Num rows: 13 Data size: 4140 Basic stats: PARTIAL Column stats: NONE Sorted Merge Bucket Map Join Operator condition map: diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out index 4645a8cf64..6aa1c9ce4f 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out @@ -493,7 +493,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (key is not null and key2 is not null) (type: boolean) + predicate: (key2 is not null and key is not null) (type: boolean) Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), key2 (type: int), value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out index 9696d93516..7894e76441 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out @@ -240,7 +240,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((ds = '1') and (key = 238)) (type: boolean) + filterExpr: ((key = 238) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 238) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning.q.out index 2b677297c4..cdaa4f89c2 100644 --- a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning.q.out @@ -1517,7 +1517,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -1578,7 +1578,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -1700,7 +1700,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -2985,7 +2985,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08')) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -3096,7 +3096,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -3157,7 +3157,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -5382,7 +5382,7 @@ STAGE PLANS: filterExpr: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 27 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -7093,7 +7093,7 @@ STAGE PLANS: filterExpr: ((date) IN ('2008-04-08', '2008-04-09') and (UDFToDouble(hour) = 11.0D) and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 4 Data size: 108 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and (date) IN ('2008-04-08', '2008-04-09') and UDFToDouble(hr) is not null and ds is not null) (type: boolean) + predicate: ((date) IN ('2008-04-08', '2008-04-09') and (UDFToDouble(hour) = 11.0D) and ds is not null and UDFToDouble(hr) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 54 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), UDFToDouble(hr) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_3.q.out b/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_3.q.out index 0a05aebc4f..5a12760c0e 100644 --- a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_3.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_3.q.out @@ -1005,7 +1005,7 @@ STAGE PLANS: filterExpr: (col2 BETWEEN 1 AND 3 and col1 is not null) (type: boolean) Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (col1 is not null and col2 BETWEEN 1 AND 3) (type: boolean) + predicate: (col2 BETWEEN 1 AND 3 and col1 is not null) (type: boolean) Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: col1 (type: int) diff --git a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out index 308911a8de..e5e2568e72 100644 --- a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out @@ -451,7 +451,7 @@ Stage-0 Group By Operator [GBY_6] (rows=2 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_33] (rows=5 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [PARTITION-LEVEL SORT] @@ -467,7 +467,7 @@ Stage-0 Group By Operator [GBY_13] (rows=2 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_34] (rows=5 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -518,7 +518,7 @@ Stage-0 Select Operator [SEL_25] (rows=1 width=36) Output:["_col1","_col7"] Filter Operator [FIL_21] (rows=1 width=36) - predicate:(((_col4 + _col7) >= 0L) and ((_col6 + _col9) >= 0) and ((_col6 > 0) or _col2) and (_col3 or (_col7 >= 1L))) + predicate:(((_col6 + _col9) >= 0) and ((_col4 + _col7) >= 0L) and (_col3 or (_col7 >= 1L)) and ((_col6 > 0) or _col2)) Join Operator [JOIN_20] (rows=3 width=32) Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col9"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":1,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 1 [PARTITION-LEVEL SORT] @@ -543,7 +543,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_35] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [PARTITION-LEVEL SORT] @@ -559,7 +559,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_36] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -628,7 +628,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_30] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 7 [PARTITION-LEVEL SORT] @@ -644,7 +644,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_31] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -693,7 +693,7 @@ Stage-0 Select Operator [SEL_25] (rows=1 width=36) Output:["_col1","_col7"] Filter Operator [FIL_21] (rows=1 width=36) - predicate:(((_col4 + _col7) >= 0L) and ((_col6 + _col9) >= 0) and ((_col6 > 0) or _col2) and (_col3 or (_col7 >= 1L))) + predicate:(((_col6 + _col9) >= 0) and ((_col4 + _col7) >= 0L) and (_col3 or (_col7 >= 1L)) and ((_col6 > 0) or _col2)) Join Operator [JOIN_20] (rows=3 width=32) Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col9"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":1,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 1 [PARTITION-LEVEL SORT] @@ -718,7 +718,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_34] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 8 [PARTITION-LEVEL SORT] @@ -734,7 +734,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_35] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -803,7 +803,7 @@ Stage-0 Group By Operator [GBY_6] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_30] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 7 [PARTITION-LEVEL SORT] @@ -819,7 +819,7 @@ Stage-0 Group By Operator [GBY_13] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_31] (rows=2 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (c_float > 0.0) and key is not null) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int > 0) or c_float is not null) and key is not null) TableScan [TS_10] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1252,11 +1252,11 @@ Stage-0 Stage-1 Reducer 2 File Output Operator [FS_17] - Select Operator [SEL_16] (rows=40 width=101) + Select Operator [SEL_16] (rows=30 width=101) Output:["_col0","_col1","_col2","_col3","_col4"] - Filter Operator [FIL_13] (rows=40 width=105) - predicate:(((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0)) and ((_col1 > 0) or _col7)) - Join Operator [JOIN_12] (rows=81 width=104) + Filter Operator [FIL_13] (rows=30 width=105) + predicate:(((_col1 > 0) or (_col6 >= 0)) and ((_col1 > 0) or _col7) and ((_col1 + _col4) = 2)) + Join Operator [JOIN_12] (rows=60 width=104) Output:["_col1","_col2","_col3","_col4","_col6","_col7"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":0,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 1 [PARTITION-LEVEL SORT] PARTITION-LEVEL SORT [RS_9] @@ -1264,7 +1264,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_18] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 3 [PARTITION-LEVEL SORT] @@ -1273,7 +1273,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=89) Output:["_col0","_col1"] Filter Operator [FIL_19] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [PARTITION-LEVEL SORT] @@ -1313,11 +1313,11 @@ Stage-0 Stage-1 Reducer 2 File Output Operator [FS_17] - Select Operator [SEL_16] (rows=40 width=101) + Select Operator [SEL_16] (rows=30 width=101) Output:["_col0","_col1","_col2","_col3","_col4"] - Filter Operator [FIL_13] (rows=40 width=105) - predicate:(((_col1 + _col4) = 2) and ((_col1 > 0) or (_col6 >= 0)) and ((_col1 > 0) or _col7)) - Join Operator [JOIN_12] (rows=81 width=104) + Filter Operator [FIL_13] (rows=30 width=105) + predicate:(((_col1 > 0) or (_col6 >= 0)) and ((_col1 > 0) or _col7) and ((_col1 + _col4) = 2)) + Join Operator [JOIN_12] (rows=60 width=104) Output:["_col1","_col2","_col3","_col4","_col6","_col7"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":0,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 1 [PARTITION-LEVEL SORT] PARTITION-LEVEL SORT [RS_9] @@ -1325,7 +1325,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_18] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 3 [PARTITION-LEVEL SORT] @@ -1334,7 +1334,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=89) Output:["_col0","_col1"] Filter Operator [FIL_19] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [PARTITION-LEVEL SORT] @@ -1558,7 +1558,7 @@ Stage-0 Select Operator [SEL_35] (rows=2 width=28) Output:["_col4","_col7"] Filter Operator [FIL_33] (rows=2 width=28) - predicate:(((_col3 + _col1) >= 0) and (_col5 or _col8)) + predicate:((_col5 or _col8) and ((_col3 + _col1) >= 0)) Join Operator [JOIN_32] (rows=6 width=27) Output:["_col1","_col3","_col4","_col5","_col7","_col8"],condition map:[{"":"{\"type\":\"Inner\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Inner\",\"left\":1,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 10 [PARTITION-LEVEL SORT] @@ -1591,7 +1591,7 @@ Stage-0 Group By Operator [GBY_3] (rows=3 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_45] (rows=6 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0)) TableScan [TS_0] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 9 [PARTITION-LEVEL SORT] @@ -1617,7 +1617,7 @@ Stage-0 Group By Operator [GBY_16] (rows=3 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_46] (rows=6 width=93) - predicate:(((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0.0))) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) >= 0)) TableScan [TS_13] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -1656,7 +1656,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1"] Filter Operator [FIL_13] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 3 [PARTITION-LEVEL SORT] @@ -1698,9 +1698,9 @@ Stage-0 Stage-1 Reducer 2 File Output Operator [FS_18] - Select Operator [SEL_17] (rows=14 width=93) + Select Operator [SEL_17] (rows=10 width=93) Output:["_col0","_col1","_col2"] - Join Operator [JOIN_16] (rows=14 width=93) + Join Operator [JOIN_16] (rows=10 width=93) Output:["_col0","_col1","_col2"],condition map:[{"":"{\"type\":\"Left Semi\",\"left\":0,\"right\":1}"},{"":"{\"type\":\"Left Semi\",\"left\":0,\"right\":2}"}],keys:{"0":"_col0","1":"_col0","2":"_col0"} <-Map 1 [PARTITION-LEVEL SORT] PARTITION-LEVEL SORT [RS_13] @@ -1708,7 +1708,7 @@ Stage-0 Select Operator [SEL_2] (rows=9 width=93) Output:["_col0","_col1","_col2"] Filter Operator [FIL_19] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and key is not null and ((c_int + 1) = 2)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 3 [PARTITION-LEVEL SORT] @@ -1719,7 +1719,7 @@ Stage-0 Select Operator [SEL_5] (rows=9 width=85) Output:["_col0"] Filter Operator [FIL_20] (rows=9 width=93) - predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 0.0)) and key is not null) + predicate:(((c_int > 0) or (c_float >= 0.0)) and ((c_int + 1) = 2) and key is not null) TableScan [TS_3] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Map 4 [PARTITION-LEVEL SORT] @@ -1808,7 +1808,7 @@ Stage-0 Group By Operator [GBY_3] (rows=1 width=101) Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, c_int, c_float Filter Operator [FIL_35] (rows=1 width=93) - predicate:((((c_int + 1) + 1) >= 0) and (((c_int + 1) > 0) or UDFToDouble(key) is not null) and ((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (UDFToDouble(key) > 0.0D) and (c_float > 0.0)) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (((c_int + 1) + 1) >= 0) and (UDFToDouble(key) > 0.0D) and ((c_int > 0) or c_float is not null) and (((c_int + 1) > 0) or UDFToDouble(key) is not null)) TableScan [TS_0] (rows=20 width=88) default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] <-Reducer 7 [PARTITION-LEVEL SORT] @@ -1826,7 +1826,7 @@ Stage-0 Group By Operator [GBY_12] (rows=1 width=93) Output:["_col0","_col1","_col2"],keys:key, c_int, c_float Filter Operator [FIL_36] (rows=1 width=93) - predicate:(((UDFToFloat(c_int) + c_float) >= 0.0) and ((c_int + 1) >= 0) and ((c_int > 0) or c_float is not null) and ((c_int >= 1) or (c_float >= 1.0)) and (UDFToDouble(key) > 0.0D) and (c_float > 0.0)) + predicate:((c_float > 0.0) and ((c_int >= 1) or (c_float >= 1.0)) and ((c_int + 1) >= 0) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (UDFToDouble(key) > 0.0D) and ((c_int > 0) or c_float is not null)) TableScan [TS_9] (rows=20 width=88) default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"] @@ -2298,7 +2298,7 @@ Stage-0 Select Operator [SEL_2] (rows=14 width=16) Output:["_col0","_col1","_col2","_col3"] Filter Operator [FIL_22] (rows=14 width=16) - predicate:((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) + predicate:((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) TableScan [TS_0] (rows=100 width=16) default@lineitem,li,Tbl:COMPLETE,Col:COMPLETE,Output:["l_orderkey","l_partkey","l_suppkey","l_linenumber"] <-Map 4 [PARTITION-LEVEL SORT] @@ -2512,7 +2512,7 @@ Stage-0 Select Operator [SEL_24] (rows=631 width=178) Output:["_col0","_col1"] Filter Operator [FIL_23] (rows=631 width=194) - predicate:(((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) + predicate:((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) Select Operator [SEL_22] (rows=631 width=194) Output:["_col0","_col1","_col2","_col3","_col5"] Join Operator [JOIN_21] (rows=631 width=194) @@ -2594,7 +2594,7 @@ Stage-0 Select Operator [SEL_23] (rows=41 width=223) Output:["_col0","_col1","_col2"] Filter Operator [FIL_22] (rows=41 width=229) - predicate:(((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) + predicate:((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) Join Operator [JOIN_21] (rows=41 width=229) Output:["_col0","_col1","_col2","_col4","_col5","_col8"],condition map:[{"":"{\"type\":\"Left Outer\",\"left\":0,\"right\":1}"}],keys:{"0":"_col0, _col1","1":"_col0, _col1"} <-Reducer 2 [PARTITION-LEVEL SORT] @@ -2686,7 +2686,7 @@ Stage-0 Select Operator [SEL_31] (rows=27 width=125) Output:["_col0","_col1"] Filter Operator [FIL_30] (rows=27 width=141) - predicate:(((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) + predicate:((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) Select Operator [SEL_29] (rows=27 width=141) Output:["_col0","_col1","_col2","_col3","_col5"] Join Operator [JOIN_28] (rows=27 width=141) @@ -2708,7 +2708,7 @@ Stage-0 Select Operator [SEL_10] (rows=1 width=12) Output:["_col0","_col1"] Filter Operator [FIL_9] (rows=1 width=16) - predicate:(UDFToDouble(_col0) is not null and _col1 is not null) + predicate:(_col1 is not null and UDFToDouble(_col0) is not null) Group By Operator [GBY_7] (rows=1 width=16) Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)","count(VALUE._col1)"] <-Map 5 [GROUP] @@ -2777,7 +2777,7 @@ Stage-0 Select Operator [SEL_33] (rows=7 width=106) Output:["_col0","_col1"] Filter Operator [FIL_32] (rows=7 width=114) - predicate:(((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) + predicate:((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) Join Operator [JOIN_31] (rows=7 width=114) Output:["_col0","_col1","_col3","_col4","_col7"],condition map:[{"":"{\"type\":\"Left Outer\",\"left\":0,\"right\":1}"}],keys:{"0":"_col0, _col1","1":"_col0, _col1"} <-Reducer 10 [PARTITION-LEVEL SORT] @@ -4433,13 +4433,13 @@ Stage-0 <-Map 3 [PARTITION-LEVEL SORT] PARTITION-LEVEL SORT [RS_9] PartitionCols:_col0 - Group By Operator [GBY_7] (rows=1 width=124) + Group By Operator [GBY_7] (rows=1 width=4) Output:["_col0"],keys:_col0 - Select Operator [SEL_5] (rows=1 width=124) + Select Operator [SEL_5] (rows=1 width=4) Output:["_col0"] - Filter Operator [FIL_14] (rows=1 width=124) + Filter Operator [FIL_14] (rows=1 width=4) predicate:id is not null - TableScan [TS_3] (rows=1 width=124) + TableScan [TS_3] (rows=1 width=4) default@things,things,Tbl:PARTIAL,Col:NONE,Output:["id"] PREHOOK: query: drop table sales diff --git a/ql/src/test/results/clientpositive/spark/spark_use_ts_stats_for_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/spark_use_ts_stats_for_mapjoin.q.out index 3cbed96d13..786898ff0f 100644 --- a/ql/src/test/results/clientpositive/spark/spark_use_ts_stats_for_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_use_ts_stats_for_mapjoin.q.out @@ -171,7 +171,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) @@ -191,7 +191,7 @@ STAGE PLANS: filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(key) is not null and key is not null) (type: boolean) + predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out index 15d52dbd17..bcaf77cce3 100644 --- a/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out @@ -2679,7 +2679,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -2818,7 +2818,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -3034,7 +3034,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -5379,7 +5379,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08')) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D)) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -5555,7 +5555,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -5694,7 +5694,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) @@ -10220,7 +10220,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 1:string, val 2008-04-08), FilterDoubleColEqualDoubleScalar(col 5:double, val 11.0)(children: CastStringToDouble(col 3:string) -> 5:double), SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 2:string)) - predicate: ((UDFToDouble(hour) = 11.0D) and (date = '2008-04-08') and ds is not null and hr is not null) (type: boolean) + predicate: ((date = '2008-04-08') and (UDFToDouble(hour) = 11.0D) and ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ds (type: string), hr (type: string) diff --git a/ql/src/test/results/clientpositive/spark/stats_only_null.q.out b/ql/src/test/results/clientpositive/spark/stats_only_null.q.out index f82c673fe9..f121827b2c 100644 --- a/ql/src/test/results/clientpositive/spark/stats_only_null.q.out +++ b/ql/src/test/results/clientpositive/spark/stats_only_null.q.out @@ -158,11 +158,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_null_part - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: a (type: double), b (type: int), c (type: string), d (type: smallint) outputColumnNames: a, b, c, d - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), count(a), count(b), count(c), count(d) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out index 7283595fcb..c4c8448de1 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out @@ -1328,7 +1328,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i (type: int), j (type: int) diff --git a/ql/src/test/results/clientpositive/spark/subquery_in.q.out b/ql/src/test/results/clientpositive/spark/subquery_in.q.out index 75750622d2..7f72e9ca09 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_in.q.out @@ -385,7 +385,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -462,10 +462,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: (p_mfgr is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_mfgr is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_mfgr is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_mfgr is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_mfgr (type: string), p_size (type: int) @@ -955,7 +955,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: key (type: string), value (type: string) @@ -1082,7 +1082,7 @@ STAGE PLANS: filterExpr: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int) @@ -1120,10 +1120,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + filterExpr: (l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + predicate: (l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int) @@ -1444,10 +1444,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_brand <> 'Brand#14') and (p_size <> 340) and p_type is not null) (type: boolean) + filterExpr: ((p_size <> 340) and (p_brand <> 'Brand#14') and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((p_brand <> 'Brand#14') and (p_size <> 340) and p_type is not null) (type: boolean) + predicate: ((p_size <> 340) and (p_brand <> 'Brand#14') and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1843,10 +1843,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: e - filterExpr: (p_name is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -1862,10 +1862,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_partkey (type: int) @@ -2110,7 +2110,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2130,7 +2130,7 @@ STAGE PLANS: filterExpr: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_size + 121150) = p_partkey) and p_name is not null and p_size is not null) (type: boolean) + predicate: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -2208,7 +2208,7 @@ STAGE PLANS: filterExpr: (p_partkey is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_partkey is not null and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2228,7 +2228,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3634,7 +3634,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3654,7 +3654,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -3799,7 +3799,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3839,7 +3839,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -3963,10 +3963,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and p_size is not null and p_name is not null) (type: boolean) + filterExpr: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_type (type: string), p_size (type: int) @@ -3986,7 +3986,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -4097,7 +4097,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -4117,7 +4117,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -4261,7 +4261,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and UDFToLong(p_size) is not null) (type: boolean) + filterExpr: (UDFToLong(p_size) is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (UDFToLong(p_size) is not null and p_type is not null) (type: boolean) @@ -4449,7 +4449,7 @@ STAGE PLANS: filterExpr: (p_partkey is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(p_size) is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and UDFToDouble(p_size) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -4512,7 +4512,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col1) is not null and _col2 is not null) (type: boolean) + predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), (UDFToDouble(_col1) / _col2) (type: double) @@ -4909,7 +4909,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 14 Data size: 1730 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 14 Data size: 1730 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -5095,7 +5095,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col1) is not null and _col2 is not null) (type: boolean) + predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col1) / _col2) (type: double), _col0 (type: int), true (type: boolean) @@ -5157,7 +5157,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 14 Data size: 1730 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 14 Data size: 1730 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -5511,7 +5511,7 @@ STAGE PLANS: filterExpr: (j is not null and UDFToLong(i) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToLong(i) is not null and j is not null) (type: boolean) + predicate: (j is not null and UDFToLong(i) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: i (type: int), j (type: int) @@ -5651,10 +5651,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_name is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -5828,7 +5828,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (p_size is not null and p_type is not null) (type: boolean) @@ -5868,7 +5868,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: pp - filterExpr: (p_type is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (p_size is not null and p_type is not null) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/subquery_multi.q.out b/ql/src/test/results/clientpositive/spark/subquery_multi.q.out index 551077907d..fa606ce1bf 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_multi.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_multi.q.out @@ -107,7 +107,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -383,7 +383,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 1 Data size: 39397 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 39397 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -608,7 +608,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 1 Data size: 39397 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 39397 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -832,7 +832,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 2 Data size: 71632 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L))) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 71632 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1060,7 +1060,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 1 Data size: 35833 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col1 is null) and (_col1 is not null or (_col9 = 0L) or _col12 is not null) and (_col12 is null or (_col9 = 0L))) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and (_col1 is not null or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 1 Data size: 35833 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1780,7 +1780,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1800,7 +1800,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_container is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -1820,7 +1820,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -1845,7 +1845,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_name (type: string) @@ -1870,7 +1870,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -1890,7 +1890,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -1990,7 +1990,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2118,7 +2118,7 @@ STAGE PLANS: filterExpr: (p_name is not null and p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_name is not null and p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2159,7 +2159,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_brand (type: string), p_type (type: string) @@ -2300,7 +2300,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_container is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2320,7 +2320,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_container is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_container is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -2340,7 +2340,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -2365,7 +2365,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_container is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_container is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_name (type: string), p_container (type: string) @@ -2390,7 +2390,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_brand (type: string), p_type (type: string), p_container (type: string) @@ -2410,7 +2410,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -2510,7 +2510,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2636,7 +2636,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2656,7 +2656,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_type (type: string) @@ -2761,7 +2761,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and (_col3 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 33 Data size: 4187 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2879,7 +2879,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2899,7 +2899,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_brand (type: string), p_type (type: string) @@ -2919,7 +2919,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_brand is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_brand is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_type (type: string), p_brand (type: string) @@ -3060,7 +3060,7 @@ STAGE PLANS: filterExpr: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int), 1 (type: int) @@ -3122,10 +3122,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), l_quantity (type: double) @@ -3229,7 +3229,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col4, _col5, _col7 Statistics: Num rows: 27 Data size: 3757 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 >= _col4) or (_col4 = 0L) or _col7 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col7 is not null) and (_col7 is null or (_col4 = 0L))) (type: boolean) + predicate: ((_col7 is null or (_col4 = 0L)) and (_col2 is not null or (_col4 = 0L) or _col7 is not null) and ((_col5 >= _col4) or (_col4 = 0L) or _col7 is not null or _col2 is null)) (type: boolean) Statistics: Num rows: 26 Data size: 3617 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), 1 (type: int) @@ -3331,7 +3331,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -3350,7 +3350,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -4141,7 +4141,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col9 <> 0L) and _col12 is null and (_col10 >= _col9) and _col5 is not null) or (_col0 = 3) or (_col9 = 0L)) (type: boolean) + predicate: ((_col9 = 0L) or (_col0 = 3) or ((_col9 <> 0L) and _col12 is null and (_col10 >= _col9) and _col5 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4364,7 +4364,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col4, _col5 Statistics: Num rows: 550 Data size: 13543 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col2 <> 0L) and _col4 is not null) or _col1 is not null or _col5 is not null) (type: boolean) + predicate: (_col5 is not null or ((_col2 <> 0L) and _col4 is not null) or _col1 is not null) (type: boolean) Statistics: Num rows: 550 Data size: 13543 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 550 Data size: 13543 Basic stats: COMPLETE Column stats: NONE @@ -4500,7 +4500,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: ws2 - filterExpr: (p_type is not null and p_retailprice is not null) (type: boolean) + filterExpr: (p_retailprice is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (p_retailprice is not null and p_type is not null) (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out index dc98f22252..e60a396de0 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out @@ -119,7 +119,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -401,7 +401,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col2 (type: int) @@ -682,7 +682,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: int) @@ -749,7 +749,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double), true (type: boolean) @@ -1093,7 +1093,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8 Statistics: Num rows: 9 Data size: 1345 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col2 is null) and (_col2 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 9 Data size: 1345 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col2 (type: int) @@ -1516,12 +1516,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key < '11') and (key > '104') is not true) (type: boolean) + filterExpr: ((key > '104') is not true and (key < '11')) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((key < '11') and (key > '104') is not true) (type: boolean) + predicate: ((key > '104') is not true and (key < '11')) (type: boolean) Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: CASE WHEN ((key > '104')) THEN (null) ELSE (key) END (type: string) @@ -1594,7 +1594,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 182 Data size: 5033 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null)) (type: boolean) Statistics: Num rows: 182 Data size: 5033 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -1685,10 +1685,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_brand <> 'Brand#14') and (p_size <> 340)) (type: boolean) + filterExpr: ((p_size <> 340) and (p_brand <> 'Brand#14')) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((p_brand <> 'Brand#14') and (p_size <> 340)) (type: boolean) + predicate: ((p_size <> 340) and (p_brand <> 'Brand#14')) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -1732,10 +1732,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p - filterExpr: (((p_size * p_size) <> 340) and p_type is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and ((p_size * p_size) <> 340) and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_size * p_size) <> 340) and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and ((p_size * p_size) <> 340) and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (p_size * p_size) (type: int), p_type (type: string) @@ -1780,7 +1780,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col14 is null or (_col10 = 0L) or _col10 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col5 is null) and (_col5 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -1970,7 +1970,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2188,7 +2188,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col0 is not null and _col5 is not null) or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col0 is null or _col5 is null) and (_col12 is null or (_col9 = 0L))) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col0 is not null and _col5 is not null) or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col0 is null or _col5 is null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2411,10 +2411,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_name is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null) (type: boolean) + predicate: (p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: p_partkey (type: int), p_name (type: string) @@ -2469,7 +2469,7 @@ STAGE PLANS: outputColumnNames: _col1, _col3, _col4, _col7 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE @@ -2656,7 +2656,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col7 is null) and (_col12 is null or (_col9 = 0L)) and (_col7 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col7 is null) and (_col7 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -2842,7 +2842,7 @@ STAGE PLANS: filterExpr: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((p_size + 121150) = p_partkey) and p_name is not null and p_size is not null) (type: boolean) + predicate: (((p_size + 121150) = p_partkey) and p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 13 Data size: 1573 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -2887,7 +2887,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col14 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col1 is null) and (_col1 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null) and (_col14 is null or (_col10 = 0L) or _col10 is null)) (type: boolean) + predicate: ((_col14 is null or (_col10 = 0L) or _col10 is null) and ((_col11 < _col10) is not true or (_col10 = 0L) or _col10 is null or _col14 is not null or _col1 is null) and (_col1 is not null or (_col10 = 0L) or _col10 is null or _col14 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3017,7 +3017,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), count(p_name) @@ -3040,7 +3040,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: p_partkey (type: int), p_name (type: string), p_size (type: int) @@ -3081,7 +3081,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col11, _col12, _col16 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col12 < _col11) is not true or (_col11 = 0L) or _col11 is null or _col16 is not null or _col1 is null) and (_col1 is not null or (_col11 = 0L) or _col11 is null or _col16 is not null) and (_col16 is null or (_col11 = 0L) or _col11 is null)) (type: boolean) + predicate: ((_col16 is null or (_col11 = 0L) or _col11 is null) and ((_col12 < _col11) is not true or (_col11 = 0L) or _col11 is null or _col16 is not null or _col1 is null) and (_col1 is not null or (_col11 = 0L) or _col11 is null or _col16 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3214,7 +3214,7 @@ STAGE PLANS: filterExpr: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(p_type) is not null and p_brand is not null) (type: boolean) + predicate: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(p_type) + 2.0D) (type: double), p_brand (type: string) @@ -3259,7 +3259,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -3506,7 +3506,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col1 is null) and (_col1 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -3779,7 +3779,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -4010,7 +4010,7 @@ STAGE PLANS: filterExpr: (key is not null and concat('v', value) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (concat('v', value) is not null and key is not null) (type: boolean) + predicate: (key is not null and concat('v', value) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: concat('v', value) (type: string), key (type: string) @@ -4086,7 +4086,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col7 Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -4325,7 +4325,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4556,7 +4556,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col12 is null or (_col9 = 0L)) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col5 is null) and (_col5 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) Statistics: Num rows: 28 Data size: 3937 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -4833,7 +4833,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -5439,10 +5439,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: e - filterExpr: (UDFToDouble((p_size + 100)) is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and UDFToDouble((p_size + 100)) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble((p_size + 100)) is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and UDFToDouble((p_size + 100)) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: p_size (type: int) @@ -5486,7 +5486,7 @@ STAGE PLANS: filterExpr: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(p_type) is not null and p_brand is not null) (type: boolean) + predicate: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: p_brand (type: string), p_type (type: string) @@ -5541,7 +5541,7 @@ STAGE PLANS: outputColumnNames: _col1, _col3, _col4, _col7 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE Column stats: NONE @@ -5780,7 +5780,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 4 Data size: 412 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 4 Data size: 412 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -6030,7 +6030,7 @@ STAGE PLANS: outputColumnNames: _col0, _col3, _col4, _col7 Statistics: Num rows: 4 Data size: 378 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 4 Data size: 378 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -6242,7 +6242,7 @@ STAGE PLANS: filterExpr: (b is not null and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (a is not null and b is not null) (type: boolean) + predicate: (b is not null and a is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: b (type: int), a (type: int) @@ -6283,7 +6283,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col7 Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -6469,7 +6469,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: i (type: int), j (type: int) @@ -6517,7 +6517,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col6 Statistics: Num rows: 4 Data size: 19 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and (_col6 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col6 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 4 Data size: 19 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: int) @@ -6713,7 +6713,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: i (type: int), j (type: int) @@ -6761,7 +6761,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col6 Statistics: Num rows: 6 Data size: 22 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and (_col6 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col6 is null or (_col3 = 0L) or _col3 is null) and (_col1 is not null or (_col3 = 0L) or _col3 is null or _col6 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col6 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 6 Data size: 22 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -6922,7 +6922,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 10 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: i (type: int), j (type: int) @@ -6963,7 +6963,7 @@ STAGE PLANS: outputColumnNames: _col0, _col3, _col4, _col7 Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -7134,7 +7134,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 3 Data size: 62 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and (_col1 is not null or (_col2 = 0L) or _col5 is not null) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col1 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 41 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -7303,7 +7303,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 3 Data size: 62 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 41 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int) @@ -7525,7 +7525,7 @@ STAGE PLANS: residual filter predicates: {(_col1 > _col6)} Statistics: Num rows: 8367 Data size: 186148 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 8367 Data size: 186148 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out b/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out index e56f128f5d..9b62717f17 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out @@ -838,7 +838,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 Statistics: Num rows: 26 Data size: 3693 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col10 <= _col9) and (_col9 <= _col11)) (type: boolean) + predicate: ((_col9 <= _col11) and (_col10 <= _col9)) (type: boolean) Statistics: Num rows: 2 Data size: 284 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -879,7 +879,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -1255,10 +1255,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: e - filterExpr: (p_name is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), (p_size + 100) (type: int) @@ -1532,7 +1532,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and UDFToDouble(p_size) is not null) (type: boolean) + filterExpr: (UDFToDouble(p_size) is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (UDFToDouble(p_size) is not null and p_type is not null) (type: boolean) @@ -1664,7 +1664,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (p_size is not null and p_type is not null) (type: boolean) @@ -1874,10 +1874,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and p_size is not null and p_retailprice is not null) (type: boolean) + filterExpr: (p_size is not null and p_retailprice is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_retailprice is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_retailprice is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment (type: string) @@ -2270,7 +2270,7 @@ STAGE PLANS: filterExpr: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_partkey is not null and p_size is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(p_name) @@ -3382,7 +3382,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col10, _col11, _col13 Statistics: Num rows: 7 Data size: 2279 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null) and (_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null)) (type: boolean) + predicate: ((_col13 is null or (_col10 = 0L)) and (_col3 is not null or (_col10 = 0L) or _col13 is not null) and ((_col11 >= _col10) or (_col10 = 0L) or _col13 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 6 Data size: 1953 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3642,7 +3642,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col12 Statistics: Num rows: 14 Data size: 1968 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col3 is null) and (_col12 is null or (_col9 = 0L)) and (_col3 is not null or (_col9 = 0L) or _col12 is not null)) (type: boolean) + predicate: ((_col12 is null or (_col9 = 0L)) and (_col3 is not null or (_col9 = 0L) or _col12 is not null) and ((_col10 >= _col9) or (_col9 = 0L) or _col12 is not null or _col3 is null)) (type: boolean) Statistics: Num rows: 14 Data size: 1968 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: string) @@ -3783,7 +3783,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1)) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) @@ -3995,7 +3995,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1)) (type: boolean) + filterExpr: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR')) (type: boolean) @@ -4332,7 +4332,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 1 Data size: 32560 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_name (type: string), p_mfgr (type: string), p_brand (type: string), p_type (type: string), p_size (type: int), p_container (type: string), p_retailprice (type: double), p_comment_n11 (type: string) @@ -4352,7 +4352,7 @@ STAGE PLANS: filterExpr: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_name is not null and p_type is not null) (type: boolean) + predicate: (p_type is not null and p_name is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_name (type: string), p_brand (type: string), p_type (type: string) @@ -5110,7 +5110,7 @@ STAGE PLANS: filterExpr: (name is not null and UDFToLong(empno) is not null) (type: boolean) Statistics: Num rows: 5 Data size: 238 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToLong(empno) is not null and name is not null) (type: boolean) + predicate: (name is not null and UDFToLong(empno) is not null) (type: boolean) Statistics: Num rows: 5 Data size: 238 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: empno (type: int), name (type: string), deptno (type: int), gender (type: string), city (type: string), empid (type: int), age (type: int), slacker (type: boolean), manager (type: boolean), joinedat (type: date), UDFToLong(deptno) (type: bigint) @@ -5847,7 +5847,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and p_size is not null) (type: boolean) + filterExpr: (p_size is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (p_size is not null and p_type is not null) (type: boolean) @@ -6297,7 +6297,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((_col2 = 0L) or _col3 is null) (type: boolean) + predicate: (_col3 is null or (_col2 = 0L)) (type: boolean) Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: int) @@ -6642,7 +6642,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 2 Data size: 6 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((_col2 = 0L) or _col3 is null) (type: boolean) + predicate: (_col3 is null or (_col2 = 0L)) (type: boolean) Statistics: Num rows: 2 Data size: 6 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: _col0 (type: int), _col1 (type: int) diff --git a/ql/src/test/results/clientpositive/spark/subquery_select.q.out b/ql/src/test/results/clientpositive/spark/subquery_select.q.out index b201eb36f2..38e1edcfb8 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_select.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_select.q.out @@ -1829,7 +1829,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -2004,7 +2004,7 @@ STAGE PLANS: filterExpr: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (key is not null and value is not null) (type: boolean) + predicate: (value is not null and key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) @@ -4367,7 +4367,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -4985,10 +4985,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p - filterExpr: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_size is not null and p_partkey is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_partkey is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_type (type: string), p_size (type: int) @@ -5368,10 +5368,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: p - filterExpr: (p_size is not null and p_type is not null and p_partkey is not null) (type: boolean) + filterExpr: (p_size is not null and p_partkey is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (p_partkey is not null and p_size is not null and p_type is not null) (type: boolean) + predicate: (p_size is not null and p_partkey is not null and p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: p_partkey (type: int), p_type (type: string), p_size (type: int) diff --git a/ql/src/test/results/clientpositive/spark/subquery_views.q.out b/ql/src/test/results/clientpositive/spark/subquery_views.q.out index ea62542ed0..5d6aceb046 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_views.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_views.q.out @@ -166,7 +166,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((value > 'val_11') and (key < '11')) (type: boolean) + filterExpr: ((key < '11') and (value > 'val_11')) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -191,7 +191,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((value > 'val_11') and (key < '11')) (type: boolean) + filterExpr: ((key < '11') and (value > 'val_11')) (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -259,7 +259,7 @@ STAGE PLANS: outputColumnNames: _col0, _col4, _col5, _col8 Statistics: Num rows: 365 Data size: 3878 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 365 Data size: 3878 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string) @@ -351,7 +351,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col4, _col5, _col8 Statistics: Num rows: 365 Data size: 3878 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 365 Data size: 3878 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out index a7129f6963..e7459bf89f 100644 --- a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out +++ b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out @@ -66,7 +66,7 @@ STAGE PLANS: Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE Filter Operator isSamplingPred: false - predicate: ((_col0 = '2008-04-08') and (_col1 < 100)) (type: boolean) + predicate: ((_col1 < 100) and (_col0 = '2008-04-08')) (type: boolean) Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out b/ql/src/test/results/clientpositive/spark/union22.q.out index b587d62a7a..609f45f268 100644 --- a/ql/src/test/results/clientpositive/spark/union22.q.out +++ b/ql/src/test/results/clientpositive/spark/union22.q.out @@ -82,7 +82,7 @@ POSTHOOK: Input: default@dst_union22_delta@ds=1 POSTHOOK: Output: default@dst_union22@ds=2 OPTIMIZED SQL: SELECT `k1`, `k2`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `ds` = '1' AND `k0` <= 50 +WHERE `k0` <= 50 AND `ds` = '1' UNION ALL SELECT `t2`.`k1`, `t2`.`k2`, `t4`.`k3`, `t4`.`k4` FROM (SELECT `k1`, `k2`, `ds` = '1' AS `=` @@ -90,7 +90,7 @@ FROM `default`.`dst_union22` WHERE `k1` > 20) AS `t2` LEFT JOIN (SELECT `k1`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `ds` = '1' AND `k0` > 50 AND `k1` > 20) AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=` +WHERE `k0` > 50 AND `k1` > 20 AND `ds` = '1') AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=` STAGE DEPENDENCIES: Stage-3 is a root stage Stage-1 depends on stages: Stage-3 @@ -192,7 +192,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: dst_union22_delta - filterExpr: ((ds = '1') and (UDFToDouble(k0) <= 50.0D)) (type: boolean) + filterExpr: ((UDFToDouble(k0) <= 50.0D) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 16936 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/spark/union_view.q.out b/ql/src/test/results/clientpositive/spark/union_view.q.out index ae3bb6baf6..66ea95705f 100644 --- a/ql/src/test/results/clientpositive/spark/union_view.q.out +++ b/ql/src/test/results/clientpositive/spark/union_view.q.out @@ -155,7 +155,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -180,7 +180,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '1')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -221,7 +221,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '2') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -271,7 +271,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '2') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '2')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -312,7 +312,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '3') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -337,7 +337,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '3') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '3')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -483,11 +483,11 @@ STAGE PLANS: 86 val_86 2 86 val_86 3 86 val_86 3 -86 val_86 1 -86 val_86 2 -86 val_86 2 86 val_86 3 86 val_86 3 +86 val_86 2 +86 val_86 2 +86 val_86 1 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -813,7 +813,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '4')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '4') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '4')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) @@ -838,7 +838,7 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '4')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Filter Operator - predicate: ((ds = '4') and (key = 86)) (type: boolean) + predicate: ((key = 86) and (ds = '4')) (type: boolean) Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE Select Operator expressions: value (type: string) diff --git a/ql/src/test/results/clientpositive/spark/vector_between_in.q.out b/ql/src/test/results/clientpositive/spark/vector_between_in.q.out index 809331def3..af1ea9b149 100644 --- a/ql/src/test/results/clientpositive/spark/vector_between_in.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_between_in.q.out @@ -158,7 +158,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDateColNotEqualDateScalar(col 3:date, val -67), FilterDateColNotEqualDateScalar(col 3:date, val -171), FilterDateColNotEqualDateScalar(col 3:date, val 20)) - predicate: ((cdate <> DATE'1969-07-14') and (cdate <> DATE'1969-10-26') and (cdate <> DATE'1970-01-21')) (type: boolean) + predicate: ((cdate <> DATE'1969-10-26') and (cdate <> DATE'1969-07-14') and (cdate <> DATE'1970-01-21')) (type: boolean) Statistics: Num rows: 12289 Data size: 2467616 Basic stats: COMPLETE Column stats: NONE Select Operator Select Vectorization: @@ -369,7 +369,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val 2365.8945945946), FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val 881.0135135135), FilterDecimalColNotEqualDecimalScalar(col 1:decimal(20,10), val -3367.6517567568)) - predicate: ((cdecimal1 <> -3367.6517567568) and (cdecimal1 <> 2365.8945945946) and (cdecimal1 <> 881.0135135135)) (type: boolean) + predicate: ((cdecimal1 <> 2365.8945945946) and (cdecimal1 <> 881.0135135135) and (cdecimal1 <> -3367.6517567568)) (type: boolean) Statistics: Num rows: 12289 Data size: 2467616 Basic stats: COMPLETE Column stats: NONE Select Operator Select Vectorization: diff --git a/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out b/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out index 2ca67289c9..7ee5f14c59 100644 --- a/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out @@ -81,7 +81,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + filterExpr: (l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -89,8 +89,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 14:string, val AIR), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), FilterStringGroupColEqualStringScalar(col 14:string, val AIR)) + predicate: (l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int) @@ -180,7 +180,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 1:int), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int) @@ -370,7 +370,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: lineitem - filterExpr: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean) + filterExpr: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -378,8 +378,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterStringGroupColEqualStringScalar(col 14:string, val AIR), FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_linenumber = 1) and (l_shipmode = 'AIR') and l_orderkey is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 0:int), FilterStringGroupColEqualStringScalar(col 14:string, val AIR)) + predicate: ((l_linenumber = 1) and l_orderkey is not null and (l_shipmode = 'AIR')) (type: boolean) Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), 1 (type: int) @@ -440,7 +440,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColEqualLongScalar(col 3:int, val 1), SelectColumnIsNotNull(col 1:int), SelectColumnIsNotNull(col 0:int)) - predicate: ((l_linenumber = 1) and l_orderkey is not null and l_partkey is not null) (type: boolean) + predicate: ((l_linenumber = 1) and l_partkey is not null and l_orderkey is not null) (type: boolean) Statistics: Num rows: 50 Data size: 5999 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), l_partkey (type: int), l_suppkey (type: int), 1 (type: int) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out index b86e030137..bec1a22335 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out @@ -1063,7 +1063,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 like '%b%') or (CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble)) (type: boolean) + filterExpr: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1072,7 +1072,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double)) + predicateExpression: FilterExprOrExpr(children: FilterDecimalColNotEqualDecimalScalar(col 13:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterDoubleColLessDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)) predicate: ((CAST( cint AS decimal(13,3)) <> 79.553) or (UDFToDouble(cbigint) < cdouble) or (cstring2 like '%b%')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator @@ -1271,7 +1271,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0)) or (cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%')) (type: boolean) + predicate: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or ((length(cstring1) < 50) and (cstring1 like '%n') and (length(cstring1) > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE @@ -30090,7 +30090,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) and (cfloat = 3.02)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 49) and (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) and (cfloat = 3.5)) or ((cint = 47) and (cfloat = 2.09)) or ((cint = 45) and (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 9216 Data size: 2180995 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) @@ -30337,7 +30337,7 @@ STAGE PLANS: GatherStats: false Filter Operator isSamplingPred: false - predicate: (((cint = 45) or (cfloat = 3.02)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 49) or (cfloat = 3.5))) (type: boolean) + predicate: (((cint = 49) or (cfloat = 3.5)) and ((cint = 47) or (cfloat = 2.09)) and ((cint = 45) or (cfloat = 3.02))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_1.q.out b/ql/src/test/results/clientpositive/spark/vectorization_1.q.out index 661c3d8468..d52f5dd710 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_1.q.out @@ -63,7 +63,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or (cboolean1 < 0)) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -72,8 +72,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0)), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColLessLongScalar(col 10:boolean, val 0)) - predicate: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (UDFToLong(cint) > cbigint) or (cbigint < UDFToLong(ctinyint)) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0))) + predicate: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), cfloat (type: float), cint (type: int), cdouble (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_10.q.out b/ql/src/test/results/clientpositive/spark/vectorization_10.q.out index 5fac187b4d..d76c27a42c 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_10.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_10.q.out @@ -77,7 +77,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(6,2), val -5638.15)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(6,2))), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) -> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern %a)))) - predicate: (((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= '10')) (type: boolean) + predicate: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a')))) (type: boolean) Statistics: Num rows: 9557 Data size: 2261694 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cdouble (type: double), ctimestamp1 (type: timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 (type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) (type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), (UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), (- (- cdouble)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_12.q.out b/ql/src/test/results/clientpositive/spark/vectorization_12.q.out index a87f453faa..230524c2c3 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_12.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_12.q.out @@ -86,7 +86,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (ctimestamp1 is null and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean) + filterExpr: (ctimestamp1 is null and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -95,8 +95,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint)))) - predicate: (((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ctimestamp1 is null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint))) + predicate: (ctimestamp1 is null and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint))) (type: boolean) Statistics: Num rows: 3754 Data size: 888395 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint), cboolean1 (type: boolean), cstring1 (type: string), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_13.q.out b/ql/src/test/results/clientpositive/spark/vectorization_13.q.out index f429a78825..43504e0caa 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_13.q.out @@ -98,7 +98,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28789.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28788.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 2730 Data size: 646063 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -455,7 +455,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28801.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28801.336)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 2730 Data size: 646063 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_14.q.out b/ql/src/test/results/clientpositive/spark/vectorization_14.q.out index be6fde6f56..e298917aba 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_14.q.out @@ -88,7 +88,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToLong(ctinyint) <= cbigint) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) (type: boolean) + filterExpr: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -97,8 +97,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), FilterDoubleColLessDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float))) - predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and (UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 14:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 14:float)), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp))) + predicate: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 606 Data size: 143411 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), (- (-26.28D + cdouble)) (type: double), ((- (-26.28D + cdouble)) * (- (-26.28D + cdouble))) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_15.q.out b/ql/src/test/results/clientpositive/spark/vectorization_15.q.out index 5a7e154e4f..4d086b4662 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_15.q.out @@ -84,7 +84,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) + filterExpr: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -93,8 +93,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) - predicate: (((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 like '%ss%')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) + predicate: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cfloat (type: float), cboolean1 (type: boolean), cdouble (type: double), cstring1 (type: string), ctinyint (type: tinyint), cint (type: int), ctimestamp1 (type: timestamp), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_16.q.out b/ql/src/test/results/clientpositive/spark/vectorization_16.q.out index 0cfec0a526..903962b370 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_16.q.out @@ -71,7 +71,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 969331 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_17.q.out b/ql/src/test/results/clientpositive/spark/vectorization_17.q.out index b0ac0ae961..8d0222fc06 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_17.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_17.q.out @@ -69,7 +69,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: boolean) + filterExpr: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -78,8 +78,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float))) - predicate: (((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float)), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)))) + predicate: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 4096 Data size: 969331 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cfloat (type: float), cstring1 (type: string), cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_2.q.out b/ql/src/test/results/clientpositive/spark/vectorization_2.q.out index 9a2d03f4d1..2d210ddb98 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_2.q.out @@ -67,7 +67,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean) + filterExpr: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -76,7 +76,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375)), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359)))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359))), FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375))) predicate: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 4778 Data size: 1130728 Basic stats: COMPLETE Column stats: NONE Select Operator diff --git a/ql/src/test/results/clientpositive/spark/vectorization_3.q.out b/ql/src/test/results/clientpositive/spark/vectorization_3.q.out index f89a821a56..1b65477b43 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_3.q.out @@ -72,7 +72,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean) + filterExpr: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -81,7 +81,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), FilterDecimalColNotEqualDecimalScalar(col 14:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 15:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 16:double), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 13:double), FilterDecimalColGreaterEqualDecimalScalar(col 14:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 14:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float), FilterDecimalColNotEqualDecimalScalar(col 16:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 17:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 17:double))) predicate: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) Statistics: Num rows: 2503 Data size: 592342 Basic stats: COMPLETE Column stats: NONE Select Operator @@ -130,7 +130,7 @@ STAGE PLANS: includeColumns: [0, 1, 2, 3, 4, 5, 8, 9] dataColumns: ctinyint:tinyint, csmallint:smallint, cint:int, cbigint:bigint, cfloat:float, cdouble:double, cstring1:string, cstring2:string, ctimestamp1:timestamp, ctimestamp2:timestamp, cboolean1:boolean, cboolean2:boolean partitionColumnCount: 0 - scratchColumnTypeNames: [double, decimal(22,3), double, double, decimal(8,3), double, double, double, double, double, double, double, double, double, double, double, double, double] + scratchColumnTypeNames: [double, decimal(8,3), double, decimal(22,3), double, double, double, double, double, double, double, double, double, double, double, double, double, double] Reducer 2 Execution mode: vectorized Reduce Vectorization: diff --git a/ql/src/test/results/clientpositive/spark/vectorization_4.q.out b/ql/src/test/results/clientpositive/spark/vectorization_4.q.out index 16ae985110..0b9a0fad0c 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_4.q.out @@ -67,7 +67,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToInteger(csmallint) >= cint) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: boolean) + filterExpr: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -76,8 +76,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0)))) - predicate: (((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or (UDFToInteger(csmallint) >= cint)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0))), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553))) + predicate: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cdouble (type: double), ctinyint (type: tinyint), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_5.q.out b/ql/src/test/results/clientpositive/spark/vectorization_5.q.out index ce9afedf07..5069ca9862 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_5.q.out @@ -71,7 +71,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %b%), SelectColumnIsNotNull(col 11:boolean)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterStringColLikeStringScalar(col 7:string, pattern a), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null) or ((cstring1 like '%b%') and cboolean2 is not null)) (type: boolean) + predicate: (((cstring1 like '%b%') and cboolean2 is not null) or ((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null)) (type: boolean) Statistics: Num rows: 9216 Data size: 2180995 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_6.q.out b/ql/src/test/results/clientpositive/spark/vectorization_6.q.out index 8efa251459..5aa1962295 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_6.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_6.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null))) (type: boolean) + filterExpr: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -70,7 +70,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint))), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 11605 Data size: 2746359 Basic stats: COMPLETE Column stats: NONE Select Operator diff --git a/ql/src/test/results/clientpositive/spark/vectorization_9.q.out b/ql/src/test/results/clientpositive/spark/vectorization_9.q.out index 0cfec0a526..903962b370 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_9.q.out @@ -71,7 +71,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 969331 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_decimal_date.q.out b/ql/src/test/results/clientpositive/spark/vectorization_decimal_date.q.out index c47c8adc3e..8ff0efae11 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_decimal_date.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_decimal_date.q.out @@ -46,7 +46,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:double)) - predicate: (cdouble is not null and cint is not null) (type: boolean) + predicate: (cint is not null and cdouble is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 1651260 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cdate (type: date), cint (type: int), cdecimal (type: decimal(20,10)) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_div0.q.out b/ql/src/test/results/clientpositive/spark/vectorization_div0.q.out index 386738598e..954af27e0b 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_div0.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_div0.q.out @@ -254,7 +254,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val 0), FilterLongColLessLongScalar(col 3:bigint, val 100000000)) - predicate: ((cbigint < 100000000L) and (cbigint > 0L)) (type: boolean) + predicate: ((cbigint > 0L) and (cbigint < 100000000L)) (type: boolean) Statistics: Num rows: 1365 Data size: 323031 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cbigint - 988888L) (type: bigint), (cdouble / UDFToDouble((cbigint - 988888L))) (type: double), (1.2 / CAST( (cbigint - 988888L) AS decimal(19,0))) (type: decimal(22,21)) @@ -476,7 +476,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -500.0), FilterDoubleColLessDoubleScalar(col 5:double, val -199.0)) - predicate: ((cdouble < -199.0D) and (cdouble >= -500.0D)) (type: boolean) + predicate: ((cdouble >= -500.0D) and (cdouble < -199.0D)) (type: boolean) Statistics: Num rows: 1365 Data size: 323031 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdouble + 200.0D) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), ((cdouble + 200.0D) / (cdouble + 200.0D)) (type: double), (UDFToDouble(cbigint) / (cdouble + 200.0D)) (type: double), (3.0D / (cdouble + 200.0D)) (type: double), (1.2D / (cdouble + 200.0D)) (type: double) @@ -698,7 +698,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 2:int, val 500000000), FilterDoubleColGreaterDoubleScalar(col 5:double, val 1.0E9), FilterLongColEqualLongScalar(col 0:tinyint, val 0)) - predicate: ((cdouble > 1.0E9D) or (cint > 500000000) or (ctinyint = 0Y)) (type: boolean) + predicate: ((cint > 500000000) or (cdouble > 1.0E9D) or (ctinyint = 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cbigint (type: bigint), ctinyint (type: tinyint), (UDFToDouble(cint) / UDFToDouble((cint - 528534767))) (type: double), (UDFToDouble(cbigint) / UDFToDouble((cbigint - 1018195815L))) (type: double), (UDFToDouble(ctinyint) / UDFToDouble(ctinyint)) (type: double), (cint % (cint - 528534767)) (type: int), (cbigint % (cbigint - 1018195815L)) (type: bigint), (ctinyint % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out index fbcdb7bda7..da2b462c77 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out @@ -95,7 +95,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint = 762L) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cstring1 = 'a') or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1))) (type: boolean) + filterExpr: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -103,8 +103,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterStringGroupColEqualStringScalar(col 6:string, val a), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean))) - predicate: (((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or ((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 1:smallint) -> 13:float), FilterDoubleColGreaterDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColNotEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 16:decimal(22,3), val -1.389)(children: CastLongToDecimal(col 3:bigint) -> 16:decimal(22,3)), FilterStringGroupColNotEqualStringScalar(col 7:string, val a), FilterDecimalColNotEqualDecimalScalar(col 17:decimal(13,3), val 79.553)(children: CastLongToDecimal(col 2:int) -> 17:decimal(13,3)), FilterLongColNotEqualLongColumn(col 11:boolean, col 10:boolean)), FilterLongColEqualLongScalar(col 3:bigint, val 762), FilterStringGroupColEqualStringScalar(col 6:string, val a)) + predicate: (((UDFToFloat(csmallint) < cfloat) and (UDFToDouble(ctimestamp2) > -5.0D) and (cdouble <> UDFToDouble(cint))) or ((CAST( cbigint AS decimal(22,3)) <= -1.389) and (cstring2 <> 'a') and (CAST( cint AS decimal(13,3)) <> 79.553) and (cboolean2 <> cboolean1)) or (cbigint = 762L) or (cstring1 = 'a')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cdouble (type: double), csmallint (type: smallint), cfloat (type: float), ctinyint (type: tinyint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) @@ -361,7 +361,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*') or ((cfloat > 79.553) and (cstring2 like '10%'))) (type: boolean) + filterExpr: (((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cfloat > 79.553) and (cstring2 like '10%')) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -369,8 +369,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 3:bigint, val 197), FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -26.28), FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 1:smallint) -> 13:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 14:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 14:float), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss.*)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 4:float, val 79.5530014038086), FilterStringColLikeStringScalar(col 7:string, pattern 10%))) - predicate: (((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*') or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cfloat > 79.553) and (cstring2 like '10%'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -26.28), FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 1:smallint) -> 13:double)), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 3:bigint, val 197), FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 4:float, val 79.5530014038086), FilterStringColLikeStringScalar(col 7:string, pattern 10%)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 14:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 14:float), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss.*))) + predicate: (((cdouble >= -26.28D) and (UDFToDouble(csmallint) > cdouble)) or ((cbigint <= 197L) and (UDFToLong(cint) < cbigint)) or ((cfloat > 79.553) and (cstring2 like '10%')) or ((UDFToFloat(ctinyint) > cfloat) and cstring1 regexp '.*ss.*')) (type: boolean) Statistics: Num rows: 6826 Data size: 1615394 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cbigint (type: bigint), csmallint (type: smallint), cdouble (type: double), ctinyint (type: tinyint), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) @@ -619,7 +619,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctimestamp1 = ctimestamp2) or (cfloat = 762.0) or (cstring1 = 'ss') or ((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null)) (type: boolean) + filterExpr: (((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (ctimestamp1 = ctimestamp2) or (cstring1 = 'ss')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -627,8 +627,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterTimestampColEqualTimestampColumn(col 8:timestamp, col 9:timestamp), FilterDoubleColEqualDoubleScalar(col 4:float, val 762.0), FilterStringGroupColEqualStringScalar(col 6:string, val ss), FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterLongColEqualLongScalar(col 11:boolean, val 1)), FilterExprAndExpr(children: FilterStringGroupColGreaterStringScalar(col 7:string, val a), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (cstring1 = 'ss') or (ctimestamp1 = ctimestamp2)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterLongColEqualLongScalar(col 11:boolean, val 1)), FilterExprAndExpr(children: FilterStringGroupColGreaterStringScalar(col 7:string, val a), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 9:timestamp)), FilterDoubleColEqualDoubleScalar(col 4:float, val 762.0), FilterTimestampColEqualTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringGroupColEqualStringScalar(col 6:string, val ss)) + predicate: (((UDFToLong(csmallint) <= cbigint) and (cboolean2 = 1)) or ((cstring2 > 'a') and cboolean1 is not null and ctimestamp2 is not null) or (cfloat = 762.0) or (ctimestamp1 = ctimestamp2) or (cstring1 = 'ss')) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint), ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), (cdouble * cdouble) (type: double) @@ -856,7 +856,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or ((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or (cfloat = 17.0)) (type: boolean) + filterExpr: (((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or ((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or (cfloat = 17.0)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -864,7 +864,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 13:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 14:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double)), FilterDoubleColEqualDoubleScalar(col 4:float, val 17.0)) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 13:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double)), FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 14:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss)), FilterDoubleColEqualDoubleScalar(col 4:float, val 17.0)) predicate: (((csmallint < UDFToShort(ctinyint)) and (UDFToDouble(ctimestamp1) >= 0.0D)) or ((ctimestamp2 <= ctimestamp1) and (UDFToDouble(cbigint) <> cdouble) and (cstring1 >= 'ss')) or (cfloat = 17.0)) (type: boolean) Statistics: Num rows: 8874 Data size: 2100060 Basic stats: COMPLETE Column stats: NONE Select Operator @@ -1101,7 +1101,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring1 regexp 'a.*' and (cstring2 like '%ss%')) or ((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint))) (type: boolean) + filterExpr: (((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1109,8 +1109,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColRegExpStringScalar(col 6:string, pattern a.*), FilterStringColLikeStringScalar(col 7:string, pattern %ss%)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 11:boolean, val 1), FilterDecimalColLessDecimalScalar(col 13:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(8,3)), FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterDoubleColGreaterEqualDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColGreaterLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint))) - predicate: (((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or ((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 11:boolean, val 1), FilterDecimalColLessDecimalScalar(col 13:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(8,3)), FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterDoubleColGreaterEqualDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float)), FilterExprAndExpr(children: FilterLongColLessLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColGreaterLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint)), FilterExprAndExpr(children: FilterStringColRegExpStringScalar(col 6:string, pattern a.*), FilterStringColLikeStringScalar(col 7:string, pattern %ss%))) + predicate: (((cboolean2 <> 1) and (CAST( csmallint AS decimal(8,3)) < 79.553) and (UDFToInteger(ctinyint) <> -257)) or ((cdouble > UDFToDouble(ctinyint)) and (cfloat >= UDFToFloat(cint))) or ((UDFToLong(cint) < cbigint) and (UDFToLong(ctinyint) > cbigint)) or (cstring1 regexp 'a.*' and (cstring2 like '%ss%'))) (type: boolean) Statistics: Num rows: 9898 Data size: 2342392 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cdouble (type: double), ctimestamp2 (type: timestamp), cstring1 (type: string), cboolean2 (type: boolean), ctinyint (type: tinyint), cfloat (type: float), ctimestamp1 (type: timestamp), csmallint (type: smallint), cbigint (type: bigint), (-3728L * cbigint) (type: bigint), (- cint) (type: int), (-863.257 - CAST( cint AS decimal(10,0))) (type: decimal(14,3)), (- csmallint) (type: smallint), (csmallint - (- csmallint)) (type: smallint), ((csmallint - (- csmallint)) + (- csmallint)) (type: smallint), (UDFToDouble(cint) / UDFToDouble(cint)) (type: double), ((-863.257 - CAST( cint AS decimal(10,0))) - -26.28) (type: decimal(15,3)), (- cfloat) (type: float), (cdouble * -89010.0D) (type: double), (UDFToDouble(ctinyint) / 988888.0D) (type: double), (- ctinyint) (type: tinyint), (79.553 / CAST( ctinyint AS decimal(3,0))) (type: decimal(9,7)) @@ -1401,7 +1401,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or (cbigint = 359L) or (cboolean1 < 0) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint = 359L) or ((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1409,8 +1409,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessLongScalar(col 0:int, val 197)(children: col 0:tinyint), FilterLongColEqualLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterLongColEqualLongScalar(col 3:bigint, val 359), FilterLongColLessLongScalar(col 10:boolean, val 0), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %ss), FilterDoubleColLessEqualDoubleColumn(col 4:float, col 13:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 13:float))) - predicate: (((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint))) or (cbigint = 359L) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColEqualLongScalar(col 3:bigint, val 359), FilterExprAndExpr(children: FilterLongColLessLongScalar(col 0:int, val 197)(children: col 0:tinyint), FilterLongColEqualLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %ss), FilterDoubleColLessEqualDoubleColumn(col 4:float, col 13:float)(children: CastLongToFloatViaLongToDouble(col 0:tinyint) -> 13:float))) + predicate: ((cboolean1 < 0) or (cbigint = 359L) or ((UDFToInteger(ctinyint) < 197) and (UDFToLong(cint) = cbigint)) or ((cstring1 like '%ss') and (cfloat <= UDFToFloat(ctinyint)))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cbigint (type: bigint), cstring1 (type: string), cboolean1 (type: boolean), cfloat (type: float), cdouble (type: double), ctimestamp2 (type: timestamp), csmallint (type: smallint), cstring2 (type: string), cboolean2 (type: boolean), (UDFToDouble(cint) / UDFToDouble(cbigint)) (type: double), (CAST( cbigint AS decimal(19,0)) % 79.553) (type: decimal(5,3)), (- (UDFToDouble(cint) / UDFToDouble(cbigint))) (type: double), (10.175 % cfloat) (type: float), (- cfloat) (type: float), (cfloat - (- cfloat)) (type: float), ((cfloat - (- cfloat)) % -6432.0) (type: float), (cdouble * UDFToDouble(csmallint)) (type: double), (- cdouble) (type: double), (- cbigint) (type: bigint), (UDFToDouble(cfloat) - (UDFToDouble(cint) / UDFToDouble(cbigint))) (type: double), (- csmallint) (type: smallint), (3569L % cbigint) (type: bigint), (359.0D - cdouble) (type: double), (- csmallint) (type: smallint) @@ -1650,7 +1650,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss')) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28))) (type: boolean) + filterExpr: (((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss'))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1658,8 +1658,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 13:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 13:decimal(7,2)), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss), FilterDoubleColNotEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double)), FilterLongColEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 16:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 3:bigint) -> 16:float), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(7,2)))) - predicate: (((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss')) or ((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 3:bigint) -> 13:float), FilterDecimalColGreaterEqualDecimalScalar(col 14:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 14:decimal(7,2))), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 15:double)(children: CastLongToDouble(col 3:bigint) -> 15:double), FilterStringGroupColGreaterEqualStringScalar(col 6:string, val ss), FilterDoubleColNotEqualDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 16:double)), FilterLongColEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 17:decimal(7,2), val -26.28)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(7,2)), FilterStringColLikeStringScalar(col 7:string, pattern ss))) + predicate: (((UDFToFloat(cbigint) <= cfloat) and (CAST( csmallint AS decimal(7,2)) >= -26.28)) or ((cdouble <= UDFToDouble(cbigint)) and (cstring1 >= 'ss') and (UDFToDouble(cint) <> cdouble)) or (UDFToInteger(ctinyint) = -89010) or ((CAST( csmallint AS decimal(7,2)) > -26.28) and (cstring2 like 'ss'))) (type: boolean) Statistics: Num rows: 10922 Data size: 2584725 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cstring1 (type: string), cboolean2 (type: boolean), ctimestamp2 (type: timestamp), cdouble (type: double), cfloat (type: float), cbigint (type: bigint), csmallint (type: smallint), cboolean1 (type: boolean), (cint + UDFToInteger(csmallint)) (type: int), (cbigint - UDFToLong(ctinyint)) (type: bigint), (- cbigint) (type: bigint), (- cfloat) (type: float), ((cbigint - UDFToLong(ctinyint)) + cbigint) (type: bigint), (cdouble / cdouble) (type: double), (- cdouble) (type: double), (UDFToLong((cint + UDFToInteger(csmallint))) * (- cbigint)) (type: bigint), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (-1.389 / CAST( ctinyint AS decimal(3,0))) (type: decimal(8,7)), (UDFToDouble(cbigint) % cdouble) (type: double), (- csmallint) (type: smallint), (UDFToInteger(csmallint) + (cint + UDFToInteger(csmallint))) (type: int) @@ -1957,7 +1957,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) + filterExpr: (((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1965,8 +1965,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 13:decimal(13,3), val -1.389)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterLongColLessLongScalar(col 1:int, val -6432)(children: col 1:smallint)), FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleColumn(col 5:double, col 4:double)(children: col 4:float), FilterStringGroupColLessEqualStringScalar(col 7:string, val a)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern ss%), FilterDecimalColLessDecimalScalar(col 14:decimal(22,3), val 10.175)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)))) - predicate: (((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterEqualDoubleColumn(col 5:double, col 4:double)(children: col 4:float), FilterStringGroupColLessEqualStringScalar(col 7:string, val a)), FilterExprAndExpr(children: FilterDecimalColLessEqualDecimalScalar(col 13:decimal(13,3), val -1.389)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)), FilterLongColLessLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), FilterLongColLessLongScalar(col 1:int, val -6432)(children: col 1:smallint)), FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern ss%), FilterDecimalColLessDecimalScalar(col 14:decimal(22,3), val 10.175)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)))) + predicate: (((cdouble >= UDFToDouble(cfloat)) and (cstring2 <= 'a')) or ((CAST( cint AS decimal(13,3)) <= -1.389) and (csmallint < UDFToShort(ctinyint)) and (UDFToInteger(csmallint) < -6432)) or ((cstring1 like 'ss%') and (CAST( cbigint AS decimal(22,3)) < 10.175))) (type: boolean) Statistics: Num rows: 3868 Data size: 915374 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp), cstring2 (type: string), cdouble (type: double), cfloat (type: float), cbigint (type: bigint), csmallint (type: smallint), (UDFToDouble(cbigint) / 3569.0D) (type: double), (-257 - UDFToInteger(csmallint)) (type: int), (-6432.0 * cfloat) (type: float), (- cdouble) (type: double), (cdouble * 10.175D) (type: double), (UDFToDouble((-6432.0 * cfloat)) / UDFToDouble(cfloat)) (type: double), (- cfloat) (type: float), (cint % UDFToInteger(csmallint)) (type: int), (- cdouble) (type: double), (cdouble * (- cdouble)) (type: double) @@ -2206,7 +2206,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble) and (UDFToInteger(ctinyint) <= cint)) (type: boolean) + filterExpr: ((UDFToInteger(ctinyint) <= cint) and (UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -2214,8 +2214,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 1:int, val -257)(children: col 1:smallint), FilterDoubleColGreaterEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterLongColLessEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint)) - predicate: ((UDFToDouble(cint) >= cdouble) and (UDFToInteger(csmallint) >= -257) and (UDFToInteger(ctinyint) <= cint)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterLongColGreaterEqualLongScalar(col 1:int, val -257)(children: col 1:smallint), FilterDoubleColGreaterEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double)) + predicate: ((UDFToInteger(ctinyint) <= cint) and (UDFToInteger(csmallint) >= -257) and (UDFToDouble(cint) >= cdouble)) (type: boolean) Statistics: Num rows: 455 Data size: 107677 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: csmallint (type: smallint), cbigint (type: bigint), ctinyint (type: tinyint), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -2496,7 +2496,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 2563.58), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 3:bigint, col 2:bigint)(children: col 2:int), FilterLongColLessLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterDoubleColLessDoubleScalar(col 4:float, val -5638.14990234375)), FilterDecimalColEqualDecimalScalar(col 13:decimal(6,2), val 2563.58)(children: CastLongToDecimal(col 0:tinyint) -> 13:decimal(6,2)), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 3:bigint) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(21,2), val -5638.15)(children: CastLongToDecimal(col 3:bigint) -> 15:decimal(21,2))))) - predicate: ((((cbigint >= UDFToLong(cint)) and (UDFToInteger(csmallint) < cint) and (cfloat < -5638.15)) or (CAST( ctinyint AS decimal(6,2)) = 2563.58) or ((cdouble <= UDFToDouble(cbigint)) and (CAST( cbigint AS decimal(21,2)) < -5638.15))) and (cdouble > 2563.58D)) (type: boolean) + predicate: ((cdouble > 2563.58D) and (((cbigint >= UDFToLong(cint)) and (UDFToInteger(csmallint) < cint) and (cfloat < -5638.15)) or (CAST( ctinyint AS decimal(6,2)) = 2563.58) or ((cdouble <= UDFToDouble(cbigint)) and (CAST( cbigint AS decimal(21,2)) < -5638.15)))) (type: boolean) Statistics: Num rows: 2654 Data size: 628077 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cdouble (type: double), cfloat (type: float), (cdouble * cdouble) (type: double) @@ -2812,7 +2812,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToDouble(ctimestamp1) <> 0.0D) and (((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint))))) (type: boolean) + filterExpr: ((((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint)))) and (UDFToDouble(ctimestamp1) <> 0.0D)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -2820,7 +2820,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDoubleColNotEqualDoubleScalar(col 13:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss), FilterDoubleColGreaterDoubleScalar(col 14:double, val -3.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), SelectColumnIsNotNull(col 11:boolean)), FilterDoubleColEqualDoubleScalar(col 15:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double), FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 16:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 16:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)), FilterDoubleColEqualDoubleColumn(col 5:double, col 17:double)(children: CastLongToDouble(col 2:int) -> 17:double), FilterExprAndExpr(children: SelectColumnIsNull(col 10:boolean), FilterDoubleColLessDoubleColumn(col 4:float, col 18:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 18:float)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:int, val -257)(children: col 0:tinyint), FilterStringColRegExpStringScalar(col 6:string, pattern .*ss), FilterDoubleColGreaterDoubleScalar(col 13:double, val -3.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), SelectColumnIsNotNull(col 11:boolean)), FilterDoubleColEqualDoubleScalar(col 14:double, val -5.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 15:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 15:double), FilterStringColLikeStringScalar(col 7:string, pattern %b%)), FilterDoubleColEqualDoubleColumn(col 5:double, col 16:double)(children: CastLongToDouble(col 2:int) -> 16:double), FilterExprAndExpr(children: SelectColumnIsNull(col 10:boolean), FilterDoubleColLessDoubleColumn(col 4:float, col 17:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 17:float))), FilterDoubleColNotEqualDoubleScalar(col 18:double, val 0.0)(children: CastTimestampToDouble(col 8:timestamp) -> 18:double)) predicate: ((((UDFToInteger(ctinyint) <> -257) and cstring1 regexp '.*ss' and (UDFToDouble(ctimestamp1) > -3.0D) and cboolean2 is not null) or (UDFToDouble(ctimestamp2) = -5.0D) or ((UDFToDouble(ctimestamp1) < 0.0D) and (cstring2 like '%b%')) or (cdouble = UDFToDouble(cint)) or (cboolean1 is null and (cfloat < UDFToFloat(cint)))) and (UDFToDouble(ctimestamp1) <> 0.0D)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator @@ -3218,7 +3218,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null)) and cboolean1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and (((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null))) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -3226,8 +3226,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 1:smallint) -> 13:double), FilterLongColEqualLongColumn(col 11:boolean, col 10:boolean), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(22,3), val -863.257)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3))), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -257), FilterLongColGreaterEqualLongScalar(col 10:boolean, val 1), SelectColumnIsNotNull(col 6:string)), FilterStringColRegExpStringScalar(col 7:string, pattern b), FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), SelectColumnIsNull(col 9:timestamp))), SelectColumnIsNotNull(col 10:boolean)) - predicate: ((((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null)) and cboolean1 is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 1:smallint) -> 13:double), FilterLongColEqualLongColumn(col 11:boolean, col 10:boolean), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(22,3), val -863.257)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3))), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -257), FilterLongColGreaterEqualLongScalar(col 10:boolean, val 1), SelectColumnIsNotNull(col 6:string)), FilterStringColRegExpStringScalar(col 7:string, pattern b), FilterExprAndExpr(children: FilterLongColGreaterEqualLongColumn(col 1:smallint, col 0:smallint)(children: col 0:tinyint), SelectColumnIsNull(col 9:timestamp)))) + predicate: (cboolean1 is not null and (((cdouble < UDFToDouble(csmallint)) and (cboolean2 = cboolean1) and (CAST( cbigint AS decimal(22,3)) <= -863.257)) or ((cint >= -257) and (cboolean1 >= 1) and cstring1 is not null) or cstring2 regexp 'b' or ((csmallint >= UDFToShort(ctinyint)) and ctimestamp2 is null))) (type: boolean) Statistics: Num rows: 10239 Data size: 2423091 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cboolean1 (type: boolean), cfloat (type: float), cbigint (type: bigint), cint (type: int), cdouble (type: double), ctinyint (type: tinyint), csmallint (type: smallint), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out index b8fab9719c..2697cd6ec3 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out @@ -27,7 +27,7 @@ STAGE PLANS: filterExpr: (ctinyint is not null and csmallint is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (csmallint is not null and ctinyint is not null) (type: boolean) + predicate: (ctinyint is not null and csmallint is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/spark/vectorized_string_funcs.q.out b/ql/src/test/results/clientpositive/spark/vectorized_string_funcs.q.out index 168f8729c0..7ac1be4d6b 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_string_funcs.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_string_funcs.q.out @@ -63,7 +63,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cbigint % 237L) = 0L) and (length(substr(cstring1, 1, 2)) <= 2) and (cstring1 like '%')) (type: boolean) + filterExpr: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) Statistics: Num rows: 12288 Data size: 2907994 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out b/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out index 9c39ce67e6..b1a808a805 100644 --- a/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out +++ b/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out @@ -84,7 +84,7 @@ STAGE PLANS: filterExpr: ((UDFToDouble(key) > 80.0D) and (UDFToDouble(key) < 100.0D)) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(key) < 100.0D) and (UDFToDouble(key) > 80.0D)) (type: boolean) + predicate: ((UDFToDouble(key) > 80.0D) and (UDFToDouble(key) < 100.0D)) (type: boolean) Statistics: Num rows: 55 Data size: 9790 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/stat_estimate_drill.q.out b/ql/src/test/results/clientpositive/stat_estimate_drill.q.out index e118b85e4c..36c49fa9b2 100644 --- a/ql/src/test/results/clientpositive/stat_estimate_drill.q.out +++ b/ql/src/test/results/clientpositive/stat_estimate_drill.q.out @@ -231,7 +231,7 @@ STAGE PLANS: filterExpr: ((a = 1) or ((a = 2) and (b = 3))) (type: boolean) Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((a = 2) and (b = 3)) or (a = 1)) (type: boolean) + predicate: ((a = 1) or ((a = 2) and (b = 3))) (type: boolean) Statistics: Num rows: 110/110 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: sum(a) diff --git a/ql/src/test/results/clientpositive/stats_only_null.q.out b/ql/src/test/results/clientpositive/stats_only_null.q.out index ab03a79b6f..21dc8424e9 100644 --- a/ql/src/test/results/clientpositive/stats_only_null.q.out +++ b/ql/src/test/results/clientpositive/stats_only_null.q.out @@ -146,11 +146,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: stats_null_part - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: a (type: double), b (type: int), c (type: string), d (type: smallint) outputColumnNames: a, b, c, d - Statistics: Num rows: 10 Data size: 2120 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), count(a), count(b), count(c), count(d) minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/stats_part.q.out b/ql/src/test/results/clientpositive/stats_part.q.out index 41c5db07ec..efc1766755 100644 --- a/ql/src/test/results/clientpositive/stats_part.q.out +++ b/ql/src/test/results/clientpositive/stats_part.q.out @@ -81,23 +81,23 @@ STAGE PLANS: TableScan alias: stats_part filterExpr: (p > 100) (type: boolean) - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (p > 100) (type: boolean) - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: key - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count(key) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: bigint) Execution mode: vectorized Reduce Operator Tree: @@ -105,10 +105,10 @@ STAGE PLANS: aggregations: count(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/stats_part2.q.out b/ql/src/test/results/clientpositive/stats_part2.q.out index 116d9ee138..1411b6eff7 100644 --- a/ql/src/test/results/clientpositive/stats_part2.q.out +++ b/ql/src/test/results/clientpositive/stats_part2.q.out @@ -119,23 +119,23 @@ STAGE PLANS: TableScan alias: stats_part filterExpr: (p > 100) (type: boolean) - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (p > 100) (type: boolean) - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int) outputColumnNames: key - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: max(key) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int) Execution mode: vectorized Reduce Operator Tree: @@ -143,10 +143,10 @@ STAGE PLANS: aggregations: max(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/stats_ppr_all.q.out b/ql/src/test/results/clientpositive/stats_ppr_all.q.out index 78c2e47472..991a7288f3 100644 --- a/ql/src/test/results/clientpositive/stats_ppr_all.q.out +++ b/ql/src/test/results/clientpositive/stats_ppr_all.q.out @@ -144,23 +144,23 @@ STAGE PLANS: TableScan alias: ss filterExpr: (UDFToDouble((((year * 10000) + (month * 100)) + day)) = 2015010.0D) (type: boolean) - Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (UDFToDouble((((year * 10000) + (month * 100)) + day)) = 2015010.0D) (type: boolean) - Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: order_amount (type: float) outputColumnNames: order_amount - Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: sum(order_amount) minReductionHashAggr: 0.99 mode: hash outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: double) Execution mode: vectorized Reduce Operator Tree: @@ -168,10 +168,10 @@ STAGE PLANS: aggregations: sum(VALUE._col0) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/subquery_exists.q.out b/ql/src/test/results/clientpositive/subquery_exists.q.out index 8abdc9694e..658a445d00 100644 --- a/ql/src/test/results/clientpositive/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/subquery_exists.q.out @@ -1300,7 +1300,7 @@ STAGE PLANS: filterExpr: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (i is not null and j is not null) (type: boolean) + predicate: (j is not null and i is not null) (type: boolean) Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: i (type: int), j (type: int) diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.out index 3efb260668..727af06c76 100644 --- a/ql/src/test/results/clientpositive/subquery_notin_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.out @@ -128,7 +128,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 333 Data size: 37299 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 333 Data size: 37299 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: bigint) @@ -353,7 +353,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col7 Statistics: Num rows: 7 Data size: 798 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null) and (_col7 is null or (_col3 = 0L) or _col3 is null)) (type: boolean) + predicate: ((_col7 is null or (_col3 = 0L) or _col3 is null) and ((_col4 < _col3) is not true or (_col3 = 0L) or _col3 is null or _col7 is not null or _col0 is null) and (_col0 is not null or (_col3 = 0L) or _col3 is null or _col7 is not null)) (type: boolean) Statistics: Num rows: 7 Data size: 798 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: double) @@ -654,7 +654,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 6 Data size: 740 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 6 Data size: 740 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: double) @@ -968,7 +968,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4 Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and (_col4 is null or (_col1 = 0L))) (type: boolean) + predicate: ((_col4 is null or (_col1 = 0L)) and (_col0 is not null or (_col1 = 0L) or _col4 is not null) and ((_col2 >= _col1) or (_col1 = 0L) or _col4 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) @@ -1187,7 +1187,7 @@ STAGE PLANS: outputColumnNames: _col0, _col2, _col3, _col5 Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and (_col5 is null or (_col2 = 0L) or _col2 is null)) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L) or _col2 is null) and (_col0 is not null or (_col2 = 0L) or _col2 is null or _col5 is not null) and ((_col3 < _col2) is not true or (_col2 = 0L) or _col2 is null or _col5 is not null or _col0 is null)) (type: boolean) Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out index ca14a120a6..462b22dac6 100644 --- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out +++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out @@ -469,7 +469,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8 Statistics: Num rows: 38 Data size: 8914 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null) and (_col8 is null or (_col4 = 0L) or _col4 is null)) (type: boolean) + predicate: ((_col8 is null or (_col4 = 0L) or _col4 is null) and ((_col5 < _col4) is not true or (_col4 = 0L) or _col4 is null or _col8 is not null or _col0 is null) and (_col0 is not null or (_col4 = 0L) or _col4 is null or _col8 is not null)) (type: boolean) Statistics: Num rows: 38 Data size: 8914 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col1 (type: string), _col0 (type: string), _col2 (type: int) 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 82666add4b..afc4cc6011 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 @@ -450,19 +450,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over10k_orc_bucketed_n0 - filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: boolean) + filterExpr: ((t < 100Y) and (b = 4294967363L)) (type: boolean) Statistics: Num rows: 2098 Data size: 41920 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((b = 4294967363L) and (t < 100Y)) (type: boolean) - Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((t < 100Y) and (b = 4294967363L)) (type: boolean) + Statistics: Num rows: 3 Data size: 60 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), si (type: smallint), i (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) sort order: +++ - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: vectorized Reducer 2 Execution mode: vectorized @@ -470,10 +470,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 36 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -523,19 +523,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over10k_orc_bucketed_n0 - filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: boolean) + filterExpr: ((t < 100Y) and (b = 4294967363L)) (type: boolean) Statistics: Num rows: 2098 Data size: 41920 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((b = 4294967363L) and (t < 100Y)) (type: boolean) - Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((t < 100Y) and (b = 4294967363L)) (type: boolean) + Statistics: Num rows: 3 Data size: 60 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ROW__ID (type: struct), t (type: tinyint), si (type: smallint), i (type: int) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: tinyint), _col2 (type: smallint), _col3 (type: int) Execution mode: vectorized Reducer 2 @@ -544,10 +544,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 3 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out index 8cb11af0c6..7f3ad53bac 100644 --- a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out +++ b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out @@ -69,7 +69,7 @@ Stage-0 Select Operator [SEL_5] (rows=1019/10 width=251) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_16] (rows=1019/10 width=251) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=251) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"] @@ -168,7 +168,7 @@ Stage-0 Select Operator [SEL_5] (rows=1019/10 width=2) Output:["_col0"] Filter Operator [FIL_17] (rows=1019/10 width=8) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=8) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"] @@ -270,7 +270,7 @@ Stage-0 Select Operator [SEL_5] (rows=1019/10 width=2) Output:["_col0"] Filter Operator [FIL_19] (rows=1019/10 width=8) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=8) default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"] @@ -361,7 +361,7 @@ Stage-0 Select Operator [SEL_5] (rows=1365/10 width=236) Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"] Filter Operator [FIL_16] (rows=1365/10 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"] <-Map 1 [CUSTOM_SIMPLE_EDGE] @@ -460,7 +460,7 @@ Stage-0 Select Operator [SEL_5] (rows=1365/10 width=236) Output:["_col0"] Filter Operator [FIL_17] (rows=1365/10 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"] <-Map 1 [CUSTOM_SIMPLE_EDGE] @@ -562,7 +562,7 @@ Stage-0 Select Operator [SEL_5] (rows=1365/10 width=236) Output:["_col0"] Filter Operator [FIL_19] (rows=1365/10 width=236) - predicate:(cbigint is not null and cint BETWEEN 1000000 AND 3000000) + predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is not null) TableScan [TS_3] (rows=12288/12288 width=236) default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"] <-Map 1 [CUSTOM_SIMPLE_EDGE] diff --git a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out index 355412edeb..afabf4be5c 100644 --- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out @@ -814,14 +814,14 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -830,7 +830,7 @@ STAGE PLANS: 1 _col0 (type: string) input vertices: 1 Map 3 - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -847,19 +847,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Execution mode: vectorized @@ -944,14 +944,14 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -960,7 +960,7 @@ STAGE PLANS: 1 _col0 (type: string) input vertices: 1 Map 3 - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator aggregations: count() @@ -978,19 +978,19 @@ STAGE PLANS: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Execution mode: vectorized @@ -1075,38 +1075,38 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Map 4 Map Operator Tree: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Reduce Operator Tree: @@ -1116,7 +1116,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 @@ -1210,38 +1210,38 @@ STAGE PLANS: TableScan alias: p1 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Map 4 Map Operator Tree: TableScan alias: p2 filterExpr: key is not null (type: boolean) - Statistics: Num rows: 525 Data size: 104474 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 525 Data size: 92000 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 499 Data size: 99300 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 499 Data size: 87443 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Reduce Operator Tree: @@ -1251,7 +1251,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - Statistics: Num rows: 548 Data size: 109230 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 548 Data size: 96187 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count() minReductionHashAggr: 0.99 diff --git a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out index a07fdb4ca0..e28b150445 100644 --- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out +++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out @@ -1356,7 +1356,7 @@ STAGE PLANS: filterExpr: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) (type: boolean) + predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1431,7 +1431,7 @@ STAGE PLANS: filterExpr: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value < 'zzzzzzzz') and key is not null) (type: boolean) + predicate: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1582,7 +1582,7 @@ STAGE PLANS: filterExpr: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) (type: boolean) + predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 2 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) @@ -1661,7 +1661,7 @@ STAGE PLANS: filterExpr: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((value < 'zzzzzzzz') and key is not null) (type: boolean) + predicate: (key is not null and (value < 'zzzzzzzz')) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: key (type: string) diff --git a/ql/src/test/results/clientpositive/transform_ppr1.q.out b/ql/src/test/results/clientpositive/transform_ppr1.q.out index bbd1c67f74..a0746107bb 100644 --- a/ql/src/test/results/clientpositive/transform_ppr1.q.out +++ b/ql/src/test/results/clientpositive/transform_ppr1.q.out @@ -61,7 +61,7 @@ STAGE PLANS: Statistics: Num rows: 2000 Data size: 724000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator isSamplingPred: false - predicate: ((_col0 = '2008-04-08') and (_col1 < 100)) (type: boolean) + predicate: ((_col1 < 100) and (_col0 = '2008-04-08')) (type: boolean) Statistics: Num rows: 333 Data size: 120546 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out b/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out index dc44d1da72..5281aacaa5 100644 --- a/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out +++ b/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out @@ -61,7 +61,7 @@ POSTHOOK: Input: default@test_tab_n3@part=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('484' AS STRING) AS `key`, `value`, CAST('1' AS STRING) AS `part` FROM `default`.`test_tab_n3` -WHERE `part` = '1' AND `key` = '484' +WHERE `key` = '484' AND `part` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -72,7 +72,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test_tab_n3 - filterExpr: ((part = '1') and (key = '484')) (type: boolean) + filterExpr: ((key = '484') and (part = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator @@ -188,7 +188,7 @@ POSTHOOK: Input: default@test_tab_n3@part=1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT CAST('0' AS STRING) AS `key`, `value`, CAST('1' AS STRING) AS `part` FROM `default`.`test_tab_n3` -WHERE `part` = '1' AND `key` = '0' +WHERE `key` = '0' AND `part` = '1' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -199,7 +199,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: test_tab_n3 - filterExpr: ((part = '1') and (key = '0')) (type: boolean) + filterExpr: ((key = '0') and (part = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/union22.q.out b/ql/src/test/results/clientpositive/union22.q.out index e04f424ca0..963408ebba 100644 --- a/ql/src/test/results/clientpositive/union22.q.out +++ b/ql/src/test/results/clientpositive/union22.q.out @@ -82,7 +82,7 @@ POSTHOOK: Input: default@dst_union22_delta@ds=1 POSTHOOK: Output: default@dst_union22@ds=2 OPTIMIZED SQL: SELECT `k1`, `k2`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `ds` = '1' AND `k0` <= 50 +WHERE `k0` <= 50 AND `ds` = '1' UNION ALL SELECT `t2`.`k1`, `t2`.`k2`, `t4`.`k3`, `t4`.`k4` FROM (SELECT `k1`, `k2`, `ds` = '1' AS `=` @@ -90,7 +90,7 @@ FROM `default`.`dst_union22` WHERE `k1` > 20) AS `t2` LEFT JOIN (SELECT `k1`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `ds` = '1' AND `k0` > 50 AND `k1` > 20) AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=` +WHERE `k0` > 50 AND `k1` > 20 AND `ds` = '1') AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`=` STAGE DEPENDENCIES: Stage-7 is a root stage , consists of Stage-8, Stage-4 Stage-8 has a backup stage: Stage-4 @@ -346,7 +346,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: dst_union22_delta - filterExpr: ((ds = '1') and (UDFToDouble(k0) <= 50.0D)) (type: boolean) + filterExpr: ((UDFToDouble(k0) <= 50.0D) and (ds = '1')) (type: boolean) Statistics: Num rows: 500 Data size: 221500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/union_offcbo.q.out b/ql/src/test/results/clientpositive/union_offcbo.q.out index 53aa2648f5..261f382f23 100644 --- a/ql/src/test/results/clientpositive/union_offcbo.q.out +++ b/ql/src/test/results/clientpositive/union_offcbo.q.out @@ -294,7 +294,7 @@ STAGE PLANS: outputColumnNames: _col8, _col9, _col10, _col12, _col13, _col16, _col17, _col18, _col19 Statistics: Num rows: 1 Data size: 121 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((COALESCE(_col8,-1) <> COALESCE(_col18,-1)) or (COALESCE(_col9,-1) <> COALESCE(_col19,-1))) and (CASE WHEN ((_col18 is not null and _col8 is null and (_col12 >= '2016-02-05'))) THEN ('DEL') WHEN ((_col18 is not null and _col8 is null and (_col12 <= '2016-02-05'))) THEN ('RET') WHEN (((_col18 = _col8) and (_col19 <> _col9))) THEN ('A_INS') ELSE ('NA') END <> 'RET') and _col18 is not null) (type: boolean) + predicate: ((CASE WHEN ((_col18 is not null and _col8 is null and (_col12 >= '2016-02-05'))) THEN ('DEL') WHEN ((_col18 is not null and _col8 is null and (_col12 <= '2016-02-05'))) THEN ('RET') WHEN (((_col18 = _col8) and (_col19 <> _col9))) THEN ('A_INS') ELSE ('NA') END <> 'RET') and ((COALESCE(_col8,-1) <> COALESCE(_col18,-1)) or (COALESCE(_col9,-1) <> COALESCE(_col19,-1))) and _col18 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 121 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col10 (type: bigint), _col16 (type: string), _col17 (type: bigint), _col13 (type: string), _col18 (type: string), _col19 (type: string), CASE WHEN ((_col18 is not null and _col8 is null and (_col12 >= '2016-02-05'))) THEN ('DEL') WHEN ((_col18 is not null and _col8 is null and (_col12 <= '2016-02-05'))) THEN ('RET') WHEN (((_col18 = _col8) and (_col19 <> _col9))) THEN ('A_INS') ELSE ('NA') END (type: string) @@ -386,7 +386,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col6, _col7, _col8, _col9, _col11, _col18, _col19 Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((COALESCE(_col8,-1) <> COALESCE(_col18,-1)) or (COALESCE(_col9,-1) <> COALESCE(_col19,-1))) and (CASE WHEN ((_col18 is not null and _col8 is null and (_col11 <= _col1))) THEN ('DEL') WHEN (((_col18 is null and _col8 is not null) or ((_col18 = _col8) and (_col19 <> _col9)))) THEN ('INS') ELSE ('NA') END <> 'RET') and _col8 is not null) (type: boolean) + predicate: ((CASE WHEN ((_col18 is not null and _col8 is null and (_col11 <= _col1))) THEN ('DEL') WHEN (((_col18 is null and _col8 is not null) or ((_col18 = _col8) and (_col19 <> _col9)))) THEN ('INS') ELSE ('NA') END <> 'RET') and ((COALESCE(_col8,-1) <> COALESCE(_col18,-1)) or (COALESCE(_col9,-1) <> COALESCE(_col19,-1))) and _col8 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 323 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: bigint), _col6 (type: string), _col7 (type: bigint), '2099-12-31' (type: string), _col8 (type: string), _col9 (type: string), CASE WHEN ((_col18 is not null and _col8 is null and (_col11 <= _col1))) THEN ('DEL') WHEN (((_col18 is null and _col8 is not null) or ((_col18 = _col8) and (_col19 <> _col9)))) THEN ('INS') ELSE ('NA') END (type: string) @@ -644,7 +644,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((COALESCE(_col0,-1) <> COALESCE(_col7,-1)) or (COALESCE(_col1,-1) <> COALESCE(_col8,-1))) and ((_col0 is null and (_col3 >= '2016-02-05')) or (_col0 is null and (_col3 <= '2016-02-05')) is not true)) (type: boolean) + predicate: (((_col0 is null and (_col3 >= '2016-02-05')) or (_col0 is null and (_col3 <= '2016-02-05')) is not true) and ((COALESCE(_col0,-1) <> COALESCE(_col7,-1)) or (COALESCE(_col1,-1) <> COALESCE(_col8,-1)))) (type: boolean) Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col2 (type: bigint), _col5 (type: string), _col6 (type: bigint), _col4 (type: string), _col7 (type: string), _col8 (type: string), CASE WHEN ((_col0 is null and (_col3 >= '2016-02-05') and _col7 is not null)) THEN ('DEL') WHEN ((_col0 is null and (_col3 <= '2016-02-05') and _col7 is not null)) THEN ('RET') WHEN (((_col7 = _col0) and (_col8 <> _col1))) THEN ('A_INS') ELSE ('NA') END (type: string) @@ -1713,7 +1713,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (((COALESCE(_col0,-1) <> COALESCE(_col7,-1)) or (COALESCE(_col1,-1) <> COALESCE(_col8,-1))) and ((_col0 is null and (_col3 >= '2016-02-05')) or (_col0 is null and (_col3 <= '2016-02-05')) is not true)) (type: boolean) + predicate: (((_col0 is null and (_col3 >= '2016-02-05')) or (_col0 is null and (_col3 <= '2016-02-05')) is not true) and ((COALESCE(_col0,-1) <> COALESCE(_col7,-1)) or (COALESCE(_col1,-1) <> COALESCE(_col8,-1)))) (type: boolean) Statistics: Num rows: 1 Data size: 220 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col2 (type: bigint), _col5 (type: string), _col6 (type: bigint), _col4 (type: string), _col7 (type: string), _col8 (type: string), CASE WHEN ((_col0 is null and (_col3 >= '2016-02-05') and _col7 is not null)) THEN ('DEL') WHEN ((_col0 is null and (_col3 <= '2016-02-05') and _col7 is not null)) THEN ('RET') WHEN (((_col7 = _col0) and (_col8 <> _col1))) THEN ('A_INS') ELSE ('NA') END (type: string) diff --git a/ql/src/test/results/clientpositive/union_pos_alias.q.out b/ql/src/test/results/clientpositive/union_pos_alias.q.out index bafd9c48ff..80d29379b8 100644 --- a/ql/src/test/results/clientpositive/union_pos_alias.q.out +++ b/ql/src/test/results/clientpositive/union_pos_alias.q.out @@ -397,10 +397,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n9 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -417,10 +417,10 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe TableScan alias: masking_test_n9 - filterExpr: (((key % 2) = 0) and (key < 10)) (type: boolean) + filterExpr: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10)) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -484,10 +484,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n9 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) @@ -590,10 +590,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n9 - filterExpr: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + filterExpr: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and (key < 10) and (key > 0)) (type: boolean) + predicate: ((key < 10) and (key > 0) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 83 Data size: 7885 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string) diff --git a/ql/src/test/results/clientpositive/union_view.q.out b/ql/src/test/results/clientpositive/union_view.q.out index d7ddc69c0f..c553030522 100644 --- a/ql/src/test/results/clientpositive/union_view.q.out +++ b/ql/src/test/results/clientpositive/union_view.q.out @@ -184,14 +184,14 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 2 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -201,23 +201,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -227,23 +227,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '1')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '1') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '1')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '1' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -268,23 +268,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '2')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '2') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '2')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '2' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -303,14 +303,14 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '2' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -320,23 +320,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '2')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '2') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '2')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '2' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -361,23 +361,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '3')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '3') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '3')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '3' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -387,23 +387,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '3')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '3') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '3')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '3' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -422,14 +422,14 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 5 Data size: 641 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 441 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '3' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1365 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 5 Data size: 900 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -860,23 +860,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '4')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '4') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '4')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '4' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -886,23 +886,23 @@ STAGE PLANS: filterExpr: ((key = 86) and (ds = '4')) (type: boolean) properties: insideView TRUE - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ds = '4') and (key = 86)) (type: boolean) - Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL + predicate: ((key = 86) and (ds = '4')) (type: boolean) + Statistics: Num rows: 1 Data size: 268 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string) outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '4' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -921,14 +921,14 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 2 Data size: 182 Basic stats: COMPLETE Column stats: COMPLETE Union - Statistics: Num rows: 4 Data size: 550 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 350 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 86 (type: int), _col0 (type: string), '4' (type: string) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1092 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 4 Data size: 720 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat diff --git a/ql/src/test/results/clientpositive/vector_date_1.q.out b/ql/src/test/results/clientpositive/vector_date_1.q.out index 5d05cc5fd5..65711a14b3 100644 --- a/ql/src/test/results/clientpositive/vector_date_1.q.out +++ b/ql/src/test/results/clientpositive/vector_date_1.q.out @@ -678,7 +678,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vector_date_1 - filterExpr: ((dt1 <> dt2) and (dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1)) (type: boolean) + filterExpr: ((dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1) and (dt1 <> dt2)) (type: boolean) Statistics: Num rows: 3 Data size: 336 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -687,8 +687,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongColumn(col 0:date, col 1:date), FilterLongColLessLongColumn(col 0:date, col 1:date), FilterLongColLessEqualLongColumn(col 0:date, col 1:date), FilterLongColGreaterLongColumn(col 1:date, col 0:date), FilterLongColGreaterEqualLongColumn(col 1:date, col 0:date)) - predicate: ((dt1 < dt2) and (dt1 <= dt2) and (dt1 <> dt2) and (dt2 > dt1) and (dt2 >= dt1)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessLongColumn(col 0:date, col 1:date), FilterLongColLessEqualLongColumn(col 0:date, col 1:date), FilterLongColGreaterLongColumn(col 1:date, col 0:date), FilterLongColGreaterEqualLongColumn(col 1:date, col 0:date), FilterLongColNotEqualLongColumn(col 0:date, col 1:date)) + predicate: ((dt1 < dt2) and (dt1 <= dt2) and (dt2 > dt1) and (dt2 >= dt1) and (dt1 <> dt2)) (type: boolean) Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: dt1 (type: date), dt2 (type: date) @@ -837,7 +837,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterDateColEqualDateScalar(col 0:date, val 11323), FilterDateColNotEqualDateScalar(col 0:date, val 0)) - predicate: ((dt1 <> DATE'1970-01-01') and (dt1 = DATE'2001-01-01')) (type: boolean) + predicate: ((dt1 = DATE'2001-01-01') and (dt1 <> DATE'1970-01-01')) (type: boolean) Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: DATE'2001-01-01' (type: date), dt2 (type: date) diff --git a/ql/src/test/results/clientpositive/vector_decimal_cast.q.out b/ql/src/test/results/clientpositive/vector_decimal_cast.q.out index bb919bef50..8889a7474d 100644 --- a/ql/src/test/results/clientpositive/vector_decimal_cast.q.out +++ b/ql/src/test/results/clientpositive/vector_decimal_cast.q.out @@ -20,7 +20,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (cdouble is not null and cint is not null and cboolean1 is not null and ctimestamp1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 638316 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -29,8 +29,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 8:timestamp)) - predicate: (cboolean1 is not null and cdouble is not null and cint is not null and ctimestamp1 is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 8:timestamp)) + predicate: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 5112 Data size: 265564 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), cint (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), CAST( cdouble AS decimal(20,10)) (type: decimal(20,10)), CAST( cint AS decimal(23,14)) (type: decimal(23,14)), CAST( cboolean1 AS decimal(5,2)) (type: decimal(5,2)), CAST( ctimestamp1 AS decimal(15,0)) (type: decimal(15,0)) @@ -144,7 +144,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypes_small - filterExpr: (cdouble is not null and cint is not null and cboolean1 is not null and ctimestamp1 is not null) (type: boolean) + filterExpr: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 638316 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -153,8 +153,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 8:timestamp)) - predicate: (cboolean1 is not null and cdouble is not null and cint is not null and ctimestamp1 is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 10:boolean), SelectColumnIsNotNull(col 2:int), SelectColumnIsNotNull(col 5:double), SelectColumnIsNotNull(col 8:timestamp)) + predicate: (cboolean1 is not null and cint is not null and cdouble is not null and ctimestamp1 is not null) (type: boolean) Statistics: Num rows: 5112 Data size: 265564 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), cint (type: int), cboolean1 (type: boolean), ctimestamp1 (type: timestamp), CAST( cdouble AS decimal(20,10)) (type: decimal(20,10)), CAST( cint AS decimal(23,14)) (type: decimal(23,14)), CAST( cboolean1 AS decimal(5,2)) (type: decimal(5,2)), CAST( ctimestamp1 AS decimal(15,0)) (type: decimal(15,0)) diff --git a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out index fd036bf01b..5580308c1e 100644 --- a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out +++ b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out @@ -56,7 +56,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: decimal_test_n1 - filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 12289 Data size: 2708832 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -65,8 +65,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 1:decimal(20,10), val 0), FilterDecimalColLessDecimalScalar(col 1:decimal(20,10), val 12345.5678), FilterDecimalColNotEqualDecimalScalar(col 2:decimal(23,14), val 0), FilterDecimalColGreaterDecimalScalar(col 2:decimal(23,14), val 1000), SelectColumnIsNotNull(col 0:double)) - predicate: ((cdecimal1 < 12345.5678) and (cdecimal1 > 0) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterDecimalColGreaterDecimalScalar(col 1:decimal(20,10), val 0), FilterDecimalColLessDecimalScalar(col 1:decimal(20,10), val 12345.5678), FilterDecimalColGreaterDecimalScalar(col 2:decimal(23,14), val 1000), SelectColumnIsNotNull(col 0:double), FilterDecimalColNotEqualDecimalScalar(col 2:decimal(23,14), val 0)) + predicate: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 751 Data size: 165540 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdecimal1 + cdecimal2) (type: decimal(25,14)), (cdecimal1 - (2 * cdecimal2)) (type: decimal(26,14)), ((cdecimal1 + 2.34) / cdecimal2) (type: decimal(38,13)), (cdecimal1 * (cdecimal2 / 3.4)) (type: decimal(38,17)), (cdecimal1 % 10) (type: decimal(12,10)), UDFToInteger(cdecimal1) (type: int), UDFToShort(cdecimal2) (type: smallint), UDFToByte(cdecimal2) (type: tinyint), UDFToLong(cdecimal1) (type: bigint), UDFToBoolean(cdecimal1) (type: boolean), UDFToDouble(cdecimal2) (type: double), UDFToFloat(cdecimal1) (type: float), CAST( cdecimal2 AS STRING) (type: string), CAST( cdecimal1 AS TIMESTAMP) (type: timestamp) @@ -205,7 +205,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: decimal_test_small_n0 - filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + filterExpr: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 12288 Data size: 2708600 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -214,8 +214,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterDecimal64ColGreaterDecimal64Scalar(col 1:decimal(10,3)/DECIMAL_64, val 0), FilterDecimalColLessDecimalScalar(col 4:decimal(10,3), val 12345.5678)(children: ConvertDecimal64ToDecimal(col 1:decimal(10,3)/DECIMAL_64) -> 4:decimal(10,3)), FilterDecimal64ColNotEqualDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 0), FilterDecimal64ColGreaterDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 100000), SelectColumnIsNotNull(col 0:double)) - predicate: ((cdecimal1 < 12345.5678) and (cdecimal1 > 0) and (cdecimal2 <> 0) and (cdecimal2 > 1000) and cdouble is not null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterDecimal64ColGreaterDecimal64Scalar(col 1:decimal(10,3)/DECIMAL_64, val 0), FilterDecimalColLessDecimalScalar(col 4:decimal(10,3), val 12345.5678)(children: ConvertDecimal64ToDecimal(col 1:decimal(10,3)/DECIMAL_64) -> 4:decimal(10,3)), FilterDecimal64ColGreaterDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 100000), SelectColumnIsNotNull(col 0:double), FilterDecimal64ColNotEqualDecimal64Scalar(col 2:decimal(7,2)/DECIMAL_64, val 0)) + predicate: ((cdecimal1 > 0) and (cdecimal1 < 12345.5678) and (cdecimal2 > 1000) and cdouble is not null and (cdecimal2 <> 0)) (type: boolean) Statistics: Num rows: 751 Data size: 165540 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdecimal1 + cdecimal2) (type: decimal(11,3)), (cdecimal1 - (2 * cdecimal2)) (type: decimal(11,3)), ((cdecimal1 + 2.34) / cdecimal2) (type: decimal(21,11)), (cdecimal1 * (cdecimal2 / 3.4)) (type: decimal(23,9)), (cdecimal1 % 10) (type: decimal(5,3)), UDFToInteger(cdecimal1) (type: int), UDFToShort(cdecimal2) (type: smallint), UDFToByte(cdecimal2) (type: tinyint), UDFToLong(cdecimal1) (type: bigint), UDFToBoolean(cdecimal1) (type: boolean), UDFToDouble(cdecimal2) (type: double), UDFToFloat(cdecimal1) (type: float), CAST( cdecimal2 AS STRING) (type: string), CAST( cdecimal1 AS TIMESTAMP) (type: timestamp) diff --git a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out index 37e805466c..18852d84c2 100644 --- a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out @@ -229,8 +229,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 2:boolean), FilterLongColEqualLongScalar(col 3:bigint, val 0)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 4:bigint, col 3:bigint), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean), SelectColumnIsNull(col 0:string))) - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 2:boolean), FilterLongColEqualLongScalar(col 3:bigint, val 0)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 4:bigint, col 3:bigint), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean), SelectColumnIsNull(col 0:string)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean))) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 895 Data size: 175214 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -351,8 +351,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 2:boolean), FilterLongColEqualLongScalar(col 3:bigint, val 0)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 4:bigint, col 3:bigint), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean), SelectColumnIsNull(col 0:string))) - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: SelectColumnIsNull(col 2:boolean), FilterLongColEqualLongScalar(col 3:bigint, val 0)), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 4:bigint, col 3:bigint), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean), SelectColumnIsNull(col 0:string)), FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:string), FilterLongColEqualLongScalar(col 3:bigint, val 0), SelectColumnIsNotNull(col 2:boolean))) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 895 Data size: 175214 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) @@ -411,7 +411,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col5 Statistics: Num rows: 895 Data size: 175214 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null) and (_col5 is null or (_col2 = 0L))) (type: boolean) + predicate: ((_col5 is null or (_col2 = 0L)) and ((_col3 >= _col2) or (_col2 = 0L) or _col5 is not null or _col0 is null) and (_col0 is not null or (_col2 = 0L) or _col5 is not null)) (type: boolean) Statistics: Num rows: 895 Data size: 175214 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string) diff --git a/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out b/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out index a86d52c30d..c5584e7646 100644 --- a/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/vector_interval_mapjoin.q.out @@ -209,7 +209,7 @@ STAGE PLANS: filterExpr: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 186864 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (CAST( ts AS DATE) is not null and dt is not null and s is not null) (type: boolean) + predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) Statistics: Num rows: 943 Data size: 176202 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) @@ -234,7 +234,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 12:date), SelectColumnIsNotNull(col 14:date)(children: CastTimestampToDate(col 10:timestamp) -> 14:date), SelectColumnIsNotNull(col 8:string)) - predicate: (CAST( ts AS DATE) is not null and dt is not null and s is not null) (type: boolean) + predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) Statistics: Num rows: 954 Data size: 178852 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) diff --git a/ql/src/test/results/clientpositive/vector_mr_diff_schema_alias.q.out b/ql/src/test/results/clientpositive/vector_mr_diff_schema_alias.q.out index 53f08809be..520a4d85b8 100644 --- a/ql/src/test/results/clientpositive/vector_mr_diff_schema_alias.q.out +++ b/ql/src/test/results/clientpositive/vector_mr_diff_schema_alias.q.out @@ -260,7 +260,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ss_sold_date_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_sold_date_sk is not null) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_sold_date_sk (type: int), ss_store_sk (type: int) diff --git a/ql/src/test/results/clientpositive/vector_multi_insert.q.out b/ql/src/test/results/clientpositive/vector_multi_insert.q.out index 637c647475..5fbd1762df 100644 --- a/ql/src/test/results/clientpositive/vector_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/vector_multi_insert.q.out @@ -134,7 +134,7 @@ STAGE PLANS: serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe name: default.orc_rn1 Filter Operator - predicate: ((rn < 1000) and (rn >= 100)) (type: boolean) + predicate: ((rn >= 100) and (rn < 1000)) (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: rn (type: int) diff --git a/ql/src/test/results/clientpositive/vector_non_constant_in_expr.q.out b/ql/src/test/results/clientpositive/vector_non_constant_in_expr.q.out index 2b13ecf750..d99cf4db00 100644 --- a/ql/src/test/results/clientpositive/vector_non_constant_in_expr.q.out +++ b/ql/src/test/results/clientpositive/vector_non_constant_in_expr.q.out @@ -23,7 +23,7 @@ STAGE PLANS: filterExpr: ((cint = UDFToInteger(ctinyint)) or (UDFToLong(cint) = cbigint)) (type: boolean) Statistics: Num rows: 12288 Data size: 3093170 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToLong(cint) = cbigint) or (cint = UDFToInteger(ctinyint))) (type: boolean) + predicate: ((cint = UDFToInteger(ctinyint)) or (UDFToLong(cint) = cbigint)) (type: boolean) Statistics: Num rows: 12288 Data size: 3093170 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) diff --git a/ql/src/test/results/clientpositive/vector_outer_join3.q.out b/ql/src/test/results/clientpositive/vector_outer_join3.q.out index e90464752a..f88492df5c 100644 --- a/ql/src/test/results/clientpositive/vector_outer_join3.q.out +++ b/ql/src/test/results/clientpositive/vector_outer_join3.q.out @@ -336,7 +336,7 @@ left outer join small_alltypesorc_a_n1 hd POSTHOOK: type: QUERY POSTHOOK: Input: default@small_alltypesorc_a_n1 #### A masked pattern was here #### -{"CBOPlan":"{\n \"rels\": [\n {\n \"id\": \"0\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"c\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 26.75,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"1\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cint\",\n \"cbigint\",\n \"cstring1\",\n \"cstring2\"\n ],\n \"exprs\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n },\n {\n \"input\": 3,\n \"name\": \"$3\"\n },\n {\n \"input\": 6,\n \"name\": \"$6\"\n },\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"2\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"cd\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 16.75,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"3\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ]\n },\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 3,\n \"name\": \"$3\"\n }\n ]\n }\n ]\n },\n \"rowCount\": 11.25\n },\n {\n \"id\": \"4\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cbigint\",\n \"cstring2\"\n ],\n \"exprs\": [\n {\n \"input\": 3,\n \"name\": \"$3\"\n },\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ],\n \"rowCount\": 11.25\n },\n {\n \"id\": \"5\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 5,\n \"name\": \"$5\"\n },\n {\n \"input\": 3,\n \"name\": \"$3\"\n }\n ]\n },\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 4,\n \"name\": \"$4\"\n },\n {\n \"input\": 1,\n \"name\": \"$1\"\n }\n ]\n }\n ]\n },\n \"joinType\": \"left\",\n \"algorithm\": \"none\",\n \"cost\": \"not available\",\n \"inputs\": [\n \"1\",\n \"4\"\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"6\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"hd\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 10.0,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"7\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 6,\n \"name\": \"$6\"\n }\n ]\n },\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n }\n ]\n }\n ]\n },\n \"rowCount\": 5.0\n },\n {\n \"id\": \"8\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cint\",\n \"cstring1\"\n ],\n \"exprs\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n },\n {\n \"input\": 6,\n \"name\": \"$6\"\n }\n ],\n \"rowCount\": 5.0\n },\n {\n \"id\": \"9\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 7,\n \"name\": \"$7\"\n },\n {\n \"input\": 2,\n \"name\": \"$2\"\n }\n ]\n },\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 6,\n \"name\": \"$6\"\n },\n {\n \"input\": 0,\n \"name\": \"$0\"\n }\n ]\n }\n ]\n },\n \"joinType\": \"left\",\n \"algorithm\": \"none\",\n \"cost\": \"not available\",\n \"inputs\": [\n \"5\",\n \"8\"\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"10\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveAggregate\",\n \"group\": [],\n \"aggs\": [\n {\n \"agg\": \"count\",\n \"type\": {\n \"type\": \"BIGINT\",\n \"nullable\": true\n },\n \"distinct\": false,\n \"operands\": []\n }\n ],\n \"rowCount\": 1.0\n }\n ]\n}","optimizedSQL":"SELECT COUNT(*) AS `$f0`\nFROM (SELECT `cint`, `cbigint`, `cstring1`, `cstring2`\nFROM `default`.`small_alltypesorc_a_n1`) AS `t`\nLEFT JOIN (SELECT `cbigint`, `cstring2`\nFROM `default`.`small_alltypesorc_a_n1`\nWHERE `cstring2` IS NOT NULL AND `cbigint` IS NOT NULL) AS `t1` ON `t`.`cstring2` = `t1`.`cstring2` AND `t`.`cbigint` = `t1`.`cbigint`\nLEFT JOIN (SELECT `cint`, `cstring1`\nFROM `default`.`small_alltypesorc_a_n1`\nWHERE `cstring1` IS NOT NULL AND `cint` IS NOT NULL) AS `t3` ON `t`.`cstring1` = `t3`.`cstring1` AND `t`.`cint` = `t3`.`cint`","PLAN VECTORIZATION":{"enabled":true,"enabledConditionsMet":["hive.vectorized.execution.enabled IS true"]},"cboInfo":"Plan optimized by CBO.","STAGE DEPENDENCIES":{"Stage-8":{"ROOT STAGE":"TRUE"},"Stage-3":{"DEPENDENT STAGES":"Stage-8"},"Stage-0":{"DEPENDENT STAGES":"Stage-3"}},"STAGE PLANS":{"Stage-8":{"Map Reduce Local Work":{"Alias -> Map Local Tables:":{"$hdt$_1:cd":{"Fetch Operator":{"limit:":"-1"}},"$hdt$_2:hd":{"Fetch Operator":{"limit:":"-1"}}},"Alias -> Map Local Operator Tree:":{"$hdt$_1:cd":{"TableScan":{"alias:":"cd","columns:":["cbigint","cstring2"],"database:":"default","filterExpr:":"(cstring2 is not null and cbigint is not null) (type: boolean)","Statistics:":"Num rows: 20 Data size: 1616 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","isTempTable:":"false","OperatorId:":"TS_2","children":{"Filter Operator":{"predicate:":"(cbigint is not null and cstring2 is not null) (type: boolean)","Statistics:":"Num rows: 11 Data size: 909 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"FIL_20","children":{"Select Operator":{"expressions:":"cbigint (type: bigint), cstring2 (type: string)","columnExprMap:":{"_col0":"cbigint","_col1":"cstring2"},"outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 11 Data size: 909 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_4","children":{"HashTable Sink Operator":{"keys:":{"0":"_col1 (type: bigint), _col3 (type: string)","1":"_col0 (type: bigint), _col1 (type: string)"},"OperatorId:":"HASHTABLESINK_30"}}}}}}}},"$hdt$_2:hd":{"TableScan":{"alias:":"hd","columns:":["cint","cstring1"],"database:":"default","filterExpr:":"(cstring1 is not null and cint is not null) (type: boolean)","Statistics:":"Num rows: 20 Data size: 1034 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","isTempTable:":"false","OperatorId:":"TS_5","children":{"Filter Operator":{"predicate:":"(cint is not null and cstring1 is not null) (type: boolean)","Statistics:":"Num rows: 5 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"FIL_21","children":{"Select Operator":{"expressions:":"cint (type: int), cstring1 (type: string)","columnExprMap:":{"_col0":"cint","_col1":"cstring1"},"outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 5 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_7","children":{"HashTable Sink Operator":{"keys:":{"0":"_col0 (type: int), _col2 (type: string)","1":"_col0 (type: int), _col1 (type: string)"},"OperatorId:":"HASHTABLESINK_28"}}}}}}}}}}},"Stage-3":{"Map Reduce":{"Map Operator Tree:":[{"TableScan":{"alias:":"c","columns:":["cint","cbigint","cstring1","cstring2"],"database:":"default","Statistics:":"Num rows: 20 Data size: 2650 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","TableScan Vectorization:":{"native:":"true","vectorizationSchemaColumns:":"[0:ctinyint:tinyint, 1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 11:cboolean2:boolean, 12:ROW__ID:struct]"},"isTempTable:":"false","OperatorId:":"TS_0","children":{"Select Operator":{"expressions:":"cint (type: int), cbigint (type: bigint), cstring1 (type: string), cstring2 (type: string)","columnExprMap:":{"_col0":"cint","_col1":"cbigint","_col2":"cstring1","_col3":"cstring2"},"outputColumnNames:":["_col0","_col1","_col2","_col3"],"Select Vectorization:":{"className:":"VectorSelectOperator","native:":"true","projectedOutputColumnNums:":"[2, 3, 6, 7]"},"Statistics:":"Num rows: 20 Data size: 2650 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_32","children":{"Map Join Operator":{"columnExprMap:":{"_col0":"0:_col0","_col2":"0:_col2"},"condition map:":[{"":"Left Outer Join 0 to 1"}],"keys:":{"0":"_col1 (type: bigint), _col3 (type: string)","1":"_col0 (type: bigint), _col1 (type: string)"},"Map Join Vectorization:":{"bigTableKeyExpressions:":["col 3:bigint","col 7:string"],"bigTableValueExpressions:":["col 2:int","col 6:string"],"className:":"VectorMapJoinOperator","native:":"false","nativeConditionsMet:":["hive.mapjoin.optimized.hashtable IS true","hive.vectorized.execution.mapjoin.native.enabled IS true","One MapJoin Condition IS true","No nullsafe IS true","Small table vectorizes IS true","Outer Join has keys IS true","Optimized Table and Supports Key Types IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"outputColumnNames:":["_col0","_col2"],"Statistics:":"Num rows: 20 Data size: 1034 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"MAPJOIN_33","children":{"Map Join Operator":{"condition map:":[{"":"Left Outer Join 0 to 1"}],"keys:":{"0":"_col0 (type: int), _col2 (type: string)","1":"_col0 (type: int), _col1 (type: string)"},"Map Join Vectorization:":{"bigTableKeyExpressions:":["col 0:int","col 1:string"],"className:":"VectorMapJoinOperator","native:":"false","nativeConditionsMet:":["hive.mapjoin.optimized.hashtable IS true","hive.vectorized.execution.mapjoin.native.enabled IS true","One MapJoin Condition IS true","No nullsafe IS true","Small table vectorizes IS true","Outer Join has keys IS true","Optimized Table and Supports Key Types IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Statistics:":"Num rows: 32 Data size: 256 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"MAPJOIN_34","children":{"Group By Operator":{"aggregations:":["count()"],"Group By Vectorization:":{"aggregators:":["VectorUDAFCountStar(*) -> bigint"],"className:":"VectorGroupByOperator","groupByMode:":"HASH","native:":"false","vectorProcessingMode:":"HASH","projectedOutputColumnNums:":"[0]"},"minReductionHashAggr:":"0.99","mode:":"hash","outputColumnNames:":["_col0"],"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"GBY_35","children":{"Reduce Output Operator":{"columnExprMap:":{"VALUE._col0":"_col0"},"sort order:":"","Reduce Sink Vectorization:":{"className:":"VectorReduceSinkOperator","native:":"false","nativeConditionsMet:":["hive.vectorized.execution.reducesink.new.enabled IS true","No PTF TopN IS true","No DISTINCT columns IS true","BinarySortableSerDe for keys IS true","LazyBinarySerDe for values IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","value expressions:":"_col0 (type: bigint)","OperatorId:":"RS_36"}}}}}}}}}}}}],"Execution mode:":"vectorized","Map Vectorization:":{"enabled:":"true","enabledConditionsMet:":["hive.vectorized.use.vectorized.input.format IS true"],"inputFormatFeatureSupport:":"[DECIMAL_64]","featureSupportInUse:":"[DECIMAL_64]","inputFileFormats:":["org.apache.hadoop.hive.ql.io.orc.OrcInputFormat"],"allNative:":"false","usesVectorUDFAdaptor:":"false","vectorized:":"true","rowBatchContext:":{"dataColumnCount:":"12","includeColumns:":"[2, 3, 6, 7]","dataColumns:":["ctinyint:tinyint","csmallint:smallint","cint:int","cbigint:bigint","cfloat:float","cdouble:double","cstring1:string","cstring2:string","ctimestamp1:timestamp","ctimestamp2:timestamp","cboolean1:boolean","cboolean2:boolean"],"partitionColumnCount:":"0","scratchColumnTypeNames:":"[]"}},"Local Work:":{"Map Reduce Local Work":{}},"Reduce Vectorization:":{"enabled:":"false","enableConditionsMet:":["hive.vectorized.execution.reduce.enabled IS true"],"enableConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Reduce Operator Tree:":{"Group By Operator":{"aggregations:":["count(VALUE._col0)"],"mode:":"mergepartial","outputColumnNames:":["_col0"],"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"GBY_17","children":{"File Output Operator":{"compressed:":"false","Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","table:":{"input format:":"org.apache.hadoop.mapred.SequenceFileInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"},"OperatorId:":"FS_19"}}}}}},"Stage-0":{"Fetch Operator":{"limit:":"-1","Processor Tree:":{"ListSink":{"OperatorId:":"LIST_SINK_37"}}}}}} +{"CBOPlan":"{\n \"rels\": [\n {\n \"id\": \"0\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"c\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 26.75,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"1\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cint\",\n \"cbigint\",\n \"cstring1\",\n \"cstring2\"\n ],\n \"exprs\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n },\n {\n \"input\": 3,\n \"name\": \"$3\"\n },\n {\n \"input\": 6,\n \"name\": \"$6\"\n },\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"2\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"cd\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 16.75,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"3\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 3,\n \"name\": \"$3\"\n }\n ]\n },\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ]\n }\n ]\n },\n \"rowCount\": 11.25\n },\n {\n \"id\": \"4\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cbigint\",\n \"cstring2\"\n ],\n \"exprs\": [\n {\n \"input\": 3,\n \"name\": \"$3\"\n },\n {\n \"input\": 7,\n \"name\": \"$7\"\n }\n ],\n \"rowCount\": 11.25\n },\n {\n \"id\": \"5\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 5,\n \"name\": \"$5\"\n },\n {\n \"input\": 3,\n \"name\": \"$3\"\n }\n ]\n },\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 4,\n \"name\": \"$4\"\n },\n {\n \"input\": 1,\n \"name\": \"$1\"\n }\n ]\n }\n ]\n },\n \"joinType\": \"left\",\n \"algorithm\": \"none\",\n \"cost\": \"not available\",\n \"inputs\": [\n \"1\",\n \"4\"\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"6\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveTableScan\",\n \"table\": [\n \"default\",\n \"small_alltypesorc_a_n1\"\n ],\n \"table:alias\": \"hd\",\n \"inputs\": [],\n \"rowCount\": 20.0,\n \"avgRowSize\": 10.0,\n \"rowType\": [\n {\n \"type\": \"TINYINT\",\n \"nullable\": true,\n \"name\": \"ctinyint\"\n },\n {\n \"type\": \"SMALLINT\",\n \"nullable\": true,\n \"name\": \"csmallint\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"cint\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"cbigint\"\n },\n {\n \"type\": \"FLOAT\",\n \"nullable\": true,\n \"name\": \"cfloat\"\n },\n {\n \"type\": \"DOUBLE\",\n \"nullable\": true,\n \"name\": \"cdouble\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring1\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"cstring2\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp1\"\n },\n {\n \"type\": \"TIMESTAMP\",\n \"nullable\": true,\n \"precision\": 9,\n \"name\": \"ctimestamp2\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean1\"\n },\n {\n \"type\": \"BOOLEAN\",\n \"nullable\": true,\n \"name\": \"cboolean2\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"BLOCK__OFFSET__INSIDE__FILE\"\n },\n {\n \"type\": \"VARCHAR\",\n \"nullable\": true,\n \"precision\": 2147483647,\n \"name\": \"INPUT__FILE__NAME\"\n },\n {\n \"fields\": [\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"writeid\"\n },\n {\n \"type\": \"INTEGER\",\n \"nullable\": true,\n \"name\": \"bucketid\"\n },\n {\n \"type\": \"BIGINT\",\n \"nullable\": true,\n \"name\": \"rowid\"\n }\n ],\n \"name\": \"ROW__ID\"\n }\n ],\n \"colStats\": [\n {\n \"name\": \"cint\",\n \"ndv\": 8,\n \"minValue\": -738306196,\n \"maxValue\": 626923679\n },\n {\n \"name\": \"cstring1\",\n \"ndv\": 8\n },\n {\n \"name\": \"ctinyint\",\n \"ndv\": 2,\n \"minValue\": -64,\n \"maxValue\": -51\n },\n {\n \"name\": \"csmallint\",\n \"ndv\": 6,\n \"minValue\": -15920,\n \"maxValue\": -6907\n },\n {\n \"name\": \"cbigint\",\n \"ndv\": 15,\n \"minValue\": -1970551565,\n \"maxValue\": 1086455747\n },\n {\n \"name\": \"cfloat\",\n \"ndv\": 2,\n \"minValue\": -64.0,\n \"maxValue\": -51.0\n },\n {\n \"name\": \"cdouble\",\n \"ndv\": 6,\n \"minValue\": -15920.0,\n \"maxValue\": -6907.0\n },\n {\n \"name\": \"cstring2\",\n \"ndv\": 15\n },\n {\n \"name\": \"ctimestamp1\",\n \"ndv\": 0\n },\n {\n \"name\": \"ctimestamp2\",\n \"ndv\": 0\n },\n {\n \"name\": \"cboolean1\",\n \"ndv\": 2\n },\n {\n \"name\": \"cboolean2\",\n \"ndv\": 2\n }\n ]\n },\n {\n \"id\": \"7\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveFilter\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n }\n ]\n },\n {\n \"op\": \"IS NOT NULL\",\n \"operands\": [\n {\n \"input\": 6,\n \"name\": \"$6\"\n }\n ]\n }\n ]\n },\n \"rowCount\": 5.0\n },\n {\n \"id\": \"8\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveProject\",\n \"fields\": [\n \"cint\",\n \"cstring1\"\n ],\n \"exprs\": [\n {\n \"input\": 2,\n \"name\": \"$2\"\n },\n {\n \"input\": 6,\n \"name\": \"$6\"\n }\n ],\n \"rowCount\": 5.0\n },\n {\n \"id\": \"9\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin\",\n \"condition\": {\n \"op\": \"AND\",\n \"operands\": [\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 7,\n \"name\": \"$7\"\n },\n {\n \"input\": 2,\n \"name\": \"$2\"\n }\n ]\n },\n {\n \"op\": \"=\",\n \"operands\": [\n {\n \"input\": 6,\n \"name\": \"$6\"\n },\n {\n \"input\": 0,\n \"name\": \"$0\"\n }\n ]\n }\n ]\n },\n \"joinType\": \"left\",\n \"algorithm\": \"none\",\n \"cost\": \"not available\",\n \"inputs\": [\n \"5\",\n \"8\"\n ],\n \"rowCount\": 20.0\n },\n {\n \"id\": \"10\",\n \"relOp\": \"org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveAggregate\",\n \"group\": [],\n \"aggs\": [\n {\n \"agg\": \"count\",\n \"type\": {\n \"type\": \"BIGINT\",\n \"nullable\": true\n },\n \"distinct\": false,\n \"operands\": []\n }\n ],\n \"rowCount\": 1.0\n }\n ]\n}","optimizedSQL":"SELECT COUNT(*) AS `$f0`\nFROM (SELECT `cint`, `cbigint`, `cstring1`, `cstring2`\nFROM `default`.`small_alltypesorc_a_n1`) AS `t`\nLEFT JOIN (SELECT `cbigint`, `cstring2`\nFROM `default`.`small_alltypesorc_a_n1`\nWHERE `cbigint` IS NOT NULL AND `cstring2` IS NOT NULL) AS `t1` ON `t`.`cstring2` = `t1`.`cstring2` AND `t`.`cbigint` = `t1`.`cbigint`\nLEFT JOIN (SELECT `cint`, `cstring1`\nFROM `default`.`small_alltypesorc_a_n1`\nWHERE `cint` IS NOT NULL AND `cstring1` IS NOT NULL) AS `t3` ON `t`.`cstring1` = `t3`.`cstring1` AND `t`.`cint` = `t3`.`cint`","PLAN VECTORIZATION":{"enabled":true,"enabledConditionsMet":["hive.vectorized.execution.enabled IS true"]},"cboInfo":"Plan optimized by CBO.","STAGE DEPENDENCIES":{"Stage-8":{"ROOT STAGE":"TRUE"},"Stage-3":{"DEPENDENT STAGES":"Stage-8"},"Stage-0":{"DEPENDENT STAGES":"Stage-3"}},"STAGE PLANS":{"Stage-8":{"Map Reduce Local Work":{"Alias -> Map Local Tables:":{"$hdt$_1:cd":{"Fetch Operator":{"limit:":"-1"}},"$hdt$_2:hd":{"Fetch Operator":{"limit:":"-1"}}},"Alias -> Map Local Operator Tree:":{"$hdt$_1:cd":{"TableScan":{"alias:":"cd","columns:":["cbigint","cstring2"],"database:":"default","filterExpr:":"(cbigint is not null and cstring2 is not null) (type: boolean)","Statistics:":"Num rows: 20 Data size: 1616 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","isTempTable:":"false","OperatorId:":"TS_2","children":{"Filter Operator":{"predicate:":"(cbigint is not null and cstring2 is not null) (type: boolean)","Statistics:":"Num rows: 11 Data size: 909 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"FIL_20","children":{"Select Operator":{"expressions:":"cbigint (type: bigint), cstring2 (type: string)","columnExprMap:":{"_col0":"cbigint","_col1":"cstring2"},"outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 11 Data size: 909 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_4","children":{"HashTable Sink Operator":{"keys:":{"0":"_col1 (type: bigint), _col3 (type: string)","1":"_col0 (type: bigint), _col1 (type: string)"},"OperatorId:":"HASHTABLESINK_30"}}}}}}}},"$hdt$_2:hd":{"TableScan":{"alias:":"hd","columns:":["cint","cstring1"],"database:":"default","filterExpr:":"(cint is not null and cstring1 is not null) (type: boolean)","Statistics:":"Num rows: 20 Data size: 1034 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","isTempTable:":"false","OperatorId:":"TS_5","children":{"Filter Operator":{"predicate:":"(cint is not null and cstring1 is not null) (type: boolean)","Statistics:":"Num rows: 5 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"FIL_21","children":{"Select Operator":{"expressions:":"cint (type: int), cstring1 (type: string)","columnExprMap:":{"_col0":"cint","_col1":"cstring1"},"outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 5 Data size: 282 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_7","children":{"HashTable Sink Operator":{"keys:":{"0":"_col0 (type: int), _col2 (type: string)","1":"_col0 (type: int), _col1 (type: string)"},"OperatorId:":"HASHTABLESINK_28"}}}}}}}}}}},"Stage-3":{"Map Reduce":{"Map Operator Tree:":[{"TableScan":{"alias:":"c","columns:":["cint","cbigint","cstring1","cstring2"],"database:":"default","Statistics:":"Num rows: 20 Data size: 2650 Basic stats: COMPLETE Column stats: COMPLETE","table:":"small_alltypesorc_a_n1","TableScan Vectorization:":{"native:":"true","vectorizationSchemaColumns:":"[0:ctinyint:tinyint, 1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 11:cboolean2:boolean, 12:ROW__ID:struct]"},"isTempTable:":"false","OperatorId:":"TS_0","children":{"Select Operator":{"expressions:":"cint (type: int), cbigint (type: bigint), cstring1 (type: string), cstring2 (type: string)","columnExprMap:":{"_col0":"cint","_col1":"cbigint","_col2":"cstring1","_col3":"cstring2"},"outputColumnNames:":["_col0","_col1","_col2","_col3"],"Select Vectorization:":{"className:":"VectorSelectOperator","native:":"true","projectedOutputColumnNums:":"[2, 3, 6, 7]"},"Statistics:":"Num rows: 20 Data size: 2650 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"SEL_32","children":{"Map Join Operator":{"columnExprMap:":{"_col0":"0:_col0","_col2":"0:_col2"},"condition map:":[{"":"Left Outer Join 0 to 1"}],"keys:":{"0":"_col1 (type: bigint), _col3 (type: string)","1":"_col0 (type: bigint), _col1 (type: string)"},"Map Join Vectorization:":{"bigTableKeyExpressions:":["col 3:bigint","col 7:string"],"bigTableValueExpressions:":["col 2:int","col 6:string"],"className:":"VectorMapJoinOperator","native:":"false","nativeConditionsMet:":["hive.mapjoin.optimized.hashtable IS true","hive.vectorized.execution.mapjoin.native.enabled IS true","One MapJoin Condition IS true","No nullsafe IS true","Small table vectorizes IS true","Outer Join has keys IS true","Optimized Table and Supports Key Types IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"outputColumnNames:":["_col0","_col2"],"Statistics:":"Num rows: 20 Data size: 1034 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"MAPJOIN_33","children":{"Map Join Operator":{"condition map:":[{"":"Left Outer Join 0 to 1"}],"keys:":{"0":"_col0 (type: int), _col2 (type: string)","1":"_col0 (type: int), _col1 (type: string)"},"Map Join Vectorization:":{"bigTableKeyExpressions:":["col 0:int","col 1:string"],"className:":"VectorMapJoinOperator","native:":"false","nativeConditionsMet:":["hive.mapjoin.optimized.hashtable IS true","hive.vectorized.execution.mapjoin.native.enabled IS true","One MapJoin Condition IS true","No nullsafe IS true","Small table vectorizes IS true","Outer Join has keys IS true","Optimized Table and Supports Key Types IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Statistics:":"Num rows: 24 Data size: 192 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"MAPJOIN_34","children":{"Group By Operator":{"aggregations:":["count()"],"Group By Vectorization:":{"aggregators:":["VectorUDAFCountStar(*) -> bigint"],"className:":"VectorGroupByOperator","groupByMode:":"HASH","native:":"false","vectorProcessingMode:":"HASH","projectedOutputColumnNums:":"[0]"},"minReductionHashAggr:":"0.99","mode:":"hash","outputColumnNames:":["_col0"],"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"GBY_35","children":{"Reduce Output Operator":{"columnExprMap:":{"VALUE._col0":"_col0"},"sort order:":"","Reduce Sink Vectorization:":{"className:":"VectorReduceSinkOperator","native:":"false","nativeConditionsMet:":["hive.vectorized.execution.reducesink.new.enabled IS true","No PTF TopN IS true","No DISTINCT columns IS true","BinarySortableSerDe for keys IS true","LazyBinarySerDe for values IS true"],"nativeConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","value expressions:":"_col0 (type: bigint)","OperatorId:":"RS_36"}}}}}}}}}}}}],"Execution mode:":"vectorized","Map Vectorization:":{"enabled:":"true","enabledConditionsMet:":["hive.vectorized.use.vectorized.input.format IS true"],"inputFormatFeatureSupport:":"[DECIMAL_64]","featureSupportInUse:":"[DECIMAL_64]","inputFileFormats:":["org.apache.hadoop.hive.ql.io.orc.OrcInputFormat"],"allNative:":"false","usesVectorUDFAdaptor:":"false","vectorized:":"true","rowBatchContext:":{"dataColumnCount:":"12","includeColumns:":"[2, 3, 6, 7]","dataColumns:":["ctinyint:tinyint","csmallint:smallint","cint:int","cbigint:bigint","cfloat:float","cdouble:double","cstring1:string","cstring2:string","ctimestamp1:timestamp","ctimestamp2:timestamp","cboolean1:boolean","cboolean2:boolean"],"partitionColumnCount:":"0","scratchColumnTypeNames:":"[]"}},"Local Work:":{"Map Reduce Local Work":{}},"Reduce Vectorization:":{"enabled:":"false","enableConditionsMet:":["hive.vectorized.execution.reduce.enabled IS true"],"enableConditionsNotMet:":["hive.execution.engine mr IN [tez, spark] IS false"]},"Reduce Operator Tree:":{"Group By Operator":{"aggregations:":["count(VALUE._col0)"],"mode:":"mergepartial","outputColumnNames:":["_col0"],"Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","OperatorId:":"GBY_17","children":{"File Output Operator":{"compressed:":"false","Statistics:":"Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE","table:":{"input format:":"org.apache.hadoop.mapred.SequenceFileInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"},"OperatorId:":"FS_19"}}}}}},"Stage-0":{"Fetch Operator":{"limit:":"-1","Processor Tree:":{"ListSink":{"OperatorId:":"LIST_SINK_37"}}}}}} PREHOOK: query: select count(*) from (select c.cstring1 from small_alltypesorc_a_n1 c left outer join small_alltypesorc_a_n1 cd diff --git a/ql/src/test/results/clientpositive/vectorization_1.q.out b/ql/src/test/results/clientpositive/vectorization_1.q.out index 917effdaad..4d0acd10a2 100644 --- a/ql/src/test/results/clientpositive/vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/vectorization_1.q.out @@ -58,7 +58,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or (cboolean1 < 0)) (type: boolean) + filterExpr: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -67,8 +67,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0)), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterLongColLessLongScalar(col 10:boolean, val 0)) - predicate: (((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0)) or (UDFToLong(cint) > cbigint) or (cbigint < UDFToLong(ctinyint)) or (cboolean1 < 0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColLessLongScalar(col 10:boolean, val 0), FilterLongColLessLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint), FilterLongColGreaterLongColumn(col 2:bigint, col 3:bigint)(children: col 2:int), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterLongColGreaterLongScalar(col 11:boolean, val 0))) + predicate: ((cboolean1 < 0) or (cbigint < UDFToLong(ctinyint)) or (UDFToLong(cint) > cbigint) or ((cdouble > UDFToDouble(ctinyint)) and (cboolean2 > 0))) (type: boolean) Statistics: Num rows: 12288 Data size: 330276 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), cfloat (type: float), cint (type: int), cdouble (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_10.q.out b/ql/src/test/results/clientpositive/vectorization_10.q.out index 197d02c935..81182cc361 100644 --- a/ql/src/test/results/clientpositive/vectorization_10.q.out +++ b/ql/src/test/results/clientpositive/vectorization_10.q.out @@ -74,7 +74,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterDecimalColLessEqualDecimalScalar(col 14:decimal(6,2), val -5638.15)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(6,2))), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) -> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern %a)))) - predicate: (((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= '10')) (type: boolean) + predicate: ((cstring2 <= '10') or ((UDFToDouble(ctinyint) > cdouble) and (CAST( ctinyint AS decimal(6,2)) <= -5638.15)) or ((cdouble > 6981.0D) and ((CAST( csmallint AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a')))) (type: boolean) Statistics: Num rows: 9557 Data size: 1937820 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdouble (type: double), ctimestamp1 (type: timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 (type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) (type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), (UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), (- (- cdouble)) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_11.q.out b/ql/src/test/results/clientpositive/vectorization_11.q.out index 140ffd2582..1040d3aefa 100644 --- a/ql/src/test/results/clientpositive/vectorization_11.q.out +++ b/ql/src/test/results/clientpositive/vectorization_11.q.out @@ -46,7 +46,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + filterExpr: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 12288 Data size: 2381474 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -55,8 +55,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string), FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a))) - predicate: ((cstring2 = cstring1) or (ctimestamp1 is null and (cstring1 like '%a'))) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterStringColLikeStringScalar(col 6:string, pattern %a)), FilterStringGroupColEqualStringGroupColumn(col 7:string, col 6:string)) + predicate: ((ctimestamp1 is null and (cstring1 like '%a')) or (cstring2 = cstring1)) (type: boolean) Statistics: Num rows: 6144 Data size: 1190792 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), ctimestamp1 (type: timestamp), (-3728 * UDFToInteger(csmallint)) (type: int), (cdouble - 9763215.5639D) (type: double), (- cdouble) (type: double), ((- cdouble) + 6981.0D) (type: double), (cdouble * -5638.15D) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_12.q.out b/ql/src/test/results/clientpositive/vectorization_12.q.out index 32ee14476e..977372a4a1 100644 --- a/ql/src/test/results/clientpositive/vectorization_12.q.out +++ b/ql/src/test/results/clientpositive/vectorization_12.q.out @@ -81,7 +81,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (ctimestamp1 is null and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint))))) (type: boolean) + filterExpr: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 12288 Data size: 1647554 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -90,8 +90,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNull(col 8:timestamp), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint)))) - predicate: (((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ctimestamp1 is null) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %a), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 11:boolean, val 1), FilterLongColGreaterEqualLongColumn(col 3:bigint, col 1:bigint)(children: col 1:smallint))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 10:boolean, col 11:boolean), FilterLongColNotEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint)), SelectColumnIsNull(col 8:timestamp)) + predicate: (((cstring1 like '%a') or ((cboolean2 <= 1) and (cbigint >= UDFToLong(csmallint)))) and ((cboolean1 >= cboolean2) or (UDFToShort(ctinyint) <> csmallint)) and ctimestamp1 is null) (type: boolean) Statistics: Num rows: 1 Data size: 166 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cboolean1 (type: boolean), cstring1 (type: string), cdouble (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_13.q.out b/ql/src/test/results/clientpositive/vectorization_13.q.out index 686497b35e..77af1addc9 100644 --- a/ql/src/test/results/clientpositive/vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/vectorization_13.q.out @@ -93,7 +93,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28789.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28788.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28789.0D) and (UDFToDouble(ctimestamp2) <> -28788.0D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) @@ -429,7 +429,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 3569.0), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 10.175), FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28801.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val -28801.336)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDecimalColLessDecimalScalar(col 15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 15:decimal(11,4)))) - predicate: (((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1))) (type: boolean) + predicate: (((cfloat < 3569.0) and (cdouble <= 10.175D) and (cboolean1 <> 1)) or ((UDFToDouble(ctimestamp1) > -28801.388D) and (UDFToDouble(ctimestamp2) <> -28801.336D) and (CAST( ctinyint AS decimal(11,4)) < 9763215.5639))) (type: boolean) Statistics: Num rows: 5461 Data size: 901772 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_14.q.out b/ql/src/test/results/clientpositive/vectorization_14.q.out index 971b1c4c3d..a1c4b26650 100644 --- a/ql/src/test/results/clientpositive/vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/vectorization_14.q.out @@ -83,7 +83,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToLong(ctinyint) <= cbigint) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint)))) (type: boolean) + filterExpr: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 12288 Data size: 2139070 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -92,8 +92,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), FilterDoubleColLessDoubleColumn(col 5:double, col 14:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 15:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 15:float))) - predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and (UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -257), FilterDoubleColLessDoubleColumn(col 4:float, col 14:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 14:float)), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 15:double), FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp))) + predicate: ((UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and ((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < ctimestamp1))) (type: boolean) Statistics: Num rows: 606 Data size: 105558 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cfloat (type: float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: double), (- (-26.28D + cdouble)) (type: double), ((- (-26.28D + cdouble)) * (- (-26.28D + cdouble))) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_15.q.out b/ql/src/test/results/clientpositive/vectorization_15.q.out index 7786f96f0c..1a5de65593 100644 --- a/ql/src/test/results/clientpositive/vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/vectorization_15.q.out @@ -79,7 +79,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cstring2 like '%ss%') or (cstring1 like '10%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) + filterExpr: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -88,8 +88,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) - predicate: (((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 like '%ss%')) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern 10%), FilterStringColLikeStringScalar(col 7:string, pattern %ss%), FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val -75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -3728.0))) + predicate: ((cstring1 like '10%') or (cstring2 like '%ss%') or ((cint >= -75) and (UDFToShort(ctinyint) = csmallint) and (cdouble >= -3728.0D))) (type: boolean) Statistics: Num rows: 12288 Data size: 2491562 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cboolean1 (type: boolean), cdouble (type: double), cstring1 (type: string), ctinyint (type: tinyint), cint (type: int), ctimestamp1 (type: timestamp), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_16.q.out b/ql/src/test/results/clientpositive/vectorization_16.q.out index 9a93c3623c..695a05ace5 100644 --- a/ql/src/test/results/clientpositive/vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/vectorization_16.q.out @@ -66,7 +66,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_17.q.out b/ql/src/test/results/clientpositive/vectorization_17.q.out index 1af1cf4b0e..c9d106c9d2 100644 --- a/ql/src/test/results/clientpositive/vectorization_17.q.out +++ b/ql/src/test/results/clientpositive/vectorization_17.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((cbigint > -23L) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble))) (type: boolean) + filterExpr: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 12288 Data size: 1647550 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -73,8 +73,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float))) - predicate: (((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterLongColGreaterLongScalar(col 3:bigint, val -23), FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 4:double, col 5:double)(children: col 4:float)), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val -863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3)))) + predicate: ((cbigint > -23L) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= cbigint) or (UDFToDouble(cfloat) = cdouble)) and ((cdouble <> 988888.0D) or (CAST( cint AS decimal(13,3)) > -863.257))) (type: boolean) Statistics: Num rows: 4096 Data size: 549274 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cfloat (type: float), cstring1 (type: string), cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_2.q.out b/ql/src/test/results/clientpositive/vectorization_2.q.out index 901acebc71..a5527a4be7 100644 --- a/ql/src/test/results/clientpositive/vectorization_2.q.out +++ b/ql/src/test/results/clientpositive/vectorization_2.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15)) or ((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359)))) (type: boolean) + filterExpr: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 12288 Data size: 2157324 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -71,7 +71,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375)), FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359)))) + predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 14:double, val -10669.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterLongColLessLongScalar(col 2:int, val 359))), FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -5638.14990234375))) predicate: (((cdouble < UDFToDouble(ctinyint)) and ((UDFToDouble(ctimestamp2) <> -10669.0D) or (cint < 359))) or ((ctimestamp1 < ctimestamp2) and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean) Statistics: Num rows: 4096 Data size: 719232 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/vectorization_3.q.out b/ql/src/test/results/clientpositive/vectorization_3.q.out index a8dc7a63ff..add0a8d345 100644 --- a/ql/src/test/results/clientpositive/vectorization_3.q.out +++ b/ql/src/test/results/clientpositive/vectorization_3.q.out @@ -77,7 +77,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), FilterDecimalColNotEqualDecimalScalar(col 14:decimal(22,3), val 79.553)(children: CastLongToDecimal(col 3:bigint) -> 14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 15:double, val -29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 15:double)), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 16:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 16:double), FilterDecimalColGreaterEqualDecimalScalar(col 17:decimal(8,3), val 79.553)(children: CastLongToDecimal(col 1:smallint) -> 17:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 9:timestamp))) - predicate: (((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2)) or ((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean) + predicate: (((UDFToFloat(cint) <= cfloat) and (CAST( cbigint AS decimal(22,3)) <> 79.553) and (UDFToDouble(ctimestamp2) = -29071.0D)) or ((UDFToDouble(cbigint) > cdouble) and (CAST( csmallint AS decimal(8,3)) >= 79.553) and (ctimestamp1 > ctimestamp2))) (type: boolean) Statistics: Num rows: 2503 Data size: 260060 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: csmallint (type: smallint), ctinyint (type: tinyint), cfloat (type: float), cint (type: int), UDFToDouble(csmallint) (type: double), (UDFToDouble(csmallint) * UDFToDouble(csmallint)) (type: double), UDFToDouble(ctinyint) (type: double), (UDFToDouble(ctinyint) * UDFToDouble(ctinyint)) (type: double), UDFToDouble(cfloat) (type: double), (UDFToDouble(cfloat) * UDFToDouble(cfloat)) (type: double), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_4.q.out b/ql/src/test/results/clientpositive/vectorization_4.q.out index 3f8d6e582f..e46558cd78 100644 --- a/ql/src/test/results/clientpositive/vectorization_4.q.out +++ b/ql/src/test/results/clientpositive/vectorization_4.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToInteger(csmallint) >= cint) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D)))) (type: boolean) + filterExpr: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -71,8 +71,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0)))) - predicate: (((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D)) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or (UDFToInteger(csmallint) >= cint)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 1:smallint), FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 3:bigint, val -563), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 0:tinyint), FilterDoubleColLessEqualDoubleScalar(col 5:double, val -3728.0))), FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 0:int, val -89010)(children: col 0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553))) + predicate: ((UDFToInteger(csmallint) >= cint) or ((cbigint <> -563L) and ((UDFToLong(ctinyint) <> cbigint) or (cdouble <= -3728.0D))) or ((UDFToInteger(ctinyint) <= -89010) and (cdouble > 79.553D))) (type: boolean) Statistics: Num rows: 12288 Data size: 256884 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cint (type: int), cdouble (type: double), ctinyint (type: tinyint), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_5.q.out b/ql/src/test/results/clientpositive/vectorization_5.q.out index c5cb6680e2..8a1d404903 100644 --- a/ql/src/test/results/clientpositive/vectorization_5.q.out +++ b/ql/src/test/results/clientpositive/vectorization_5.q.out @@ -66,7 +66,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 6:string, pattern %b%), SelectColumnIsNotNull(col 11:boolean)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleColumn(col 13:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), FilterStringColLikeStringScalar(col 7:string, pattern a), SelectColumnIsNotNull(col 9:timestamp))) - predicate: (((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null) or ((cstring1 like '%b%') and cboolean2 is not null)) (type: boolean) + predicate: (((cstring1 like '%b%') and cboolean2 is not null) or ((UDFToDouble(ctinyint) = cdouble) and (cstring2 like 'a') and ctimestamp2 is not null)) (type: boolean) Statistics: Num rows: 7658 Data size: 1529972 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int) diff --git a/ql/src/test/results/clientpositive/vectorization_6.q.out b/ql/src/test/results/clientpositive/vectorization_6.q.out index b2e3625eb5..de34b45708 100644 --- a/ql/src/test/results/clientpositive/vectorization_6.q.out +++ b/ql/src/test/results/clientpositive/vectorization_6.q.out @@ -58,7 +58,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and (((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null))) (type: boolean) + filterExpr: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 2110130 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -67,7 +67,7 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint)))) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterLongColLessEqualLongScalar(col 10:boolean, val 0), FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), FilterExprAndExpr(children: FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)), SelectColumnIsNotNull(col 3:bigint))), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or (((cstring2 like '%a') or (cfloat <= -257.0)) and cbigint is not null)) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5951 Data size: 1022000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator diff --git a/ql/src/test/results/clientpositive/vectorization_7.q.out b/ql/src/test/results/clientpositive/vectorization_7.q.out index 00de99ea50..85cb01bce8 100644 --- a/ql/src/test/results/clientpositive/vectorization_7.q.out +++ b/ql/src/test/results/clientpositive/vectorization_7.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -79,8 +79,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28815.0)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28815.0D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) @@ -296,7 +296,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((ctinyint <> 0Y) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D)))) (type: boolean) + filterExpr: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 12288 Data size: 3019778 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -304,8 +304,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 14:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0)))) - predicate: (((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and ((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and (ctinyint <> 0Y)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: FilterExprOrExpr(children: FilterDoubleColGreaterDoubleScalar(col 5:double, val 988888.0), FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, val -28792.315)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double), FilterDoubleColLessEqualDoubleScalar(col 5:double, val 3569.0))), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleScalar(col 14:double, val -28800.0)(children: CastTimestampToDouble(col 8:timestamp) -> 14:double), FilterLongColEqualLongColumn(col 0:int, col 2:int)(children: col 0:tinyint), FilterStringColLikeStringScalar(col 7:string, pattern ss)), FilterLongColNotEqualLongScalar(col 0:tinyint, val 0)) + predicate: (((cdouble > 988888.0D) or ((UDFToDouble(ctimestamp2) > -28792.315D) and (cdouble <= 3569.0D))) and ((UDFToDouble(ctimestamp1) <= -28800.0D) or (UDFToInteger(ctinyint) = cint) or (cstring2 like 'ss')) and (ctinyint <> 0Y)) (type: boolean) Statistics: Num rows: 5461 Data size: 1342196 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), cbigint (type: bigint), csmallint (type: smallint), ctinyint (type: tinyint), ctimestamp1 (type: timestamp), cstring1 (type: string), (cbigint + cbigint) (type: bigint), (UDFToInteger(csmallint) % -257) (type: int), (- csmallint) (type: smallint), (- ctinyint) (type: tinyint), (UDFToInteger((- ctinyint)) + 17) (type: int), (cbigint * UDFToLong((- csmallint))) (type: bigint), (cint % UDFToInteger(csmallint)) (type: int), (- ctinyint) (type: tinyint), ((- ctinyint) % ctinyint) (type: tinyint) diff --git a/ql/src/test/results/clientpositive/vectorization_8.q.out b/ql/src/test/results/clientpositive/vectorization_8.q.out index fb387e7dcd..847064bc2a 100644 --- a/ql/src/test/results/clientpositive/vectorization_8.q.out +++ b/ql/src/test/results/clientpositive/vectorization_8.q.out @@ -66,7 +66,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -75,8 +75,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 10.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 16.0)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 10.0D) and (UDFToDouble(ctimestamp2) <> 16.0D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) @@ -279,7 +279,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or (cfloat < -6432.0) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) + filterExpr: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 12288 Data size: 2983078 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -287,8 +287,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) - predicate: (((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null) or (cfloat < -6432.0)) (type: boolean) + predicateExpression: FilterExprOrExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val -6432.0), FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleScalar(col 13:double, val 12.503)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), FilterDoubleColNotEqualDoubleScalar(col 14:double, val 11.998)(children: CastTimestampToDouble(col 9:timestamp) -> 14:double), SelectColumnIsNotNull(col 7:string)), FilterExprAndExpr(children: FilterDoubleColEqualDoubleScalar(col 5:double, val 988888.0), SelectColumnIsNotNull(col 10:boolean))) + predicate: ((cfloat < -6432.0) or ((UDFToDouble(ctimestamp1) <= 12.503D) and (UDFToDouble(ctimestamp2) <> 11.998D) and cstring2 is not null) or ((cdouble = 988888.0D) and cboolean1 is not null)) (type: boolean) Statistics: Num rows: 3059 Data size: 742850 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctimestamp1 (type: timestamp), cdouble (type: double), cboolean1 (type: boolean), cstring1 (type: string), cfloat (type: float), (- cdouble) (type: double), (-5638.15D - cdouble) (type: double), (cdouble * -257.0D) (type: double), (UDFToFloat(cint) + cfloat) (type: float), ((- cdouble) + UDFToDouble(cbigint)) (type: double), (- cdouble) (type: double), (-1.389 - cfloat) (type: float), (- cfloat) (type: float), ((-5638.15D - cdouble) + UDFToDouble((UDFToFloat(cint) + cfloat))) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_9.q.out b/ql/src/test/results/clientpositive/vectorization_9.q.out index 9a93c3623c..695a05ace5 100644 --- a/ql/src/test/results/clientpositive/vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/vectorization_9.q.out @@ -66,7 +66,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: FilterStringColLikeStringScalar(col 7:string, pattern %b%), FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val a))) - predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and (cstring2 like '%b%')) (type: boolean) + predicate: ((cstring2 like '%b%') and ((cdouble >= -1.389D) or (cstring1 < 'a'))) (type: boolean) Statistics: Num rows: 4096 Data size: 769522 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cstring1 (type: string), cdouble (type: double), ctimestamp1 (type: timestamp), (cdouble * cdouble) (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out b/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out index 5f43684861..88b40f563a 100644 --- a/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out +++ b/ql/src/test/results/clientpositive/vectorization_decimal_date.q.out @@ -43,7 +43,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:int), SelectColumnIsNotNull(col 1:double)) - predicate: (cdouble is not null and cint is not null) (type: boolean) + predicate: (cint is not null and cdouble is not null) (type: boolean) Statistics: Num rows: 6848 Data size: 920460 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cdate (type: date), cint (type: int), cdecimal (type: decimal(20,10)) diff --git a/ql/src/test/results/clientpositive/vectorization_limit.q.out b/ql/src/test/results/clientpositive/vectorization_limit.q.out index 5ab3c5bf70..d91fa77341 100644 --- a/ql/src/test/results/clientpositive/vectorization_limit.q.out +++ b/ql/src/test/results/clientpositive/vectorization_limit.q.out @@ -23,10 +23,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 183488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 20400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/vectorization_offset_limit.q.out b/ql/src/test/results/clientpositive/vectorization_offset_limit.q.out index 52dc1175ae..90ab966d3c 100644 --- a/ql/src/test/results/clientpositive/vectorization_offset_limit.q.out +++ b/ql/src/test/results/clientpositive/vectorization_offset_limit.q.out @@ -21,10 +21,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + filterExpr: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 12288 Data size: 183488 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(cbigint) < cdouble) and (cint > 0)) (type: boolean) + predicate: ((cint > 0) and (UDFToDouble(cbigint) < cdouble)) (type: boolean) Statistics: Num rows: 1365 Data size: 20400 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cbigint (type: bigint), cdouble (type: double) diff --git a/ql/src/test/results/clientpositive/vectorized_context.q.out b/ql/src/test/results/clientpositive/vectorized_context.q.out index 5890ca2a11..490e56e806 100644 --- a/ql/src/test/results/clientpositive/vectorized_context.q.out +++ b/ql/src/test/results/clientpositive/vectorized_context.q.out @@ -165,7 +165,7 @@ STAGE PLANS: filterExpr: (ss_store_sk is not null and ss_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 6075 Data size: 72744 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ss_hdemo_sk is not null and ss_store_sk is not null) (type: boolean) + predicate: (ss_store_sk is not null and ss_hdemo_sk is not null) (type: boolean) Statistics: Num rows: 6075 Data size: 72744 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ss_store_sk (type: int), ss_hdemo_sk (type: int), ss_net_profit (type: double) diff --git a/ql/src/test/results/clientpositive/vectorized_join46_mr.q.out b/ql/src/test/results/clientpositive/vectorized_join46_mr.q.out index 5dbe87d28c..b474e05d7b 100644 --- a/ql/src/test/results/clientpositive/vectorized_join46_mr.q.out +++ b/ql/src/test/results/clientpositive/vectorized_join46_mr.q.out @@ -215,10 +215,10 @@ STAGE PLANS: $hdt$_1:test2 TableScan alias: test2 - filterExpr: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + filterExpr: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 4 Data size: 380 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key BETWEEN 100 AND 102 and value is not null) (type: boolean) + predicate: (value is not null and key BETWEEN 100 AND 102) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: int), col_2 (type: string) diff --git a/ql/src/test/results/clientpositive/vectorized_mapjoin3.q.out b/ql/src/test/results/clientpositive/vectorized_mapjoin3.q.out index 9cf9e2de3b..b9b203c0d2 100644 --- a/ql/src/test/results/clientpositive/vectorized_mapjoin3.q.out +++ b/ql/src/test/results/clientpositive/vectorized_mapjoin3.q.out @@ -453,7 +453,7 @@ STAGE PLANS: filterExpr: (int_col_1 is not null and decimal0801_col is not null) (type: boolean) Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (decimal0801_col is not null and int_col_1 is not null) (type: boolean) + predicate: (int_col_1 is not null and decimal0801_col is not null) (type: boolean) Statistics: Num rows: 5 Data size: 580 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal0801_col (type: decimal(8,1)), int_col_1 (type: int) @@ -788,7 +788,7 @@ STAGE PLANS: filterExpr: ((type = 'TEST') and t_id is not null and f_id is not null) (type: boolean) Statistics: Num rows: 10 Data size: 5520 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((type = 'TEST') and f_id is not null and t_id is not null) (type: boolean) + predicate: ((type = 'TEST') and t_id is not null and f_id is not null) (type: boolean) Statistics: Num rows: 5 Data size: 2760 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: t_id (type: string), f_id (type: string) @@ -814,7 +814,7 @@ STAGE PLANS: className: VectorFilterOperator native: true predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 0:string), SelectColumnIsNotNull(col 1:string)) - predicate: (f_id is not null and t_id is not null) (type: boolean) + predicate: (t_id is not null and f_id is not null) (type: boolean) Statistics: Num rows: 10 Data size: 3680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: t_id (type: string), f_id (type: string) diff --git a/ql/src/test/results/clientpositive/vectorized_string_funcs.q.out b/ql/src/test/results/clientpositive/vectorized_string_funcs.q.out index 1797bd2afe..75da19136c 100644 --- a/ql/src/test/results/clientpositive/vectorized_string_funcs.q.out +++ b/ql/src/test/results/clientpositive/vectorized_string_funcs.q.out @@ -60,7 +60,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (((cbigint % 237L) = 0L) and (length(substr(cstring1, 1, 2)) <= 2) and (cstring1 like '%')) (type: boolean) + filterExpr: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) Statistics: Num rows: 12288 Data size: 1816546 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (((cbigint % 237L) = 0L) and (cstring1 like '%') and (length(substr(cstring1, 1, 2)) <= 2)) (type: boolean) diff --git a/ql/src/test/results/clientpositive/view_cbo.q.out b/ql/src/test/results/clientpositive/view_cbo.q.out index dae35a143b..3d47944590 100644 --- a/ql/src/test/results/clientpositive/view_cbo.q.out +++ b/ql/src/test/results/clientpositive/view_cbo.q.out @@ -766,7 +766,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 250 Data size: 48500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 * 2L) = _col3) and (_col2 > 0L)) (type: boolean) + predicate: ((_col2 > 0L) and ((_col2 * 2L) = _col3)) (type: boolean) Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: string)