From ad63c4f8be582856422236c10a28cd8f8de1bd76 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 3 Jun 2026 10:27:16 +0100 Subject: [PATCH 01/41] Bump Calcite version to 1.38, minor code adjustments: - AggCall construction adjustments in HiveAggregate and HiveSqlSumAggFunction, due to "ddb4200f8f Refactor: Add fields AggregateCall.rexList and RelBuilder.AggCall.preOperands" (1.35) - Add visitLambda and visitLambdaRef in RexVisitor implementation (HiveCalciteUtil#ConstantFinder), due to "[CALCITE-3679] Allow lambda expressions in SQL queries" (1.37) --- pom.xml | 2 +- .../hive/ql/optimizer/calcite/HiveCalciteUtil.java | 12 ++++++++++++ .../calcite/functions/HiveSqlSumAggFunction.java | 1 + .../calcite/reloperators/HiveAggregate.java | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4481607165db..47ffca295cf5 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.0.0-M24 1.12.0 1.82 - 1.33.0 + 1.38.0 6.0.5 6.0.11 3.2.0-release diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java index b1b8003e21fd..9569e2f66eae 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java @@ -48,6 +48,8 @@ import org.apache.calcite.rex.RexDynamicParam; import org.apache.calcite.rex.RexFieldAccess; import org.apache.calcite.rex.RexInputRef; +import org.apache.calcite.rex.RexLambda; +import org.apache.calcite.rex.RexLambdaRef; import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexLocalRef; import org.apache.calcite.rex.RexNode; @@ -1139,6 +1141,16 @@ public Boolean visitSubQuery(RexSubQuery subQuery) { public Boolean visitPatternFieldRef(RexPatternFieldRef fieldRef) { return false; } + + @Override + public Boolean visitLambda(RexLambda lambda) { + return false; + } + + @Override + public Boolean visitLambdaRef(RexLambdaRef lambdaRef) { + return false; + } } public static Set getInputRefs(RexNode expr) { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java index 47133de47ff8..4ee10c0a24e7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java @@ -120,6 +120,7 @@ public AggregateCall topSplit(RexBuilder rexBuilder, false, false, false, + ImmutableList.of(), ImmutableList.of(ordinal), -1, aggregateCall.distinctKeys, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java index 52a11d4e8d98..dd52a92808b5 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java @@ -75,8 +75,8 @@ private static AggregateCall replaceAggFunction(RelDataType rowType, AggregateCa SqlTypeUtil.projectTypes(rowType, aggCall.getArgList()), aggCall.getType()); return AggregateCall.create(aggFunction, aggCall.isDistinct(), aggCall.isApproximate(), aggCall.ignoreNulls(), - aggCall.getArgList(), aggCall.filterArg, aggCall.distinctKeys, aggCall.getCollation(), aggCall.getType(), - aggCall.getName()); + aggCall.rexList, aggCall.getArgList(), aggCall.filterArg, aggCall.distinctKeys, aggCall.getCollation(), + aggCall.getType(), aggCall.getName()); } @Override From 3890bebb8c917bdde9276d5c8940248888d67163 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 3 Jun 2026 12:06:05 +0100 Subject: [PATCH 02/41] Use non-deprecated version of RexBuilder#makeAbstractCast in HiveSqlSumAggFunction, RexNodeConvertera and ASTConverter; previous method deprecated as a consequence of "[CALCITE-5557] Add SAFE_CAST function (enabled in BigQuery library)" (1.35) --- .../ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java | 4 ++-- .../hive/ql/optimizer/calcite/translator/ASTConverter.java | 2 +- .../ql/optimizer/calcite/translator/RexNodeConverter.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java index 4ee10c0a24e7..33fc8859a323 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/functions/HiveSqlSumAggFunction.java @@ -108,7 +108,7 @@ public AggregateCall topSplit(RexBuilder rexBuilder, break; case 2: node = rexBuilder.makeCall(SqlStdOperatorTable.MULTIPLY, merges); - node = rexBuilder.makeAbstractCast(aggregateCall.type, node); + node = rexBuilder.makeAbstractCast(aggregateCall.type, node, false); break; default: throw new AssertionError("unexpected count " + merges); @@ -120,7 +120,7 @@ public AggregateCall topSplit(RexBuilder rexBuilder, false, false, false, - ImmutableList.of(), + List.of(), ImmutableList.of(ordinal), -1, aggregateCall.distinctKeys, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTConverter.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTConverter.java index f3e47f010646..02a7d06993e6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTConverter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/ASTConverter.java @@ -874,7 +874,7 @@ public ASTNode visitLiteral(RexLiteral literal) { return ASTBuilder.literal(literal); } nullLiteralMap.put(literal, true); - RexNode r = rexBuilder.makeAbstractCast(literal.getType(), literal); + RexNode r = rexBuilder.makeAbstractCast(literal.getType(), literal, false); return r.accept(this); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java index ab9eb330b3a5..d51f53480617 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/RexNodeConverter.java @@ -344,7 +344,7 @@ public static RexNode handleExplicitCast(GenericUDF udf, RelDataType returnType, || (udf instanceof GenericUDFToMap) || (udf instanceof GenericUDFToArray) || (udf instanceof GenericUDFToStruct)) { - castExpr = rexBuilder.makeAbstractCast(returnType, childRexNodeLst.get(0)); + castExpr = rexBuilder.makeAbstractCast(returnType, childRexNodeLst.get(0), false); } } From 8936affcc1ddb0b5aed7d5f102ff5bd448df7000 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 3 Jun 2026 17:24:04 +0100 Subject: [PATCH 03/41] HiveHepExtractRelNodeRule: do the conversion using a shuttle, instead of HepPlanner, otherwise we get IllegalArgumentException. The reason is "7fc3e1b Refactor: Add RelNode.stripped" (Calcite 1.35), which added a new check in HepRelVertex constructor (inner rel cannot be another HepRelVertex), and this is violated by HiveHepExtractRelNodeRule, which takes the root node (already extracted from its HepRelVertex), but its whole subtree is composed by HepRelVertex, so when trying to initialize the HepPlanner inside HiveHepExtractRelNodeRule, we reach the new exception (because the root's children are already HepRelVertex): HepRelVertex(RelNode rel) { super(rel.getCluster(), rel.getTraitSet()); currentRel = requireNonNull(rel, "rel"); checkArgument(!(rel instanceof HepRelVertex)); // <-- new check } java.lang.IllegalArgumentException at org.apache.hive.com.google.common.base.Preconditions.checkArgument(Preconditions.java:120) at org.apache.calcite.plan.hep.HepRelVertex.(HepRelVertex.java:54) at org.apache.calcite.plan.hep.HepPlanner.addRelToGraph(HepPlanner.java:837) at org.apache.calcite.plan.hep.HepPlanner.addRelToGraph(HepPlanner.java:813) at org.apache.calcite.plan.hep.HepPlanner.setRoot(HepPlanner.java:163) at org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveHepExtractRelNodeRule.execute(HiveHepExtractRelNodeRule.java:39) --- .../rules/HiveHepExtractRelNodeRule.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java index 12e47843d161..dda21269a03e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java @@ -19,12 +19,11 @@ import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; -import org.apache.calcite.plan.hep.HepPlanner; import org.apache.calcite.plan.hep.HepProgram; import org.apache.calcite.plan.hep.HepProgramBuilder; import org.apache.calcite.plan.hep.HepRelVertex; import org.apache.calcite.rel.RelNode; - +import org.apache.calcite.rel.RelShuttleImpl; /** * The goal of this rule is to extract the RelNode from the @@ -35,9 +34,23 @@ public class HiveHepExtractRelNodeRule extends RelOptRule { public static RelNode execute(RelNode node) { - final HepPlanner tmpPlanner = new HepPlanner(PROGRAM); + /* final HepPlanner tmpPlanner = new HepPlanner(PROGRAM); tmpPlanner.setRoot(node); - return tmpPlanner.findBestExp(); + return tmpPlanner.findBestExp(); */ + + // TODO cleanup + RelNode res = node.accept(new RelShuttleImpl() { + @Override + public RelNode visit(RelNode other) { + if (other instanceof HepRelVertex) { + HepRelVertex vertex = (HepRelVertex) other; + RelNode innerNode = vertex.getCurrentRel(); + return innerNode.accept(this); + } + return super.visit(other); + } + }); + return res; } private static final HepProgram PROGRAM = new HepProgramBuilder() From d8cb7794e27b148ffa19d2b74ed3b5b8d636a564 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 4 Jun 2026 08:53:20 +0100 Subject: [PATCH 04/41] In druid-handler pom-xml: add asm and asm-commons (version 9.7) dependencies to maven-shade-plugin, to avoid: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-shade-plugin:3.6.0:shade (default) on project hive-druid-handler: Error creating shaded jar: Problem shading JAR .../hive/druid-handler/target/hive-druid-handler-4.3.0-SNAPSHOT.jar entry org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: org.apache.maven.plugin.MojoExecutionException: Error in ASM processing class org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: Index 65536 out of bounds for length 334 --- druid-handler/pom.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index dcc5ebd8a481..b36fc8410e1a 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -134,14 +134,6 @@ org.codehaus.plexus plexus-utils - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm - org.checkerframework checker-qual @@ -409,6 +401,18 @@ + + + org.ow2.asm + asm + 9.7 + + + org.ow2.asm + asm-commons + 9.7 + + From 600635da3454d6064d09435138532e867fee6974 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 4 Jun 2026 12:35:22 +0100 Subject: [PATCH 05/41] Update Calcite default charset system property (use UTF16 instead of the default ISO-8859-1), otherwise we get "charset pollution" on char literals in explained plans (e.g. _UTF-16LE'1' instead of simply '1') due to "CALCITE-6006: RelToSqlConverter loses charset information" (introduced in 1.36) --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index 31f695ed558b..1f8699852a3b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -28,6 +28,7 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.calcite.util.ConversionUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.ObjectUtils; @@ -569,6 +570,9 @@ private Hive(HiveConf c, boolean doRegisterAllFns) throws HiveException { conf = c; // turn off calcite rexnode normalization System.setProperty("calcite.enable.rexnode.digest.normalize", "false"); + // update calcite default charset + System.setProperty("calcite.default.charset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); + System.setProperty("calcite.default.nationalcharset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); if (doRegisterAllFns) { registerAllFunctionsOnce(); } From 959752a5e9ca67eaa4a1101dac1c7f980fee20ef Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 4 Jun 2026 15:33:51 +0100 Subject: [PATCH 06/41] In MaterializationView rules, we cannot use HiveHepExtractRelNodeRule as part of the UnionRewritingPullProgram. Due to "7fc3e1b Refactor: Add RelNode.stripped" (included in Calcite 1.35), which added a new check in HepRelVertex constructor (inner rel cannot be another HepRelVertex), we basically cannot apply a HepProgram on a tree containing already HepVertex. As a workaround, it is proposed to extend the MaterializedView* rules (as HiveMaterializedView*Rule), override the rewriteQuery (where the UnionRewritingPullProgram is called), and unwrap the HepRelVertex tree ourselves before calling the super.rewriteQuery. Also, there was already an auxiliary method for this unwrapping (HiveCalciteUtil.stripHepVertices), so no need to create a new one inside HiveHepExtractRelNodeRule (which could be removed indeed). --- .../calcite/rules/HiveFieldTrimmerRule.java | 3 +- .../rules/HiveHepExtractRelNodeRule.java | 16 +- ...eInsertDeleteIncrementalRewritingRule.java | 5 +- .../rules/views/HiveMaterializedViewRule.java | 168 +++++++++++++++--- 4 files changed, 155 insertions(+), 37 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFieldTrimmerRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFieldTrimmerRule.java index d9eddc2be20c..3cfcd1c05ea1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFieldTrimmerRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveFieldTrimmerRule.java @@ -21,6 +21,7 @@ import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.hep.HepRelVertex; import org.apache.calcite.rel.RelNode; +import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelFactories; @@ -57,7 +58,7 @@ public void onMatch(RelOptRuleCall call) { return; } // The node is the root, release the kraken! - node = HiveHepExtractRelNodeRule.execute(node); + node = HiveCalciteUtil.stripHepVertices(node); call.transformTo(trim(call, node)); triggered = true; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java index dda21269a03e..2ffb14c74d8d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveHepExtractRelNodeRule.java @@ -19,11 +19,11 @@ import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; +import org.apache.calcite.plan.hep.HepPlanner; import org.apache.calcite.plan.hep.HepProgram; import org.apache.calcite.plan.hep.HepProgramBuilder; import org.apache.calcite.plan.hep.HepRelVertex; import org.apache.calcite.rel.RelNode; -import org.apache.calcite.rel.RelShuttleImpl; /** * The goal of this rule is to extract the RelNode from the @@ -31,26 +31,26 @@ * @see HiveFieldTrimmerRule * @see org.apache.hadoop.hive.ql.optimizer.calcite.rules.views.HiveAggregateInsertDeleteIncrementalRewritingRule */ +// TODO remove public class HiveHepExtractRelNodeRule extends RelOptRule { public static RelNode execute(RelNode node) { - /* final HepPlanner tmpPlanner = new HepPlanner(PROGRAM); + final HepPlanner tmpPlanner = new HepPlanner(PROGRAM); tmpPlanner.setRoot(node); - return tmpPlanner.findBestExp(); */ + return tmpPlanner.findBestExp(); // TODO cleanup - RelNode res = node.accept(new RelShuttleImpl() { + /* RelNode res = node.accept(new RelShuttleImpl() { @Override public RelNode visit(RelNode other) { - if (other instanceof HepRelVertex) { - HepRelVertex vertex = (HepRelVertex) other; - RelNode innerNode = vertex.getCurrentRel(); + RelNode innerNode = other.stripped(); + if (other != innerNode) { return innerNode.accept(this); } return super.visit(other); } }); - return res; + return res; */ } private static final HepProgram PROGRAM = new HepProgramBuilder() diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregateInsertDeleteIncrementalRewritingRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregateInsertDeleteIncrementalRewritingRule.java index 6a826a15b1ff..cb6f91d3890e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregateInsertDeleteIncrementalRewritingRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregateInsertDeleteIncrementalRewritingRule.java @@ -31,10 +31,9 @@ import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.tools.RelBuilder; import org.apache.hadoop.hive.ql.ddl.view.materialized.alter.rebuild.AlterMaterializedViewRebuildAnalyzer; +import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelFactories; -import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveHepExtractRelNodeRule; - /** * This rule will perform a rewriting to prepare the plan for incremental * view maintenance in case there exist aggregation operator, so we can @@ -118,7 +117,7 @@ protected IncrementalComputePlanWithDeletedRows createJoinRightInput(RelOptRuleC RelNode aggInput = aggregate.getInput(); // Propagate rowIsDeleted column - aggInput = HiveHepExtractRelNodeRule.execute(aggInput); + aggInput = HiveCalciteUtil.stripHepVertices(aggInput); aggInput = new HiveRowIsDeletedPropagator(relBuilder).propagate(aggInput); // The row schema has two additional columns after propagation: diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java index 4c71f7534e35..9c21977166cc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewRule.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.ql.optimizer.calcite.rules.views; +import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableList; import org.apache.calcite.avatica.util.TimeUnitRange; import org.apache.calcite.plan.RelOptRule; @@ -28,7 +29,9 @@ import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Filter; import org.apache.calcite.rel.core.Join; +import org.apache.calcite.rel.core.Project; import org.apache.calcite.rel.core.TableScan; +import org.apache.calcite.rel.metadata.RelMetadataQuery; import org.apache.calcite.rel.rules.materialize.MaterializedViewProjectFilterRule; import org.apache.calcite.rel.rules.materialize.MaterializedViewOnlyFilterRule; import org.apache.calcite.rel.rules.materialize.MaterializedViewProjectJoinRule; @@ -36,17 +39,22 @@ import org.apache.calcite.rel.rules.materialize.MaterializedViewProjectAggregateRule; import org.apache.calcite.rel.rules.materialize.MaterializedViewOnlyAggregateRule; import org.apache.calcite.rel.rules.ProjectRemoveRule; +import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexSimplify; +import org.apache.calcite.rex.RexTableInputRef; import org.apache.calcite.sql.SqlFunction; import org.apache.calcite.tools.RelBuilder; import org.apache.calcite.tools.RelBuilderFactory; import org.apache.calcite.util.ImmutableBitSet; import org.apache.calcite.util.Util; +import org.apache.hadoop.hive.ql.optimizer.calcite.HiveCalciteUtil; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelBuilder; import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelFactories; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveFilterProjectTransposeRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveJoinProjectTransposeRule; import org.apache.hadoop.hive.ql.optimizer.calcite.rules.HiveProjectMergeRule; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.List; @@ -63,7 +71,7 @@ public class HiveMaterializedViewRule { * the root of the plan. */ private static final HepProgram PROGRAM = new HepProgramBuilder() - .addRuleInstance(HiveHepExtractRelNodeRule.INSTANCE) + // .addRuleInstance(HiveHepExtractRelNodeRule.INSTANCE) .addRuleInstance(HiveVolcanoExtractRelNodeRule.INSTANCE) .addRuleInstance(HiveTableScanProjectInsert.INSTANCE) .addRuleCollection( @@ -78,36 +86,16 @@ public class HiveMaterializedViewRule { .build(); public static final MaterializedViewProjectFilterRule INSTANCE_PROJECT_FILTER = - (MaterializedViewProjectFilterRule) MaterializedViewProjectFilterRule.Config.DEFAULT - .withGenerateUnionRewriting(true) - .withFastBailOut(false) - .withUnionRewritingPullProgram(PROGRAM) - .withRelBuilderFactory(HiveRelFactories.HIVE_BUILDER) - .toRule(); + new HiveMaterializedViewProjectFilterRule(HiveRelFactories.HIVE_BUILDER, true, PROGRAM, false); public static final MaterializedViewOnlyFilterRule INSTANCE_FILTER = - (MaterializedViewOnlyFilterRule) MaterializedViewOnlyFilterRule.Config.DEFAULT - .withGenerateUnionRewriting(true) - .withFastBailOut(false) - .withUnionRewritingPullProgram(PROGRAM) - .withRelBuilderFactory(HiveRelFactories.HIVE_BUILDER) - .toRule(); + new HiveMaterializedViewOnlyFilterRule(HiveRelFactories.HIVE_BUILDER, true, PROGRAM, false); public static final MaterializedViewProjectJoinRule INSTANCE_PROJECT_JOIN = - (MaterializedViewProjectJoinRule) MaterializedViewProjectJoinRule.Config.DEFAULT - .withGenerateUnionRewriting(true) - .withFastBailOut(false) - .withUnionRewritingPullProgram(PROGRAM) - .withRelBuilderFactory(HiveRelFactories.HIVE_BUILDER) - .toRule(); + new HiveMaterializedViewProjectJoinRule(HiveRelFactories.HIVE_BUILDER, true, PROGRAM, false); public static final MaterializedViewOnlyJoinRule INSTANCE_JOIN = - (MaterializedViewOnlyJoinRule) MaterializedViewOnlyJoinRule.Config.DEFAULT - .withGenerateUnionRewriting(true) - .withFastBailOut(false) - .withUnionRewritingPullProgram(PROGRAM) - .withRelBuilderFactory(HiveRelFactories.HIVE_BUILDER) - .toRule(); + new HiveMaterializedViewOnlyJoinRule(HiveRelFactories.HIVE_BUILDER, true, PROGRAM, false); public static final HiveMaterializedViewProjectAggregateRule INSTANCE_PROJECT_AGGREGATE = new HiveMaterializedViewProjectAggregateRule(HiveRelFactories.HIVE_BUILDER, @@ -133,6 +121,22 @@ public HiveMaterializedViewProjectAggregateRule( super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram); } + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap queryToViewTableMapping, + EquivalenceClasses viewEC, EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, queryToViewTableMapping, viewEC, queryEC); + } + @Override protected SqlFunction getFloorSqlFunction(TimeUnitRange flag) { return HiveRelBuilder.getFloorSqlFunction(flag); @@ -145,18 +149,132 @@ public HiveMaterializedViewOnlyAggregateRule( super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram); } + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap queryToViewTableMapping, + EquivalenceClasses viewEC, EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, queryToViewTableMapping, viewEC, queryEC); + } + @Override protected SqlFunction getFloorSqlFunction(TimeUnitRange flag) { return HiveRelBuilder.getFloorSqlFunction(flag); } } + protected static class HiveMaterializedViewProjectFilterRule extends MaterializedViewProjectFilterRule { + public HiveMaterializedViewProjectFilterRule(RelBuilderFactory relBuilderFactory, + boolean generateUnionRewriting, HepProgram unionRewritingPullProgram, + boolean fastBailOut) { + super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram, fastBailOut); + } + + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap viewToQueryTableMapping, + EquivalenceClasses viewEC, EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, viewToQueryTableMapping, viewEC, queryEC); + } + } + + protected static class HiveMaterializedViewOnlyFilterRule extends MaterializedViewOnlyFilterRule { + public HiveMaterializedViewOnlyFilterRule(RelBuilderFactory relBuilderFactory, + boolean generateUnionRewriting, HepProgram unionRewritingPullProgram, + boolean fastBailOut) { + super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram, fastBailOut); + } + + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap viewToQueryTableMapping, + EquivalenceClasses viewEC, EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, viewToQueryTableMapping, viewEC, queryEC); + } + } + + protected static class HiveMaterializedViewProjectJoinRule extends MaterializedViewProjectJoinRule { + public HiveMaterializedViewProjectJoinRule(RelBuilderFactory relBuilderFactory, + boolean generateUnionRewriting, HepProgram unionRewritingPullProgram, + boolean fastBailOut) { + super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram, fastBailOut); + } + + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap viewToQueryTableMapping, + EquivalenceClasses viewEC, EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, viewToQueryTableMapping, viewEC, queryEC); + } + } + + protected static class HiveMaterializedViewOnlyJoinRule extends MaterializedViewOnlyJoinRule { + public HiveMaterializedViewOnlyJoinRule(RelBuilderFactory relBuilderFactory, + boolean generateUnionRewriting, HepProgram unionRewritingPullProgram, + boolean fastBailOut) { + super(relBuilderFactory, generateUnionRewriting, unionRewritingPullProgram, fastBailOut); + } + + @Override protected @Nullable RelNode rewriteQuery( + RelBuilder relBuilder, + RexBuilder rexBuilder, + RexSimplify simplify, + RelMetadataQuery mq, + RexNode compensationColumnsEquiPred, + RexNode otherCompensationPred, + @Nullable Project topProject, + RelNode node, + BiMap viewToQueryTableMapping, + EquivalenceClasses viewEC, + EquivalenceClasses queryEC) { + RelNode unwrappedNode = HiveCalciteUtil.stripHepVertices(node); + return super.rewriteQuery(relBuilder, rexBuilder, simplify, mq, compensationColumnsEquiPred, + otherCompensationPred, topProject, unwrappedNode, viewToQueryTableMapping, viewEC, queryEC); + } + } + /** * This rule is used within the PROGRAM that rewrites the query for * partial rewritings. Its goal is to extract the RelNode from the * HepRelVertex node so the rest of the rules in the PROGRAM can be * applied correctly. */ + // TODO remove private static class HiveHepExtractRelNodeRule extends RelOptRule { private static final HiveHepExtractRelNodeRule INSTANCE = From b41d5cc7d510da31d750e4ae261fa36ff3dde12b Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 4 Jun 2026 17:26:07 +0100 Subject: [PATCH 07/41] Fix HiveRelFieldTrimmer#rewriteGBConstantKeys: the condition on its javadoc "none of the relnode above aggregate refers to these [group] keys" should not be checked via fieldsUsed.contains(aggregate.getGroupSet()) but rather fieldsUsed.intersects(aggregate.getGroupSet()) Also get rid of unnecessary check aggregate.getIndicatorCount() > 0 which is always false (this method is deprecated and always returns zero) --- .../hive/ql/optimizer/calcite/rules/HiveRelFieldTrimmer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelFieldTrimmer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelFieldTrimmer.java index f6f011fe5823..20e07a96dfb6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelFieldTrimmer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelFieldTrimmer.java @@ -549,9 +549,8 @@ private ImmutableBitSet generateNewGroupset(Aggregate aggregate, ImmutableBitSet */ private Aggregate rewriteGBConstantKeys(Aggregate aggregate, ImmutableBitSet fieldsUsed, ImmutableBitSet aggCallFields) { - if ((aggregate.getIndicatorCount() > 0) - || (aggregate.getGroupSet().isEmpty()) - || fieldsUsed.contains(aggregate.getGroupSet())) { + if (aggregate.getGroupSet().isEmpty() + || fieldsUsed.intersects(aggregate.getGroupSet())) { return aggregate; } From c51a2f50bde0c378c37d2c95c91f89d77ca2c4bd Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 5 Jun 2026 09:25:23 +0100 Subject: [PATCH 08/41] Add asm dependency to parent pom, trying to fix the javadoc error seen on Jenkins: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-shade-plugin:3.6.0:shade (default) on project hive-druid-handler: Error creating shaded jar: Problem shading JAR /home/jenkins/agent/workspace/hive-precommit_PR-6523/druid-handler/target/hive-druid-handler-4.3.0-SNAPSHOT.jar entry org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: org.apache.maven.plugin.MojoExecutionException: Error in ASM processing class org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: Index 65536 out of bounds for length 334 --- druid-handler/pom.xml | 12 ++++++++++-- pom.xml | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index b36fc8410e1a..f73d755c966b 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -308,6 +308,14 @@ ${log4j2.version} test + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + @@ -405,12 +413,12 @@ org.ow2.asm asm - 9.7 + ${asm.version} org.ow2.asm asm-commons - 9.7 + ${asm.version} diff --git a/pom.xml b/pom.xml index 47ffca295cf5..cd6963609267 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,7 @@ 4.9.3 2.0.0-M24 + 9.7 1.12.0 1.82 1.38.0 @@ -358,6 +359,21 @@ ${immutables.version} provided + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + org.ow2.asm + asm-tree + ${asm.version} + com.sun.jersey jersey-core From a15541d7b12a7a4b68c347d5890f8fb6a3828a8d Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 5 Jun 2026 10:12:02 +0100 Subject: [PATCH 09/41] Adjust literals in plans (remove charset) As a consequence of defining Calcite default charset system property in a previous commit, now in RexLiteral#appendAsJava (which already contained the literal charset vs default charset verification, added to SqlImplementor in CALCITE-6006 1.36) literals that used to print the charset don't do it anymore, e.g. _UTF-16LE'ten' => 'ten' --- .../clientpositive/llap/antijoin4.q.out | 2 +- .../cardinality_preserving_join_opt.q.out | 8 +++---- .../llap/cbo_case_when_type_conversion.q.out | 8 +++---- .../llap/cbo_component_access_if.q.out | 2 +- .../llap/cbo_constantfolding.q.out | 2 +- ...cbo_filter_proj_transpose_noinputref.q.out | 6 ++--- .../cbo_join_transitive_pred_loop_3.q.out | 6 ++--- .../cbo_join_transitive_pred_loop_4.q.out | 6 ++--- .../clientpositive/llap/cbo_rp_explain.q.out | 4 ++-- .../clientpositive/llap/collision.q.out | 2 +- .../llap/constraints_explain_ddl.q.out | 6 ++--- .../llap/cte_cbo_rewrite_0.q.out | 12 +++++----- .../clientpositive/llap/cte_join.q.out | 2 +- .../clientpositive/llap/cte_mat_12.q.out | 8 +++---- .../clientpositive/llap/cte_mat_type.q.out | 12 +++++----- .../distribution_key_constant_value.q.out | 4 ++-- .../llap/external_jdbc_join_mv.q.out | 2 +- .../llap/filter_emptyliteral.q.out | 4 ++-- .../clientpositive/llap/groupby13.q.out | 4 ++-- .../llap/in_typecheck_char.q.out | 4 ++-- .../llap/jdbc_project_pushdown.q.out | 8 +++---- .../llap/jdbc_table_dml_postgres.q.out | 2 +- .../llap/lateral_view_cbo.q.out | 4 ++-- .../materialized_view_rewrite_by_text_3.q.out | 4 ++-- .../materialized_view_rewrite_by_text_4.q.out | 4 ++-- ...lized_view_rewrite_ssb_grouping_sets.q.out | 22 +++++++++---------- ...zed_view_rewrite_ssb_grouping_sets_2.q.out | 8 +++---- .../clientpositive/llap/multi_in_clause.q.out | 2 +- .../clientpositive/llap/order_by_expr_2.q.out | 8 +++---- .../llap/partition_explain_ddl.q.out | 12 +++++----- .../clientpositive/llap/pointlookup6.q.out | 4 ++-- ...ubquery_in_invalid_intermediate_plan.q.out | 6 ++--- .../llap/subquery_nested_expressions.q.out | 6 ++--- .../llap/subquery_notexists.q.out | 2 +- .../llap/tez_union_group_by.q.out | 10 ++++----- .../llap/udtf_with_unionall.q.out | 14 ++++++------ ...all_filter_transpose_pruned_operands.q.out | 4 ++-- .../clientpositive/llap/uniontype_cbo.q.out | 2 +- .../results/clientpositive/llap/values.q.out | 18 +++++++-------- ...op_relnode_not_project_authorization.q.out | 2 +- .../llap/windowing_distinct.q.out | 6 ++--- .../constraints/cbo_query_grouping_sets.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query1.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query10.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query12.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query13.q.out | 8 +++---- .../perf/tpcds30tb/cte/cbo_query14.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query15.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query16.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query17.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query18.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query2.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query20.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query24.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query26.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query27.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query30.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query33.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query34.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query36.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query41.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query43.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query45.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query46.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query48.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query49.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query5.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query53.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query54.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query56.q.out | 8 +++---- .../perf/tpcds30tb/cte/cbo_query59.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query60.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query61.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query63.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query64.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query66.q.out | 8 +++---- .../perf/tpcds30tb/cte/cbo_query68.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query69.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query7.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query71.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query72.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query73.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query75.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query76.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query77.q.out | 6 ++--- .../perf/tpcds30tb/cte/cbo_query8.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query80.q.out | 10 ++++----- .../perf/tpcds30tb/cte/cbo_query81.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query84.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query85.q.out | 10 ++++----- .../perf/tpcds30tb/cte/cbo_query88.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query89.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query91.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query93.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query94.q.out | 8 +++---- .../perf/tpcds30tb/cte/cbo_query95.q.out | 8 +++---- .../perf/tpcds30tb/cte/cbo_query96.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query98.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_ext_query1.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query1.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query10.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query12.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query13.q.out | 8 +++---- .../perf/tpcds30tb/tez/cbo_query14.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query15.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query16.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query17.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query18.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query2.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query20.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query24.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query26.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query27.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query30.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query33.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query34.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query36.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query41.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query43.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query45.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query46.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query48.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query49.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query5.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query53.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query54.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query56.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query59.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query60.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query61.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query63.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query64.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query66.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query68.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query69.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query7.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query71.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query72.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query73.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query75.q.out | 12 +++++----- .../perf/tpcds30tb/tez/cbo_query76.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query77.q.out | 6 ++--- .../perf/tpcds30tb/tez/cbo_query8.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query80.q.out | 12 +++++----- .../perf/tpcds30tb/tez/cbo_query81.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query84.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query85.q.out | 10 ++++----- .../perf/tpcds30tb/tez/cbo_query88.q.out | 16 +++++++------- .../perf/tpcds30tb/tez/cbo_query89.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query91.q.out | 4 ++-- .../perf/tpcds30tb/tez/cbo_query93.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query94.q.out | 8 +++---- .../perf/tpcds30tb/tez/cbo_query95.q.out | 8 +++---- .../perf/tpcds30tb/tez/cbo_query96.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query98.q.out | 2 +- 155 files changed, 373 insertions(+), 373 deletions(-) diff --git a/ql/src/test/results/clientpositive/llap/antijoin4.q.out b/ql/src/test/results/clientpositive/llap/antijoin4.q.out index 62cbf85908dc..4f6dfb4c0efc 100644 --- a/ql/src/test/results/clientpositive/llap/antijoin4.q.out +++ b/ql/src/test/results/clientpositive/llap/antijoin4.q.out @@ -168,7 +168,7 @@ POSTHOOK: Input: default@antijoin3_t1 POSTHOOK: Input: default@antijoin3_t2 #### A masked pattern was here #### CBO PLAN: -HiveProject(t1id=[$0], t1notnull=[$1], t1nullable=[$2], _c3=[_UTF-16LE'foo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) +HiveProject(t1id=[$0], t1notnull=[$1], t1nullable=[$2], _c3=['foo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveAntiJoin(condition=[=($0, $3)], joinType=[anti]) HiveProject(t1id=[$0], t1notnull=[$1], t1nullable=[$2]) HiveTableScan(table=[[default, antijoin3_t1]], table:alias=[t1]) diff --git a/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out b/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out index 46ef1ef6f75a..fe0485e4049e 100644 --- a/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out +++ b/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out @@ -91,7 +91,7 @@ HiveProject(c_first_name=[$3], _c1=[$5], _c2=[*($1, $6)], c_customer_sk=[$4], ss HiveProject(ss_customer_sk=[$1], EXPR$0=[*(+($0, $0), $2)], EXPR$1=[CAST($1):BIGINT]) HiveFilter(condition=[IS NOT NULL(CAST($1):BIGINT)]) HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) - HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) + HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, customer]], table:alias=[c]) @@ -162,7 +162,7 @@ HiveProject(c_first_name=[$2], _c1=[$4], _c2=[*(*(+($6, $6), $8), $5)], c_custom HiveFilter(condition=[IS NOT NULL(CAST($0):BIGINT)]) HiveProject(ss_customer_sk=[$1]) HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) - HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) + HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveProject(c_first_name=[$0], c_last_name=[$1], c_customer_sk=[$2], c_discount=[$3]) HiveTableScan(table=[[default, customer]], table:alias=[c]) @@ -237,7 +237,7 @@ POSTHOOK: Input: default@customer POSTHOOK: Input: default@store_sales #### A masked pattern was here #### CBO PLAN: -HiveProject(c_first_name=[$4], _c1=[||(||(||(||($4, _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5), _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5)], _c2=[*($1, -(1, $7))], c_customer_sk=[$3], ss_customer_sk=[$0]) +HiveProject(c_first_name=[$4], _c1=[||(||(||(||($4, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5)], _c2=[*($1, -(1, $7))], c_customer_sk=[$3], ss_customer_sk=[$0]) HiveJoin(condition=[=($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_customer_sk=[$1], EXPR$0=[*(+($0, $0), $2)], EXPR$1=[CAST($1):BIGINT]) @@ -309,7 +309,7 @@ POSTHOOK: Input: default@customer POSTHOOK: Input: default@store_sales #### A masked pattern was here #### CBO PLAN: -HiveProject(c_first_name=[$6], _c1=[||(||(||(||($6, _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7), _UTF-16LE' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7)], _c2=[*(*(+($3, $3), $5), -(1, $9))], c_customer_sk=[$2], ss_customer_sk=[$0]) +HiveProject(c_first_name=[$6], _c1=[||(||(||(||($6, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7)], _c2=[*(*(+($3, $3), $5), -(1, $9))], c_customer_sk=[$2], ss_customer_sk=[$0]) HiveJoin(condition=[=($2, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_case_when_type_conversion.q.out b/ql/src/test/results/clientpositive/llap/cbo_case_when_type_conversion.q.out index 5f22106d856a..929877025830 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_case_when_type_conversion.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_case_when_type_conversion.q.out @@ -26,7 +26,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(col1=[$0], col2=[CASE(=(CAST(UPPER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'A'), _UTF-16LE'OK':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col1=[$0], col2=[CASE(=(CAST(UPPER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'A'), 'OK':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: explain @@ -77,7 +77,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(col1=[$0], col2=[CASE(=(CAST(UPPER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'A'), _UTF-16LE'OK':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col1=[$0], col2=[CASE(=(CAST(UPPER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'A'), 'OK':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: explain @@ -138,7 +138,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(col1=[$0], col2=[CASE(=(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'a'), _UTF-16LE'OK a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", =(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'b'), _UTF-16LE'OK b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col1=[$0], col2=[CASE(=(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'a'), 'OK a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", =(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'b'), 'OK b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: explain cbo @@ -162,7 +162,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(col1=[$0], col2=[CASE(=(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'a'), _UTF-16LE'OK a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", =(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'b'), _UTF-16LE'OK b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col1=[$0], col2=[CASE(=(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'a'), 'OK a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", =(CAST(LOWER($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'b'), 'OK b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'N/A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: select col1, diff --git a/ql/src/test/results/clientpositive/llap/cbo_component_access_if.q.out b/ql/src/test/results/clientpositive/llap/cbo_component_access_if.q.out index b7d732b542b4..7d89b7cb926d 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_component_access_if.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_component_access_if.q.out @@ -23,6 +23,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_component_access_if_tbl #### A masked pattern was here #### CBO PLAN: -HiveProject(codes=[CASE(=(concat_ws(_UTF-16LE',':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", COMPONENT_ACCESS($0).code), _UTF-16LE''), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE',':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", COMPONENT_ACCESS($0).code))]) +HiveProject(codes=[CASE(=(concat_ws(',':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", COMPONENT_ACCESS($0).code), ''), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(',':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", COMPONENT_ACCESS($0).code))]) HiveTableScan(table=[[default, cbo_component_access_if_tbl]], table:alias=[cbo_component_access_if_tbl]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_constantfolding.q.out b/ql/src/test/results/clientpositive/llap/cbo_constantfolding.q.out index 43f257a806a2..782fd1bad752 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_constantfolding.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_constantfolding.q.out @@ -31,7 +31,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[CAST(_UTF-16LE'2023-01-01 00:00:00':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) +HiveProject(_c0=[CAST('2023-01-01 00:00:00':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: EXPLAIN CBO SELECT TO_UNIX_TIMESTAMP(DATE '2023-01-01') diff --git a/ql/src/test/results/clientpositive/llap/cbo_filter_proj_transpose_noinputref.q.out b/ql/src/test/results/clientpositive/llap/cbo_filter_proj_transpose_noinputref.q.out index 654f7b6d9a5e..dadf667ae493 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_filter_proj_transpose_noinputref.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_filter_proj_transpose_noinputref.q.out @@ -40,11 +40,11 @@ POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### CBO PLAN: -HiveProject(c.m=[CAST(_UTF-16LE'2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) +HiveProject(c.m=[CAST('2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(DUMMY=[0]) HiveTableScan(table=[[default, test1]], table:alias=[test1]) - HiveProject(m=[CAST(_UTF-16LE'2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=(_UTF-16LE'2', $0)]) + HiveProject(m=[CAST('2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=('2', $0)]) HiveTableScan(table=[[default, test2]], table:alias=[d]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out index f6c27dbf5618..337b5bfa4fd2 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out @@ -54,14 +54,14 @@ CBO PLAN: HiveProject(a.bd_id=[$0]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject($f0=[$0]) HiveUnion(all=[true]) HiveProject($f0=[CAST(9:BIGINT):BIGINT]) - HiveFilter(condition=[AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out index dc73afba7cdf..56d474694d6e 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out @@ -54,7 +54,7 @@ CBO PLAN: HiveProject(a.bd_id=[$0]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject($f0=[$0]) HiveFilter(condition=[=($1, 2)]) @@ -64,10 +64,10 @@ HiveProject(a.bd_id=[$0]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) HiveProject($f0=[CAST(9:BIGINT):BIGINT]) - HiveFilter(condition=[AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject(bd_id=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_explain.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_explain.q.out index f5964fecd36b..424454a73c9b 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_rp_explain.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_rp_explain.q.out @@ -51,8 +51,8 @@ CBO PLAN: HiveProject(lname=[$2], title=[$3]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveSortExchange(distribution=[hash[0]], collation=[[0]]) - HiveProject(id=[$0], fname=[CAST(_UTF-16LE'Victor':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], lname=[$2]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'Victor'), IS NOT NULL($0))]) + HiveProject(id=[$0], fname=[CAST('Victor':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], lname=[$2]) + HiveFilter(condition=[AND(=($1, 'Victor'), IS NOT NULL($0))]) HiveTableScan(table=[[default, author]], qbid:alias=[author]) HiveSortExchange(distribution=[hash[1]], collation=[[1]]) HiveProject(title=[$1], author=[$2]) diff --git a/ql/src/test/results/clientpositive/llap/collision.q.out b/ql/src/test/results/clientpositive/llap/collision.q.out index b82de9954c1d..b7b17f71f958 100644 --- a/ql/src/test/results/clientpositive/llap/collision.q.out +++ b/ql/src/test/results/clientpositive/llap/collision.q.out @@ -479,7 +479,7 @@ POSTHOOK: Input: cpn@mytable_1000_n POSTHOOK: Output: cpn_view@myview_1000_n POSTHOOK: Output: database:cpn_view CBO PLAN: -HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$118], col4=[$3], col5=[$4], col6=[$5], col7=[$6], col8=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(1, 0))], col9=[CASE(IS NOT NULL($8), $8, 0:DECIMAL(28, 0))], col10=[$9], alt_col11=[CASE(CASE(IS NOT NULL($20), =(CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'X'), false), _UTF-16LE'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], alt_col12=[CASE(CASE(IS NOT NULL($91), =(CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'X'), false), _UTF-16LE'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col13=[$10], col14=[CASE(IN(trim($4), _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), CASE(IS NOT NULL($62), $62, -1:DECIMAL(18, 0)), CASE(IS NOT NULL($62), $62, 1:DECIMAL(18, 0)))], col15=[$11], col16=[$12], col17=[$13], col18=[$14], col19=[$15], col20=[$17], col21=[$16], col22=[$18], col23=[$19], col11=[CASE(IS NOT NULL(trim($20)), trim($20), _UTF-16LE'Z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col24=[$21], col25=[$22], col26=[$23], col27=[$24], col28=[$25], col29=[$27], col30=[$28], col31=[$29], col32=[$31], col33=[$32], col34=[$33], col35=[$34], col36=[$35], col37=[$36], col38=[$37], col39=[CASE(IS NOT NULL(trim($39)), trim($39), _UTF-16LE'N':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], parent_col9=[CASE(IS NOT NULL($40), $40, -999:DECIMAL(28, 0))], col40=[CASE(IS NOT NULL($41), CAST($41):INTEGER, -1)], col41=[$42], col42=[$43], col43=[CASE(=(trim($72), _UTF-16LE''), _UTF-16LE'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim($72)), trim($72), _UTF-16LE'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col44=[$83], col45=[$84], col46=[$85], col47=[$86], col48=[$87], col49=[$88], col50=[$89], col51=[$90], col12=[$91], col52=[$92], col53=[$93], col54=[$94], col55=[$95], col56=[$96], col57=[$97], col58=[CASE(IS NOT NULL($98), $98, -1)], col59=[$99], col60=[$100], col61=[$102], col62=[$103], col63=[CASE(=(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), _UTF-16LE''), _UTF-16LE'-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), _UTF-16LE'-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col64=[$107], col65=[$105], col66=[$108], col67=[CASE(IS NOT NULL($68), $68, -999:DECIMAL(18, 0))], col68=[$109], col69=[$110], col70=[$113], col71=[$114], col72=[$30], col73=[$38], col74=[$104], col75=[$26], col76=[$101], col77=[$115], col116=[$116], col117=[$117], col78=[CASE(IS NOT NULL($56), $56, -1:DECIMAL(18, 0))], col79=[$69], col114=[$111], col115=[$112], col92=[CASE(IS NOT NULL($49), CAST($49):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col80=[CASE(IS NOT NULL($52), $52, -1)], col81=[$48], col93=[$50], col82=[$73], col83=[$47], col118=[$44], col84=[CASE(IS NOT NULL($74), CAST($74):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col85=[$64], col86=[$79], col87=[$58], col88=[CASE(IS NOT NULL($80), CAST($80):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$118], col4=[$3], col5=[$4], col6=[$5], col7=[$6], col8=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(1, 0))], col9=[CASE(IS NOT NULL($8), $8, 0:DECIMAL(28, 0))], col10=[$9], alt_col11=[CASE(CASE(IS NOT NULL($20), =(CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), false), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], alt_col12=[CASE(CASE(IS NOT NULL($91), =(CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), false), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col13=[$10], col14=[CASE(IN(trim($4), 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), CASE(IS NOT NULL($62), $62, -1:DECIMAL(18, 0)), CASE(IS NOT NULL($62), $62, 1:DECIMAL(18, 0)))], col15=[$11], col16=[$12], col17=[$13], col18=[$14], col19=[$15], col20=[$17], col21=[$16], col22=[$18], col23=[$19], col11=[CASE(IS NOT NULL(trim($20)), trim($20), 'Z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col24=[$21], col25=[$22], col26=[$23], col27=[$24], col28=[$25], col29=[$27], col30=[$28], col31=[$29], col32=[$31], col33=[$32], col34=[$33], col35=[$34], col36=[$35], col37=[$36], col38=[$37], col39=[CASE(IS NOT NULL(trim($39)), trim($39), 'N':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], parent_col9=[CASE(IS NOT NULL($40), $40, -999:DECIMAL(28, 0))], col40=[CASE(IS NOT NULL($41), CAST($41):INTEGER, -1)], col41=[$42], col42=[$43], col43=[CASE(=(trim($72), ''), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim($72)), trim($72), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col44=[$83], col45=[$84], col46=[$85], col47=[$86], col48=[$87], col49=[$88], col50=[$89], col51=[$90], col12=[$91], col52=[$92], col53=[$93], col54=[$94], col55=[$95], col56=[$96], col57=[$97], col58=[CASE(IS NOT NULL($98), $98, -1)], col59=[$99], col60=[$100], col61=[$102], col62=[$103], col63=[CASE(=(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ''), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col64=[$107], col65=[$105], col66=[$108], col67=[CASE(IS NOT NULL($68), $68, -999:DECIMAL(18, 0))], col68=[$109], col69=[$110], col70=[$113], col71=[$114], col72=[$30], col73=[$38], col74=[$104], col75=[$26], col76=[$101], col77=[$115], col116=[$116], col117=[$117], col78=[CASE(IS NOT NULL($56), $56, -1:DECIMAL(18, 0))], col79=[$69], col114=[$111], col115=[$112], col92=[CASE(IS NOT NULL($49), CAST($49):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col80=[CASE(IS NOT NULL($52), $52, -1)], col81=[$48], col93=[$50], col82=[$73], col83=[$47], col118=[$44], col84=[CASE(IS NOT NULL($74), CAST($74):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col85=[$64], col86=[$79], col87=[$58], col88=[CASE(IS NOT NULL($80), CAST($80):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[cpn, mytable_1000_n]], table:alias=[mytable_1000_n]) PREHOOK: query: CREATE OR REPLACE VIEW cpn_view.myview_1000_n AS diff --git a/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out b/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out index 98c8a9056d22..7d012d8ee65a 100644 --- a/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out +++ b/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out @@ -116,7 +116,7 @@ EXPLAIN CBO SELECT c_custkey from customer_removal_n0 where c_nation IN ('USA', EXPLAIN VECTORIZED SELECT c_custkey from customer_removal_n0 where c_nation IN ('USA', 'INDIA') group by c_custkey; CBO PLAN:HiveProject(c_custkey=[$0]) - HiveFilter(condition=[IN($4, _UTF-16LE'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($4, 'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_removal_n0]], table:alias=[customer_removal_n0]) PLAN VECTORIZATION: @@ -187,7 +187,7 @@ EXPLAIN CBO SELECT c_custkey from customer_removal_n0 where c_nation IN ('USA', EXPLAIN VECTORIZED SELECT c_custkey from customer_removal_n0 where c_nation IN ('USA', 'INDIA') group by c_custkey, c_nation; CBO PLAN:HiveProject(c_custkey=[$0]) - HiveFilter(condition=[IN($4, _UTF-16LE'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($4, 'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_removal_n0]], table:alias=[customer_removal_n0]) PLAN VECTORIZATION: @@ -1349,7 +1349,7 @@ EXPLAIN VECTORIZED SELECT count(c_custkey) from customer_removal_n0 where c_nati group by c_custkey, c_nation; CBO PLAN:HiveProject(_c0=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) - HiveFilter(condition=[IN($4, _UTF-16LE'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($4, 'INDIA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'USA':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_removal_n0]], table:alias=[customer_removal_n0]) PLAN VECTORIZATION: diff --git a/ql/src/test/results/clientpositive/llap/cte_cbo_rewrite_0.q.out b/ql/src/test/results/clientpositive/llap/cte_cbo_rewrite_0.q.out index a3bf50d1cde9..749e573b0368 100644 --- a/ql/src/test/results/clientpositive/llap/cte_cbo_rewrite_0.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_cbo_rewrite_0.q.out @@ -333,7 +333,7 @@ HiveProject(name=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(name=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(name=[$0], _o__c1=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], _o__c1=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -343,7 +343,7 @@ HiveProject(name=[$0], _c1=[$1]) HiveProject(deptno=[$0], name=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, depts]], table:alias=[d]) - HiveProject(name=[$0], _o__c1=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], _o__c1=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -665,7 +665,7 @@ HiveProject(name=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(name=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(name=[$0], _o__c1=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], _o__c1=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) HiveProject(name=[$0], $f1=[$1], $f2=[$2]) @@ -677,7 +677,7 @@ HiveProject(name=[$0], _c1=[$1]) HiveProject(deptno=[$0], name=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, depts]], table:alias=[d]) - HiveProject(name=[$0], _o__c1=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], _o__c1=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) @@ -720,7 +720,7 @@ POSTHOOK: Input: default@emps CBO PLAN: HiveProject(summary.name=[$0], summary.salary_range=[$1]) HiveAggregate(group=[{0, 1}]) - HiveProject(name=[$0], salary_range=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], salary_range=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -806,7 +806,7 @@ POSTHOOK: Input: default@emps CBO PLAN: HiveProject(summary.name=[$0], summary.salary_range=[$1]) HiveAggregate(group=[{0, 1}]) - HiveProject(name=[$0], salary_range=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(name=[$0], salary_range=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/llap/cte_join.q.out b/ql/src/test/results/clientpositive/llap/cte_join.q.out index 5087ac897668..0373a9d976a7 100644 --- a/ql/src/test/results/clientpositive/llap/cte_join.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_join.q.out @@ -134,7 +134,7 @@ CBO PLAN: HiveProject(s.a=[$0], t1.a=[$1], t1.b=[$2]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(a=[$0]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'c'), IS NOT NULL($0))]) + HiveFilter(condition=[AND(=($1, 'c'), IS NOT NULL($0))]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) HiveProject(a=[$0], b=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_12.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_12.q.out index e72b749978ea..c4b6ff9a3e78 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_12.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_12.q.out @@ -66,10 +66,10 @@ HiveProject(_c0=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(_o__c0=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(_o__c0=[$1], _o__c1=[_UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(_o__c0=[$1], _o__c1=['A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveAggregate(group=[{1}], agg#0=[count()]) HiveTableScan(table=[[default, emps]], table:alias=[e]) - HiveProject(_o__c0=[$1], _o__c1=[_UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(_o__c0=[$1], _o__c1=['B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveAggregate(group=[{1}], agg#0=[count()]) HiveTableScan(table=[[default, emps]], table:alias=[e]) @@ -149,12 +149,12 @@ HiveProject(_c0=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(_o__c0=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(_o__c0=[$1], _o__c1=[_UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(_o__c0=[$1], _o__c1=['A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) HiveProject(deptno=[$0], $f1=[$1]) HiveAggregate(group=[{1}], agg#0=[count()]) HiveTableScan(table=[[default, emps]], table:alias=[e]) - HiveProject(_o__c0=[$1], _o__c1=[_UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(_o__c0=[$1], _o__c1=['B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) PREHOOK: query: EXPLAIN CBO diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_type.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_type.q.out index 2ffb09e431fc..0bf4bea932bb 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_type.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_type.q.out @@ -73,10 +73,10 @@ HiveProject(d_name=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(d_name=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=($1, 100000:DECIMAL(6, 0))]) HiveTableScan(table=[[default, dept_avg]], table:alias=[da]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<($1, 100000:DECIMAL(6, 0))]) HiveTableScan(table=[[default, dept_avg]], table:alias=[da]) @@ -123,7 +123,7 @@ HiveProject(d_name=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(d_name=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) HiveProject(name=[$0], $f1=[$1], $f2=[$2]) @@ -135,7 +135,7 @@ HiveProject(d_name=[$0], _c1=[$1]) HiveProject(deptno=[$0], name=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, depts]], table:alias=[d]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) @@ -180,7 +180,7 @@ HiveProject(d_name=[$0], _c1=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(d_name=[$0], _o__c1=[$1]) HiveUnion(all=[true]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['HIGH':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[>=(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -190,7 +190,7 @@ HiveProject(d_name=[$0], _c1=[$1]) HiveProject(deptno=[$0], name=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, depts]], table:alias=[d]) - HiveProject(d_name=[$0], _o__c1=[_UTF-16LE'LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveProject(d_name=[$0], _o__c1=['LOW':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveFilter(condition=[<(CAST(/($1, $2)):DECIMAL(12, 6), 100000:DECIMAL(6, 0))]) HiveAggregate(group=[{3}], agg#0=[sum($1)], agg#1=[count($1)]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/llap/distribution_key_constant_value.q.out b/ql/src/test/results/clientpositive/llap/distribution_key_constant_value.q.out index 3c078bedea21..c001a812d19b 100644 --- a/ql/src/test/results/clientpositive/llap/distribution_key_constant_value.q.out +++ b/ql/src/test/results/clientpositive/llap/distribution_key_constant_value.q.out @@ -22,7 +22,7 @@ POSTHOOK: Input: default@test #### A masked pattern was here #### CBO PLAN: HiveSortExchange(distribution=[hash[0]], collation=[[]]) - HiveProject(col1=[$0], col2=[CAST(_UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($1, _UTF-16LE'a')]) + HiveProject(col1=[$0], col2=[CAST('a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($1, 'a')]) HiveTableScan(table=[[default, test]], table:alias=[test]) diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out b/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out index 871af16b4fef..ab29e56fe7a9 100644 --- a/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out +++ b/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out @@ -157,7 +157,7 @@ POSTHOOK: Input: default@mv1 POSTHOOK: Input: default@person #### A masked pattern was here #### CBO PLAN: -HiveProject(person.id=[$0], person.name=[$1], person.jid=[$2], person.cid=[$3], job.id=[$4], job.title=[CAST(_UTF-16LE'Software Engineer':VARCHAR(20) CHARACTER SET "UTF-16LE"):VARCHAR(20) CHARACTER SET "UTF-16LE"], country.id=[$5], country.name=[$6]) +HiveProject(person.id=[$0], person.name=[$1], person.jid=[$2], person.cid=[$3], job.id=[$4], job.title=[CAST('Software Engineer':VARCHAR(20) CHARACTER SET "UTF-16LE"):VARCHAR(20) CHARACTER SET "UTF-16LE"], country.id=[$5], country.name=[$6]) HiveJoin(condition=[=($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(id=[$0], name=[$1], jid=[$2], cid=[$3]) diff --git a/ql/src/test/results/clientpositive/llap/filter_emptyliteral.q.out b/ql/src/test/results/clientpositive/llap/filter_emptyliteral.q.out index c30b5e152eef..94c0f4226a35 100644 --- a/ql/src/test/results/clientpositive/llap/filter_emptyliteral.q.out +++ b/ql/src/test/results/clientpositive/llap/filter_emptyliteral.q.out @@ -16,7 +16,7 @@ POSTHOOK: Input: default@employee #### A masked pattern was here #### CBO PLAN: HiveProject(id=[$2]) - HiveFilter(condition=[=($0, _UTF-16LE'')]) + HiveFilter(condition=[=($0, '')]) HiveTableScan(table=[[default, employee]], table:alias=[employee]) PREHOOK: query: explain cbo SELECT id FROM employee where lastname = '' @@ -29,6 +29,6 @@ POSTHOOK: Input: default@employee #### A masked pattern was here #### CBO PLAN: HiveProject(id=[$2]) - HiveFilter(condition=[=($1, _UTF-16LE' ')]) + HiveFilter(condition=[=($1, ' ')]) HiveTableScan(table=[[default, employee]], table:alias=[employee]) diff --git a/ql/src/test/results/clientpositive/llap/groupby13.q.out b/ql/src/test/results/clientpositive/llap/groupby13.q.out index d7c3ff6ebb38..c390221e2645 100644 --- a/ql/src/test/results/clientpositive/llap/groupby13.q.out +++ b/ql/src/test/results/clientpositive/llap/groupby13.q.out @@ -129,8 +129,8 @@ POSTHOOK: Input: default@agby CBO PLAN: HiveProject(_c0=[$1]) HiveAggregate(group=[{0}], agg#0=[min($0)]) - HiveProject($f0=[CAST(_UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($1, _UTF-16LE'a')]) + HiveProject($f0=[CAST('a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($1, 'a')]) HiveTableScan(table=[[default, agby]], table:alias=[agby]) PREHOOK: query: select min(j) from aGBY where j='a' group by j diff --git a/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out b/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out index e3a0c8d590a7..c0b3952f9d2f 100644 --- a/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out +++ b/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out @@ -306,7 +306,7 @@ POSTHOOK: Input: default@ax CBO PLAN: HiveProject(_c0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) - HiveFilter(condition=[IN($1, _UTF-16LE'a ', _UTF-16LE'bb ', _UTF-16LE'aa ', _UTF-16LE'bbb ', _UTF-16LE'ab ', _UTF-16LE'ba ', _UTF-16LE'aaa ', _UTF-16LE'bbb ', _UTF-16LE'abc ', _UTF-16LE'bc ', _UTF-16LE'ac ', _UTF-16LE'bca ', _UTF-16LE'cab ', _UTF-16LE'cb ', _UTF-16LE'ca ', _UTF-16LE'cbc ', _UTF-16LE'z ')]) + HiveFilter(condition=[IN($1, 'a ', 'bb ', 'aa ', 'bbb ', 'ab ', 'ba ', 'aaa ', 'bbb ', 'abc ', 'bc ', 'ac ', 'bca ', 'cab ', 'cb ', 'ca ', 'cbc ', 'z ')]) HiveTableScan(table=[[default, ax]], table:alias=[ax]) PREHOOK: query: explain select count(*) from ax where t in @@ -390,7 +390,7 @@ POSTHOOK: Input: default@ax CBO PLAN: HiveProject(_c0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) - HiveFilter(condition=[IN($1, _UTF-16LE'a', _UTF-16LE'aa', _UTF-16LE'aaa', _UTF-16LE'ab', _UTF-16LE'abc', _UTF-16LE'ac', _UTF-16LE'ba', _UTF-16LE'bb', _UTF-16LE'bbb', _UTF-16LE'bc', _UTF-16LE'bca', _UTF-16LE'ca', _UTF-16LE'cab', _UTF-16LE'cb', _UTF-16LE'cbc', _UTF-16LE'z')]) + HiveFilter(condition=[IN($1, 'a', 'aa', 'aaa', 'ab', 'abc', 'ac', 'ba', 'bb', 'bbb', 'bc', 'bca', 'ca', 'cab', 'cb', 'cbc', 'z')]) HiveTableScan(table=[[default, ax]], table:alias=[ax]) PREHOOK: query: explain select count(*) from ax where t in diff --git a/ql/src/test/results/clientpositive/llap/jdbc_project_pushdown.q.out b/ql/src/test/results/clientpositive/llap/jdbc_project_pushdown.q.out index d3eb7a8cf7f4..5acc9c3a2106 100644 --- a/ql/src/test/results/clientpositive/llap/jdbc_project_pushdown.q.out +++ b/ql/src/test/results/clientpositive/llap/jdbc_project_pushdown.q.out @@ -83,7 +83,7 @@ HiveProject(id=[$0]) HiveProject(id=[$0]) HiveJdbcConverter(convention=[JDBC.POSTGRES]) JdbcProject(id=[$0]) - JdbcFilter(condition=[=(SUBSTRING($1, 0, 4), _UTF-16LE'Les')]) + JdbcFilter(condition=[=(SUBSTRING($1, 0, 4), 'Les')]) JdbcProject(id=[$0], title=[$1]) JdbcHiveTableScan(table=[[default, book]], table:alias=[book]) @@ -137,7 +137,7 @@ POSTHOOK: Input: default@book #### A masked pattern was here #### CBO PLAN: HiveProject(id=[$0]) - HiveFilter(condition=[=(CAST(ucase($1)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'LES MISERABLES')]) + HiveFilter(condition=[=(CAST(ucase($1)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'LES MISERABLES')]) HiveProject(id=[$0], title=[$1]) HiveJdbcConverter(convention=[JDBC.POSTGRES]) JdbcProject(id=[$0], title=[$1]) @@ -281,7 +281,7 @@ CBO PLAN: HiveProject(book.title=[$0], author.fname=[$3]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(title=[$0], author=[$1]) - HiveFilter(condition=[=(CAST(ucase($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'LES MISERABLES')]) + HiveFilter(condition=[=(CAST(ucase($0)):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'LES MISERABLES')]) HiveProject(title=[$0], author=[$1]) HiveJdbcConverter(convention=[JDBC.POSTGRES]) JdbcFilter(condition=[IS NOT NULL($1)]) @@ -290,7 +290,7 @@ HiveProject(book.title=[$0], author.fname=[$3]) HiveProject(id=[$0], fname=[$1]) HiveJdbcConverter(convention=[JDBC.POSTGRES]) JdbcProject(id=[$0], fname=[$1]) - JdbcFilter(condition=[AND(=(SUBSTRING($2, 0, 4), _UTF-16LE'Hug'), IS NOT NULL($0))]) + JdbcFilter(condition=[AND(=(SUBSTRING($2, 0, 4), 'Hug'), IS NOT NULL($0))]) JdbcHiveTableScan(table=[[default, author]], table:alias=[author]) PREHOOK: query: explain select book.title, author.fname from book join author diff --git a/ql/src/test/results/clientpositive/llap/jdbc_table_dml_postgres.q.out b/ql/src/test/results/clientpositive/llap/jdbc_table_dml_postgres.q.out index ff176beec780..786f0cbfeaf9 100644 --- a/ql/src/test/results/clientpositive/llap/jdbc_table_dml_postgres.q.out +++ b/ql/src/test/results/clientpositive/llap/jdbc_table_dml_postgres.q.out @@ -43,7 +43,7 @@ POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@country CBO PLAN: HiveProject(col1=[$0], col2=[$1]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(8, _UTF-16LE'Hungary':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(8, 'Hungary':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: EXPLAIN INSERT INTO country VALUES (8, 'Hungary') diff --git a/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out b/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out index 762801321efb..77816b1ad272 100644 --- a/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out +++ b/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out @@ -54,7 +54,7 @@ POSTHOOK: Input: default@simple_table #### A masked pattern was here #### CBO PLAN: HiveProject(tf.col1=[$6], tf.col2=[$7], tf.col3=[$8]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW($0, $1, $2, $3, $4, $5, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, $0), ROW($0, $1, $2, $3, $4, $5, _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, $0)))], rowType=[RecordType(VARCHAR(2147483647) col, VARCHAR(2147483647) ARRAY array_col, BIGINT BLOCK__OFFSET__INSIDE__FILE, VARCHAR(2147483647) INPUT__FILE__NAME, RecordType(BIGINT writeid, INTEGER bucketid, BIGINT rowid) ROW__ID, BOOLEAN ROW__IS__DELETED, VARCHAR(2147483647) tf.col1, INTEGER tf.col2, VARCHAR(2147483647) tf.col3)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW($0, $1, $2, $3, $4, $5, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, $0), ROW($0, $1, $2, $3, $4, $5, 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, $0)))], rowType=[RecordType(VARCHAR(2147483647) col, VARCHAR(2147483647) ARRAY array_col, BIGINT BLOCK__OFFSET__INSIDE__FILE, VARCHAR(2147483647) INPUT__FILE__NAME, RecordType(BIGINT writeid, INTEGER bucketid, BIGINT rowid) ROW__ID, BOOLEAN ROW__IS__DELETED, VARCHAR(2147483647) tf.col1, INTEGER tf.col2, VARCHAR(2147483647) tf.col3)]) HiveTableScan(table=[[default, simple_table]], table:alias=[simple_table]) PREHOOK: query: EXPLAIN CBO SELECT myTable.myCol FROM simple_table @@ -92,7 +92,7 @@ HiveProject(mycol=[$6]) HiveProject(col=[$0], array_col=[$1], BLOCK__OFFSET__INSIDE__FILE=[$2], INPUT__FILE__NAME=[$3], ROW__ID=[$4], ROW__IS__DELETED=[$5], mytable.mycol=[$6]) HiveTableFunctionScan(invocation=[LATERAL(explode(ARRAY(1, 2, 3)), $0, $1, $2, $3, $4, $5)], rowType=[RecordType(VARCHAR(2147483647) col, VARCHAR(2147483647) ARRAY array_col, BIGINT BLOCK__OFFSET__INSIDE__FILE, VARCHAR(2147483647) INPUT__FILE__NAME, RecordType(BIGINT writeid, INTEGER bucketid, BIGINT rowid) ROW__ID, BOOLEAN ROW__IS__DELETED, INTEGER mytable.mycol)]) HiveProject(col=[$0], array_col=[$1], BLOCK__OFFSET__INSIDE__FILE=[$2], INPUT__FILE__NAME=[$3], ROW__ID=[$4], ROW__IS__DELETED=[$5]) - HiveFilter(condition=[=($0, _UTF-16LE'0')]) + HiveFilter(condition=[=($0, '0')]) HiveTableScan(table=[[default, simple_table]], table:alias=[simple_table]) PREHOOK: query: EXPLAIN CBO SELECT myCol FROM simple_table diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_3.q.out index e688639a0f5e..28c46fdc7349 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_3.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_3.q.out @@ -32,8 +32,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(t1.col0=[CAST(_UTF-16LE'FOO':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($0, _UTF-16LE'FOO')]) +HiveProject(t1.col0=[CAST('FOO':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($0, 'FOO')]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: explain cbo diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_4.q.out index 977a822cecb1..784e6d379bb2 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_4.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_by_text_4.q.out @@ -66,8 +66,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: -HiveProject(t1.col0=[CAST(_UTF-16LE'foo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($0, _UTF-16LE'foo')]) +HiveProject(t1.col0=[CAST('foo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($0, 'foo')]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) PREHOOK: query: ALTER MATERIALIZED VIEW mat1 REBUILD diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out index 16f331beb008..30e6cd56edeb 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out @@ -822,7 +822,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$0], p_brand1=[$1]) HiveAggregate(group=[{4, 9}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($10, _UTF-16LE'MFGR#12'), =($14, _UTF-16LE'AMERICA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($10, 'MFGR#12'), =($14, 'AMERICA'))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -873,7 +873,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$0], p_brand1=[$1]) HiveAggregate(group=[{4, 9}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $9, _UTF-16LE'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($14, _UTF-16LE'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $9, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($14, 'ASIA'))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -921,11 +921,11 @@ POSTHOOK: Input: default@ssb_part_n3 POSTHOOK: Input: default@supplier_n3 #### A masked pattern was here #### CBO PLAN: -HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST(_UTF-16LE'MFGR#2239':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) +HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST('MFGR#2239':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveSortLimit(sort0=[$1], dir0=[ASC]) HiveProject(lo_revenue=[$1], d_year=[$0]) HiveAggregate(group=[{4}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($9, _UTF-16LE'MFGR#2239'), =($14, _UTF-16LE'EUROPE'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($9, 'MFGR#2239'), =($14, 'EUROPE'))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -980,7 +980,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_nation=[$0], s_nation=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{1, 4, 13}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($2, _UTF-16LE'ASIA'), =($14, _UTF-16LE'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($2, 'ASIA'), =($14, 'ASIA'))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1033,7 +1033,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_city=[$0], s_city=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{0, 4, 12}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($1, _UTF-16LE'UNITED STATES'), =($13, _UTF-16LE'UNITED STATES'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($1, 'UNITED STATES'), =($13, 'UNITED STATES'))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1086,7 +1086,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_city=[$0], s_city=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{0, 4, 12}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), IN($0, _UTF-16LE'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IN($12, _UTF-16LE'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), IN($0, 'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IN($12, 'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1139,7 +1139,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_city=[$0], s_city=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{0, 4, 12}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($5, _UTF-16LE'Dec1997'), IN($0, _UTF-16LE'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IN($12, _UTF-16LE'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($5, 'Dec1997'), IN($0, 'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IN($12, 'UNITED KI1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'UNITED KI5':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1198,7 +1198,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC]) HiveProject(d_year=[$1], c_nation=[$0], profit=[$2]) HiveAggregate(group=[{1, 4}], agg#0=[sum($17)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, _UTF-16LE'AMERICA'), =($14, _UTF-16LE'AMERICA'), IN($11, _UTF-16LE'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'AMERICA'), =($14, 'AMERICA'), IN($11, 'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1259,7 +1259,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC]) HiveProject(d_year=[$0], s_nation=[$2], p_category=[$1], profit=[$3]) HiveAggregate(group=[{4, 10, 13}], agg#0=[sum($17)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, _UTF-16LE'AMERICA'), =($14, _UTF-16LE'AMERICA'), IN($4, 1997, 1998), IN($11, _UTF-16LE'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'AMERICA'), =($14, 'AMERICA'), IN($4, 1997, 1998), IN($11, 'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1320,7 +1320,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC]) HiveProject(d_year=[$0], s_city=[$2], p_brand1=[$1], profit=[$3]) HiveAggregate(group=[{4, 9, 12}], agg#0=[sum($17)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, _UTF-16LE'AMERICA'), =($10, _UTF-16LE'MFGR#14'), =($13, _UTF-16LE'UNITED STATES'), IN($4, 1997, 1998))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'AMERICA'), =($10, 'MFGR#14'), =($13, 'UNITED STATES'), IN($4, 1997, 1998))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: DROP MATERIALIZED VIEW `ssb_mv_n3` diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out index 7d4a3dd58be6..220e6c63f519 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out @@ -668,7 +668,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$1], p_brand1=[$0]) HiveAggregate(group=[{0, 7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($1, _UTF-16LE'MFGR#12'), =($4, _UTF-16LE'AMERICA'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($1, 'MFGR#12'), =($4, 'AMERICA'))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: explain cbo @@ -719,7 +719,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$1], p_brand1=[$0]) HiveAggregate(group=[{0, 7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), BETWEEN(false, $0, _UTF-16LE'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($4, _UTF-16LE'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), BETWEEN(false, $0, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($4, 'ASIA'))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: explain cbo @@ -767,11 +767,11 @@ POSTHOOK: Input: default@ssb_part_n4 POSTHOOK: Input: default@supplier_n4 #### A masked pattern was here #### CBO PLAN: -HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST(_UTF-16LE'MFGR#2239':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) +HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST('MFGR#2239':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) HiveSortLimit(sort0=[$1], dir0=[ASC]) HiveProject(lo_revenue=[$1], d_year=[$0]) HiveAggregate(group=[{7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($0, _UTF-16LE'MFGR#2239'), =($4, _UTF-16LE'EUROPE'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($0, 'MFGR#2239'), =($4, 'EUROPE'))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: DROP MATERIALIZED VIEW `ssb_mv_n4` diff --git a/ql/src/test/results/clientpositive/llap/multi_in_clause.q.out b/ql/src/test/results/clientpositive/llap/multi_in_clause.q.out index 3bf26bd97d67..102d84d7db6b 100644 --- a/ql/src/test/results/clientpositive/llap/multi_in_clause.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_in_clause.q.out @@ -82,7 +82,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@very_simple_table_for_in_test #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[AND(null, IS NULL($0), IN($1, _UTF-16LE'x':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) +HiveProject(_c0=[AND(null, IS NULL($0), IN($1, 'x':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, very_simple_table_for_in_test]], table:alias=[very_simple_table_for_in_test]) PREHOOK: query: select name IN('g','r') AND name IN('a','b') AND othername IN('x', 'y') from very_simple_table_for_in_test diff --git a/ql/src/test/results/clientpositive/llap/order_by_expr_2.q.out b/ql/src/test/results/clientpositive/llap/order_by_expr_2.q.out index b58039a7f752..e5c6516fcfe8 100644 --- a/ql/src/test/results/clientpositive/llap/order_by_expr_2.q.out +++ b/ql/src/test/results/clientpositive/llap/order_by_expr_2.q.out @@ -141,7 +141,7 @@ HiveProject(c0=[$0], c1=[$1], c2=[$2]) HiveSortLimit(sort0=[$3], dir0=[ASC]) HiveProject(c0=[$0], c1=[$1], c2=[$2], (tok_function when (= (tok_table_or_col store_name) 'HQ') tok_null (tok_table_or_col store_name))=[$1]) HiveAggregate(group=[{0, 1, 2}]) - HiveProject($f0=[$0], $f1=[CASE(=($0, _UTF-16LE'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) + HiveProject($f0=[$0], $f1=[CASE(=($0, 'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) PREHOOK: query: select store.store_name as c0, case store_name when 'HQ' then null else store_name end as c1, @@ -183,9 +183,9 @@ POSTHOOK: Input: default@store CBO PLAN: HiveProject(c0=[$0], c1=[$1], c2=[$2]) HiveSortLimit(sort0=[$3], dir0=[ASC]) - HiveProject(c0=[$0], c1=[$1], c2=[$2], (tok_function when (= (tok_table_or_col store_name) 'hq') tok_null (tok_table_or_col store_name))0=[CASE(=($0, _UTF-16LE'hq'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)]) + HiveProject(c0=[$0], c1=[$1], c2=[$2], (tok_function when (= (tok_table_or_col store_name) 'hq') tok_null (tok_table_or_col store_name))0=[CASE(=($0, 'hq'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)]) HiveAggregate(group=[{0, 1, 2}]) - HiveProject($f0=[$0], $f1=[CASE(=($0, _UTF-16LE'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) + HiveProject($f0=[$0], $f1=[CASE(=($0, 'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) PREHOOK: query: select store.store_name as c0, case store_name when 'HQ' then null else store_name end as c1, @@ -228,7 +228,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], dir0=[ASC]) HiveProject(c0=[$0], c1=[$1], c2=[$2]) HiveAggregate(group=[{0, 1, 2}]) - HiveProject($f0=[$0], $f1=[CASE(=($0, _UTF-16LE'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) + HiveProject($f0=[$0], $f1=[CASE(=($0, 'HQ'), null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], $f2=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) PREHOOK: query: select store.store_name as c0, case store_name when 'HQ' then null else store_name end as c1, diff --git a/ql/src/test/results/clientpositive/llap/partition_explain_ddl.q.out b/ql/src/test/results/clientpositive/llap/partition_explain_ddl.q.out index 86a09dc3e301..b46a36a51793 100644 --- a/ql/src/test/results/clientpositive/llap/partition_explain_ddl.q.out +++ b/ql/src/test/results/clientpositive/llap/partition_explain_ddl.q.out @@ -162,8 +162,8 @@ EXPLAIN CBO select * from add_part_test where ds='2010-01-01'; EXPLAIN VECTORIZED select * from add_part_test where ds='2010-01-01'; -CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[CAST(_UTF-16LE'2010-01-01':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($2, _UTF-16LE'2010-01-01')]) +CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[CAST('2010-01-01':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($2, '2010-01-01')]) HiveTableScan(table=[[default, add_part_test]], table:alias=[add_part_test]) PLAN VECTORIZATION: @@ -289,7 +289,7 @@ EXPLAIN CBO select * from add_part_test where ds>='2010-01-01'; EXPLAIN VECTORIZED select * from add_part_test where ds>='2010-01-01'; CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[$2]) - HiveFilter(condition=[>=($2, _UTF-16LE'2010-01-01')]) + HiveFilter(condition=[>=($2, '2010-01-01')]) HiveTableScan(table=[[default, add_part_test]], table:alias=[add_part_test]) PLAN VECTORIZATION: @@ -436,8 +436,8 @@ EXPLAIN CBO select * from add_part_test_db.add_part_test where ds='2010-01-01'; EXPLAIN VECTORIZED select * from add_part_test_db.add_part_test where ds='2010-01-01'; -CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[CAST(_UTF-16LE'2010-01-01':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($2, _UTF-16LE'2010-01-01')]) +CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[CAST('2010-01-01':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($2, '2010-01-01')]) HiveTableScan(table=[[add_part_test_db, add_part_test]], table:alias=[add_part_test]) PLAN VECTORIZATION: @@ -563,7 +563,7 @@ EXPLAIN CBO select * from add_part_test_db.add_part_test where ds>='2010-01-01'; EXPLAIN VECTORIZED select * from add_part_test_db.add_part_test where ds>='2010-01-01'; CBO PLAN:HiveProject(add_part_test.key=[$0], add_part_test.value=[$1], add_part_test.ds=[$2]) - HiveFilter(condition=[>=($2, _UTF-16LE'2010-01-01')]) + HiveFilter(condition=[>=($2, '2010-01-01')]) HiveTableScan(table=[[add_part_test_db, add_part_test]], table:alias=[add_part_test]) PLAN VECTORIZATION: diff --git a/ql/src/test/results/clientpositive/llap/pointlookup6.q.out b/ql/src/test/results/clientpositive/llap/pointlookup6.q.out index 10d99588a0ce..271e8217f0b0 100644 --- a/ql/src/test/results/clientpositive/llap/pointlookup6.q.out +++ b/ql/src/test/results/clientpositive/llap/pointlookup6.q.out @@ -58,10 +58,10 @@ CBO PLAN: HiveProject(l_table.string_col=[$0]) HiveJoin(condition=[=($1, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(string_col=[$0]) - HiveFilter(condition=[IN($0, _UTF-16LE'AAA111':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'BBB222':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($0, 'AAA111':VARCHAR(30) CHARACTER SET "UTF-16LE", 'BBB222':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, l_table]], table:alias=[l_table]) HiveProject(string_col=[$0]) - HiveFilter(condition=[IN($0, _UTF-16LE'AAA111':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'BBB222':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($0, 'AAA111':VARCHAR(30) CHARACTER SET "UTF-16LE", 'BBB222':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, r_table]], table:alias=[r_table]) PREHOOK: query: SELECT l_table.string_col from l_table, r_table diff --git a/ql/src/test/results/clientpositive/llap/subquery_in_invalid_intermediate_plan.q.out b/ql/src/test/results/clientpositive/llap/subquery_in_invalid_intermediate_plan.q.out index b703c09d4941..8c5ea40d8e60 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_in_invalid_intermediate_plan.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_in_invalid_intermediate_plan.q.out @@ -16,10 +16,10 @@ CBO PLAN: HiveProject(b.key=[$0], b.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[semi]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>($0, _UTF-16LE'9'), IS NOT NULL($1))]) + HiveFilter(condition=[AND(>($0, '9'), IS NOT NULL($1))]) HiveTableScan(table=[[default, src]], table:alias=[b]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>($0, _UTF-16LE'9'), IS NOT NULL($1))]) + HiveFilter(condition=[AND(>($0, '9'), IS NOT NULL($1))]) HiveTableScan(table=[[default, src]], table:alias=[a]) PREHOOK: query: explain cbo @@ -179,7 +179,7 @@ HiveProject(b.key=[$0], b.value=[$1]) HiveTableScan(table=[[default, src]], table:alias=[b]) HiveProject(key=[$0], key0=[$0]) HiveAggregate(group=[{0}]) - HiveFilter(condition=[>($0, _UTF-16LE'9')]) + HiveFilter(condition=[>($0, '9')]) HiveTableScan(table=[[default, src]], table:alias=[a]) PREHOOK: query: select * diff --git a/ql/src/test/results/clientpositive/llap/subquery_nested_expressions.q.out b/ql/src/test/results/clientpositive/llap/subquery_nested_expressions.q.out index b60245997a9c..e7217415b441 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_nested_expressions.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_nested_expressions.q.out @@ -29,8 +29,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t0 #### A masked pattern was here #### CBO PLAN: -HiveProject(x4=[CAST(_UTF-16LE'Something':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=(concat_ws(_UTF-16LE'L4':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws(_UTF-16LE'L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws(_UTF-16LE'L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws(_UTF-16LE'L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0))), _UTF-16LE'Something')]) - HiveProject(x1=[concat_ws(_UTF-16LE'L1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws(_UTF-16LE'L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws(_UTF-16LE'L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0))]) +HiveProject(x4=[CAST('Something':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=(concat_ws('L4':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws('L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws('L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0)), concat_ws('L3':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0))), 'Something')]) + HiveProject(x1=[concat_ws('L1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", concat_ws('L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0), concat_ws('L0':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0, $0, $0, $0))]) HiveTableScan(table=[[default, t0]], table:alias=[t0]) diff --git a/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out b/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out index 6c71bc5f88b1..4589512ffc33 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out @@ -1484,7 +1484,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@tschema #### A masked pattern was here #### CBO PLAN: -HiveProject(eid=[_UTF-16LE'empno':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], a.id=[$0]) +HiveProject(eid=['empno':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], a.id=[$0]) HiveAggregate(group=[{0}]) HiveAntiJoin(condition=[=($0, $2)], joinType=[anti]) HiveProject(id=[$0]) 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 705bdbb07312..a7010825c135 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 @@ -155,24 +155,24 @@ HiveProject(o.u=[$0], n.u=[$1]) HiveAggregate(group=[{0}]) HiveJoin(condition=[AND(=($1, $3), IS NOT DISTINCT FROM($2, $4))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(u=[$0], t=[$1], st=[$2]) - HiveFilter(condition=[AND(>=($3, _UTF-16LE'2014-03-04'), <($3, _UTF-16LE'2014-09-03'), <>($0, 0), IS NOT NULL($1))]) + HiveFilter(condition=[AND(>=($3, '2014-03-04'), <($3, '2014-09-03'), <>($0, 0), IS NOT NULL($1))]) HiveTableScan(table=[[default, x_n3]], table:alias=[x_n3]) HiveProject(t=[$0], st=[$1]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, v_n15]], table:alias=[v_n15]) HiveProject($f0=[$0]) - HiveFilter(condition=[<=($1, _UTF-16LE'2014-09-02')]) + HiveFilter(condition=[<=($1, '2014-09-02')]) HiveAggregate(group=[{0}], agg#0=[min($1)]) HiveProject(u=[$0], date=[$1]) HiveUnion(all=[true]) HiveProject(u=[$0], date=[$3]) - HiveFilter(condition=[AND(<($3, _UTF-16LE'2014-09-02'), <>($0, 0))]) + HiveFilter(condition=[AND(<($3, '2014-09-02'), <>($0, 0))]) HiveTableScan(table=[[default, x_n3]], table:alias=[x_n3]) HiveProject(u=[$0], date=[$1]) - HiveFilter(condition=[AND(<($1, _UTF-16LE'2014-09-02'), <>($0, 0))]) + HiveFilter(condition=[AND(<($1, '2014-09-02'), <>($0, 0))]) HiveTableScan(table=[[default, y_n1]], table:alias=[y_n1]) HiveProject(u=[$0], date=[$1]) - HiveFilter(condition=[AND(<($1, _UTF-16LE'2014-09-02'), <>($0, 0))]) + HiveFilter(condition=[AND(<($1, '2014-09-02'), <>($0, 0))]) HiveTableScan(table=[[default, z_n0]], table:alias=[z_n0]) PREHOOK: query: EXPLAIN diff --git a/ql/src/test/results/clientpositive/llap/udtf_with_unionall.q.out b/ql/src/test/results/clientpositive/llap/udtf_with_unionall.q.out index 8c85be3234f1..7699877a3c47 100644 --- a/ql/src/test/results/clientpositive/llap/udtf_with_unionall.q.out +++ b/ql/src/test/results/clientpositive/llap/udtf_with_unionall.q.out @@ -32,10 +32,10 @@ CBO PLAN: HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$3]) HiveUnion(all=[true]) HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$3]) - HiveTableFunctionScan(invocation=[stack(3, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE, _UTF-16LE'z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2016-01-01:DATE, _UTF-16LE'y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2017-08-09:DATE, _UTF-16LE'x':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2, VARCHAR(2147483647) col3)]) + HiveTableFunctionScan(invocation=[stack(3, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE, 'z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2016-01-01:DATE, 'y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2017-08-09:DATE, 'x':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2, VARCHAR(2147483647) col3)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$3]) - HiveTableFunctionScan(invocation=[stack(3, _UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE, _UTF-16LE'n':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2016-01-01:DATE, _UTF-16LE'm':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2017-08-09:DATE, _UTF-16LE'l':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2, VARCHAR(2147483647) col3)]) + HiveTableFunctionScan(invocation=[stack(3, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE, 'n':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2016-01-01:DATE, 'm':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2017-08-09:DATE, 'l':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2, VARCHAR(2147483647) col3)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: SELECT * FROM (VALUES(1, '1'), (2, 'orange'), (5, 'yellow')) AS Colors1 @@ -83,10 +83,10 @@ CBO PLAN: HiveProject(col1=[$0], col2=[$1]) HiveUnion(all=[true]) HiveProject(col0=[$0], col1=[$1]) - HiveTableFunctionScan(invocation=[stack(2, 10, _UTF-16LE'X':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, _UTF-16LE'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(INTEGER col0, VARCHAR(2147483647) col1)]) + HiveTableFunctionScan(invocation=[stack(2, 10, 'X':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], rowType=[RecordType(INTEGER col0, VARCHAR(2147483647) col1)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) HiveProject(col1=[$0], col2=[$1]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(1, _UTF-16LE'1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(2, _UTF-16LE'orange':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(5, _UTF-16LE'yellow':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(10, _UTF-16LE'green':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(11, _UTF-16LE'blue':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(12, _UTF-16LE'indigo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(20, _UTF-16LE'violet':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(1, '1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(2, 'orange':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(5, 'yellow':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(10, 'green':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(11, 'blue':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(12, 'indigo':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(20, 'violet':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: SELECT INLINE(array(struct('A',10,date '2015-01-01'),struct('B',20,date '2015-02-02'))) @@ -119,7 +119,7 @@ POSTHOOK: Input: _dummy_database@_dummy_table #### A masked pattern was here #### CBO PLAN: HiveProject(col1=[$0], col2=[$1], col3=[$2]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(_UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE), ROW(_UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2015-02-02:DATE), ROW(_UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2016-01-01:DATE), ROW(_UTF-16LE'D':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 40, 2016-02-02:DATE)))], rowType=[RecordType(VARCHAR(2147483647) col1, INTEGER col2, DATE col3)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW('A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE), ROW('B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2015-02-02:DATE), ROW('C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2016-01-01:DATE), ROW('D':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 40, 2016-02-02:DATE)))], rowType=[RecordType(VARCHAR(2147483647) col1, INTEGER col2, DATE col3)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: SELECT INLINE(array(struct('A',10,date '2015-01-01'),struct('B',20,date '2015-02-02'))) @@ -164,9 +164,9 @@ CBO PLAN: HiveProject(col1=[$0], col2=[$1], col3=[$2]) HiveUnion(all=[true]) HiveProject(col0=[$0], col1=[$1], col2=[$2]) - HiveTableFunctionScan(invocation=[stack(2, _UTF-16LE'X':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 50, 2017-01-01:DATE, _UTF-16LE'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 60, 2017-01-01:DATE)], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2)]) + HiveTableFunctionScan(invocation=[stack(2, 'X':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 50, 2017-01-01:DATE, 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 60, 2017-01-01:DATE)], rowType=[RecordType(VARCHAR(2147483647) col0, INTEGER col1, DATE col2)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) HiveProject(col1=[$0], col2=[$1], col3=[$2]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(_UTF-16LE'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE), ROW(_UTF-16LE'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2015-02-02:DATE), ROW(_UTF-16LE'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2016-01-01:DATE), ROW(_UTF-16LE'D':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 40, 2016-02-02:DATE)))], rowType=[RecordType(VARCHAR(2147483647) col1, INTEGER col2, DATE col3)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW('A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 10, 2015-01-01:DATE), ROW('B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 20, 2015-02-02:DATE), ROW('C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 30, 2016-01-01:DATE), ROW('D':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 40, 2016-02-02:DATE)))], rowType=[RecordType(VARCHAR(2147483647) col1, INTEGER col2, DATE col3)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) diff --git a/ql/src/test/results/clientpositive/llap/union_all_filter_transpose_pruned_operands.q.out b/ql/src/test/results/clientpositive/llap/union_all_filter_transpose_pruned_operands.q.out index 9d38e5955f27..fd17094a2f4e 100644 --- a/ql/src/test/results/clientpositive/llap/union_all_filter_transpose_pruned_operands.q.out +++ b/ql/src/test/results/clientpositive/llap/union_all_filter_transpose_pruned_operands.q.out @@ -134,7 +134,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@t #### A masked pattern was here #### CBO PLAN: -HiveProject(t2.a=[CAST(_UTF-16LE'1000':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], t2.b=[$1]) - HiveFilter(condition=[=($0, _UTF-16LE'1000')]) +HiveProject(t2.a=[CAST('1000':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], t2.b=[$1]) + HiveFilter(condition=[=($0, '1000')]) HiveTableScan(table=[[default, t]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/uniontype_cbo.q.out b/ql/src/test/results/clientpositive/llap/uniontype_cbo.q.out index 5f69f735e829..db11f98fc3ed 100644 --- a/ql/src/test/results/clientpositive/llap/uniontype_cbo.q.out +++ b/ql/src/test/results/clientpositive/llap/uniontype_cbo.q.out @@ -29,7 +29,7 @@ POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@utable CBO PLAN: HiveProject(col1=[$0]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(create_union(0, 10, _UTF-16LE'ten':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), ROW(create_union(1, 10, _UTF-16LE'ten':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))))], rowType=[RecordType(RecordType(INTEGER $tag_0, VARCHAR(2147483647) $tag_1) col1)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(create_union(0, 10, 'ten':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), ROW(create_union(1, 10, 'ten':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))))], rowType=[RecordType(RecordType(INTEGER $tag_0, VARCHAR(2147483647) $tag_1) col1)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: INSERT INTO utable values diff --git a/ql/src/test/results/clientpositive/llap/values.q.out b/ql/src/test/results/clientpositive/llap/values.q.out index e4626872c838..f7b446ba9b37 100644 --- a/ql/src/test/results/clientpositive/llap/values.q.out +++ b/ql/src/test/results/clientpositive/llap/values.q.out @@ -72,13 +72,13 @@ Explain CBO PLAN: HiveProject(col1=[$0], col2=[$1]) HiveUnion(all=[true]) - HiveProject(col1=[CAST(_UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col2=[$1]) - HiveFilter(condition=[=($0, _UTF-16LE'a')]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(_UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(_UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(VARCHAR(2147483647) col1, VARCHAR(2147483647) col2)]) + HiveProject(col1=[CAST('a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col2=[$1]) + HiveFilter(condition=[=($0, 'a')]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW('a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW('b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(VARCHAR(2147483647) col1, VARCHAR(2147483647) col2)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) - HiveProject(col1=[CAST(_UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col2=[$1]) - HiveFilter(condition=[=($0, _UTF-16LE'b')]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(_UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW(_UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(VARCHAR(2147483647) col1, VARCHAR(2147483647) col2)]) + HiveProject(col1=[CAST('b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col2=[$1]) + HiveFilter(condition=[=($0, 'b')]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW('a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ROW('b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))], rowType=[RecordType(VARCHAR(2147483647) col1, VARCHAR(2147483647) col2)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: WITH t1 AS (VALUES('a', 'b'), ('b', 'c')) @@ -121,13 +121,13 @@ CBO PLAN: HiveProject(col1=[$0], col2=[$1], col3=[null:NULL], col4=[$2]) HiveUnion(all=[true]) HiveProject(col1=[$0], col2=[$1], col4=[$3]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(1, _UTF-16LE'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 10:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(1, 'a':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 10:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) HiveProject(col1=[$0], col2=[$1], col4=[$3]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(2, _UTF-16LE'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 20:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(2, 'b':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 20:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) HiveProject(col1=[$0], col2=[$1], col4=[$3]) - HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(3, _UTF-16LE'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 30:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) + HiveTableFunctionScan(invocation=[inline(ARRAY(ROW(3, 'c':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", null:NULL, 30:DECIMAL(2, 0))))], rowType=[RecordType(INTEGER col1, VARCHAR(2147483647) col2, NULL col3, DECIMAL(2, 0) col4)]) HiveTableScan(table=[[_dummy_database, _dummy_table]], table:alias=[_dummy_table]) PREHOOK: query: VALUES(1, 'a', NULL, 10.0) diff --git a/ql/src/test/results/clientpositive/llap/view_top_relnode_not_project_authorization.q.out b/ql/src/test/results/clientpositive/llap/view_top_relnode_not_project_authorization.q.out index 67e76bd6d451..9ecd2525ba68 100644 --- a/ql/src/test/results/clientpositive/llap/view_top_relnode_not_project_authorization.q.out +++ b/ql/src/test/results/clientpositive/llap/view_top_relnode_not_project_authorization.q.out @@ -84,7 +84,7 @@ POSTHOOK: Input: default@vw_t2 #### A masked pattern was here #### CBO PLAN: HiveProject(vw_t2.username=[$0]) - HiveFilter(condition=[>($0, _UTF-16LE'a')]) + HiveFilter(condition=[>($0, 'a')]) HiveProject(username=[$0]) HiveSortLimit(fetch=[1]) HiveProject(username=[$0]) diff --git a/ql/src/test/results/clientpositive/llap/windowing_distinct.q.out b/ql/src/test/results/clientpositive/llap/windowing_distinct.q.out index da8db2ccaccd..8bbe75873f67 100644 --- a/ql/src/test/results/clientpositive/llap/windowing_distinct.q.out +++ b/ql/src/test/results/clientpositive/llap/windowing_distinct.q.out @@ -77,7 +77,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@windowing_distinct #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[count(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[count(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[count(DISTINCT $7) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[count(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[count(DISTINCT ||(_UTF-16LE'Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[count(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c6=[count(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c7=[count(DISTINCT $11) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) +HiveProject(_c0=[count(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[count(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[count(DISTINCT $7) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[count(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[count(DISTINCT ||('Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[count(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c6=[count(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c7=[count(DISTINCT $11) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveTableScan(table=[[default, windowing_distinct]], table:alias=[windowing_distinct]) PREHOOK: query: EXPLAIN VECTORIZATION @@ -299,7 +299,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@windowing_distinct #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[sum(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[sum(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[sum(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[sum(DISTINCT ||(_UTF-16LE'Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[sum(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[sum(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) +HiveProject(_c0=[sum(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[sum(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[sum(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[sum(DISTINCT ||('Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[sum(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[sum(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveTableScan(table=[[default, windowing_distinct]], table:alias=[windowing_distinct]) PREHOOK: query: EXPLAIN VECTORIZATION @@ -498,7 +498,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@windowing_distinct #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[avg(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[avg(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[avg(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[avg(DISTINCT ||(_UTF-16LE'Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[avg(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[avg(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) +HiveProject(_c0=[avg(DISTINCT $1) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c1=[avg(DISTINCT $6) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c2=[avg(DISTINCT $8) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c3=[avg(DISTINCT ||('Mr.':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $8)) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c4=[avg(DISTINCT $9) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], _c5=[avg(DISTINCT $10) OVER (PARTITION BY $0 ORDER BY $0 NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveTableScan(table=[[default, windowing_distinct]], table:alias=[windowing_distinct]) PREHOOK: query: EXPLAIN VECTORIZATION diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query_grouping_sets.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query_grouping_sets.q.out index 71768cdc25af..83ea9058c56b 100644 --- a/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/perf/tez/constraints/cbo_query_grouping_sets.q.out @@ -73,7 +73,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IN($12, 9, 5), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0], ca_state=[$8], ca_country=[$10]) - HiveFilter(condition=[IN($8, _UTF-16LE'AL':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'MS':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'TN':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($8, 'AL':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MS':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'TN':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cs_sold_date_sk=[$0], cs_bill_customer_sk=[$1], cs_bill_cdemo_sk=[$2], cs_item_sk=[$3], CAST=[$4], d_date_sk=[$5], cd_demo_sk=[$6], CAST0=[$7]) HiveJoin(condition=[=($2, $6)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -85,7 +85,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ 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(=($3, _UTF-16LE'College'), =($1, _UTF-16LE'M'))]) + HiveFilter(condition=[AND(=($3, 'College'), =($1, 'M'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) PREHOOK: query: EXPLAIN diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query1.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query1.q.out index 92e6a3acb4d5..1a41d7a2a669 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query1.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 2000)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($24, _UTF-16LE'NM')]) + HiveFilter(condition=[=($24, 'NM')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(_o__c0=[*(CAST(/($1, $2)):DECIMAL(21, 6), 1.2:DECIMAL(2, 1))], ctr_store_sk=[$0]) HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(21, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query10.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query10.q.out index 7739d1edebad..30203caba874 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query10.q.out @@ -20,7 +20,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= 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'Dona Ana County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Douglas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Gaines County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Richland County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Walker County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($7, 'Dona Ana County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Douglas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Gaines County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Richland County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Walker County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_address]], table:alias=[ca]) HiveProject(ss_customer_sk=[$0]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out index 813daa134207..2149474baf7d 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out index 0a32c8957651..4c343aee7f60 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out @@ -11,13 +11,13 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(hd_demo_sk=[$0], EXPR$0=[=($3, 3)], EXPR$1=[=($3, 1)]) HiveFilter(condition=[IN($3, 1, 3)]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) - HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, _UTF-16LE'M')], EXPR$4=[=($3, _UTF-16LE'4 yr Degree')], EXPR$6=[=($2, _UTF-16LE'D')], EXPR$7=[=($3, _UTF-16LE'Primary')], EXPR$9=[=($2, _UTF-16LE'U')], EXPR$10=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query14.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query14.q.out index 440e945b5701..491f70f9c6de 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query14.q.out @@ -97,7 +97,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveAggregate(group=[{0, 1, 2, 3}], agg#0=[sum($4)], agg#1=[sum($5)]) HiveProject(channel=[$0], i_brand_id=[$1], i_class_id=[$2], i_category_id=[$3], sales=[$4], number_sales=[$5]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) @@ -194,7 +194,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(<=(1998, $6), <=($6, 2000))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) @@ -288,7 +288,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(<=(1998, $6), <=($6, 2000))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $5)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out index 63bd5b7fd814..4e5189075790 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out @@ -7,7 +7,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) - HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, _UTF-16LE'CA', _UTF-16LE'GA', _UTF-16LE'WA')], EXPR$1=[IN(substr($9, 1, 5), _UTF-16LE'85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, 'CA', 'GA', 'WA')], EXPR$1=[IN(substr($9, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cs_bill_customer_sk=[$0], cs_sales_price=[$1], cs_sold_date_sk=[$2], EXPR$0=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query16.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query16.q.out index 4e9966445da8..457d9093e2f4 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query16.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(cs_ship_date_sk=[$2], cs_ship_addr_sk=[$3], cs_call_center_sk=[$4], cs_warehouse_sk=[$5], cs_order_number=[$6], cs_ext_ship_cost=[$7], cs_net_profit=[$8], d_date_sk=[$9], d_date=[$10], ca_address_sk=[$0], ca_state=[$1], cc_call_center_sk=[$11], cc_county=[$12]) HiveJoin(condition=[=($4, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'NY'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'NY')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('NY'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'NY')]) 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=[$1], cs_ship_addr_sk=[$9], cs_call_center_sk=[$10], cs_warehouse_sk=[$13], cs_order_number=[$16], cs_ext_ship_cost=[$27], cs_net_profit=[$32]) @@ -17,7 +17,7 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cc_call_center_sk=[$0], cc_county=[$25]) - HiveFilter(condition=[IN($25, _UTF-16LE'Daviess County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Franklin Parish':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Levy County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Ziebach County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($25, 'Daviess County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Franklin Parish':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Levy County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Ziebach County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, call_center]], table:alias=[call_center]) HiveProject(cs_warehouse_sk=[$13], cs_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($13)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query17.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query17.q.out index cbdc327d995a..deb86a5642f0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query17.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($33))]) 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')]) + HiveFilter(condition=[IN($15, '2000Q1', '2000Q2', '2000Q3')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ss_store_sk=[$2], ss_ticket_number=[$3], ss_quantity=[$4], ss_sold_date_sk=[$5], d_date_sk=[$6], sr_item_sk=[$7], sr_customer_sk=[$8], sr_ticket_number=[$9], sr_return_quantity=[$10], sr_returned_date_sk=[$11], d_date_sk0=[$12]) HiveJoin(condition=[AND(=($1, $8), =($0, $7), =($3, $9))], joinType=[inner], algorithm=[none], cost=[not available]) @@ -20,7 +20,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[=($15, _UTF-16LE'2000Q1')]) + HiveFilter(condition=[=($15, '2000Q1')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(sr_item_sk=[$0], sr_customer_sk=[$1], sr_ticket_number=[$2], sr_return_quantity=[$3], sr_returned_date_sk=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($4, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -28,7 +28,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($19))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[IN($15, _UTF-16LE'2000Q1', _UTF-16LE'2000Q2', _UTF-16LE'2000Q3')]) + HiveFilter(condition=[IN($15, '2000Q1', '2000Q2', '2000Q3')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_state=[$24]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query18.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query18.q.out index 2acdb87cc00a..2af559040959 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query18.q.out @@ -14,7 +14,7 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0], $f10=[CAST($6):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($3, _UTF-16LE'College '))]) + HiveFilter(condition=[AND(=($1, 'M'), =($3, 'College '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$1], c_current_addr_sk=[$2], $f9=[$3], ca_address_sk=[$4], ca_county=[$5], ca_state=[$6], ca_country=[$7]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -22,7 +22,7 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($12, 1, 4, 5, 9, 10, 12), IS NOT NULL($2), 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=[IN($8, _UTF-16LE'AL', _UTF-16LE'MS', _UTF-16LE'NC', _UTF-16LE'ND', _UTF-16LE'OK', _UTF-16LE'TN', _UTF-16LE'WI')]) + HiveFilter(condition=[IN($8, 'AL', 'MS', 'NC', 'ND', 'OK', 'TN', 'WI')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query2.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query2.q.out index 2be4a3993fd9..b1abc5469daf 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query2.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query2.q.out @@ -9,7 +9,7 @@ HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], ag HiveProject(sold_date_sk=[$33], sales_price=[$22]) HiveFilter(condition=[IS NOT NULL($33)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) @@ -30,7 +30,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC]) HiveProject(sold_date_sk=[$33], sales_price=[$22]) HiveFilter(condition=[IS NOT NULL($33)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) @@ -50,7 +50,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC]) HiveProject(sold_date_sk=[$33], sales_price=[$22]) HiveFilter(condition=[IS NOT NULL($33)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out index c96f9bdb6b8e..4c518c59b256 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query24.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query24.q.out index efebab39cda5..c55930fdbfa4 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query24.q.out @@ -52,7 +52,7 @@ HiveProject(c_last_name=[$0], c_first_name=[$1], s_store_name=[$2], paid=[$3]) HiveFilter(condition=[AND(=($10, 7), IS NOT NULL($25))]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_current_price=[$5], i_size=[$15], i_units=[$18], i_manager_id=[$20]) - HiveFilter(condition=[=($17, _UTF-16LE'orchid ')]) + HiveFilter(condition=[=($17, 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(_o__c0=[*(0.05:DECIMAL(2, 2), CAST(/($0, $1)):DECIMAL(21, 6))]) HiveFilter(condition=[IS NOT NULL(CAST(/($0, $1)):DECIMAL(21, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query26.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query26.q.out index dda45cc67163..0ac6eb5e41ed 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query26.q.out @@ -13,10 +13,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($1, _UTF-16LE'F'), =($3, _UTF-16LE'Primary '))]) + HiveFilter(condition=[AND(=($2, 'W'), =($1, 'F'), =($3, 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'N'), =($14, _UTF-16LE'N'))]) + HiveFilter(condition=[OR(=($9, 'N'), =($14, 'N'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query27.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query27.q.out index b3a723cd05cb..51cdedd15423 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query27.q.out @@ -14,10 +14,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'U'), =($1, _UTF-16LE'M'), =($3, _UTF-16LE'2 yr Degree '))]) + HiveFilter(condition=[AND(=($2, 'U'), =($1, 'M'), =($3, '2 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(s_store_sk=[$0], s_state=[$24]) - HiveFilter(condition=[IN($24, _UTF-16LE'FL', _UTF-16LE'LA', _UTF-16LE'MI', _UTF-16LE'MO', _UTF-16LE'SC', _UTF-16LE'SD')]) + HiveFilter(condition=[IN($24, 'FL', 'LA', 'MI', 'MO', 'SC', 'SD')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query30.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query30.q.out index 5efe49ea7df1..dff10565081f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query30.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0]) - HiveFilter(condition=[=($8, _UTF-16LE'IL')]) + HiveFilter(condition=[=($8, 'IL')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(wr_returning_customer_sk=[$0], ca_state=[$1], $f2=[$2]) HiveFilter(condition=[IS NOT NULL($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out index 28eca731c89f..a2522c6e0701 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out @@ -15,7 +15,7 @@ HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) CTE Suggestion: HiveProject(i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Books '), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, 'Books '), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) CBO PLAN: @@ -47,7 +47,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveTableSpool(table=[[cte, cte_suggestion_3]]) HiveProject(i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Books '), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, 'Books '), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out index 3df017c39ccb..2771464b0899 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out @@ -18,9 +18,9 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(>($4, 0), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($23, _UTF-16LE'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($23, 'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query36.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query36.q.out index ec7dc0021f08..374ed9a0d64c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query36.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query36.q.out @@ -15,7 +15,7 @@ HiveProject(gross_margin=[$0], i_category=[$1], i_class=[$2], lochierarchy=[$3], HiveFilter(condition=[=($6, 1999)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($24, _UTF-16LE'AL', _UTF-16LE'FL', _UTF-16LE'GA', _UTF-16LE'LA', _UTF-16LE'MI', _UTF-16LE'MO', _UTF-16LE'SC', _UTF-16LE'SD')]) + HiveFilter(condition=[IN($24, 'AL', 'FL', 'GA', 'LA', 'MI', 'MO', 'SC', 'SD')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_class=[$10], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out index b91ec1153e8a..72cb293d31f0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out @@ -9,6 +9,6 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(i_manufact=[$0]) HiveFilter(condition=[>($1, 0)]) HiveAggregate(group=[{14}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'frosted', _UTF-16LE'rose'), IN($18, _UTF-16LE'Gross', _UTF-16LE'Lb'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'black', _UTF-16LE'chocolate'), IN($18, _UTF-16LE'Box', _UTF-16LE'Dram'), IN($15, _UTF-16LE'economy', _UTF-16LE'petite')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'magenta', _UTF-16LE'slate'), IN($18, _UTF-16LE'Bundle', _UTF-16LE'Carton'), IN($15, _UTF-16LE'N/A', _UTF-16LE'small')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'cornflower', _UTF-16LE'firebrick'), IN($18, _UTF-16LE'Oz', _UTF-16LE'Pound'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'almond', _UTF-16LE'steel'), IN($18, _UTF-16LE'Case', _UTF-16LE'Tsp'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'aquamarine', _UTF-16LE'purple'), IN($18, _UTF-16LE'Bunch', _UTF-16LE'Gram'), IN($15, _UTF-16LE'economy', _UTF-16LE'petite')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'lavender', _UTF-16LE'papaya'), IN($18, _UTF-16LE'Cup', _UTF-16LE'Pallet'), IN($15, _UTF-16LE'N/A', _UTF-16LE'small')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'cyan', _UTF-16LE'maroon'), IN($18, _UTF-16LE'Each', _UTF-16LE'N/A'), IN($15, _UTF-16LE'large', _UTF-16LE'medium'))), IS NOT NULL($14))]) + HiveFilter(condition=[AND(OR(AND(=($12, 'Women'), IN($17, 'frosted', 'rose'), IN($18, 'Gross', 'Lb'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'black', 'chocolate'), IN($18, 'Box', 'Dram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'magenta', 'slate'), IN($18, 'Bundle', 'Carton'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cornflower', 'firebrick'), IN($18, 'Oz', 'Pound'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'almond', 'steel'), IN($18, 'Case', 'Tsp'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'aquamarine', 'purple'), IN($18, 'Bunch', 'Gram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'lavender', 'papaya'), IN($18, 'Cup', 'Pallet'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cyan', 'maroon'), IN($18, 'Each', 'N/A'), IN($15, 'large', 'medium'))), IS NOT NULL($14))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query43.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query43.q.out index a20883c6a5d7..76f1f7f3d272 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query43.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query43.q.out @@ -8,7 +8,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out index ce42781178eb..d705bd014511 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(ca_zip=[$1], ca_county=[$0], _c2=[$2]) HiveAggregate(group=[{7, 8}], agg#0=[sum($2)]) - HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), _UTF-16LE'85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveProject(ws_item_sk=[$5], ws_bill_customer_sk=[$6], ws_sales_price=[$7], ws_sold_date_sk=[$8], c_customer_sk=[$0], c_current_addr_sk=[$1], ca_address_sk=[$2], ca_county=[$3], ca_zip=[$4], d_date_sk=[$9], d_year=[$10], d_qoy=[$11], i_item_sk=[$12], i_item_id=[$13], i_item_id0=[$14], literalTrue=[$15]) HiveJoin(condition=[=($5, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query46.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query46.q.out index abdbebce09c7..da767daf8383 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query46.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), IN($7, 0, 6))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($22, _UTF-16LE'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Highland Park':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Salem':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Union':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($22, 'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Highland Park':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Salem':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Union':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out index 9d2e9add949f..b4874b81abce 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out @@ -2,12 +2,12 @@ CBO PLAN: HiveProject(_c0=[$0]) HiveAggregate(group=[{}], agg#0=[sum($7)]) HiveJoin(condition=[AND(=($6, $0), OR(AND($1, $9), AND($2, $10), AND($3, $11)))], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'M'), =($3, _UTF-16LE'4 yr Degree '))]) + HiveFilter(condition=[AND(=($2, 'M'), =($3, '4 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out index 41c4971341e0..6a741aa853d3 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out @@ -13,7 +13,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveAggregate(group=[{0, 1, 2, 3, 4}]) HiveProject(channel=[$0], item=[$1], return_ratio=[$2], return_rank=[$3], currency_rank=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) @@ -31,7 +31,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) @@ -46,7 +46,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(>($17, 0), >($32, 1:DECIMAL(1, 0)), >($28, 0:DECIMAL(1, 0)), IS NOT NULL($33))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[cs]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out index c57a4bf13c24..3078577b3d51 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out @@ -9,7 +9,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -26,7 +26,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_store_id=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -43,7 +43,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cp_catalog_page_sk=[$0], cp_catalog_page_id=[$1]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out index d05b53e81ec5..16190e274296 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$2], sort1=[$1], sort2=[$0], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants', _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'reference', _UTF-16LE'self-help'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'importoamalg #1', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9'), 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'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), 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'))))]) + HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'reference', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'reference', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_qoy=[$10]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query54.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query54.q.out index c08e3bf696ab..f5a2ecae98ca 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query54.q.out @@ -72,7 +72,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[AND(=($10, _UTF-16LE'consignment '), =($12, _UTF-16LE'Jewelry '))]) + HiveFilter(condition=[AND(=($10, 'consignment '), =($12, 'Jewelry '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_month_seq=[$1], $f0=[$2], $f00=[$3]) HiveJoin(condition=[<=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out index 84133326b4f2..cf53ca890c2f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out @@ -10,7 +10,7 @@ HiveProject(d_date_sk=[$0], d_year=[CAST(2000):INTEGER], d_moy=[CAST(1):INTEGER] CTE Suggestion: HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, _UTF-16LE'chiffon', _UTF-16LE'lace', _UTF-16LE'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) HiveTableScan(table=[[default, item]], table:alias=[item]) CBO PLAN: @@ -39,7 +39,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, _UTF-16LE'lace'), =($17, _UTF-16LE'orchid'), =($17, _UTF-16LE'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -55,7 +55,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, _UTF-16LE'lace'), =($17, _UTF-16LE'orchid'), =($17, _UTF-16LE'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -71,6 +71,6 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, _UTF-16LE'lace'), =($17, _UTF-16LE'orchid'), =($17, _UTF-16LE'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query59.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query59.q.out index 2db041c4715c..dbdaa7c3768f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query59.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query59.q.out @@ -4,7 +4,7 @@ HiveProject($f0=[$4], $f1=[$0], $f2=[CASE($5, $1, null:DECIMAL(7, 2))], $f3=[CAS HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($6))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) @@ -28,7 +28,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out index 9c4a85ce80e4..df91809ad9a0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out @@ -10,7 +10,7 @@ HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(9):INTEGER] CTE Suggestion: HiveProject(i_item_id=[$1]) - HiveFilter(condition=[=($12, _UTF-16LE'Children ')]) + HiveFilter(condition=[=($12, 'Children ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) CBO PLAN: @@ -40,7 +40,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveTableSpool(table=[[cte, cte_suggestion_2]]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[=($12, _UTF-16LE'Children ')]) + HiveFilter(condition=[=($12, 'Children ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query61.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query61.q.out index 7b40cec81724..1b3246a7d556 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query61.q.out @@ -14,7 +14,7 @@ HiveProject(d_date_sk=[$0]) CTE Suggestion: HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[=($12, _UTF-16LE'Electronics ')]) + HiveFilter(condition=[=($12, 'Electronics ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) CTE Suggestion: @@ -52,14 +52,14 @@ HiveProject(promotions=[$0], total=[$1], _c2=[*(/(CAST($0):DECIMAL(15, 4), CAST( HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveTableSpool(table=[[cte, cte_suggestion_2]]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[=($12, _UTF-16LE'Electronics ')]) + HiveFilter(condition=[=($12, 'Electronics ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveTableSpool(table=[[cte, cte_suggestion_3]]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[=($27, -7:DECIMAL(1, 0))]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'Y'), =($11, _UTF-16LE'Y'), =($8, _UTF-16LE'Y'))]) + HiveFilter(condition=[OR(=($9, 'Y'), =($11, 'Y'), =($8, 'Y'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[sum($6)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out index 01da209407ba..254d1388d6ce 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants', _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'refernece', _UTF-16LE'self-help'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'importoamalg #1', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9'), 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'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), 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'))))]) + HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'refernece', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'refernece', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out index e5ae62458519..32eff473f0c1 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out @@ -4,7 +4,7 @@ HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not a HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($6), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($5))]) 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'burnished', _UTF-16LE'chocolate', _UTF-16LE'dim', _UTF-16LE'maroon', _UTF-16LE'navajo', _UTF-16LE'steel'), BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'), BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) CTE Suggestion: @@ -73,7 +73,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, _UTF-16LE'burnished'), =($17, _UTF-16LE'chocolate'), =($17, _UTF-16LE'dim'), =($17, _UTF-16LE'maroon'), =($17, _UTF-16LE'navajo'), =($17, _UTF-16LE'steel')))]) + HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, 'burnished'), =($17, 'chocolate'), =($17, 'dim'), =($17, 'maroon'), =($17, 'navajo'), =($17, 'steel')))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -133,7 +133,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, _UTF-16LE'burnished'), =($17, _UTF-16LE'chocolate'), =($17, _UTF-16LE'dim'), =($17, _UTF-16LE'maroon'), =($17, _UTF-16LE'navajo'), =($17, _UTF-16LE'steel')))]) + HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, 'burnished'), =($17, 'chocolate'), =($17, 'dim'), =($17, 'maroon'), =($17, 'navajo'), =($17, 'steel')))]) 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/tpcds30tb/cte/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out index 9eb0c5cdc6a1..8b51923eed73 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out @@ -5,7 +5,7 @@ HiveProject(d_date_sk=[$0], EXPR$0=[=($8, 1)], EXPR$1=[=($8, 2)], EXPR$2=[=($8, CTE Suggestion: HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, _UTF-16LE'AIRBORNE', _UTF-16LE'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) CTE Suggestion: @@ -14,7 +14,7 @@ HiveProject(t_time_sk=[$0]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) CBO PLAN: -HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county=[$3], w_state=[$4], w_country=[$5], ship_carriers=[CAST(_UTF-16LE'DIAMOND,AIRBORNE':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], year=[CAST(2002):INTEGER], jan_sales=[$6], feb_sales=[$7], mar_sales=[$8], apr_sales=[$9], may_sales=[$10], jun_sales=[$11], jul_sales=[$12], aug_sales=[$13], sep_sales=[$14], oct_sales=[$15], nov_sales=[$16], dec_sales=[$17], jan_sales_per_sq_foot=[$18], feb_sales_per_sq_foot=[$19], mar_sales_per_sq_foot=[$20], apr_sales_per_sq_foot=[$21], may_sales_per_sq_foot=[$22], jun_sales_per_sq_foot=[$23], jul_sales_per_sq_foot=[$24], aug_sales_per_sq_foot=[$25], sep_sales_per_sq_foot=[$26], oct_sales_per_sq_foot=[$27], nov_sales_per_sq_foot=[$28], dec_sales_per_sq_foot=[$29], jan_net=[$30], feb_net=[$31], mar_net=[$32], apr_net=[$33], may_net=[$34], jun_net=[$35], jul_net=[$36], aug_net=[$37], sep_net=[$38], oct_net=[$39], nov_net=[$40], dec_net=[$41]) +HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county=[$3], w_state=[$4], w_country=[$5], ship_carriers=[CAST('DIAMOND,AIRBORNE':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], year=[CAST(2002):INTEGER], jan_sales=[$6], feb_sales=[$7], mar_sales=[$8], apr_sales=[$9], may_sales=[$10], jun_sales=[$11], jul_sales=[$12], aug_sales=[$13], sep_sales=[$14], oct_sales=[$15], nov_sales=[$16], dec_sales=[$17], jan_sales_per_sq_foot=[$18], feb_sales_per_sq_foot=[$19], mar_sales_per_sq_foot=[$20], apr_sales_per_sq_foot=[$21], may_sales_per_sq_foot=[$22], jun_sales_per_sq_foot=[$23], jul_sales_per_sq_foot=[$24], aug_sales_per_sq_foot=[$25], sep_sales_per_sq_foot=[$26], oct_sales_per_sq_foot=[$27], nov_sales_per_sq_foot=[$28], dec_sales_per_sq_foot=[$29], jan_net=[$30], feb_net=[$31], mar_net=[$32], apr_net=[$33], may_net=[$34], jun_net=[$35], jul_net=[$36], aug_net=[$37], sep_net=[$38], oct_net=[$39], nov_net=[$40], dec_net=[$41]) HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29], $f30=[$30], $f31=[$31], $f32=[$32], $f33=[$33], $f34=[$34], $f35=[$35], $f36=[$36], $f37=[$37], $f38=[$38], $f39=[$39], $f40=[$40], $f41=[$41]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)], agg#24=[sum($30)], agg#25=[sum($31)], agg#26=[sum($32)], agg#27=[sum($33)], agg#28=[sum($34)], agg#29=[sum($35)], agg#30=[sum($36)], agg#31=[sum($37)], agg#32=[sum($38)], agg#33=[sum($39)], agg#34=[sum($40)], agg#35=[sum($41)]) @@ -38,7 +38,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[OR(=($4, _UTF-16LE'DIAMOND'), =($4, _UTF-16LE'AIRBORNE'))]) + HiveFilter(condition=[OR(=($4, 'DIAMOND'), =($4, 'AIRBORNE'))]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) @@ -57,7 +57,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[OR(=($4, _UTF-16LE'DIAMOND'), =($4, _UTF-16LE'AIRBORNE'))]) + HiveFilter(condition=[OR(=($4, 'DIAMOND'), =($4, 'AIRBORNE'))]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query68.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query68.q.out index 7ffdf2cff7f6..2a467d3a3003 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query68.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$0], sort1=[$4], dir0=[ASC], dir1=[ASC], fetch=[100]) 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':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($22, 'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query69.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query69.q.out index 9ffac55dfe01..8012b13dbaa2 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query69.q.out @@ -19,7 +19,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ 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')]) + HiveFilter(condition=[IN($8, 'CO', 'IL', 'MN')]) HiveTableScan(table=[[default, customer_address]], table:alias=[ca]) HiveProject(ss_customer_sk=[$0]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query7.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query7.q.out index 5c5d16b51077..a29cee5d15c1 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query7.q.out @@ -13,10 +13,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($1, _UTF-16LE'F'), =($3, _UTF-16LE'Primary '))]) + HiveFilter(condition=[AND(=($2, 'W'), =($1, 'F'), =($3, 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'N'), =($14, _UTF-16LE'N'))]) + HiveFilter(condition=[OR(=($9, 'N'), =($14, 'N'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out index 52f65c94dcf1..380465f5c4bc 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out @@ -37,6 +37,6 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[=($20, 1)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'dinner'), =($9, _UTF-16LE'breakfast'))]) + HiveFilter(condition=[OR(=($9, 'dinner'), =($9, 'breakfast'))]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query72.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query72.q.out index 227b9d707cd2..9a35bac9ed77 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query72.q.out @@ -20,10 +20,10 @@ HiveSortLimit(sort0=[$5], sort1=[$0], sort2=[$1], sort3=[$2], dir0=[DESC], dir1= HiveFilter(condition=[AND(IS NOT NULL($17), IS NOT NULL($4), IS NOT NULL($3), IS NOT NULL($1), IS NOT NULL($33))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'1001-5000 ')]) + HiveFilter(condition=[=($2, '1001-5000 ')]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'M')]) + HiveFilter(condition=[=($2, 'M')]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0], d_week_seq=[$1], d_date_sk0=[$2], d_week_seq0=[$3], EXPR$0=[$4]) HiveJoin(condition=[=($3, $1)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out index 13dbe2ffe643..bcf158a8544e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out @@ -18,9 +18,9 @@ HiveSortLimit(sort0=[$5], dir0=[DESC]) 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(>($4, 0), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($23, _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($23, 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query75.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query75.q.out index 77b71a146683..b7c7b0acbb62 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query75.q.out @@ -15,7 +15,7 @@ HiveProject(d_date_sk=[$0]) CTE Suggestion: 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, 'Sports '), IS NOT NULL($7), IS NOT NULL($9), IS NOT NULL($11), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) CTE Suggestion: @@ -59,7 +59,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.i HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveTableSpool(table=[[cte, cte_suggestion_3]]) 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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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=[-($6, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($7, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[right], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query76.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query76.q.out index 86e531d376d4..534080f01639 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query76.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query76.q.out @@ -4,7 +4,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveAggregate(group=[{0, 1, 2, 3, 4}], agg#0=[count()], agg#1=[sum($5)]) HiveProject(channel=[$0], col_name=[$1], d_year=[$2], d_qoy=[$3], i_category=[$4], ext_sales_price=[$5]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=[_UTF-16LE'ss_addr_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$1], d_qoy=[$2], i_category=[$7], ext_sales_price=[$4]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['ss_addr_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$1], d_qoy=[$2], i_category=[$7], ext_sales_price=[$4]) HiveJoin(condition=[=($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(d_date_sk=[$0], d_year=[$6], d_qoy=[$10]) @@ -14,7 +14,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) - 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=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['ws_web_page_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_item_sk=[$2], ws_ext_sales_price=[$22], ws_sold_date_sk=[$33]) @@ -24,7 +24,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=[_UTF-16LE'cs_warehouse_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['cs_warehouse_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_item_sk=[$14], cs_ext_sales_price=[$22], cs_sold_date_sk=[$33]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out index 3f692d3766bd..1a596dde7964 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out @@ -10,7 +10,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_store_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -32,7 +32,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_call_center_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -52,7 +52,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_web_page_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query8.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query8.q.out index 365ec254866a..1f3d8cc5792a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query8.q.out @@ -20,7 +20,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) HiveProject($f0=[substr($9, 1, 5)]) - HiveFilter(condition=[AND(IN(substr($9, 1, 5), _UTF-16LE'89436':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'65085':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83927':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77557':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58429':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40697':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80614':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10502':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32779':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91137':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61265':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'98294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59362':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'87291':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84093':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21505':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17184':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10866':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25797':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28055':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18377':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80332':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21757':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29742':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90885':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40811':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25990':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47513':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89531':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10391':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18846':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82637':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41368':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83658':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86199':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81625':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26696':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89338':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19053':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36610':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99823':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41249':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48584':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'78890':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14090':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'34425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79188':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50497':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84861':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90733':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37119':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57835':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70067':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'62878':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19303':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18840':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16737':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16022':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49613':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'68310':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'60069':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'98360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48649':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39050':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41793':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25002':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27413':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47208':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16515':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15009':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80015':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63982':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81087':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67468':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'34175':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'64008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11201':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48043':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45645':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61163':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41100':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89951':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22745':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35851':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83326':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61125':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'78298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80752':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49858':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52940':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'96976':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53582':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18717':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50530':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27670':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'96577':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57856':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56372':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16165':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54561':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'44439':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22926':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61451':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92397':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70873':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13355':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21801':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46346':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56458':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47306':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99555':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69399':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26234':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47546':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49661':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88601':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35943':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25632':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'24611':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'44166':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30379':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11110':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14329':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'93815':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71381':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25612':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14664':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21077':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82626':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'60915':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81020':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11433':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13414':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42548':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92713':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47484':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45539':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35901':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19506':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'65690':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73957':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49231':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20005':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18384':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76615':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38177':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55607':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41369':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58581':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'75692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95464':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22246':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51061':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77209':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15482':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10688':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45907':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73520':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17959':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'24677':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'66446':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94627':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15560':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41967':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69297':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11929':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59403':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33283':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57350':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10827':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25251':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15526':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36496':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55854':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81980':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49157':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63512':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28944':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36503':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54010':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18767':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23969':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43905':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'66979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33113':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59080':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79144':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70373':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67031':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26705':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50906':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52406':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26066':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73146':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'31897':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30045':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14354':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19770':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22928':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'97790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50723':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46081':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30202':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88500':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14172':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'93578':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83583':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46047':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94167':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82564':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21156':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86709':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37931':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74703':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83103':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23054':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70470':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49247':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91911':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69998':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70070':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91830':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49521':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81450':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89091':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'62378':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25683':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61869':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36580':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85778':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36871':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28810':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83712':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45486':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26935':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20132':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55349':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86057':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10094':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11357':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40758':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30432':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21204':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30214':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61024':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74621':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11622':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'68908':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33032':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99194':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99900':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45013':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32895':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32322':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27385':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58049':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18586':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15492':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IS NOT NULL(substr(substr($9, 1, 5), 1, 2)))]) + HiveFilter(condition=[AND(IN(substr($9, 1, 5), '89436':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '65085':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83927':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77557':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58429':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40697':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80614':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10502':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32779':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91137':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61265':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '98294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59362':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '87291':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84093':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21505':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17184':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10866':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25797':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28055':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18377':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80332':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21757':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29742':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90885':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40811':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25990':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47513':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89531':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10391':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18846':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82637':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41368':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83658':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86199':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81625':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26696':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89338':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19053':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36610':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99823':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41249':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48584':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '78890':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14090':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '34425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79188':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50497':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84861':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90733':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37119':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57835':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70067':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '62878':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19303':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18840':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16737':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16022':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49613':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '68310':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '60069':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '98360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48649':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39050':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41793':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25002':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27413':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47208':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16515':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15009':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80015':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63982':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81087':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67468':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '34175':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '64008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11201':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48043':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45645':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61163':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41100':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89951':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22745':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35851':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83326':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61125':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '78298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80752':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49858':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52940':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '96976':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53582':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18717':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50530':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27670':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '96577':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57856':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56372':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16165':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54561':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '44439':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22926':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61451':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92397':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70873':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13355':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21801':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46346':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56458':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47306':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99555':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69399':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26234':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47546':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49661':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88601':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35943':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25632':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '24611':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '44166':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30379':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11110':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14329':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '93815':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71381':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25612':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14664':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21077':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82626':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '60915':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81020':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11433':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13414':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42548':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92713':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47484':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45539':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35901':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19506':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '65690':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73957':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49231':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20005':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18384':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76615':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38177':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55607':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41369':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58581':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '75692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95464':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22246':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51061':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77209':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15482':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10688':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45907':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73520':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17959':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '24677':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '66446':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94627':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15560':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41967':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69297':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11929':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59403':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33283':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57350':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10827':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25251':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15526':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36496':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55854':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81980':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49157':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63512':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28944':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36503':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54010':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18767':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23969':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43905':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '66979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33113':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59080':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79144':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70373':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67031':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26705':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50906':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52406':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26066':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73146':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '31897':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30045':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14354':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19770':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22928':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '97790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50723':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46081':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30202':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88500':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14172':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '93578':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83583':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46047':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94167':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82564':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21156':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86709':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37931':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74703':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83103':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23054':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70470':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49247':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91911':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69998':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70070':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91830':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49521':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81450':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89091':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '62378':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25683':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61869':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36580':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85778':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36871':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28810':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83712':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45486':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26935':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20132':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55349':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86057':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10094':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11357':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40758':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30432':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21204':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30214':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61024':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74621':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11622':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '68908':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33032':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99194':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99900':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45013':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32895':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32322':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27385':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58049':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18586':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15492':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IS NOT NULL(substr(substr($9, 1, 5), 1, 2)))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) @@ -32,7 +32,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL(substr(substr($9, 1, 5), 1, 2))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(=($10, _UTF-16LE'Y'), IS NOT NULL($4))]) + HiveFilter(condition=[AND(=($10, 'Y'), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(s_store_sk=[$0], s_store_name=[$5], EXPR$0=[substr($25, 1, 2)]) HiveFilter(condition=[IS NOT NULL(substr($25, 1, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out index 701c91b3a694..64d0b6298d67 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out @@ -10,7 +10,7 @@ HiveProject(i_item_sk=[$0]) CTE Suggestion: HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[=($11, _UTF-16LE'N')]) + HiveFilter(condition=[=($11, 'N')]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) CBO PLAN: @@ -19,7 +19,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -41,11 +41,11 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveTableSpool(table=[[cte, cte_suggestion_2]]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[=($11, _UTF-16LE'N')]) + HiveFilter(condition=[=($11, 'N')]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(s_store_sk=[$0], s_store_id=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -65,7 +65,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[cte, cte_suggestion_2]], table:alias=[cte_suggestion_2]) HiveProject(cp_catalog_page_sk=[$0], cp_catalog_page_id=[$1]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query81.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query81.q.out index 250ee1b75f8b..abef3ae984ba 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query81.q.out @@ -9,7 +9,7 @@ HiveProject(d_date_sk=[$0]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) CBO PLAN: -HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_name=[$3], ca_street_number=[$4], ca_street_name=[$5], ca_street_type=[$6], ca_suite_number=[$7], ca_city=[$8], ca_county=[$9], ca_state=[CAST(_UTF-16LE'IL'):CHAR(2) CHARACTER SET "UTF-16LE"], ca_zip=[$10], ca_country=[$11], ca_gmt_offset=[$12], ca_location_type=[$13], ctr_total_return=[$14]) +HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_name=[$3], ca_street_number=[$4], ca_street_name=[$5], ca_street_type=[$6], ca_suite_number=[$7], ca_city=[$8], ca_county=[$9], ca_state=[CAST('IL'):CHAR(2) CHARACTER SET "UTF-16LE"], ca_zip=[$10], ca_country=[$11], ca_gmt_offset=[$12], ca_location_type=[$13], ctr_total_return=[$14]) HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5=[$5], sort6=[$6], sort7=[$7], sort8=[$8], sort9=[$9], sort10=[$10], sort11=[$11], sort12=[$12], sort13=[$13], sort14=[$14], dir0=[ASC], dir1=[ASC], dir2=[ASC], dir3=[ASC], dir4=[ASC], dir5=[ASC], dir6=[ASC], dir7=[ASC], dir8=[ASC], dir9=[ASC], dir10=[ASC], dir11=[ASC], dir12=[ASC], dir13=[ASC], dir14=[ASC], fetch=[100]) HiveProject(c_customer_id=[$1], c_salutation=[$3], c_first_name=[$4], c_last_name=[$5], ca_street_number=[$7], ca_street_name=[$8], ca_street_type=[$9], ca_suite_number=[$10], ca_city=[$11], ca_county=[$12], ca_zip=[$13], ca_country=[$14], ca_gmt_offset=[$15], ca_location_type=[$16], ctr_total_return=[$19]) HiveJoin(condition=[AND(=($18, $21), >($19, $20))], joinType=[inner], algorithm=[none], cost=[not available]) @@ -19,7 +19,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0], ca_street_number=[$2], ca_street_name=[$3], ca_street_type=[$4], ca_suite_number=[$5], ca_city=[$6], ca_county=[$7], ca_zip=[$9], ca_country=[$10], ca_gmt_offset=[$11], ca_location_type=[$12]) - HiveFilter(condition=[=($8, _UTF-16LE'IL')]) + HiveFilter(condition=[=($8, 'IL')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cr_returning_customer_sk=[$0], ca_state=[$1], $f2=[$2]) HiveFilter(condition=[IS NOT NULL($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query84.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query84.q.out index 23cc2cb99181..a02b370668e8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query84.q.out @@ -12,11 +12,11 @@ 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], customername=[$4], ca_address_sk=[$5], hd_demo_sk=[$6], hd_income_band_sk=[$7], ib_income_band_sk=[$8]) 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], customername=[||(||($9, _UTF-16LE', ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $8)]) + HiveProject(c_customer_id=[$1], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], customername=[||(||($9, ', ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $8)]) 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')]) + HiveFilter(condition=[=($6, 'Hopewell')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(hd_demo_sk=[$0], hd_income_band_sk=[$1], ib_income_band_sk=[$2]) HiveJoin(condition=[=($2, $1)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out index c1814f85a24a..1285cc0bef33 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out @@ -19,14 +19,14 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveProject(wr_item_sk=[$1], wr_refunded_cdemo_sk=[$3], wr_refunded_addr_sk=[$5], wr_returning_cdemo_sk=[$7], wr_reason_sk=[$11], wr_order_number=[$12], wr_fee=[$17], wr_refunded_cash=[$19]) HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($11), IS NOT NULL($5))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) - HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, _UTF-16LE'M')], EXPR$1=[=($3, _UTF-16LE'4 yr Degree')], EXPR$2=[=($2, _UTF-16LE'D')], EXPR$3=[=($3, _UTF-16LE'Primary')], EXPR$4=[=($2, _UTF-16LE'U')], EXPR$5=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) HiveProject(r_reason_sk=[$0], r_reason_desc=[$2]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query88.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query88.q.out index 26b097303392..bd8506122233 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query88.q.out @@ -5,7 +5,7 @@ HiveProject(hd_demo_sk=[$0]) CTE Suggestion: HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) CTE Suggestion: @@ -46,7 +46,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveTableSpool(table=[[cte, cte_suggestion_1]]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out index 4fd3daa1f1ed..2762a85dfa4a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out @@ -13,7 +13,7 @@ HiveProject(tmp1.i_category=[$0], tmp1.i_class=[$1], tmp1.i_brand=[$2], tmp1.s_s HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'birdal', _UTF-16LE'musical', _UTF-16LE'pants', _UTF-16LE'parenting', _UTF-16LE'wallpaper', _UTF-16LE'womens'), IN($12, _UTF-16LE'Books', _UTF-16LE'Electronics', _UTF-16LE'Home', _UTF-16LE'Jewelry', _UTF-16LE'Men', _UTF-16LE'Shoes'), OR(AND(IN($12, _UTF-16LE'Books', _UTF-16LE'Electronics', _UTF-16LE'Home'), IN($10, _UTF-16LE'musical', _UTF-16LE'parenting', _UTF-16LE'wallpaper')), AND(IN($12, _UTF-16LE'Jewelry', _UTF-16LE'Men', _UTF-16LE'Shoes'), IN($10, _UTF-16LE'birdal', _UTF-16LE'pants', _UTF-16LE'womens'))))]) + HiveFilter(condition=[AND(IN($10, 'birdal', 'musical', 'pants', 'parenting', 'wallpaper', 'womens'), IN($12, 'Books', 'Electronics', 'Home', 'Jewelry', 'Men', 'Shoes'), OR(AND(IN($12, 'Books', 'Electronics', 'Home'), IN($10, 'musical', 'parenting', 'wallpaper')), AND(IN($12, 'Jewelry', 'Men', 'Shoes'), IN($10, 'birdal', 'pants', 'womens'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out index 8a70a2068f52..e50094e4420a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out @@ -23,10 +23,10 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= 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($2, _UTF-16LE'M', _UTF-16LE'W'), IN($3, _UTF-16LE'Advanced Degree', _UTF-16LE'Unknown'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown '), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree ')))]) + HiveFilter(condition=[AND(IN($2, 'M', 'W'), IN($3, 'Advanced Degree', 'Unknown'), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[LIKE($2, _UTF-16LE'0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[LIKE($2, '0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(cc_call_center_sk=[$0], cc_call_center_id=[$1], cc_name=[$6], cc_manager=[$11]) HiveTableScan(table=[[default, call_center]], table:alias=[call_center]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query93.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query93.q.out index b84f16e73260..2cce6b0cb9e0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query93.q.out @@ -11,6 +11,6 @@ HiveSortLimit(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($7)]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(r_reason_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'Did not like the warranty ')]) + HiveFilter(condition=[=($2, 'Did not like the warranty ')]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query94.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query94.q.out index 5f14c7b74791..db2b77e06306 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query94.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$3], ws_web_site_sk=[$4], ws_warehouse_sk=[$5], ws_order_number=[$6], ws_ext_ship_cost=[$7], ws_net_profit=[$8], d_date_sk=[$9], d_date=[$10], ca_address_sk=[$0], ca_state=[$1], web_site_sk=[$11], web_company_name=[$12]) HiveJoin(condition=[=($4, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'TX')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'TX')]) 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=[$1], ws_ship_addr_sk=[$10], ws_web_site_sk=[$12], ws_warehouse_sk=[$14], ws_order_number=[$16], ws_ext_ship_cost=[$27], ws_net_profit=[$32]) @@ -16,8 +16,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(web_site_sk=[$0], web_company_name=[CAST(_UTF-16LE'pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($14, _UTF-16LE'pri ')]) + HiveProject(web_site_sk=[$0], web_company_name=[CAST('pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($14, 'pri ')]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) HiveProject(ws_warehouse_sk=[$14], ws_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($14)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query95.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query95.q.out index 57eaa4112026..ade0c5d94067 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query95.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$3], ws_web_site_sk=[$4], ws_order_number=[$5], ws_ext_ship_cost=[$6], ws_net_profit=[$7], d_date_sk=[$8], d_date=[$9], ca_address_sk=[$0], ca_state=[$1], web_site_sk=[$10], web_company_name=[$11]) HiveJoin(condition=[=($4, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'TX')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'TX')]) 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=[$1], ws_ship_addr_sk=[$10], ws_web_site_sk=[$12], ws_order_number=[$16], ws_ext_ship_cost=[$27], ws_net_profit=[$32]) @@ -16,8 +16,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(web_site_sk=[$0], web_company_name=[CAST(_UTF-16LE'pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($14, _UTF-16LE'pri ')]) + HiveProject(web_site_sk=[$0], web_company_name=[CAST('pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($14, 'pri ')]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) HiveProject(ws_order_number=[$1]) HiveJoin(condition=[AND(=($1, $3), <>($0, $2))], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query96.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query96.q.out index a244bc3bc7bf..0a84ef02bf84 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query96.q.out @@ -11,7 +11,7 @@ HiveProject(_c0=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30))]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[=($3, 5)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out index e6db70d26a68..bd41a4b82589 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_ext_query1.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_ext_query1.q.out index 5b4b7d14c27a..7e3abfd8983b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_ext_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_ext_query1.q.out @@ -17,7 +17,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(s_store_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[=($24, _UTF-16LE'NM')]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[=($24, 'NM')]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store]], table:alias=[store]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(_o__c0=[*(CAST(/($1, $2)):DECIMAL(21, 6), 1.2:DECIMAL(2, 1))], ctr_store_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(21, 6))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### @@ -51,7 +51,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]): rowcount = ###Masked###, cum HiveFilter(condition=[=($6, 2000)]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(s_store_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### - HiveFilter(condition=[=($24, _UTF-16LE'NM')]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### + HiveFilter(condition=[=($24, 'NM')]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveTableScan(table=[[default, store]], table:alias=[store]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveProject(_o__c0=[*(CAST(/($1, $2)):DECIMAL(21, 6), 1.2:DECIMAL(2, 1))], ctr_store_sk=[$0]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(21, 6))]): rowcount = ###Masked###, cumulative cost = ###Masked###, id = ###Masked### diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query1.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query1.q.out index 1216481c7623..7a96bdd1d3ee 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query1.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query1.q.out @@ -17,7 +17,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 2000)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($24, _UTF-16LE'NM')]) + HiveFilter(condition=[=($24, 'NM')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(_o__c0=[*(CAST(/($1, $2)):DECIMAL(21, 6), 1.2:DECIMAL(2, 1))], ctr_store_sk=[$0]) HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(21, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query10.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query10.q.out index 47df9c179067..24d8f8cd0590 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query10.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query10.q.out @@ -15,7 +15,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], sort5= 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'Dona Ana County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Douglas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Gaines County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Richland County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Walker County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($7, 'Dona Ana County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Douglas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Gaines County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Richland County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Walker County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_address]], table:alias=[ca]) HiveProject(ss_customer_sk=[$0]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out index 813daa134207..2149474baf7d 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out index 0a32c8957651..4c343aee7f60 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out @@ -11,13 +11,13 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(hd_demo_sk=[$0], EXPR$0=[=($3, 3)], EXPR$1=[=($3, 1)]) HiveFilter(condition=[IN($3, 1, 3)]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) - HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, _UTF-16LE'M')], EXPR$4=[=($3, _UTF-16LE'4 yr Degree')], EXPR$6=[=($2, _UTF-16LE'D')], EXPR$7=[=($3, _UTF-16LE'Primary')], EXPR$9=[=($2, _UTF-16LE'U')], EXPR$10=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query14.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query14.q.out index 1666a5956211..4cfe4453b85c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query14.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query14.q.out @@ -8,7 +8,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 1, 2}, {0, 1}, {0}, {}]], agg#0=[sum($4)], agg#1=[sum($5)]) HiveProject(channel=[$0], i_brand_id=[$1], i_class_id=[$2], i_category_id=[$3], sales=[$4], number_sales=[$5]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) @@ -83,7 +83,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(average_sales=[$0]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, avg_sales]], table:alias=[avg_sales]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) @@ -158,7 +158,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveProject(average_sales=[$0]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, avg_sales]], table:alias=[avg_sales]) - HiveProject(channel=[_UTF-16LE'web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], i_brand_id=[$0], i_class_id=[$1], i_category_id=[$2], sales=[$3], number_sales=[$4]) HiveJoin(condition=[>($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveFilter(condition=[IS NOT NULL($3)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out index 63bd5b7fd814..4e5189075790 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out @@ -7,7 +7,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) - HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, _UTF-16LE'CA', _UTF-16LE'GA', _UTF-16LE'WA')], EXPR$1=[IN(substr($9, 1, 5), _UTF-16LE'85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, 'CA', 'GA', 'WA')], EXPR$1=[IN(substr($9, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cs_bill_customer_sk=[$0], cs_sales_price=[$1], cs_sold_date_sk=[$2], EXPR$0=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query16.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query16.q.out index 4e9966445da8..457d9093e2f4 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query16.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query16.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(cs_ship_date_sk=[$2], cs_ship_addr_sk=[$3], cs_call_center_sk=[$4], cs_warehouse_sk=[$5], cs_order_number=[$6], cs_ext_ship_cost=[$7], cs_net_profit=[$8], d_date_sk=[$9], d_date=[$10], ca_address_sk=[$0], ca_state=[$1], cc_call_center_sk=[$11], cc_county=[$12]) HiveJoin(condition=[=($4, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'NY'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'NY')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('NY'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'NY')]) 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=[$1], cs_ship_addr_sk=[$9], cs_call_center_sk=[$10], cs_warehouse_sk=[$13], cs_order_number=[$16], cs_ext_ship_cost=[$27], cs_net_profit=[$32]) @@ -17,7 +17,7 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cc_call_center_sk=[$0], cc_county=[$25]) - HiveFilter(condition=[IN($25, _UTF-16LE'Daviess County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Franklin Parish':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Levy County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Ziebach County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($25, 'Daviess County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Franklin Parish':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Levy County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Ziebach County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, call_center]], table:alias=[call_center]) HiveProject(cs_warehouse_sk=[$13], cs_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($13)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query17.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query17.q.out index cbdc327d995a..deb86a5642f0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query17.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($33))]) 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')]) + HiveFilter(condition=[IN($15, '2000Q1', '2000Q2', '2000Q3')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d3]) HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ss_store_sk=[$2], ss_ticket_number=[$3], ss_quantity=[$4], ss_sold_date_sk=[$5], d_date_sk=[$6], sr_item_sk=[$7], sr_customer_sk=[$8], sr_ticket_number=[$9], sr_return_quantity=[$10], sr_returned_date_sk=[$11], d_date_sk0=[$12]) HiveJoin(condition=[AND(=($1, $8), =($0, $7), =($3, $9))], joinType=[inner], algorithm=[none], cost=[not available]) @@ -20,7 +20,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[=($15, _UTF-16LE'2000Q1')]) + HiveFilter(condition=[=($15, '2000Q1')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(sr_item_sk=[$0], sr_customer_sk=[$1], sr_ticket_number=[$2], sr_return_quantity=[$3], sr_returned_date_sk=[$4], d_date_sk=[$5]) HiveJoin(condition=[=($4, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -28,7 +28,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT NULL($19))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) - HiveFilter(condition=[IN($15, _UTF-16LE'2000Q1', _UTF-16LE'2000Q2', _UTF-16LE'2000Q3')]) + HiveFilter(condition=[IN($15, '2000Q1', '2000Q2', '2000Q3')]) HiveTableScan(table=[[default, date_dim]], table:alias=[d2]) HiveProject(s_store_sk=[$0], s_state=[$24]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query18.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query18.q.out index 2acdb87cc00a..2af559040959 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query18.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query18.q.out @@ -14,7 +14,7 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0], $f10=[CAST($6):DECIMAL(12, 2)]) - HiveFilter(condition=[AND(=($1, _UTF-16LE'M'), =($3, _UTF-16LE'College '))]) + HiveFilter(condition=[AND(=($1, 'M'), =($3, 'College '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(c_customer_sk=[$0], c_current_cdemo_sk=[$1], c_current_addr_sk=[$2], $f9=[$3], ca_address_sk=[$4], ca_county=[$5], ca_state=[$6], ca_country=[$7]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -22,7 +22,7 @@ HiveSortLimit(sort0=[$1], sort1=[$2], sort2=[$3], sort3=[$0], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($12, 1, 4, 5, 9, 10, 12), IS NOT NULL($2), 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=[IN($8, _UTF-16LE'AL', _UTF-16LE'MS', _UTF-16LE'NC', _UTF-16LE'ND', _UTF-16LE'OK', _UTF-16LE'TN', _UTF-16LE'WI')]) + HiveFilter(condition=[IN($8, 'AL', 'MS', 'NC', 'ND', 'OK', 'TN', 'WI')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query2.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query2.q.out index c6c150a4651d..a42724f2b95c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query2.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query2.q.out @@ -15,7 +15,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC]) HiveProject(sold_date_sk=[$33], sales_price=[$22]) HiveFilter(condition=[IS NOT NULL($33)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) @@ -35,7 +35,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC]) HiveProject(sold_date_sk=[$33], sales_price=[$22]) HiveFilter(condition=[IS NOT NULL($33)]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out index c96f9bdb6b8e..4c518c59b256 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query24.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query24.q.out index f59f8a569afc..a4f3f03c1b64 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query24.q.out @@ -29,7 +29,7 @@ HiveProject(c_last_name=[$0], c_first_name=[$1], s_store_name=[$2], paid=[$3]) HiveFilter(condition=[AND(=($10, 7), IS NOT NULL($25))]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_current_price=[$5], i_size=[$15], i_units=[$18], i_manager_id=[$20]) - HiveFilter(condition=[=($17, _UTF-16LE'orchid ')]) + HiveFilter(condition=[=($17, 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(_o__c0=[*(0.05:DECIMAL(2, 2), CAST(/($0, $1)):DECIMAL(21, 6))]) HiveFilter(condition=[IS NOT NULL(CAST(/($0, $1)):DECIMAL(21, 6))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query26.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query26.q.out index dda45cc67163..0ac6eb5e41ed 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query26.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query26.q.out @@ -13,10 +13,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($1, _UTF-16LE'F'), =($3, _UTF-16LE'Primary '))]) + HiveFilter(condition=[AND(=($2, 'W'), =($1, 'F'), =($3, 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'N'), =($14, _UTF-16LE'N'))]) + HiveFilter(condition=[OR(=($9, 'N'), =($14, 'N'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query27.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query27.q.out index b3a723cd05cb..51cdedd15423 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query27.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query27.q.out @@ -14,10 +14,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 2001)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'U'), =($1, _UTF-16LE'M'), =($3, _UTF-16LE'2 yr Degree '))]) + HiveFilter(condition=[AND(=($2, 'U'), =($1, 'M'), =($3, '2 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(s_store_sk=[$0], s_state=[$24]) - HiveFilter(condition=[IN($24, _UTF-16LE'FL', _UTF-16LE'LA', _UTF-16LE'MI', _UTF-16LE'MO', _UTF-16LE'SC', _UTF-16LE'SD')]) + HiveFilter(condition=[IN($24, 'FL', 'LA', 'MI', 'MO', 'SC', 'SD')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query30.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query30.q.out index 5e5de8b19ec6..ad7fbfd889af 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query30.q.out @@ -8,7 +8,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0]) - HiveFilter(condition=[=($8, _UTF-16LE'IL')]) + HiveFilter(condition=[=($8, 'IL')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(wr_returning_customer_sk=[$0], ca_state=[$1], $f2=[$2]) HiveFilter(condition=[IS NOT NULL($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out index b9956ea50903..c1ebd65079ec 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($13)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Books '), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, 'Books '), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -44,7 +44,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($13)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Books '), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, 'Books '), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -65,6 +65,6 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($13)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_manufact_id=[$13]) - HiveFilter(condition=[AND(=($12, _UTF-16LE'Books '), IS NOT NULL($13))]) + HiveFilter(condition=[AND(=($12, 'Books '), IS NOT NULL($13))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out index 3df017c39ccb..2771464b0899 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out @@ -18,9 +18,9 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(>($4, 0), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($23, _UTF-16LE'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($23, 'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query36.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query36.q.out index ec7dc0021f08..374ed9a0d64c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query36.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query36.q.out @@ -15,7 +15,7 @@ HiveProject(gross_margin=[$0], i_category=[$1], i_class=[$2], lochierarchy=[$3], HiveFilter(condition=[=($6, 1999)]) HiveTableScan(table=[[default, date_dim]], table:alias=[d1]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($24, _UTF-16LE'AL', _UTF-16LE'FL', _UTF-16LE'GA', _UTF-16LE'LA', _UTF-16LE'MI', _UTF-16LE'MO', _UTF-16LE'SC', _UTF-16LE'SD')]) + HiveFilter(condition=[IN($24, 'AL', 'FL', 'GA', 'LA', 'MI', 'MO', 'SC', 'SD')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(i_item_sk=[$0], i_class=[$10], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out index b91ec1153e8a..72cb293d31f0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out @@ -9,6 +9,6 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(i_manufact=[$0]) HiveFilter(condition=[>($1, 0)]) HiveAggregate(group=[{14}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'frosted', _UTF-16LE'rose'), IN($18, _UTF-16LE'Gross', _UTF-16LE'Lb'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'black', _UTF-16LE'chocolate'), IN($18, _UTF-16LE'Box', _UTF-16LE'Dram'), IN($15, _UTF-16LE'economy', _UTF-16LE'petite')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'magenta', _UTF-16LE'slate'), IN($18, _UTF-16LE'Bundle', _UTF-16LE'Carton'), IN($15, _UTF-16LE'N/A', _UTF-16LE'small')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'cornflower', _UTF-16LE'firebrick'), IN($18, _UTF-16LE'Oz', _UTF-16LE'Pound'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'almond', _UTF-16LE'steel'), IN($18, _UTF-16LE'Case', _UTF-16LE'Tsp'), IN($15, _UTF-16LE'large', _UTF-16LE'medium')), AND(=($12, _UTF-16LE'Women'), IN($17, _UTF-16LE'aquamarine', _UTF-16LE'purple'), IN($18, _UTF-16LE'Bunch', _UTF-16LE'Gram'), IN($15, _UTF-16LE'economy', _UTF-16LE'petite')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'lavender', _UTF-16LE'papaya'), IN($18, _UTF-16LE'Cup', _UTF-16LE'Pallet'), IN($15, _UTF-16LE'N/A', _UTF-16LE'small')), AND(=($12, _UTF-16LE'Men'), IN($17, _UTF-16LE'cyan', _UTF-16LE'maroon'), IN($18, _UTF-16LE'Each', _UTF-16LE'N/A'), IN($15, _UTF-16LE'large', _UTF-16LE'medium'))), IS NOT NULL($14))]) + HiveFilter(condition=[AND(OR(AND(=($12, 'Women'), IN($17, 'frosted', 'rose'), IN($18, 'Gross', 'Lb'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'black', 'chocolate'), IN($18, 'Box', 'Dram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'magenta', 'slate'), IN($18, 'Bundle', 'Carton'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cornflower', 'firebrick'), IN($18, 'Oz', 'Pound'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'almond', 'steel'), IN($18, 'Case', 'Tsp'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'aquamarine', 'purple'), IN($18, 'Bunch', 'Gram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'lavender', 'papaya'), IN($18, 'Cup', 'Pallet'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cyan', 'maroon'), IN($18, 'Each', 'N/A'), IN($15, 'large', 'medium'))), IS NOT NULL($14))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query43.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query43.q.out index a20883c6a5d7..76f1f7f3d272 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query43.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query43.q.out @@ -8,7 +8,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5= HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out index ce42781178eb..d705bd014511 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(ca_zip=[$1], ca_county=[$0], _c2=[$2]) HiveAggregate(group=[{7, 8}], agg#0=[sum($2)]) - HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), _UTF-16LE'85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveProject(ws_item_sk=[$5], ws_bill_customer_sk=[$6], ws_sales_price=[$7], ws_sold_date_sk=[$8], c_customer_sk=[$0], c_current_addr_sk=[$1], ca_address_sk=[$2], ca_county=[$3], ca_zip=[$4], d_date_sk=[$9], d_year=[$10], d_qoy=[$11], i_item_sk=[$12], i_item_id=[$13], i_item_id0=[$14], literalTrue=[$15]) HiveJoin(condition=[=($5, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query46.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query46.q.out index abdbebce09c7..da767daf8383 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query46.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query46.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), IN($7, 0, 6))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($22, _UTF-16LE'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Highland Park':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Salem':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Union':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($22, 'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Highland Park':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Salem':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Union':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out index 9d2e9add949f..b4874b81abce 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out @@ -2,12 +2,12 @@ CBO PLAN: HiveProject(_c0=[$0]) HiveAggregate(group=[{}], agg#0=[sum($7)]) HiveJoin(condition=[AND(=($6, $0), OR(AND($1, $9), AND($2, $10), AND($3, $11)))], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'M'), =($3, _UTF-16LE'4 yr Degree '))]) + HiveFilter(condition=[AND(=($2, 'M'), =($3, '4 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out index ea3554b05100..503043fcf358 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out @@ -8,7 +8,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveAggregate(group=[{0, 1, 2, 3, 4}]) HiveProject(channel=[$0], item=[$1], return_ratio=[$2], return_rank=[$3], currency_rank=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) @@ -25,7 +25,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) @@ -42,7 +42,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(d_date_sk=[$0]) HiveFilter(condition=[AND(=($6, 2000), =($8, 12))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], item=[$0], return_ratio=[$1], return_rank=[$2], currency_rank=[$3]) HiveFilter(condition=[OR(<=($2, 10), <=($3, 10))]) HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out index 647a8170af6d..ab73ed07b847 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out @@ -4,7 +4,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -21,7 +21,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(s_store_sk=[$0], s_store_id=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -38,7 +38,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cp_catalog_page_sk=[$0], cp_catalog_page_id=[$1]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveAggregate(group=[{8}], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)], agg#3=[sum($5)]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out index d05b53e81ec5..16190e274296 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$2], sort1=[$1], sort2=[$0], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants', _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'reference', _UTF-16LE'self-help'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'importoamalg #1', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9'), 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'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), 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'))))]) + HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'reference', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'reference', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_qoy=[$10]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query54.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query54.q.out index 1feeb5e1d87c..8c51e64a2382 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query54.q.out @@ -62,7 +62,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[AND(=($10, _UTF-16LE'consignment '), =($12, _UTF-16LE'Jewelry '))]) + HiveFilter(condition=[AND(=($10, 'consignment '), =($12, 'Jewelry '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_month_seq=[$1], $f0=[$2], $f00=[$3]) HiveJoin(condition=[<=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out index 7716e8ff912d..ecabe181abd2 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out @@ -22,7 +22,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, _UTF-16LE'chiffon', _UTF-16LE'lace', _UTF-16LE'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -42,7 +42,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, _UTF-16LE'chiffon', _UTF-16LE'lace', _UTF-16LE'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -62,6 +62,6 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, _UTF-16LE'chiffon', _UTF-16LE'lace', _UTF-16LE'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query59.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query59.q.out index 72e4f3621913..52d259a0554f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query59.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query59.q.out @@ -17,7 +17,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) @@ -32,7 +32,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(ss_store_sk=[$6], ss_sales_price=[$12], ss_sold_date_sk=[$22]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, _UTF-16LE'Sunday ')], EXPR$1=[=($14, _UTF-16LE'Monday ')], EXPR$2=[=($14, _UTF-16LE'Tuesday ')], EXPR$3=[=($14, _UTF-16LE'Wednesday')], EXPR$4=[=($14, _UTF-16LE'Thursday ')], EXPR$5=[=($14, _UTF-16LE'Friday ')], EXPR$6=[=($14, _UTF-16LE'Saturday ')]) + HiveProject(d_date_sk=[$0], d_week_seq=[$4], EXPR$0=[=($14, 'Sunday ')], EXPR$1=[=($14, 'Monday ')], EXPR$2=[=($14, 'Tuesday ')], EXPR$3=[=($14, 'Wednesday')], EXPR$4=[=($14, 'Thursday ')], EXPR$5=[=($14, 'Friday ')], EXPR$6=[=($14, 'Saturday ')]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(d_week_seq=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out index 084d28c52fae..0df9457e9fcd 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out @@ -22,7 +22,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[=($12, _UTF-16LE'Children ')]) + HiveFilter(condition=[=($12, 'Children ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -42,7 +42,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[=($12, _UTF-16LE'Children ')]) + HiveFilter(condition=[=($12, 'Children ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -62,6 +62,6 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[=($12, _UTF-16LE'Children ')]) + HiveFilter(condition=[=($12, 'Children ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query61.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query61.q.out index 529274360fee..4a711c45572e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query61.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query61.q.out @@ -24,13 +24,13 @@ HiveProject(promotions=[$0], total=[$1], _c2=[*(/(CAST($0):DECIMAL(15, 4), CAST( HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[=($12, _UTF-16LE'Electronics ')]) + HiveFilter(condition=[=($12, 'Electronics ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[=($27, -7:DECIMAL(1, 0))]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'Y'), =($11, _UTF-16LE'Y'), =($8, _UTF-16LE'Y'))]) + HiveFilter(condition=[OR(=($9, 'Y'), =($11, 'Y'), =($8, 'Y'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[sum($6)]) @@ -53,7 +53,7 @@ HiveProject(promotions=[$0], total=[$1], _c2=[*(/(CAST($0):DECIMAL(15, 4), CAST( HiveFilter(condition=[AND(=($6, 1999), =($8, 11))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0]) - HiveFilter(condition=[=($12, _UTF-16LE'Electronics ')]) + HiveFilter(condition=[=($12, 'Electronics ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[=($27, -7:DECIMAL(1, 0))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out index 01da209407ba..254d1388d6ce 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', _UTF-16LE'pants', _UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'refernece', _UTF-16LE'self-help'), IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'exportiunivamalg #9', _UTF-16LE'importoamalg #1', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9'), 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'exportiunivamalg #9', _UTF-16LE'scholaramalgamalg #14', _UTF-16LE'scholaramalgamalg #7', _UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Men', _UTF-16LE'Music', _UTF-16LE'Women'), 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'))))]) + HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'refernece', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'refernece', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out index ec7570a533e4..27f71da51db8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out @@ -32,7 +32,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, _UTF-16LE'burnished', _UTF-16LE'chocolate', _UTF-16LE'dim', _UTF-16LE'maroon', _UTF-16LE'navajo', _UTF-16LE'steel'))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -93,7 +93,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, _UTF-16LE'burnished', _UTF-16LE'chocolate', _UTF-16LE'dim', _UTF-16LE'maroon', _UTF-16LE'navajo', _UTF-16LE'steel'))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'))]) 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/tpcds30tb/tez/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out index 3bd067917966..e3a0a3467bea 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out @@ -1,5 +1,5 @@ CBO PLAN: -HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county=[$3], w_state=[$4], w_country=[$5], ship_carriers=[CAST(_UTF-16LE'DIAMOND,AIRBORNE':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], year=[CAST(2002):INTEGER], jan_sales=[$6], feb_sales=[$7], mar_sales=[$8], apr_sales=[$9], may_sales=[$10], jun_sales=[$11], jul_sales=[$12], aug_sales=[$13], sep_sales=[$14], oct_sales=[$15], nov_sales=[$16], dec_sales=[$17], jan_sales_per_sq_foot=[$18], feb_sales_per_sq_foot=[$19], mar_sales_per_sq_foot=[$20], apr_sales_per_sq_foot=[$21], may_sales_per_sq_foot=[$22], jun_sales_per_sq_foot=[$23], jul_sales_per_sq_foot=[$24], aug_sales_per_sq_foot=[$25], sep_sales_per_sq_foot=[$26], oct_sales_per_sq_foot=[$27], nov_sales_per_sq_foot=[$28], dec_sales_per_sq_foot=[$29], jan_net=[$30], feb_net=[$31], mar_net=[$32], apr_net=[$33], may_net=[$34], jun_net=[$35], jul_net=[$36], aug_net=[$37], sep_net=[$38], oct_net=[$39], nov_net=[$40], dec_net=[$41]) +HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county=[$3], w_state=[$4], w_country=[$5], ship_carriers=[CAST('DIAMOND,AIRBORNE':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], year=[CAST(2002):INTEGER], jan_sales=[$6], feb_sales=[$7], mar_sales=[$8], apr_sales=[$9], may_sales=[$10], jun_sales=[$11], jul_sales=[$12], aug_sales=[$13], sep_sales=[$14], oct_sales=[$15], nov_sales=[$16], dec_sales=[$17], jan_sales_per_sq_foot=[$18], feb_sales_per_sq_foot=[$19], mar_sales_per_sq_foot=[$20], apr_sales_per_sq_foot=[$21], may_sales_per_sq_foot=[$22], jun_sales_per_sq_foot=[$23], jul_sales_per_sq_foot=[$24], aug_sales_per_sq_foot=[$25], sep_sales_per_sq_foot=[$26], oct_sales_per_sq_foot=[$27], nov_sales_per_sq_foot=[$28], dec_sales_per_sq_foot=[$29], jan_net=[$30], feb_net=[$31], mar_net=[$32], apr_net=[$33], may_net=[$34], jun_net=[$35], jul_net=[$36], aug_net=[$37], sep_net=[$38], oct_net=[$39], nov_net=[$40], dec_net=[$41]) HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29], $f30=[$30], $f31=[$31], $f32=[$32], $f33=[$33], $f34=[$34], $f35=[$35], $f36=[$36], $f37=[$37], $f38=[$38], $f39=[$39], $f40=[$40], $f41=[$41]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)], agg#24=[sum($30)], agg#25=[sum($31)], agg#26=[sum($32)], agg#27=[sum($33)], agg#28=[sum($34)], agg#29=[sum($35)], agg#30=[sum($36)], agg#31=[sum($37)], agg#32=[sum($38)], agg#33=[sum($39)], agg#34=[sum($40)], agg#35=[sum($41)]) @@ -22,7 +22,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, _UTF-16LE'AIRBORNE', _UTF-16LE'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) @@ -43,7 +43,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, _UTF-16LE'AIRBORNE', _UTF-16LE'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query68.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query68.q.out index 7ffdf2cff7f6..2a467d3a3003 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query68.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query68.q.out @@ -23,7 +23,7 @@ HiveSortLimit(sort0=[$0], sort1=[$4], dir0=[ASC], dir1=[ASC], fetch=[100]) 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':VARCHAR(60) CHARACTER SET "UTF-16LE", _UTF-16LE'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($22, 'Cedar Grove':VARCHAR(60) CHARACTER SET "UTF-16LE", 'Wildwood':VARCHAR(60) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[OR(=($4, 1), =($3, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query69.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query69.q.out index 48c0c4e35535..b08b3da6df04 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query69.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query69.q.out @@ -14,7 +14,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$4], sort4=[$6], dir0=[ 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')]) + HiveFilter(condition=[IN($8, 'CO', 'IL', 'MN')]) HiveTableScan(table=[[default, customer_address]], table:alias=[ca]) HiveProject(ss_customer_sk=[$0]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query7.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query7.q.out index 5c5d16b51077..a29cee5d15c1 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query7.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query7.q.out @@ -13,10 +13,10 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[=($6, 1998)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[AND(=($2, _UTF-16LE'W'), =($1, _UTF-16LE'F'), =($3, _UTF-16LE'Primary '))]) + HiveFilter(condition=[AND(=($2, 'W'), =($1, 'F'), =($3, 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[OR(=($9, _UTF-16LE'N'), =($14, _UTF-16LE'N'))]) + HiveFilter(condition=[OR(=($9, 'N'), =($14, 'N'))]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out index cf65b8819fe4..758141ba6a0b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out @@ -35,6 +35,6 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[=($20, 1)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4]) - HiveFilter(condition=[IN($9, _UTF-16LE'breakfast', _UTF-16LE'dinner')]) + HiveFilter(condition=[IN($9, 'breakfast', 'dinner')]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query72.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query72.q.out index 227b9d707cd2..9a35bac9ed77 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query72.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query72.q.out @@ -20,10 +20,10 @@ HiveSortLimit(sort0=[$5], sort1=[$0], sort2=[$1], sort3=[$2], dir0=[DESC], dir1= HiveFilter(condition=[AND(IS NOT NULL($17), IS NOT NULL($4), IS NOT NULL($3), IS NOT NULL($1), IS NOT NULL($33))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'1001-5000 ')]) + HiveFilter(condition=[=($2, '1001-5000 ')]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(cd_demo_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'M')]) + HiveFilter(condition=[=($2, 'M')]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(d_date_sk=[$0], d_week_seq=[$1], d_date_sk0=[$2], d_week_seq0=[$3], EXPR$0=[$4]) HiveJoin(condition=[=($3, $1)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out index 13dbe2ffe643..bcf158a8544e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out @@ -18,9 +18,9 @@ HiveSortLimit(sort0=[$5], dir0=[DESC]) 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(>($4, 0), IN($2, _UTF-16LE'>10000', _UTF-16LE'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[IN($23, _UTF-16LE'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", _UTF-16LE'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[IN($23, 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query75.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query75.q.out index 38a97c4bdfe8..66eed2a9f31e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query75.q.out @@ -26,7 +26,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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=[-($6, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($7, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[right], algorithm=[none], cost=[not available]) @@ -41,7 +41,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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=[-($6, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($7, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[right], algorithm=[none], cost=[not available]) @@ -56,7 +56,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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)]) @@ -81,7 +81,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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=[-($6, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($7, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[right], algorithm=[none], cost=[not available]) @@ -96,7 +96,7 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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=[-($6, CASE(IS NOT NULL($2), $2, 0))], sales_amt=[-($7, CASE(IS NOT NULL($3), $3, 0:DECIMAL(1, 0)))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[right], algorithm=[none], cost=[not available]) @@ -111,6 +111,6 @@ HiveProject(prev_year=[CAST(2001):INTEGER], year=[CAST(2002):INTEGER], curr_yr.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($13), IS NOT NULL($11), IS NOT NULL($7), IS NOT NULL($9))]) + HiveFilter(condition=[AND(=($12, '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/tpcds30tb/tez/cbo_query76.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query76.q.out index 86e531d376d4..534080f01639 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query76.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query76.q.out @@ -4,7 +4,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveAggregate(group=[{0, 1, 2, 3, 4}], agg#0=[count()], agg#1=[sum($5)]) HiveProject(channel=[$0], col_name=[$1], d_year=[$2], d_qoy=[$3], i_category=[$4], ext_sales_price=[$5]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=[_UTF-16LE'ss_addr_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$1], d_qoy=[$2], i_category=[$7], ext_sales_price=[$4]) + HiveProject(channel=['store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['ss_addr_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$1], d_qoy=[$2], i_category=[$7], ext_sales_price=[$4]) HiveJoin(condition=[=($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(d_date_sk=[$0], d_year=[$6], d_qoy=[$10]) @@ -14,7 +14,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) - 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=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) + HiveProject(channel=['web':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['ws_web_page_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_item_sk=[$2], ws_ext_sales_price=[$22], ws_sold_date_sk=[$33]) @@ -24,7 +24,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], dir0=[ HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_category=[$12]) HiveTableScan(table=[[default, item]], table:alias=[item]) - HiveProject(channel=[_UTF-16LE'catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=[_UTF-16LE'cs_warehouse_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) + HiveProject(channel=['catalog':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], col_name=['cs_warehouse_sk':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], d_year=[$4], d_qoy=[$5], i_category=[$7], ext_sales_price=[$1]) HiveJoin(condition=[=($0, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_item_sk=[$14], cs_ext_sales_price=[$22], cs_sold_date_sk=[$33]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out index 603272d382d2..54e9f3482e06 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out @@ -5,7 +5,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_store_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -27,7 +27,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[$3], profit=[-($2, $4)]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[$3], profit=[-($2, $4)]) HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cs_call_center_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -47,7 +47,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_web_page_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query8.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query8.q.out index 365ec254866a..1f3d8cc5792a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query8.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query8.q.out @@ -20,7 +20,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) HiveProject($f0=[substr($9, 1, 5)]) - HiveFilter(condition=[AND(IN(substr($9, 1, 5), _UTF-16LE'89436':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'65085':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83927':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77557':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58429':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40697':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80614':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10502':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32779':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91137':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61265':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'98294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59362':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'87291':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84093':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21505':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17184':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10866':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25797':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28055':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18377':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80332':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21757':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29742':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90885':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40811':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25990':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47513':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89531':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10391':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18846':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82637':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41368':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83658':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86199':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81625':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26696':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89338':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19053':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36610':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99823':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41249':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48584':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'78890':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14090':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'34425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79188':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50497':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84861':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90733':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37119':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57835':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70067':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'62878':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19303':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18840':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16737':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16022':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49613':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'68310':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'60069':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'98360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48649':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39050':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41793':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25002':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27413':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47208':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16515':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15009':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80015':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63982':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81087':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67468':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'34175':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'64008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11201':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48043':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45645':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61163':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41100':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89951':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22745':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35851':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83326':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61125':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'78298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80752':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49858':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52940':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'96976':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53582':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18717':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'90226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50530':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27670':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'96577':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57856':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56372':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16165':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54561':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'44439':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22926':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61451':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92397':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70873':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13355':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21801':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46346':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56458':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47306':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99555':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69399':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26234':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47546':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49661':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88601':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35943':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25632':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'24611':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'44166':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30379':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11110':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14329':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'93815':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71381':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25612':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14664':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21077':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82626':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'60915':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81020':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11433':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13414':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42548':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92713':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'47484':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45539':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35901':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19506':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'65690':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73957':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49231':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20005':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18384':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76615':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38177':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55607':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41369':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58581':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'76232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'75692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95464':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22246':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51061':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'56692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'77209':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15482':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10688':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45907':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73520':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'17959':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'24677':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'66446':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94627':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'53535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15560':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'41967':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69297':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11929':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59403':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33283':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'57350':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10827':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'71286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25251':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'95042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15526':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36496':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55854':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81980':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'35375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49157':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63512':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28944':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36503':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54010':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18767':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23969':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'43905':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'66979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33113':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59080':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79144':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70373':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67031':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'38360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26705':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50906':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52406':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26066':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'73146':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'31897':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30045':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'92454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14354':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19770':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'22928':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'97790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'50723':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46081':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30202':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88500':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'13261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14172':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'93578':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83583':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'46047':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'94167':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'82564':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21156':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86709':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'37931':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74703':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83103':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'23054':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70470':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49247':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91911':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69998':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'70070':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'63197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'54853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'88191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'91830':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'49521':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'19454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'81450':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'89091':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'62378':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'25683':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61869':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'51744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36580':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'85778':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'36871':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'28810':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'83712':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45486':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'67393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'26935':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'42393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'20132':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55349':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'86057':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'80218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'10094':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11357':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'48819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'39734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'40758':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30432':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21204':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'29467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'30214':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'61024':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'55307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'74621':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'11622':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'68908':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33032':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'52868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99194':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99900':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'84936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'69036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'99149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'45013':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32895':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'59004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32322':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'14933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'33562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'72550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'27385':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58049':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'58200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'16808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'21360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'32961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'18586':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'79307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", _UTF-16LE'15492':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IS NOT NULL(substr(substr($9, 1, 5), 1, 2)))]) + HiveFilter(condition=[AND(IN(substr($9, 1, 5), '89436':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '65085':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83927':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77557':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58429':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40697':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80614':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10502':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32779':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91137':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61265':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '98294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59362':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '87291':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84093':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21505':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17184':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10866':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25797':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28055':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18377':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80332':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21757':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29742':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90885':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29898':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40811':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25990':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47513':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89531':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10391':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18846':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82637':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41368':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83658':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86199':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81625':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26696':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89338':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19053':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36610':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99823':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41249':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48584':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '78890':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14090':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '34425':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79188':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50497':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84861':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90733':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37119':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57835':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70067':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '62878':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19303':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18840':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16737':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16022':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49613':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89977':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '68310':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '60069':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '98360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48649':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39050':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41793':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25002':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27413':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47208':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16515':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15009':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80015':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63982':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81087':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67468':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '34175':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '64008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11201':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48043':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45645':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61163':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41100':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89951':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22745':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35851':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83326':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61125':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '78298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80752':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49858':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52940':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '96976':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53582':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18717':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '90226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50530':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94203':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27670':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '96577':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57856':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56372':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16165':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23427':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54561':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28806':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '44439':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22926':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30123':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61451':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92397':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70873':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13355':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21801':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46346':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56458':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47306':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99555':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69399':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26234':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47546':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49661':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88601':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35943':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25632':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '24611':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '44166':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56648':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30379':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59785':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11110':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14329':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '93815':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52226':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71381':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13842':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25612':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63294':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14664':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21077':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82626':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '60915':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81020':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11433':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13414':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42548':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92713':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '47484':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16072':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45539':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35901':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19506':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '65690':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73957':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71850':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49231':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14276':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20005':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18384':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76615':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38177':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55607':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41369':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95447':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58581':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '76232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '75692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95464':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22246':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51061':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '56692':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '77209':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15482':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10688':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45907':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73520':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72666':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '17959':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '24677':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '66446':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94627':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '53535':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15560':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '41967':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69297':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11929':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59403':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33283':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52232':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '57350':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40921':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36635':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10827':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '71286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19736':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80619':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25251':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '95042':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15526':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36496':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55854':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49124':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81980':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '35375':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49157':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63512':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28944':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14946':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36503':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54010':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18767':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23969':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '43905':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '66979':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33113':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21286':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58471':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59080':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13395':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79144':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70373':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67031':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '38360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26705':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50906':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52406':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26066':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '73146':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15884':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '31897':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30045':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61068':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '92454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13376':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14354':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19770':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '22928':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '97790':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '50723':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46081':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30202':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20223':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88500':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67298':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '13261':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14172':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81410':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '93578':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83583':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '46047':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '94167':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '82564':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21156':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15799':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86709':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '37931':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74703':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83103':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '23054':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70470':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72008':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49247':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91911':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69998':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '70070':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '63197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '54853':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88191':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '91830':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '49521':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '19454':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81450':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '89091':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '62378':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '25683':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61869':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '51744':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36580':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85778':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '36871':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48121':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '28810':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83712':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45486':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '67393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '26935':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '42393':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '20132':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55349':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86057':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21309':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80218':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '10094':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11357':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '48819':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '39734':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '40758':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30432':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21204':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '29467':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '30214':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '61024':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '55307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '74621':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '11622':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '68908':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33032':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '52868':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99194':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99900':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '84936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '69036':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '99149':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '45013':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32895':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '59004':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32322':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '14933':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32936':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '33562':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '72550':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '27385':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58049':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '58200':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '16808':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '21360':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '32961':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '18586':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '79307':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '15492':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IS NOT NULL(substr(substr($9, 1, 5), 1, 2)))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) @@ -32,7 +32,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL(substr(substr($9, 1, 5), 1, 2))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(c_current_addr_sk=[$4]) - HiveFilter(condition=[AND(=($10, _UTF-16LE'Y'), IS NOT NULL($4))]) + HiveFilter(condition=[AND(=($10, 'Y'), IS NOT NULL($4))]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(s_store_sk=[$0], s_store_name=[$5], EXPR$0=[substr($25, 1, 2)]) HiveFilter(condition=[IS NOT NULL(substr($25, 1, 2))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out index 2fea65b34ef5..e84714796d71 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out @@ -4,7 +4,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=[_UTF-16LE'store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -24,11 +24,11 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[>($5, 50:DECIMAL(2, 0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[=($11, _UTF-16LE'N')]) + HiveFilter(condition=[=($11, 'N')]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(s_store_sk=[$0], s_store_id=[$1]) HiveTableScan(table=[[default, store]], table:alias=[store]) - HiveProject(channel=[_UTF-16LE'catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -48,11 +48,11 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[>($5, 50:DECIMAL(2, 0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[=($11, _UTF-16LE'N')]) + HiveFilter(condition=[=($11, 'N')]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(cp_catalog_page_sk=[$0], cp_catalog_page_id=[$1]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) - HiveProject(channel=[_UTF-16LE'web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||(_UTF-16LE'web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -72,7 +72,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[>($5, 50:DECIMAL(2, 0))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(p_promo_sk=[$0]) - HiveFilter(condition=[=($11, _UTF-16LE'N')]) + HiveFilter(condition=[=($11, 'N')]) HiveTableScan(table=[[default, promotion]], table:alias=[promotion]) HiveProject(web_site_sk=[$0], web_site_id=[$1]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query81.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query81.q.out index d1bdb18108d9..ba58d53de761 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query81.q.out @@ -1,5 +1,5 @@ CBO PLAN: -HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_name=[$3], ca_street_number=[$4], ca_street_name=[$5], ca_street_type=[$6], ca_suite_number=[$7], ca_city=[$8], ca_county=[$9], ca_state=[CAST(_UTF-16LE'IL'):CHAR(2) CHARACTER SET "UTF-16LE"], ca_zip=[$10], ca_country=[$11], ca_gmt_offset=[$12], ca_location_type=[$13], ctr_total_return=[$14]) +HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_name=[$3], ca_street_number=[$4], ca_street_name=[$5], ca_street_type=[$6], ca_suite_number=[$7], ca_city=[$8], ca_county=[$9], ca_state=[CAST('IL'):CHAR(2) CHARACTER SET "UTF-16LE"], ca_zip=[$10], ca_country=[$11], ca_gmt_offset=[$12], ca_location_type=[$13], ctr_total_return=[$14]) HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$4], sort5=[$5], sort6=[$6], sort7=[$7], sort8=[$8], sort9=[$9], sort10=[$10], sort11=[$11], sort12=[$12], sort13=[$13], sort14=[$14], dir0=[ASC], dir1=[ASC], dir2=[ASC], dir3=[ASC], dir4=[ASC], dir5=[ASC], dir6=[ASC], dir7=[ASC], dir8=[ASC], dir9=[ASC], dir10=[ASC], dir11=[ASC], dir12=[ASC], dir13=[ASC], dir14=[ASC], fetch=[100]) HiveProject(c_customer_id=[$1], c_salutation=[$3], c_first_name=[$4], c_last_name=[$5], ca_street_number=[$7], ca_street_name=[$8], ca_street_type=[$9], ca_suite_number=[$10], ca_city=[$11], ca_county=[$12], ca_zip=[$13], ca_country=[$14], ca_gmt_offset=[$15], ca_location_type=[$16], ctr_total_return=[$19]) HiveJoin(condition=[AND(=($18, $21), >($19, $20))], joinType=[inner], algorithm=[none], cost=[not available]) @@ -9,7 +9,7 @@ HiveProject(c_customer_id=[$0], c_salutation=[$1], c_first_name=[$2], c_last_nam HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(ca_address_sk=[$0], ca_street_number=[$2], ca_street_name=[$3], ca_street_type=[$4], ca_suite_number=[$5], ca_city=[$6], ca_county=[$7], ca_zip=[$9], ca_country=[$10], ca_gmt_offset=[$11], ca_location_type=[$12]) - HiveFilter(condition=[=($8, _UTF-16LE'IL')]) + HiveFilter(condition=[=($8, 'IL')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cr_returning_customer_sk=[$0], ca_state=[$1], $f2=[$2]) HiveFilter(condition=[IS NOT NULL($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query84.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query84.q.out index 23cc2cb99181..a02b370668e8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query84.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query84.q.out @@ -12,11 +12,11 @@ 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], customername=[$4], ca_address_sk=[$5], hd_demo_sk=[$6], hd_income_band_sk=[$7], ib_income_band_sk=[$8]) 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], customername=[||(||($9, _UTF-16LE', ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $8)]) + HiveProject(c_customer_id=[$1], c_current_cdemo_sk=[$2], c_current_hdemo_sk=[$3], c_current_addr_sk=[$4], customername=[||(||($9, ', ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $8)]) 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')]) + HiveFilter(condition=[=($6, 'Hopewell')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(hd_demo_sk=[$0], hd_income_band_sk=[$1], ib_income_band_sk=[$2]) HiveJoin(condition=[=($2, $1)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out index c1814f85a24a..1285cc0bef33 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out @@ -19,14 +19,14 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveProject(wr_item_sk=[$1], wr_refunded_cdemo_sk=[$3], wr_refunded_addr_sk=[$5], wr_returning_cdemo_sk=[$7], wr_reason_sk=[$11], wr_order_number=[$12], wr_fee=[$17], wr_refunded_cash=[$19]) HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($3), IS NOT NULL($11), IS NOT NULL($5))]) HiveTableScan(table=[[default, web_returns]], table:alias=[web_returns]) - HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, _UTF-16LE'GA', _UTF-16LE'KY', _UTF-16LE'NM')], EXPR$1=[IN($8, _UTF-16LE'IN', _UTF-16LE'MT', _UTF-16LE'OR')], EXPR$2=[IN($8, _UTF-16LE'MO', _UTF-16LE'WI', _UTF-16LE'WV')]) - HiveFilter(condition=[AND(IN($8, _UTF-16LE'GA', _UTF-16LE'IN', _UTF-16LE'KY', _UTF-16LE'MO', _UTF-16LE'MT', _UTF-16LE'NM', _UTF-16LE'OR', _UTF-16LE'WI', _UTF-16LE'WV'), =($10, _UTF-16LE'United States'))]) + HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) + HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) - HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, _UTF-16LE'M')], EXPR$1=[=($3, _UTF-16LE'4 yr Degree')], EXPR$2=[=($2, _UTF-16LE'D')], EXPR$3=[=($3, _UTF-16LE'Primary')], EXPR$4=[=($2, _UTF-16LE'U')], EXPR$5=[=($3, _UTF-16LE'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($2, _UTF-16LE'D', _UTF-16LE'M', _UTF-16LE'U'), IN($3, _UTF-16LE'4 yr Degree', _UTF-16LE'Advanced Degree', _UTF-16LE'Primary'))]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) HiveProject(r_reason_sk=[$0], r_reason_desc=[$2]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query88.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query88.q.out index b7dddd27623c..d925d7e9efca 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query88.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query88.q.out @@ -29,7 +29,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -46,7 +46,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -63,7 +63,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -80,7 +80,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -97,7 +97,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -114,7 +114,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -131,7 +131,7 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) @@ -148,6 +148,6 @@ HiveProject(s1.h8_30_to_9=[$0], s2.h9_to_9_30=[$7], s3.h9_30_to_10=[$6], s4.h10_ HiveFilter(condition=[AND(<=($4, 5), IN($3, 0, 1, 3), OR(AND(=($3, 3), IS NOT NULL($4)), AND(=($3, 0), <=($4, 2)), AND(=($3, 1), <=($4, 3))))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out index 4fd3daa1f1ed..2762a85dfa4a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out @@ -13,7 +13,7 @@ HiveProject(tmp1.i_category=[$0], tmp1.i_class=[$1], tmp1.i_brand=[$2], tmp1.s_s HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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'birdal', _UTF-16LE'musical', _UTF-16LE'pants', _UTF-16LE'parenting', _UTF-16LE'wallpaper', _UTF-16LE'womens'), IN($12, _UTF-16LE'Books', _UTF-16LE'Electronics', _UTF-16LE'Home', _UTF-16LE'Jewelry', _UTF-16LE'Men', _UTF-16LE'Shoes'), OR(AND(IN($12, _UTF-16LE'Books', _UTF-16LE'Electronics', _UTF-16LE'Home'), IN($10, _UTF-16LE'musical', _UTF-16LE'parenting', _UTF-16LE'wallpaper')), AND(IN($12, _UTF-16LE'Jewelry', _UTF-16LE'Men', _UTF-16LE'Shoes'), IN($10, _UTF-16LE'birdal', _UTF-16LE'pants', _UTF-16LE'womens'))))]) + HiveFilter(condition=[AND(IN($10, 'birdal', 'musical', 'pants', 'parenting', 'wallpaper', 'womens'), IN($12, 'Books', 'Electronics', 'Home', 'Jewelry', 'Men', 'Shoes'), OR(AND(IN($12, 'Books', 'Electronics', 'Home'), IN($10, 'musical', 'parenting', 'wallpaper')), AND(IN($12, 'Jewelry', 'Men', 'Shoes'), IN($10, 'birdal', 'pants', 'womens'))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out index 8a70a2068f52..e50094e4420a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out @@ -23,10 +23,10 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= 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($2, _UTF-16LE'M', _UTF-16LE'W'), IN($3, _UTF-16LE'Advanced Degree', _UTF-16LE'Unknown'), IN(ROW($2, $3), ROW(_UTF-16LE'M', _UTF-16LE'Unknown '), ROW(_UTF-16LE'W', _UTF-16LE'Advanced Degree ')))]) + HiveFilter(condition=[AND(IN($2, 'M', 'W'), IN($3, 'Advanced Degree', 'Unknown'), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[LIKE($2, _UTF-16LE'0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveFilter(condition=[LIKE($2, '0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(cc_call_center_sk=[$0], cc_call_center_id=[$1], cc_name=[$6], cc_manager=[$11]) HiveTableScan(table=[[default, call_center]], table:alias=[call_center]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query93.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query93.q.out index b84f16e73260..2cce6b0cb9e0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query93.q.out @@ -11,6 +11,6 @@ HiveSortLimit(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[IS NOT NULL($7)]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(r_reason_sk=[$0]) - HiveFilter(condition=[=($2, _UTF-16LE'Did not like the warranty ')]) + HiveFilter(condition=[=($2, 'Did not like the warranty ')]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query94.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query94.q.out index 5f14c7b74791..db2b77e06306 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query94.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query94.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$3], ws_web_site_sk=[$4], ws_warehouse_sk=[$5], ws_order_number=[$6], ws_ext_ship_cost=[$7], ws_net_profit=[$8], d_date_sk=[$9], d_date=[$10], ca_address_sk=[$0], ca_state=[$1], web_site_sk=[$11], web_company_name=[$12]) HiveJoin(condition=[=($4, $11)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'TX')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'TX')]) 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=[$1], ws_ship_addr_sk=[$10], ws_web_site_sk=[$12], ws_warehouse_sk=[$14], ws_order_number=[$16], ws_ext_ship_cost=[$27], ws_net_profit=[$32]) @@ -16,8 +16,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(web_site_sk=[$0], web_company_name=[CAST(_UTF-16LE'pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($14, _UTF-16LE'pri ')]) + HiveProject(web_site_sk=[$0], web_company_name=[CAST('pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($14, 'pri ')]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) HiveProject(ws_warehouse_sk=[$14], ws_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($14)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query95.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query95.q.out index 57eaa4112026..ade0c5d94067 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query95.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query95.q.out @@ -6,8 +6,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) HiveProject(ws_ship_date_sk=[$2], ws_ship_addr_sk=[$3], ws_web_site_sk=[$4], ws_order_number=[$5], ws_ext_ship_cost=[$6], ws_net_profit=[$7], d_date_sk=[$8], d_date=[$9], ca_address_sk=[$0], ca_state=[$1], web_site_sk=[$10], web_company_name=[$11]) HiveJoin(condition=[=($4, $10)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $0)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ca_address_sk=[$0], ca_state=[CAST(_UTF-16LE'TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($8, _UTF-16LE'TX')]) + HiveProject(ca_address_sk=[$0], ca_state=[CAST('TX'):CHAR(2) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($8, 'TX')]) 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=[$1], ws_ship_addr_sk=[$10], ws_web_site_sk=[$12], ws_order_number=[$16], ws_ext_ship_cost=[$27], ws_net_profit=[$32]) @@ -16,8 +16,8 @@ HiveProject(order count=[$0], total shipping cost=[$1], total net profit=[$2]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(web_site_sk=[$0], web_company_name=[CAST(_UTF-16LE'pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=($14, _UTF-16LE'pri ')]) + HiveProject(web_site_sk=[$0], web_company_name=[CAST('pri '):CHAR(50) CHARACTER SET "UTF-16LE"]) + HiveFilter(condition=[=($14, 'pri ')]) HiveTableScan(table=[[default, web_site]], table:alias=[web_site]) HiveProject(ws_order_number=[$1]) HiveJoin(condition=[AND(=($1, $3), <>($0, $2))], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query96.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query96.q.out index a244bc3bc7bf..0a84ef02bf84 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query96.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query96.q.out @@ -11,7 +11,7 @@ HiveProject(_c0=[$0]) HiveFilter(condition=[AND(=($3, 8), >=($4, 30))]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) HiveProject(s_store_sk=[$0]) - HiveFilter(condition=[=($5, _UTF-16LE'ese')]) + HiveFilter(condition=[=($5, 'ese')]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[=($3, 5)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out index e6db70d26a68..bd41a4b82589 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, _UTF-16LE'Books', _UTF-16LE'Jewelry', _UTF-16LE'Sports')]) + HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) HiveTableScan(table=[[default, item]], table:alias=[item]) From dcd76161464105eaf1de7ce48825b1c5a14f1b9b Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 5 Jun 2026 16:12:03 +0100 Subject: [PATCH 10/41] Disable simplifyValues in HiveRelBuilder config. Due to "[CALCITE-5717] RelBuilder.project of literals on a single-row Aggregate should create a Values" (introduced 1.35), cases like TestMiniLlapLocalCliDriver with file explainuser_1.q led to: "java.lang.UnsupportedOperationException: Values with non-empty tuples are not supported. at org.apache.hadoop.hive.ql.optimizer.calcite.translator.ASTConverter.convert(ASTConverter.java:264)". The reason is that RelBuilder#project_ contains the simplification (only applicable if config.simplifyValues is true): "If the expressions are all literals, and the input is a Values with N rows [...], replace with a Values with same tuple N times"; and with CALCITE-5717 that simplification was extended to not only "Values with N rows" but also "Aggregates with 1 row", and this case would lead to creating a non-empty HiveValues, which is not supported in our case. The easiest solution to prevent that from happening is disabling simplifyValues in HiveRelBuilder config. --- .../hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java index 80ee1cb4647e..3ac0a1210e56 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelBuilder.java @@ -89,7 +89,8 @@ public static RelBuilderFactory proto(final Context context) { return new RelBuilderFactory() { @Override public RelBuilder create(RelOptCluster cluster, RelOptSchema schema) { - Context confContext = Contexts.of(Config.DEFAULT.withPruneInputOfAggregate(Bug.CALCITE_4513_FIXED)); + Context confContext = Contexts.of(Config.DEFAULT.withPruneInputOfAggregate(Bug.CALCITE_4513_FIXED) + .withSimplifyValues(false)); // disabled to avoid simplifications that can create non-empty HiveValues return new HiveRelBuilder(Contexts.chain(context, confContext), cluster, schema); } }; From 4ae0b914b50892f5b6deabf6bf566ef45aa52fec Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 5 Jun 2026 17:48:07 +0100 Subject: [PATCH 11/41] Quick fix for charset in TestHiveRelJsonReader --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java | 1 + .../hive/ql/optimizer/calcite/TestHiveRelJsonReader.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index 1f8699852a3b..ae2372abdf57 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -571,6 +571,7 @@ private Hive(HiveConf c, boolean doRegisterAllFns) throws HiveException { // turn off calcite rexnode normalization System.setProperty("calcite.enable.rexnode.digest.normalize", "false"); // update calcite default charset + // TODO is this the right place? It's not considered in cases like TestHiveRelJsonReader System.setProperty("calcite.default.charset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); System.setProperty("calcite.default.nationalcharset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); if (doRegisterAllFns) { diff --git a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/TestHiveRelJsonReader.java b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/TestHiveRelJsonReader.java index 89c2606e04ec..fc196714379d 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/TestHiveRelJsonReader.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/TestHiveRelJsonReader.java @@ -23,6 +23,7 @@ import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.plan.volcano.VolcanoPlanner; +import org.apache.calcite.util.ConversionUtil; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hive.testutils.HiveTestEnvSetup; import org.junit.jupiter.params.ParameterizedTest; @@ -57,6 +58,10 @@ static Stream inputJsonFiles() throws IOException { @ParameterizedTest @MethodSource("inputJsonFiles") void testReadJson(Path jsonFile) throws IOException { + // TODO cleaner way? The current approach of setting these properties in Hive.java does not work for this test + System.setProperty("calcite.default.charset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); + System.setProperty("calcite.default.nationalcharset", ConversionUtil.NATIVE_UTF16_CHARSET_NAME); + String jsonContent = Files.readAllLines(jsonFile).stream().filter(line -> !line.startsWith("Warning")).collect(Collectors.joining()); // Use VolcanoPlanner to be able to set the ConventionTraitDef in the cluster, From 5c66a3dfceff217fea17e43320c361f66f6895f1 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Sat, 6 Jun 2026 09:15:22 +0100 Subject: [PATCH 12/41] Minor (formatting) Another attempt to fix druid-handler asm javadoc error seen on Jenkins: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-shade-plugin:3.6.0:shade (default) on project hive-druid-handler: Error creating shaded jar: Problem shading JAR /home/jenkins/agent/workspace/hive-precommit_PR-6523/druid-handler/target/hive-druid-handler-4.3.0-SNAPSHOT.jar entry org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: org.apache.maven.plugin.MojoExecutionException: Error in ASM processing class org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: Index 65536 out of bounds for length 334 --- druid-handler/pom.xml | 9 +++++++++ pom.xml | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index f73d755c966b..fa8ed187e56a 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -316,6 +316,10 @@ org.ow2.asm asm-commons + + org.ow2.asm + asm-util + @@ -420,6 +424,11 @@ asm-commons ${asm.version} + + org.ow2.asm + asm-util + ${asm.version} + diff --git a/pom.xml b/pom.xml index cd6963609267..55e9f3deeeee 100644 --- a/pom.xml +++ b/pom.xml @@ -374,6 +374,11 @@ asm-tree ${asm.version} + + org.ow2.asm + asm-util + ${asm.version} + com.sun.jersey jersey-core From 8d49c4c8d84e6cb49fae33420dc831f4814c6db9 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 8 Jun 2026 11:40:44 +0100 Subject: [PATCH 13/41] Adjust test plans due to [CALCITE-5798] Improve simplification of '(x < y) IS NOT TRUE' when x and y are not nullable (1.35) [CALCITE-6317] Incorrect constant replacement when group keys are NULL (1.37) Adjust test plans due to change in representation of floating point values in RexLiteral: [CALCITE-2067] RexLiteral cannot represent accurately floating point values, including NaN, Infinity (1.38) Adjust test plans simplifications around IS_NOT_NULL: [CALCITE-5639] RexSimplify should remove IS NOT NULL check when LIKE comparison is present (1.35) (actually more generic than just LIKE) [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) (actually more generic than just CAST) --- .../llap/alter_partition_coltype.q.out | 4 +- .../llap/annotate_stats_join_pkfk.q.out | 4 +- .../llap/bucket_map_join_tez2.q.out | 2 +- .../cardinality_preserving_join_opt.q.out | 30 ++++------ .../cbo_aggregate_reduce_functions_rule.q.out | 4 +- .../cbo_join_transitive_pred_loop_3.q.out | 4 +- .../cbo_join_transitive_pred_loop_4.q.out | 4 +- .../clientpositive/llap/cbo_limit.q.out | 2 +- .../clientpositive/llap/comments.q.out | 4 +- .../llap/constraints_explain_ddl.q.out | 8 +-- .../clientpositive/llap/cte_mat_6.q.out | 4 +- .../llap/dynamic_partition_pruning.q.out | 8 +-- .../llap/dynamic_semijoin_reduction_2.q.out | 4 +- .../clientpositive/llap/explainuser_1.q.out | 4 +- .../llap/external_jdbc_table2.q.out | 2 +- .../clientpositive/llap/fouter_join_ppr.q.out | 16 +++--- .../llap/groupby_sort_1_23.q.out | 4 +- .../llap/groupby_sort_skew_1_23.q.out | 4 +- .../results/clientpositive/llap/having.q.out | 2 +- .../results/clientpositive/llap/input42.q.out | 4 +- .../clientpositive/llap/input_part1.q.out | 2 +- .../llap/intersect_all_rj.q.out | 2 +- .../results/clientpositive/llap/join26.q.out | 2 +- .../results/clientpositive/llap/join32.q.out | 2 +- .../clientpositive/llap/join32_lessSize.q.out | 6 +- .../results/clientpositive/llap/join33.q.out | 2 +- .../results/clientpositive/llap/join34.q.out | 6 +- .../results/clientpositive/llap/join35.q.out | 6 +- .../llap/lateral_view_cbo.q.out | 2 +- .../llap/list_bucket_dml_6.q.out | 4 +- .../llap/list_bucket_dml_7.q.out | 4 +- .../llap/list_bucket_dml_8.q.out | 2 +- .../clientpositive/llap/louter_join_ppr.q.out | 16 +++--- .../results/clientpositive/llap/macro.q.out | 2 +- .../materialized_view_create_rewrite_6.q.out | 10 ++-- ...ed_view_create_rewrite_6_aggr_2joins.q.out | 10 ++-- ...ed_view_create_rewrite_6_aggr_3joins.q.out | 30 +++++----- .../materialized_view_create_rewrite_9.q.out | 10 ++-- ...lized_view_rewrite_ssb_grouping_sets.q.out | 12 ++-- .../llap/multi_count_distinct_null.q.out | 4 +- .../llap/orc_predicate_pushdown.q.out | 12 ++-- .../clientpositive/llap/outer_join_ppr.q.out | 8 +-- .../llap/parquet_predicate_pushdown.q.out | 12 ++-- .../llap/parquet_vectorization_0.q.out | 10 ++-- .../llap/partition_unix_timestamp.q.out | 2 +- .../results/clientpositive/llap/pcr.q.out | 6 +- .../results/clientpositive/llap/pcs.q.out | 2 +- .../clientpositive/llap/ppd_join_filter.q.out | 16 +++--- .../llap/rand_partitionpruner1.q.out | 2 +- .../llap/rand_partitionpruner2.q.out | 2 +- .../llap/rand_partitionpruner3.q.out | 4 +- .../clientpositive/llap/router_join_ppr.q.out | 16 +++--- .../llap/rule_exclusion_config.q.out | 12 ++-- .../clientpositive/llap/semijoin4.q.out | 4 +- .../clientpositive/llap/semijoin5.q.out | 4 +- .../clientpositive/llap/sharedwork.q.out | 2 +- .../sharedwork_map_side_aggregations.q.out | 20 +++---- .../sharedwork_mapjoin_datasize_check.q.out | 52 ++++++++--------- .../llap/stats_unset_hilo.q.out | 12 ++-- .../clientpositive/llap/subquery_ANY.q.out | 6 +- .../clientpositive/llap/subquery_in.q.out | 12 ++-- .../clientpositive/llap/subquery_multi.q.out | 2 +- .../clientpositive/llap/subquery_notin.q.out | 4 +- .../llap/subquery_notin_having.q.out | 4 +- .../clientpositive/llap/subquery_scalar.q.out | 6 +- .../temp_table_alter_partition_coltype.q.out | 4 +- .../llap/tez_dynpart_hashjoin_2.q.out | 56 ++++++++++--------- .../llap/tez_vector_dynpart_hashjoin_2.q.out | 56 ++++++++++--------- .../results/clientpositive/llap/tpch18.q.out | 6 +- .../results/clientpositive/llap/union22.q.out | 6 +- .../results/clientpositive/llap/union24.q.out | 24 ++++---- .../llap/union_all_filter_transpose.q.out | 4 +- .../llap/vector_char_mapjoin1.q.out | 6 +- .../llap/vector_varchar_mapjoin1.q.out | 4 +- ...vectorized_dynamic_partition_pruning.q.out | 8 +-- 75 files changed, 332 insertions(+), 326 deletions(-) diff --git a/ql/src/test/results/clientpositive/llap/alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_coltype.q.out index c16ac363f08f..2f690514b45e 100644 --- a/ql/src/test/results/clientpositive/llap/alter_partition_coltype.q.out +++ b/ql/src/test/results/clientpositive/llap/alter_partition_coltype.q.out @@ -130,7 +130,7 @@ POSTHOOK: Input: default@alter_coltype #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`alter_coltype` -WHERE `ts` = 6.30 +WHERE `ts` = 6.3E0 STAGE DEPENDENCIES: Stage-0 is a root stage @@ -160,7 +160,7 @@ POSTHOOK: Input: default@alter_coltype #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`alter_coltype` -WHERE `ts` = 3 AND `dt` = 100 +WHERE `ts` = 3.0E0 AND `dt` = 1.000E2 STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/annotate_stats_join_pkfk.q.out b/ql/src/test/results/clientpositive/llap/annotate_stats_join_pkfk.q.out index 8b3bebdbbc70..1dacfd37360f 100644 --- a/ql/src/test/results/clientpositive/llap/annotate_stats_join_pkfk.q.out +++ b/ql/src/test/results/clientpositive/llap/annotate_stats_join_pkfk.q.out @@ -500,10 +500,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: ss - filterExpr: UDFToLong(ss_store_sk) is not null (type: boolean) + filterExpr: ss_store_sk is not null (type: boolean) Statistics: Num rows: 1000 Data size: 3860 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToLong(ss_store_sk) is not null (type: boolean) + predicate: ss_store_sk is not null (type: boolean) Statistics: Num rows: 964 Data size: 3720 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToLong(ss_store_sk) (type: bigint) 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 2c3ff1e4d7d9..d4ee8ae77495 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 @@ -2349,7 +2349,7 @@ POSTHOOK: Input: default@my_fact OPTIMIZED SQL: SELECT `t0`.`bucket_col`, `t2`.`join_col` AS `account1`, `t0`.`accounting_period` AS `my_fact.accounting_period` FROM (SELECT `bucket_col`, `join_col`, `accounting_period` FROM `default`.`my_fact` -WHERE `fiscal_year` = '2015' AND `accounting_period` = 10 AND `join_col` IS NOT NULL) AS `t0` +WHERE `fiscal_year` = '2015' AND `accounting_period` = 1.00E1 AND `join_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `join_col` FROM `default`.`my_dim` WHERE `filter_col` IN ('VAL1', 'VAL2') AND `join_col` IS NOT NULL) AS `t2` ON `t0`.`join_col` = `t2`.`join_col` diff --git a/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out b/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out index fe0485e4049e..89b749aa9fb2 100644 --- a/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out +++ b/ql/src/test/results/clientpositive/llap/cardinality_preserving_join_opt.q.out @@ -89,9 +89,9 @@ CBO PLAN: HiveProject(c_first_name=[$3], _c1=[$5], _c2=[*($1, $6)], c_customer_sk=[$4], ss_customer_sk=[$0]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_customer_sk=[$1], EXPR$0=[*(+($0, $0), $2)], EXPR$1=[CAST($1):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($1):BIGINT)]) + HiveFilter(condition=[IS NOT NULL($1)]) HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) - HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) + HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1.0E0, $3)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, customer]], table:alias=[c]) @@ -158,11 +158,9 @@ CBO PLAN: HiveProject(c_first_name=[$2], _c1=[$4], _c2=[*(*(+($6, $6), $8), $5)], c_customer_sk=[$3], ss_customer_sk=[$0]) HiveJoin(condition=[=($0, $7)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_customer_sk=[$0], EXPR$1=[CAST($0):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($0):BIGINT)]) - HiveProject(ss_customer_sk=[$1]) - HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) - HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1, $3)]) + HiveProject(ss_customer_sk=[$1], EXPR$1=[CAST($1):BIGINT]) + HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) + HiveProject(c_first_name=[$0], c_customer_sk=[$2], _o__c1=[||(||(||(||($0, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $1)], EXPR$1=[-(1.0E0, $3)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveProject(c_first_name=[$0], c_last_name=[$1], c_customer_sk=[$2], c_discount=[$3]) HiveTableScan(table=[[default, customer]], table:alias=[c]) @@ -237,11 +235,11 @@ POSTHOOK: Input: default@customer POSTHOOK: Input: default@store_sales #### A masked pattern was here #### CBO PLAN: -HiveProject(c_first_name=[$4], _c1=[||(||(||(||($4, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5)], _c2=[*($1, -(1, $7))], c_customer_sk=[$3], ss_customer_sk=[$0]) +HiveProject(c_first_name=[$4], _c1=[||(||(||(||($4, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $5)], _c2=[*($1, -(1.0E0, $7))], c_customer_sk=[$3], ss_customer_sk=[$0]) HiveJoin(condition=[=($3, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $3)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_customer_sk=[$1], EXPR$0=[*(+($0, $0), $2)], EXPR$1=[CAST($1):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($1):BIGINT)]) + HiveFilter(condition=[IS NOT NULL($1)]) HiveProject(ss_quantity=[$0], ss_customer_sk=[$1], ss_list_price=[$2]) HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) HiveProject(c_customer_sk=[$2]) @@ -309,14 +307,12 @@ POSTHOOK: Input: default@customer POSTHOOK: Input: default@store_sales #### A masked pattern was here #### CBO PLAN: -HiveProject(c_first_name=[$6], _c1=[||(||(||(||($6, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7)], _c2=[*(*(+($3, $3), $5), -(1, $9))], c_customer_sk=[$2], ss_customer_sk=[$0]) +HiveProject(c_first_name=[$6], _c1=[||(||(||(||($6, ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7), ' ':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), $7)], _c2=[*(*(+($3, $3), $5), -(1.0E0, $9))], c_customer_sk=[$2], ss_customer_sk=[$0]) HiveJoin(condition=[=($2, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_customer_sk=[$0], EXPR$1=[CAST($0):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($0):BIGINT)]) - HiveProject(ss_customer_sk=[$1]) - HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) + HiveProject(ss_customer_sk=[$1], EXPR$1=[CAST($1):BIGINT]) + HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) HiveProject(c_customer_sk=[$2]) HiveTableScan(table=[[default, customer]], table:alias=[c]) HiveProject(ss_quantity=[$0], ss_customer_sk=[$1], ss_list_price=[$2]) @@ -375,10 +371,8 @@ CBO PLAN: HiveProject(c_first_name=[$3], ss_customer_sk=[$0], c_customer_sk=[$2]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $1)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_customer_sk=[$0], EXPR$0=[CAST($0):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($0):BIGINT)]) - HiveProject(ss_customer_sk=[$1]) - HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) + HiveProject(ss_customer_sk=[$1], EXPR$0=[CAST($1):BIGINT]) + HiveTableScan(table=[[default, store_sales]], table:alias=[ss]) HiveProject(c_customer_sk=[$2]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) HiveProject(c_first_name=[$0], c_customer_sk=[$2]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out b/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out index ffd29645cfb8..6e87e124641d 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out @@ -158,7 +158,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test #### A masked pattern was here #### CBO PLAN: -HiveProject(_c0=[CAST(COALESCE($0, 0E0:DOUBLE)):DOUBLE], _c1=[CAST(COALESCE($1, 0E0:DOUBLE)):DOUBLE], _c2=[CAST(COALESCE($2, 0E0:DOUBLE)):DOUBLE], _c3=[CAST(COALESCE($3, 0E0:DOUBLE)):DOUBLE], _c4=[CAST(COALESCE($4, 0E0:DOUBLE)):DOUBLE], _c5=[CAST(COALESCE($5, 0E0:DOUBLE)):DOUBLE], _c6=[/($6, $7)], _c7=[/($1, $8)], _c8=[/($9, $10)], _c9=[/($3, $11)], _c10=[/($12, $13)], _c11=[/($5, $14)], _c12=[POWER(/(-($15, /(*($6, $6), $7)), $7), 0.5:DECIMAL(2, 1))], _c13=[POWER(/(GREATEST(0, -($16, /(*($1, $1), $8))), $8), 0.5:DECIMAL(2, 1))], _c14=[POWER(/(-($17, /(*($9, $9), $10)), $10), 0.5:DECIMAL(2, 1))], _c15=[POWER(/(GREATEST(0, -($18, /(*($3, $3), $11))), $11), 0.5:DECIMAL(2, 1))], _c16=[POWER(/(-($19, /(*($12, $12), $13)), $13), 0.5:DECIMAL(2, 1))], _c17=[POWER(/(GREATEST(0, -($20, /(*($5, $5), $14))), $14), 0.5:DECIMAL(2, 1))], _c18=[POWER(/(-($15, /(*($6, $6), $7)), CASE(=($7, 1), null:BIGINT, -($7, 1))), 0.5:DECIMAL(2, 1))], _c19=[POWER(/(GREATEST(0, -($16, /(*($1, $1), $8))), CASE(=($8, 1), null:BIGINT, -($8, 1))), 0.5:DECIMAL(2, 1))], _c20=[POWER(/(-($17, /(*($9, $9), $10)), CASE(=($10, 1), null:BIGINT, -($10, 1))), 0.5:DECIMAL(2, 1))], _c21=[POWER(/(GREATEST(0, -($18, /(*($3, $3), $11))), CASE(=($11, 1), null:BIGINT, -($11, 1))), 0.5:DECIMAL(2, 1))], _c22=[POWER(/(-($19, /(*($12, $12), $13)), CASE(=($13, 1), null:BIGINT, -($13, 1))), 0.5:DECIMAL(2, 1))], _c23=[POWER(/(GREATEST(0, -($20, /(*($5, $5), $14))), CASE(=($14, 1), null:BIGINT, -($14, 1))), 0.5:DECIMAL(2, 1))], _c24=[/(-($15, /(*($6, $6), $7)), $7)], _c25=[/(GREATEST(0, -($16, /(*($1, $1), $8))), $8)], _c26=[/(-($17, /(*($9, $9), $10)), $10)], _c27=[/(GREATEST(0, -($18, /(*($3, $3), $11))), $11)], _c28=[/(-($19, /(*($12, $12), $13)), $13)], _c29=[/(GREATEST(0, -($20, /(*($5, $5), $14))), $14)], _c30=[/(-($15, /(*($6, $6), $7)), CASE(=($7, 1), null:BIGINT, -($7, 1)))], _c31=[/(GREATEST(0, -($16, /(*($1, $1), $8))), CASE(=($8, 1), null:BIGINT, -($8, 1)))], _c32=[/(-($17, /(*($9, $9), $10)), CASE(=($10, 1), null:BIGINT, -($10, 1)))], _c33=[/(GREATEST(0, -($18, /(*($3, $3), $11))), CASE(=($11, 1), null:BIGINT, -($11, 1)))], _c34=[/(-($19, /(*($12, $12), $13)), CASE(=($13, 1), null:BIGINT, -($13, 1)))], _c35=[/(GREATEST(0, -($20, /(*($5, $5), $14))), CASE(=($14, 1), null:BIGINT, -($14, 1)))], _c36=[$0], _c37=[$1], _c38=[$2], _c39=[$3], _c40=[$4], _c41=[$5], _c42=[$21], _c43=[$8], _c44=[$22], _c45=[$11], _c46=[$23], _c47=[$14]) +HiveProject(_c0=[CAST(COALESCE($0, 0.0E0:DOUBLE)):DOUBLE], _c1=[CAST(COALESCE($1, 0.0E0:DOUBLE)):DOUBLE], _c2=[CAST(COALESCE($2, 0.0E0:DOUBLE)):DOUBLE], _c3=[CAST(COALESCE($3, 0.0E0:DOUBLE)):DOUBLE], _c4=[CAST(COALESCE($4, 0.0E0:DOUBLE)):DOUBLE], _c5=[CAST(COALESCE($5, 0.0E0:DOUBLE)):DOUBLE], _c6=[/($6, $7)], _c7=[/($1, $8)], _c8=[/($9, $10)], _c9=[/($3, $11)], _c10=[/($12, $13)], _c11=[/($5, $14)], _c12=[POWER(/(-($15, /(*($6, $6), $7)), $7), 0.5:DECIMAL(2, 1))], _c13=[POWER(/(GREATEST(0, -($16, /(*($1, $1), $8))), $8), 0.5:DECIMAL(2, 1))], _c14=[POWER(/(-($17, /(*($9, $9), $10)), $10), 0.5:DECIMAL(2, 1))], _c15=[POWER(/(GREATEST(0, -($18, /(*($3, $3), $11))), $11), 0.5:DECIMAL(2, 1))], _c16=[POWER(/(-($19, /(*($12, $12), $13)), $13), 0.5:DECIMAL(2, 1))], _c17=[POWER(/(GREATEST(0, -($20, /(*($5, $5), $14))), $14), 0.5:DECIMAL(2, 1))], _c18=[POWER(/(-($15, /(*($6, $6), $7)), CASE(=($7, 1), null:BIGINT, -($7, 1))), 0.5:DECIMAL(2, 1))], _c19=[POWER(/(GREATEST(0, -($16, /(*($1, $1), $8))), CASE(=($8, 1), null:BIGINT, -($8, 1))), 0.5:DECIMAL(2, 1))], _c20=[POWER(/(-($17, /(*($9, $9), $10)), CASE(=($10, 1), null:BIGINT, -($10, 1))), 0.5:DECIMAL(2, 1))], _c21=[POWER(/(GREATEST(0, -($18, /(*($3, $3), $11))), CASE(=($11, 1), null:BIGINT, -($11, 1))), 0.5:DECIMAL(2, 1))], _c22=[POWER(/(-($19, /(*($12, $12), $13)), CASE(=($13, 1), null:BIGINT, -($13, 1))), 0.5:DECIMAL(2, 1))], _c23=[POWER(/(GREATEST(0, -($20, /(*($5, $5), $14))), CASE(=($14, 1), null:BIGINT, -($14, 1))), 0.5:DECIMAL(2, 1))], _c24=[/(-($15, /(*($6, $6), $7)), $7)], _c25=[/(GREATEST(0, -($16, /(*($1, $1), $8))), $8)], _c26=[/(-($17, /(*($9, $9), $10)), $10)], _c27=[/(GREATEST(0, -($18, /(*($3, $3), $11))), $11)], _c28=[/(-($19, /(*($12, $12), $13)), $13)], _c29=[/(GREATEST(0, -($20, /(*($5, $5), $14))), $14)], _c30=[/(-($15, /(*($6, $6), $7)), CASE(=($7, 1), null:BIGINT, -($7, 1)))], _c31=[/(GREATEST(0, -($16, /(*($1, $1), $8))), CASE(=($8, 1), null:BIGINT, -($8, 1)))], _c32=[/(-($17, /(*($9, $9), $10)), CASE(=($10, 1), null:BIGINT, -($10, 1)))], _c33=[/(GREATEST(0, -($18, /(*($3, $3), $11))), CASE(=($11, 1), null:BIGINT, -($11, 1)))], _c34=[/(-($19, /(*($12, $12), $13)), CASE(=($13, 1), null:BIGINT, -($13, 1)))], _c35=[/(GREATEST(0, -($20, /(*($5, $5), $14))), CASE(=($14, 1), null:BIGINT, -($14, 1)))], _c36=[$0], _c37=[$1], _c38=[$2], _c39=[$3], _c40=[$4], _c41=[$5], _c42=[$21], _c43=[$8], _c44=[$22], _c45=[$11], _c46=[$23], _c47=[$14]) HiveAggregate(group=[{}], agg#0=[sum($0)], agg#1=[sum($1)], agg#2=[sum($2)], agg#3=[sum($3)], agg#4=[sum($4)], agg#5=[sum($5)], agg#6=[sum($6)], agg#7=[count($6)], agg#8=[count($1)], agg#9=[sum($7)], agg#10=[count($7)], agg#11=[count($3)], agg#12=[sum($8)], agg#13=[count($8)], agg#14=[count($5)], agg#15=[sum($9)], agg#16=[sum($10)], agg#17=[sum($11)], agg#18=[sum($12)], agg#19=[sum($13)], agg#20=[sum($14)], agg#21=[count($0)], agg#22=[count($2)], agg#23=[count($4)]) HiveProject($f0=[$0], $f1=[CAST($0):DOUBLE], $f2=[$1], $f3=[CAST($1):DOUBLE], $f4=[$2], $f5=[CAST($2):DOUBLE], $f00=[CAST($0):DOUBLE], $f20=[CAST($1):DOUBLE], $f40=[CAST($2):DOUBLE], $f9=[*(CAST($0):DOUBLE, CAST($0):DOUBLE)], $f10=[*(CAST($0):DOUBLE, CAST($0):DOUBLE)], $f11=[*(CAST($1):DOUBLE, CAST($1):DOUBLE)], $f12=[*(CAST($1):DOUBLE, CAST($1):DOUBLE)], $f13=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)], $f14=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)]) HiveTableScan(table=[[default, test]], table:alias=[test]) @@ -284,7 +284,7 @@ POSTHOOK: query: SELECT FROM test POSTHOOK: type: QUERY POSTHOOK: Input: default@test -#### A masked pattern was here #### +POSTHOOK: Output: hdfs://### HDFS PATH ### 228.0 228.0 0.0 0.0 193.0 193.0 28.5 28.5 NULL NULL 32.166666666666664 32.166666666666664 47.34448225506326 47.34448225506326 NULL NULL 53.52387836802893 53.52387836802893 50.61338050075578 50.61338050075578 NULL NULL 58.63247109466449 58.63247109466449 2241.5 2241.5 NULL NULL 2864.805555555555 2864.805555555555 2561.714285714286 2561.714285714286 NULL NULL 3437.7666666666664 3437.7666666666664 228.0 228.0 NULL NULL 193.0 193.0 8 8 8 0 8 6 PREHOOK: query: SELECT `$SUM0`(c_numeric), diff --git a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out index 337b5bfa4fd2..06e23928e795 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_3.q.out @@ -54,7 +54,7 @@ CBO PLAN: HiveProject(a.bd_id=[$0]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject($f0=[$0]) HiveUnion(all=[true]) @@ -62,6 +62,6 @@ HiveProject(a.bd_id=[$0]) HiveFilter(condition=[AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out index 56d474694d6e..51207a3f2c42 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_join_transitive_pred_loop_4.q.out @@ -54,7 +54,7 @@ CBO PLAN: HiveProject(a.bd_id=[$0]) HiveJoin(condition=[=($0, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(bd_id=[$0]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject($f0=[$0]) HiveFilter(condition=[=($1, 2)]) @@ -68,6 +68,6 @@ HiveProject(a.bd_id=[$0]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) HiveProject(bd_id=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))), IS NOT NULL($0))]) + HiveFilter(condition=[OR(AND(=($0, 8), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), AND(=($0, 9), IN($1, 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")))]) HiveTableScan(table=[[default, tablea]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out index 1744eabbf1c6..02ea1c060187 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_limit.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_limit.q.out @@ -351,7 +351,7 @@ HiveProject(c_int=[$0]) HiveProject(c_int=[$0]) HiveSortLimit(fetch=[1]) HiveProject(c_int=[$2]) - HiveFilter(condition=[>($3, 1E0)]) + HiveFilter(condition=[>($3, 1.0E0)]) HiveTableScan(table=[[default, cbo_t1]], table:alias=[cbo_t1]) PREHOOK: query: select c_int from (select c_int from cbo_t1 where c_float > 1.0 limit 1) subq where c_int > 1 order by c_int diff --git a/ql/src/test/results/clientpositive/llap/comments.q.out b/ql/src/test/results/clientpositive/llap/comments.q.out index 461f7190a0f0..bb6028210dc7 100644 --- a/ql/src/test/results/clientpositive/llap/comments.q.out +++ b/ql/src/test/results/clientpositive/llap/comments.q.out @@ -82,10 +82,10 @@ POSTHOOK: Input: default@src OPTIMIZED SQL: SELECT COUNT(*) AS `_c1` FROM (SELECT `key` FROM `default`.`src` -WHERE `key` > 0) AS `t0` +WHERE `key` > 0E0) AS `t0` INNER JOIN (SELECT `key` FROM `default`.`src` -WHERE `key` > 0) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 0E0) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out b/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out index 7d012d8ee65a..caed0ad92bec 100644 --- a/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out +++ b/ql/src/test/results/clientpositive/llap/constraints_explain_ddl.q.out @@ -1581,7 +1581,7 @@ EXPLAIN CBO select key1 from dest_g21 where value1 > 1 group by key1, value1; EXPLAIN VECTORIZED select key1 from dest_g21 where value1 > 1 group by key1, value1; CBO PLAN:HiveProject(key1=[$0]) - HiveFilter(condition=[>($1, 1E0)]) + HiveFilter(condition=[>($1, 1.0E0)]) HiveTableScan(table=[[default, dest_g21]], table:alias=[dest_g21]) PLAN VECTORIZATION: @@ -1841,7 +1841,7 @@ EXPLAIN CBO select count(key1) from dest_g21 where value1 > 1 group by key1, val EXPLAIN VECTORIZED select count(key1) from dest_g21 where value1 > 1 group by key1, value1; CBO PLAN:HiveProject(_c0=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) - HiveFilter(condition=[>($1, 1E0)]) + HiveFilter(condition=[>($1, 1.0E0)]) HiveTableScan(table=[[default, dest_g21]], table:alias=[dest_g21]) PLAN VECTORIZATION: @@ -1978,7 +1978,7 @@ CBO PLAN:HiveProject(t1.key1=[$0]) HiveProject(key1=[$0], value1=[$1]) HiveTableScan(table=[[default, dest_g21]], table:alias=[t1]) HiveProject(key1=[$0]) - HiveFilter(condition=[>($1, 2E0)]) + HiveFilter(condition=[>($1, 2.0E0)]) HiveTableScan(table=[[default, dest_g21]], table:alias=[t2]) PLAN VECTORIZATION: @@ -2126,7 +2126,7 @@ CBO PLAN:HiveProject(_c0=[$1]) HiveProject(key1=[$0], value1=[$1]) HiveTableScan(table=[[default, dest_g21]], table:alias=[t1]) HiveProject(key1=[$0]) - HiveFilter(condition=[>($1, 2E0)]) + HiveFilter(condition=[>($1, 2.0E0)]) HiveTableScan(table=[[default, dest_g21]], table:alias=[t2]) PLAN VECTORIZATION: diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_6.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_6.q.out index ab3bd99ee299..470df6d9a3f9 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_6.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_6.q.out @@ -528,10 +528,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t0 - filterExpr: UDFToLong(col0) is not null (type: boolean) + filterExpr: col0 is not null (type: boolean) Statistics: Num rows: 7 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToLong(col0) is not null (type: boolean) + predicate: col0 is not null (type: boolean) Statistics: Num rows: 7 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: col0 (type: int), UDFToLong(col0) (type: bigint) 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 f341b49a9e4c..a5785cd007af 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 @@ -2449,10 +2449,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) is not null (type: boolean) + filterExpr: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) is not null (type: boolean) + predicate: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) (type: string) @@ -2470,10 +2470,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n0 - filterExpr: ((UDFToDouble(hour) = 11.0D) and CAST( hr AS STRING) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and CAST( hr AS STRING) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( hr AS STRING) (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 42e695b3321d..81cc30a7b9d5 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 @@ -152,10 +152,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: ((smallint_col_19 = -92S) and UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) (type: boolean) + filterExpr: ((smallint_col_19 = -92S) and tinyint_col_15 is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 124 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((smallint_col_19 = -92S) 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: ((smallint_col_19 = -92S) and tinyint_col_15 is not null and decimal2709_col_9 is not null and tinyint_col_20 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) 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 7151b95c136f..b078ff203d6e 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out @@ -2893,7 +2893,7 @@ Stage-0 Select Operator [SEL_12] (rows=1 width=114) Output:["_col0","_col1"] Filter Operator [FIL_39] (rows=1 width=114) - predicate:(((_col2 - _col1) > 600.0D) and _col1 is not null) + predicate:((_col2 - _col1) > 600.0D) Group By Operator [GBY_10] (rows=5 width=114) Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)"],keys:KEY._col0 <-Map 1 [SIMPLE_EDGE] llap @@ -2908,7 +2908,7 @@ Stage-0 Select Operator [SEL_25] (rows=1 width=110) Output:["_col0","_col1","_col2"] Filter Operator [FIL_40] (rows=1 width=114) - predicate:(((_col2 - _col1) > 600.0D) and _col1 is not null) + predicate:((_col2 - _col1) > 600.0D) Group By Operator [GBY_23] (rows=5 width=114) Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)"],keys:KEY._col0 <-Map 1 [SIMPLE_EDGE] llap diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out b/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out index 26efe619ef72..942595fbd25d 100644 --- a/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out +++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out @@ -716,7 +716,7 @@ STAGE PLANS: hive.sql.query SELECT "ikey" FROM (SELECT "ikey", "bkey", "dkey" FROM "EXTERNAL_JDBC_SIMPLE_DERBY2_TABLE1") AS "t" -WHERE ("bkey" = 10 AND "dkey" = 15.15 OR "bkey" = 20 AND "dkey" = 25.25) AND "bkey" IN (10, 20) AND "dkey" IN (15.15, 25.25) AND "ikey" IS NOT NULL +WHERE ("bkey" = 10 AND "dkey" = 1.515E1 OR "bkey" = 20 AND "dkey" = 2.525E1) AND "bkey" IN (10, 20) AND "dkey" IN (1.515E1, 2.525E1) AND "ikey" IS NOT NULL hive.sql.query.fieldNames ikey hive.sql.query.fieldTypes int hive.sql.query.split true diff --git a/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out index 8984774e9332..d17901d6c637 100644 --- a/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/llap/groupby_sort_1_23.q.out index 191f46cb9948..74e815cfbf39 100644 --- a/ql/src/test/results/clientpositive/llap/groupby_sort_1_23.q.out +++ b/ql/src/test/results/clientpositive/llap/groupby_sort_1_23.q.out @@ -1532,9 +1532,9 @@ SELECT key, key + 1, count(1) FROM T1_n80 GROUP BY key, key + 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@t1_n80 POSTHOOK: Output: default@outputtbl3_n2 -OPTIMIZED SQL: SELECT `key`, CAST(`key` AS DOUBLE) + 1 AS `_c1`, COUNT(*) AS `_c2` +OPTIMIZED SQL: SELECT `key`, CAST(`key` AS DOUBLE) + 1.0E0 AS `_c1`, COUNT(*) AS `_c2` FROM `default`.`t1_n80` -GROUP BY `key`, CAST(`key` AS DOUBLE) + 1 +GROUP BY `key`, CAST(`key` AS DOUBLE) + 1.0E0 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/llap/groupby_sort_skew_1_23.q.out index ecc1b78ed696..d3e895c15adb 100644 --- a/ql/src/test/results/clientpositive/llap/groupby_sort_skew_1_23.q.out +++ b/ql/src/test/results/clientpositive/llap/groupby_sort_skew_1_23.q.out @@ -1576,9 +1576,9 @@ SELECT key, key + 1, count(1) FROM T1_n56 GROUP BY key, key + 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@t1_n56 POSTHOOK: Output: default@outputtbl3_n1 -OPTIMIZED SQL: SELECT `key`, CAST(`key` AS DOUBLE) + 1 AS `_c1`, COUNT(*) AS `_c2` +OPTIMIZED SQL: SELECT `key`, CAST(`key` AS DOUBLE) + 1.0E0 AS `_c1`, COUNT(*) AS `_c2` FROM `default`.`t1_n56` -GROUP BY `key`, CAST(`key` AS DOUBLE) + 1 +GROUP BY `key`, CAST(`key` AS DOUBLE) + 1.0E0 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/having.q.out b/ql/src/test/results/clientpositive/llap/having.q.out index 73f0b68a8c5b..3b3c543fcb7b 100644 --- a/ql/src/test/results/clientpositive/llap/having.q.out +++ b/ql/src/test/results/clientpositive/llap/having.q.out @@ -1346,7 +1346,7 @@ POSTHOOK: Input: default@src #### A masked pattern was here #### CBO PLAN: HiveProject(c=[$1], m=[$2]) - HiveFilter(condition=[AND(>($1, 3), >(CAST($2):DOUBLE, 400))]) + HiveFilter(condition=[AND(>($1, 3), >(CAST($2):DOUBLE, 400.0E0))]) HiveAggregate(group=[{0}], agg#0=[count($1)], agg#1=[max($0)]) HiveTableScan(table=[[default, src]], table:alias=[src]) diff --git a/ql/src/test/results/clientpositive/llap/input42.q.out b/ql/src/test/results/clientpositive/llap/input42.q.out index d6194442e799..861fb154a9f2 100644 --- a/ql/src/test/results/clientpositive/llap/input42.q.out +++ b/ql/src/test/results/clientpositive/llap/input42.q.out @@ -1131,7 +1131,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `a.key`, `value` AS `a.value`, CAST('2008-04-08' AS STRING) AS `a.ds`, `hr` AS `a.hr` FROM `default`.`srcpart` -WHERE `key` < 200 AND `ds` = '2008-04-08' +WHERE `key` < 2.000E2 AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-0 is a root stage @@ -1629,7 +1629,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `a.key`, `value` AS `a.value`, CAST('2008-04-08' AS STRING) AS `a.ds`, `hr` AS `a.hr` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND RAND(100) < 0.1 +WHERE `ds` = '2008-04-08' AND RAND(100) < 1E-1 STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/input_part1.q.out b/ql/src/test/results/clientpositive/llap/input_part1.q.out index f99bf183b366..404371da2808 100644 --- a/ql/src/test/results/clientpositive/llap/input_part1.q.out +++ b/ql/src/test/results/clientpositive/llap/input_part1.q.out @@ -22,7 +22,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Output: default@dest1_n45 OPTIMIZED SQL: SELECT `key` AS `srcpart.key`, `value` AS `srcpart.value`, CAST('12' AS STRING) AS `srcpart.hr`, CAST('2008-04-08' AS STRING) AS `srcpart.ds` FROM `default`.`srcpart` -WHERE `key` < 100 AND `ds` = '2008-04-08' AND `hr` = '12' +WHERE `key` < 1.000E2 AND `ds` = '2008-04-08' AND `hr` = '12' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/intersect_all_rj.q.out b/ql/src/test/results/clientpositive/llap/intersect_all_rj.q.out index 51fb71412ba0..61765ce414a3 100644 --- a/ql/src/test/results/clientpositive/llap/intersect_all_rj.q.out +++ b/ql/src/test/results/clientpositive/llap/intersect_all_rj.q.out @@ -185,7 +185,7 @@ HiveProject(timestamp_col=[$1]) HiveFilter(condition=[IS NOT NULL($1)]) HiveTableScan(table=[[default, table_7]], table:alias=[a3]) HiveProject($f0=[CASE(IS NOT NULL($2), $2, CASE($0, $3, $1))], EXPR$1=[CAST($4):BIGINT]) - HiveFilter(condition=[IS NOT NULL(CAST($4):BIGINT)]) + HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, table_10]], table:alias=[a4]) HiveProject($f0=[$0], $f1=[$1]) HiveAggregate(group=[{0}], agg#0=[count()]) diff --git a/ql/src/test/results/clientpositive/llap/join26.q.out b/ql/src/test/results/clientpositive/llap/join26.q.out index e0662ab5bd07..18ea69cfe901 100644 --- a/ql/src/test/results/clientpositive/llap/join26.q.out +++ b/ql/src/test/results/clientpositive/llap/join26.q.out @@ -31,7 +31,7 @@ POSTHOOK: Output: default@dest_j1_n10 OPTIMIZED SQL: SELECT `t4`.`key` AS `x.key`, `t0`.`value` AS `z.value`, `t2`.`value` AS `y.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `key` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` INNER JOIN (SELECT `key` diff --git a/ql/src/test/results/clientpositive/llap/join32.q.out b/ql/src/test/results/clientpositive/llap/join32.q.out index efee714a3bcc..85de7041eb71 100644 --- a/ql/src/test/results/clientpositive/llap/join32.q.out +++ b/ql/src/test/results/clientpositive/llap/join32.q.out @@ -31,7 +31,7 @@ POSTHOOK: Output: default@dest_j1_n12 OPTIMIZED SQL: SELECT `t4`.`key` AS `x.key`, `t0`.`value` AS `z.value`, `t2`.`value` AS `y.value` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `value` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` INNER JOIN (SELECT `key`, `value` 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 15ec6ca9af08..5a436ae7e09c 100644 --- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out @@ -39,7 +39,7 @@ POSTHOOK: Output: default@dest_j1_n21 OPTIMIZED SQL: SELECT `t4`.`key` AS `x.key`, `t0`.`value` AS `z.value`, `t2`.`value` AS `y.value` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `value` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` INNER JOIN (SELECT `key`, `value` @@ -1109,7 +1109,7 @@ POSTHOOK: Output: default@dest_j2_n1 OPTIMIZED SQL: SELECT `t4`.`key` AS `res.key`, `t0`.`value` AS `z.value`, `t4`.`value` AS `res.value` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `value` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` INNER JOIN (SELECT `key`, `value` @@ -1608,7 +1608,7 @@ POSTHOOK: Output: default@dest_j2_n1 OPTIMIZED SQL: SELECT `t2`.`key` AS `res.key`, `t0`.`value` AS `z.value`, `t2`.`value` AS `res.value` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `value` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src1` WHERE `value` IS NOT NULL) AS `t2` LEFT JOIN (SELECT `key` diff --git a/ql/src/test/results/clientpositive/llap/join33.q.out b/ql/src/test/results/clientpositive/llap/join33.q.out index d1bb9c66a78e..4467faca0cce 100644 --- a/ql/src/test/results/clientpositive/llap/join33.q.out +++ b/ql/src/test/results/clientpositive/llap/join33.q.out @@ -31,7 +31,7 @@ POSTHOOK: Output: default@dest_j1_n7 OPTIMIZED SQL: SELECT `t4`.`key` AS `x.key`, `t0`.`value` AS `z.value`, `t2`.`value` AS `y.value` FROM (SELECT `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 AND `value` IS NOT NULL) AS `t0` +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 AND `value` IS NOT NULL) AS `t0` INNER JOIN ((SELECT `key`, `value` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t2` INNER JOIN (SELECT `key`, `value` diff --git a/ql/src/test/results/clientpositive/llap/join34.q.out b/ql/src/test/results/clientpositive/llap/join34.q.out index ef54be0b29eb..7b2ea969f26d 100644 --- a/ql/src/test/results/clientpositive/llap/join34.q.out +++ b/ql/src/test/results/clientpositive/llap/join34.q.out @@ -36,14 +36,14 @@ OPTIMIZED SQL: SELECT `t6`.`key` AS `x.key`, `t6`.`value` AS `x.value`, `t4`.`va FROM (SELECT * FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` < 20 +WHERE `key` < 2.00E1 UNION ALL SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 100) AS `t3`) AS `t4` +WHERE `key` > 1.000E2) AS `t3`) AS `t4` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE (`key` < 20 OR `key` > 100) AND `key` IS NOT NULL) AS `t6` ON `t4`.`key` = `t6`.`key` +WHERE (`key` < 2.00E1 OR `key` > 1.000E2) AND `key` IS NOT NULL) AS `t6` ON `t4`.`key` = `t6`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/join35.q.out b/ql/src/test/results/clientpositive/llap/join35.q.out index 39c088690d6e..8bcea997a487 100644 --- a/ql/src/test/results/clientpositive/llap/join35.q.out +++ b/ql/src/test/results/clientpositive/llap/join35.q.out @@ -36,16 +36,16 @@ OPTIMIZED SQL: SELECT `t8`.`key` AS `x.key`, `t8`.`value` AS `x.value`, `t6`.`$f FROM (SELECT * FROM (SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` < 20 +WHERE `key` < 2.00E1 GROUP BY `key` UNION ALL SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src` -WHERE `key` > 100 +WHERE `key` > 1.000E2 GROUP BY `key`) AS `t5`) AS `t6` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE (`key` < 20 OR `key` > 100) AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` +WHERE (`key` < 2.00E1 OR `key` > 1.000E2) AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out b/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out index 77816b1ad272..beaa76627989 100644 --- a/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out +++ b/ql/src/test/results/clientpositive/llap/lateral_view_cbo.q.out @@ -107,7 +107,7 @@ POSTHOOK: Input: default@simple_table #### A masked pattern was here #### CBO PLAN: HiveProject(mycol=[$6]) - HiveFilter(condition=[=(CAST($6):DOUBLE, 1)]) + HiveFilter(condition=[=(CAST($6):DOUBLE, 1.0E0)]) HiveTableFunctionScan(invocation=[LATERAL(explode($1), $0, $1, $2, $3, $4, $5)], rowType=[RecordType(VARCHAR(2147483647) col, VARCHAR(2147483647) ARRAY array_col, BIGINT BLOCK__OFFSET__INSIDE__FILE, VARCHAR(2147483647) INPUT__FILE__NAME, RecordType(BIGINT writeid, INTEGER bucketid, BIGINT rowid) ROW__ID, BOOLEAN ROW__IS__DELETED, VARCHAR(2147483647) mytable.mycol)]) HiveTableScan(table=[[default, simple_table]], table:alias=[simple_table]) diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out index dbcf49b202e7..77031e619ae3 100644 --- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out +++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out @@ -29,7 +29,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 100 = 0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` +OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 1.000E2 = 0E0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` FROM `default`.`srcpart` WHERE `ds` = '2008-04-08' STAGE DEPENDENCIES: @@ -394,7 +394,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 100 = 0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` +OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 1.000E2 = 0E0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` FROM `default`.`srcpart` WHERE `ds` = '2008-04-08' STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out index ad7051398156..4acd155d78ba 100644 --- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out +++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out @@ -29,7 +29,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 100 = 0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` +OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 1.000E2 = 0E0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` FROM `default`.`srcpart` WHERE `ds` = '2008-04-08' STAGE DEPENDENCIES: @@ -394,7 +394,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 100 = 0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` +OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 1.000E2 = 0E0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` FROM `default`.`srcpart` WHERE `ds` = '2008-04-08' STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_8.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_8.q.out index 148303926d66..6262641b6c84 100644 --- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_8.q.out +++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_8.q.out @@ -29,7 +29,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcpart POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 -OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 100 = 0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` +OPTIMIZED SQL: SELECT `key`, `value`, CAST(CASE WHEN CAST(`key` AS DOUBLE) % 1.000E2 = 0E0 THEN 'a1' ELSE 'b1' END AS STRING) AS `_c2` FROM `default`.`srcpart` WHERE `ds` = '2008-04-08' STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out index 695a3b4b4561..01ce7ce062f5 100644 --- a/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/macro.q.out b/ql/src/test/results/clientpositive/llap/macro.q.out index 01cdb2e04f2f..ee1e7885e64d 100644 --- a/ql/src/test/results/clientpositive/llap/macro.q.out +++ b/ql/src/test/results/clientpositive/llap/macro.q.out @@ -46,7 +46,7 @@ POSTHOOK: query: EXPLAIN EXTENDED SELECT SIGMOID(2) FROM src LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -OPTIMIZED SQL: SELECT CAST(0.8807970779778823 AS DOUBLE) AS `_c0` +OPTIMIZED SQL: SELECT CAST(8.807970779778823E-1 AS DOUBLE) AS `_c0` FROM `default`.`src` LIMIT 1 STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out index 0da424d05bb0..a3fa96f1694e 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out @@ -248,7 +248,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(t1.a=[$5], _c1=[CAST(CASE(IS NULL($1), $6, IS NULL($6), $1, +($6, $1))):DECIMAL(17, 2)], _c2=[CASE(IS NULL($2), $7, +($7, $2))], _c3=[CAST(/(CAST(CASE(IS NULL($1), $6, IS NULL($6), $1, +($6, $1))):DECIMAL(17, 2), CASE(IS NULL($2), $7, +($7, $2)))):DECIMAL(11, 6)], _c4=[CASE(IS NULL($3), $8, +($8, $3))]) - HiveFilter(condition=[OR(AND($4, OR(AND(IS NULL($3), =($8, 0)), AND(=(+($8, $3), 0), IS NOT NULL($3)))), AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), AND(>(+($8, $3), 0), IS NOT NULL($3)))), AND($4, OR(AND(IS NULL($3), >($8, 0)), AND(>(+($8, $3), 0), IS NOT NULL($3)))))]) + HiveFilter(condition=[OR(AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))))]) HiveJoin(condition=[IS NOT DISTINCT FROM($0, $5)], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], _c1=[$1], _c2=[$2], _c4=[$4], $f4=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) @@ -385,7 +385,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 Statistics: Num rows: 2 Data size: 746 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 429 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct) @@ -398,7 +398,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: (_col4 and ((_col3 is null and (_col9 = 0L)) or (((_col9 + _col3) = 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 = 0L)) or ((_col9 + _col3) = 0))) (type: boolean) Statistics: Num rows: 1 Data size: 429 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct) @@ -411,7 +411,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: (_col4 and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 429 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col6 (type: char(15)), CAST( CASE WHEN (_col1 is null) THEN (_col7) WHEN (_col7 is null) THEN (_col1) ELSE ((_col7 + _col1)) END AS decimal(17,2)) (type: decimal(17,2)), if(_col2 is null, _col8, (_col8 + _col2)) (type: bigint), CAST( (CAST( CASE WHEN (_col1 is null) THEN (_col7) WHEN (_col7 is null) THEN (_col1) ELSE ((_col7 + _col1)) END AS decimal(17,2)) / if(_col2 is null, _col8, (_col8 + _col2))) AS decimal(11,6)) (type: decimal(11,6)), if(_col3 is null, _col9, (_col9 + _col3)) (type: bigint) @@ -442,7 +442,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 1328 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: struct), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: bigint), _col8 (type: binary), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: binary), _col13 (type: decimal(11,6)), _col14 (type: decimal(11,6)), _col15 (type: bigint), _col16 (type: binary), _col17 (type: bigint), _col18 (type: bigint), _col19 (type: bigint), _col20 (type: binary) Filter Operator - predicate: (_col4 is null and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 is null and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 429 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col6 (type: char(15)), CAST( CASE WHEN (_col1 is null) THEN (_col7) WHEN (_col7 is null) THEN (_col1) ELSE ((_col7 + _col1)) END AS decimal(17,2)) (type: decimal(17,2)), if(_col2 is null, _col8, (_col8 + _col2)) (type: bigint), CAST( (CAST( CASE WHEN (_col1 is null) THEN (_col7) WHEN (_col7 is null) THEN (_col1) ELSE ((_col7 + _col1)) END AS decimal(17,2)) / if(_col2 is null, _col8, (_col8 + _col2))) AS decimal(11,6)) (type: decimal(11,6)), if(_col3 is null, _col9, (_col9 + _col3)) (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out index efd93217839e..9b25fd6f2bb9 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out @@ -129,7 +129,7 @@ POSTHOOK: Output: default@cmv_mat_view_n6 POSTHOOK: Output: default@cmv_mat_view_n6 CBO PLAN: HiveProject(cmv_basetable_n6.a=[$5], cmv_basetable_2_n3.c=[$6], cmv_basetable_2_n3.b=[$7], _c3=[CASE(IS NULL($3), $8, +($8, $3))]) - HiveFilter(condition=[OR(AND($4, OR(AND(IS NULL($3), =($8, 0)), AND(=(+($8, $3), 0), IS NOT NULL($3)))), AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), AND(>(+($8, $3), 0), IS NOT NULL($3)))), AND($4, OR(AND(IS NULL($3), >($8, 0)), AND(>(+($8, $3), 0), IS NOT NULL($3)))))]) + HiveFilter(condition=[OR(AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))), AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))))]) HiveJoin(condition=[AND(IS NOT DISTINCT FROM($0, $5), IS NOT DISTINCT FROM($1, $6), IS NOT DISTINCT FROM($2, $7))], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], c=[$1], b=[$2], _c3=[$3], $f4=[true]) HiveTableScan(table=[[default, cmv_mat_view_n6]], table:alias=[default.cmv_mat_view_n6]) @@ -266,7 +266,7 @@ STAGE PLANS: outputColumnNames: _col3, _col4, _col5, _col6, _col7, _col8, _col9 Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct) @@ -279,7 +279,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: (_col4 and ((_col3 is null and (_col9 = 0L)) or (((_col9 + _col3) = 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 = 0L)) or ((_col9 + _col3) = 0))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: struct) @@ -292,7 +292,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: (_col4 and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col6 (type: int), _col7 (type: decimal(10,2)), _col8 (type: varchar(256)), if(_col3 is null, _col9, (_col9 + _col3)) (type: bigint) @@ -323,7 +323,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 944 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: decimal(10,2)), _col6 (type: decimal(10,2)), _col7 (type: bigint), _col8 (type: binary), _col9 (type: int), _col10 (type: struct), _col11 (type: bigint), _col12 (type: binary), _col13 (type: bigint), _col14 (type: bigint), _col15 (type: bigint), _col16 (type: binary) Filter Operator - predicate: (_col4 is null and ((_col3 is null and (_col9 > 0L)) or (((_col9 + _col3) > 0) and _col3 is not null))) (type: boolean) + predicate: (_col4 is null and ((_col3 is null and (_col9 > 0L)) or ((_col9 + _col3) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col6 (type: int), _col7 (type: decimal(10,2)), _col8 (type: varchar(256)), if(_col3 is null, _col9, (_col9 + _col3)) (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_3joins.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_3joins.q.out index a3107db3142d..f1678e3c62a3 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_3joins.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_3joins.q.out @@ -159,7 +159,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(cmv_basetable_n6.a=[$4], cmv_basetable_2_n3.c=[$5], _c2=[CASE(IS NULL($2), $6, +($6, $2))]) - HiveFilter(condition=[OR(AND($3, OR(AND(IS NULL($2), =($6, 0)), AND(=(+($6, $2), 0), IS NOT NULL($2)))), AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))), AND($3, OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))))]) + HiveFilter(condition=[OR(AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), =($6, 0)), =(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))))]) HiveJoin(condition=[AND(IS NOT DISTINCT FROM($0, $4), IS NOT DISTINCT FROM($1, $5))], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], c=[$1], _c2=[$2], $f3=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) @@ -343,7 +343,7 @@ STAGE PLANS: outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 Statistics: Num rows: 2 Data size: 424 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -356,7 +356,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: (_col3 and ((_col2 is null and (_col7 = 0L)) or (((_col7 + _col2) = 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 = 0L)) or ((_col7 + _col2) = 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -369,7 +369,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: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: int), _col6 (type: decimal(10,2)), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) @@ -400,7 +400,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 712 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: decimal(10,2)), _col6 (type: decimal(10,2)), _col7 (type: bigint), _col8 (type: binary), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: binary) Filter Operator - predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: int), _col6 (type: decimal(10,2)), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) @@ -681,7 +681,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(cmv_basetable_n6.a=[$4], cmv_basetable_2_n3.c=[$5], _c2=[CASE(IS NULL($2), $6, +($6, $2))]) - HiveFilter(condition=[OR(AND($3, OR(AND(IS NULL($2), =($6, 0)), AND(=(+($6, $2), 0), IS NOT NULL($2)))), AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))), AND($3, OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))))]) + HiveFilter(condition=[OR(AND($3, OR(AND(IS NULL($2), =($6, 0)), =(+($6, $2), 0))), AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))))]) HiveJoin(condition=[AND(IS NOT DISTINCT FROM($0, $4), IS NOT DISTINCT FROM($1, $5))], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], c=[$1], _c2=[$2], $f3=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) @@ -696,8 +696,8 @@ HiveProject(cmv_basetable_n6.a=[$4], cmv_basetable_2_n3.c=[$5], _c2=[CASE(IS NUL HiveProject(a=[$0], c=[$2]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, cmv_basetable_2_n3]], table:alias=[cmv_basetable_2_n3]) - HiveProject(a=[$0], c=[$2], _deleted=[AND($7, <(2, $6.writeid))]) - HiveFilter(condition=[AND(<(2, $6.writeid), OR(NOT($7), >=(2, $6.writeid), $7), IS NOT NULL($0))]) + HiveProject(a=[$0], c=[$2], _deleted=[AND($7, IS NOT NULL($6.writeid))]) + HiveFilter(condition=[AND(<(2, $6.writeid), IS NOT NULL($7), IS NOT NULL($0))]) HiveTableScan(table=[[default, cmv_basetable_n6]], table:alias=[cmv_basetable_n6]) PREHOOK: query: EXPLAIN @@ -768,15 +768,15 @@ STAGE PLANS: Map Operator Tree: TableScan alias: cmv_basetable_n6 - filterExpr: ((ROW__ID.writeid > 2L) and ((not ROW__IS__DELETED) or (ROW__ID.writeid <= 2L) or ROW__IS__DELETED) and a is not null) (type: boolean) + filterExpr: ((ROW__ID.writeid > 2L) and ROW__IS__DELETED is not null and a is not null) (type: boolean) properties: acid.fetch.deleted.rows TRUE Statistics: Num rows: 3 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((ROW__ID.writeid > 2L) and ((not ROW__IS__DELETED) or (ROW__ID.writeid <= 2L) or ROW__IS__DELETED) and a is not null) (type: boolean) + predicate: ((ROW__ID.writeid > 2L) and ROW__IS__DELETED is not null 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)), (ROW__IS__DELETED and (ROW__ID.writeid > 2L)) (type: boolean) + expressions: a (type: int), c (type: decimal(10,2)), (ROW__IS__DELETED and ROW__ID.writeid is not null) (type: boolean) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator @@ -864,7 +864,7 @@ STAGE PLANS: outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7 Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -877,7 +877,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: (_col3 and ((_col2 is null and (_col7 = 0L)) or (((_col7 + _col2) = 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 = 0L)) or ((_col7 + _col2) = 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -890,7 +890,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: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: int), _col6 (type: decimal(10,2)), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) @@ -921,7 +921,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 712 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: decimal(10,2)), _col6 (type: decimal(10,2)), _col7 (type: bigint), _col8 (type: binary), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: binary) Filter Operator - predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 212 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: int), _col6 (type: decimal(10,2)), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out index 8210886d2011..c28d0014f1b1 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out @@ -246,7 +246,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(t1.a=[$4], _c1=[CASE(IS NULL($1), $5, IS NULL($5), $1, +($5, $1))], _c2=[CASE(IS NULL($2), $6, +($6, $2))]) - HiveFilter(condition=[OR(AND($3, OR(AND(IS NULL($2), =($6, 0)), AND(=(+($6, $2), 0), IS NOT NULL($2)))), AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))), AND($3, OR(AND(IS NULL($2), >($6, 0)), AND(>(+($6, $2), 0), IS NOT NULL($2)))))]) + HiveFilter(condition=[OR(AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), =($6, 0)), =(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))))]) HiveJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], _c1=[$1], _c2=[$2], $f3=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) @@ -383,7 +383,7 @@ STAGE PLANS: outputColumnNames: _col1, _col2, _col3, _col4, _col5, _col6, _col7 Statistics: Num rows: 2 Data size: 402 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 205 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -396,7 +396,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: (_col3 and ((_col2 is null and (_col7 = 0L)) or (((_col7 + _col2) = 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 = 0L)) or ((_col7 + _col2) = 0))) (type: boolean) Statistics: Num rows: 1 Data size: 205 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col4 (type: struct) @@ -409,7 +409,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: (_col3 and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 205 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: char(15)), CASE WHEN (_col1 is null) THEN (_col6) WHEN (_col6 is null) THEN (_col1) ELSE ((_col6 + _col1)) END (type: bigint), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) @@ -440,7 +440,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 576 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: struct), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: binary), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: binary) Filter Operator - predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or (((_col7 + _col2) > 0) and _col2 is not null))) (type: boolean) + predicate: (_col3 is null and ((_col2 is null and (_col7 > 0L)) or ((_col7 + _col2) > 0))) (type: boolean) Statistics: Num rows: 1 Data size: 205 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col5 (type: char(15)), CASE WHEN (_col1 is null) THEN (_col6) WHEN (_col6 is null) THEN (_col1) ELSE ((_col6 + _col1)) END (type: bigint), if(_col2 is null, _col7, (_col7 + _col2)) (type: bigint) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out index 30e6cd56edeb..22d641c9c63b 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out @@ -697,7 +697,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(<($8, 2.5E1), =(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $7, 1E0:DOUBLE, 3E0:DOUBLE), =($4, 1993))]) + HiveFilter(condition=[AND(<($8, 25.0E0), =(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $7, 1.0E0:DOUBLE, 3.0E0:DOUBLE), =($4, 1993))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -733,7 +733,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 2.6E1:DOUBLE, 3.5E1:DOUBLE), BETWEEN(false, $7, 4E0:DOUBLE, 6E0:DOUBLE), =($6, 199401))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 4.0E0:DOUBLE, 6.0E0:DOUBLE), =($6, 199401))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -771,7 +771,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 2.6E1:DOUBLE, 3.5E1:DOUBLE), BETWEEN(false, $7, 5E0:DOUBLE, 7E0:DOUBLE), =($4, 1994), =($3, 6))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 5.0E0:DOUBLE, 7.0E0:DOUBLE), =($4, 1994), =($3, 6))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -822,7 +822,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$0], p_brand1=[$1]) HiveAggregate(group=[{4, 9}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($10, 'MFGR#12'), =($14, 'AMERICA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =('AMERICA', $14), =('MFGR#12', $10))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -925,7 +925,7 @@ HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST('MFGR#2239':VARCHAR(214 HiveSortLimit(sort0=[$1], dir0=[ASC]) HiveProject(lo_revenue=[$1], d_year=[$0]) HiveAggregate(group=[{4}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($9, 'MFGR#2239'), =($14, 'EUROPE'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =('EUROPE', $14), =('MFGR#2239', $9))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1259,7 +1259,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC]) HiveProject(d_year=[$0], s_nation=[$2], p_category=[$1], profit=[$3]) HiveAggregate(group=[{4, 10, 13}], agg#0=[sum($17)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'AMERICA'), =($14, 'AMERICA'), IN($4, 1997, 1998), IN($11, 'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'AMERICA'), =($14, 'AMERICA'), IN($11, 'MFGR#1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), IN($4, 1997, 1998))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo diff --git a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out index 38d7f628de00..8ac79787a132 100644 --- a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out @@ -25,9 +25,9 @@ POSTHOOK: Output: hdfs://### HDFS PATH ### CBO PLAN: HiveProject(_c0=[$0], _c1=[$1]) HiveAggregate(group=[{}], agg#0=[count($0)], agg#1=[count($1)]) - HiveProject($f0=[CASE(=($2, 1), 1, null:INTEGER)], $f1=[null:INTEGER]) + HiveProject($f0=[CASE(=($2, 1), 1, null:INTEGER)], $f1=[CASE(AND(=($2, 2), IS NOT NULL($1)), 1, null:INTEGER)]) HiveAggregate(group=[{0, 1}], groups=[[{0}, {1}]], GROUPING__ID=[GROUPING__ID()]) - HiveProject($f0=[true], $f1=[true]) + HiveProject($f0=[0], $f1=[null:NULL]) HiveTableScan(table=[[default, employee]], table:alias=[employee]) PREHOOK: query: select count(distinct 0), count(distinct null) from employee 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 cb2d50d73666..6a1d019aa518 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 @@ -511,7 +511,7 @@ STAGE PLANS: TableScan alias: orc_pred Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -541,9 +541,9 @@ STAGE PLANS: Processor Tree: TableScan alias: orc_pred - filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -627,7 +627,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -695,10 +695,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) diff --git a/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out index 8ff5ce57c388..f726e4998174 100644 --- a/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 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 4858f10aa63a..fb7360879e71 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 @@ -445,7 +445,7 @@ STAGE PLANS: TableScan alias: tbl_pred Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -475,9 +475,9 @@ STAGE PLANS: Processor Tree: TableScan alias: tbl_pred - filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%') and s is not null) (type: boolean) + predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -561,7 +561,7 @@ STAGE PLANS: alias: tbl_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -629,10 +629,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: tbl_pred - filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and s is not null) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) diff --git a/ql/src/test/results/clientpositive/llap/parquet_vectorization_0.q.out b/ql/src/test/results/clientpositive/llap/parquet_vectorization_0.q.out index 3d01120514a3..0037b269a8a0 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_vectorization_0.q.out @@ -1228,12 +1228,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesparquet - filterExpr: ((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) + filterExpr: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or (null and (cstring1 like '%n') and null)) (type: boolean) Statistics: Num rows: 12288 Data size: 862450 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - 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) + predicate: ((cstring1 like 'a%') or (cstring1 like 'b%') or (cstring1 like 'c%') or (null and (cstring1 like '%n') and null)) (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 @@ -30022,7 +30022,7 @@ POSTHOOK: Input: default@alltypesparquet #### A masked pattern was here #### OPTIMIZED SQL: SELECT `ctinyint` AS `alltypesparquet.ctinyint`, `csmallint` AS `alltypesparquet.csmallint`, `cint` AS `alltypesparquet.cint`, `cbigint` AS `alltypesparquet.cbigint`, `cfloat` AS `alltypesparquet.cfloat`, `cdouble` AS `alltypesparquet.cdouble`, `cstring1` AS `alltypesparquet.cstring1`, `cstring2` AS `alltypesparquet.cstring2`, `ctimestamp1` AS `alltypesparquet.ctimestamp1`, `ctimestamp2` AS `alltypesparquet.ctimestamp2`, `cboolean1` AS `alltypesparquet.cboolean1`, `cboolean2` AS `alltypesparquet.cboolean2` FROM `default`.`alltypesparquet` -WHERE `cint` = 49 AND `cfloat` = 3.5 OR `cint` = 47 AND `cfloat` = 2.09 OR `cint` = 45 AND `cfloat` = 3.02 +WHERE `cint` = 49 AND `cfloat` = 3.5E0 OR `cint` = 47 AND `cfloat` = 2.09E0 OR `cint` = 45 AND `cfloat` = 3.02E0 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -30133,7 +30133,7 @@ POSTHOOK: Input: default@alltypesparquet #### A masked pattern was here #### OPTIMIZED SQL: SELECT `ctinyint` AS `alltypesparquet.ctinyint`, `csmallint` AS `alltypesparquet.csmallint`, `cint` AS `alltypesparquet.cint`, `cbigint` AS `alltypesparquet.cbigint`, `cfloat` AS `alltypesparquet.cfloat`, `cdouble` AS `alltypesparquet.cdouble`, `cstring1` AS `alltypesparquet.cstring1`, `cstring2` AS `alltypesparquet.cstring2`, `ctimestamp1` AS `alltypesparquet.ctimestamp1`, `ctimestamp2` AS `alltypesparquet.ctimestamp2`, `cboolean1` AS `alltypesparquet.cboolean1`, `cboolean2` AS `alltypesparquet.cboolean2` FROM `default`.`alltypesparquet` -WHERE (`cint`, `cfloat`) IN ((49, 3.5), (47, 2.09), (45, 3.02)) +WHERE (`cint`, `cfloat`) IN ((49, 3.5E0), (47, 2.09E0), (45, 3.02E0)) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -30244,7 +30244,7 @@ POSTHOOK: Input: default@alltypesparquet #### A masked pattern was here #### OPTIMIZED SQL: SELECT `ctinyint` AS `alltypesparquet.ctinyint`, `csmallint` AS `alltypesparquet.csmallint`, `cint` AS `alltypesparquet.cint`, `cbigint` AS `alltypesparquet.cbigint`, `cfloat` AS `alltypesparquet.cfloat`, `cdouble` AS `alltypesparquet.cdouble`, `cstring1` AS `alltypesparquet.cstring1`, `cstring2` AS `alltypesparquet.cstring2`, `ctimestamp1` AS `alltypesparquet.ctimestamp1`, `ctimestamp2` AS `alltypesparquet.ctimestamp2`, `cboolean1` AS `alltypesparquet.cboolean1`, `cboolean2` AS `alltypesparquet.cboolean2` FROM `default`.`alltypesparquet` -WHERE (`cint` = 49 OR `cfloat` = 3.5) AND (`cint` = 47 OR `cfloat` = 2.09) AND (`cint` = 45 OR `cfloat` = 3.02) +WHERE (`cint` = 49 OR `cfloat` = 3.5E0) AND (`cint` = 47 OR `cfloat` = 2.09E0) AND (`cint` = 45 OR `cfloat` = 3.02E0) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/partition_unix_timestamp.q.out b/ql/src/test/results/clientpositive/llap/partition_unix_timestamp.q.out index e72d30f4d1c5..2f5aa8be6f4a 100644 --- a/ql/src/test/results/clientpositive/llap/partition_unix_timestamp.q.out +++ b/ql/src/test/results/clientpositive/llap/partition_unix_timestamp.q.out @@ -24,6 +24,6 @@ POSTHOOK: Input: default@t1 #### A masked pattern was here #### CBO PLAN: HiveProject(t1.a=[$0], t1.p_year=[$1]) - HiveFilter(condition=[=(CAST($1):DOUBLE, 2.0250E3)]) + HiveFilter(condition=[=(CAST($1):DOUBLE, 2025.0E0)]) HiveTableScan(table=[[default, t1]], table:alias=[t1]) diff --git a/ql/src/test/results/clientpositive/llap/pcr.q.out b/ql/src/test/results/clientpositive/llap/pcr.q.out index a1f5a0f77d09..d6af1ccad95a 100644 --- a/ql/src/test/results/clientpositive/llap/pcr.q.out +++ b/ql/src/test/results/clientpositive/llap/pcr.q.out @@ -4144,7 +4144,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `ds` = '2008-04-08' AND `hr` = 11 +WHERE `ds` = '2008-04-08' AND `hr` = 1.10E1 ORDER BY `key` LIMIT 10 STAGE DEPENDENCIES: @@ -4294,7 +4294,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 `key` = 11 AND `ds` = '2008-04-08' AND `hr` IN ('11', '12') +WHERE `key` = 1.10E1 AND `ds` = '2008-04-08' AND `hr` IN ('11', '12') ORDER BY `key`, `hr` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -4482,7 +4482,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key`, `value`, `ds`, CAST('11' AS STRING) AS `hr` FROM `default`.`srcpart` -WHERE `key` = 11 AND `hr` = '11' +WHERE `key` = 1.10E1 AND `hr` = '11' ORDER BY `key`, `ds` STAGE DEPENDENCIES: Stage-1 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/pcs.q.out b/ql/src/test/results/clientpositive/llap/pcs.q.out index b0ce8b5d0cfe..14b5bc3e1f12 100644 --- a/ql/src/test/results/clientpositive/llap/pcs.q.out +++ b/ql/src/test/results/clientpositive/llap/pcs.q.out @@ -1302,7 +1302,7 @@ POSTHOOK: Input: default@pcs_t1@ds=2000-04-09 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `ds` FROM `default`.`pcs_t1` -WHERE (`ds`, `key`, RAND(100)) IN (('2000-04-08', 1, 0.2), ('2000-04-09', 2, 0.3)) +WHERE (`ds`, `key`, RAND(100)) IN (('2000-04-08', 1, 2E-1), ('2000-04-09', 2, 3E-1)) STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/llap/ppd_join_filter.q.out index a6a70108877e..df7b74627e36 100644 --- a/ql/src/test/results/clientpositive/llap/ppd_join_filter.q.out +++ b/ql/src/test/results/clientpositive/llap/ppd_join_filter.q.out @@ -32,11 +32,11 @@ OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t4`.`k2` AS `b.k2`, `t4`.`k3` AS ` FROM (SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` -INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3 AS `k3` +INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2.0E0 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3.0E0 AS `k3` FROM `default`.`src` WHERE `key` IS NOT NULL GROUP BY `key` -HAVING CAST(MIN(`key`) AS DOUBLE) + 1 < 5) AS `t4` ON `t0`.`key` = `t4`.`key` +HAVING CAST(MIN(`key`) AS DOUBLE) + 1.0E0 < 5.0E0) AS `t4` ON `t0`.`key` = `t4`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -277,11 +277,11 @@ OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t4`.`k2` AS `b.k2`, `t4`.`k3` AS ` FROM (SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` -INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3 AS `k3` +INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2.0E0 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3.0E0 AS `k3` FROM `default`.`src` WHERE `key` IS NOT NULL GROUP BY `key` -HAVING CAST(MIN(`key`) AS DOUBLE) + 1 < 5) AS `t4` ON `t0`.`key` = `t4`.`key` +HAVING CAST(MIN(`key`) AS DOUBLE) + 1.0E0 < 5.0E0) AS `t4` ON `t0`.`key` = `t4`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -522,11 +522,11 @@ OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t4`.`k2` AS `b.k2`, `t4`.`k3` AS ` FROM (SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` -INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3 AS `k3` +INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2.0E0 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3.0E0 AS `k3` FROM `default`.`src` WHERE `key` IS NOT NULL GROUP BY `key` -HAVING CAST(MIN(`key`) AS DOUBLE) + 1 < 5) AS `t4` ON `t0`.`key` = `t4`.`key` +HAVING CAST(MIN(`key`) AS DOUBLE) + 1.0E0 < 5.0E0) AS `t4` ON `t0`.`key` = `t4`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -766,11 +766,11 @@ OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t4`.`k2` AS `b.k2`, `t4`.`k3` AS ` FROM (SELECT `key` FROM `default`.`src` WHERE `key` IS NOT NULL) AS `t0` -INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3 AS `k3` +INNER JOIN (SELECT `key`, CAST(MIN(`key`) AS DOUBLE) + 2.0E0 AS `k2`, CAST(MIN(`key`) AS DOUBLE) + 3.0E0 AS `k3` FROM `default`.`src` WHERE `key` IS NOT NULL GROUP BY `key` -HAVING CAST(MIN(`key`) AS DOUBLE) + 1 < 5) AS `t4` ON `t0`.`key` = `t4`.`key` +HAVING CAST(MIN(`key`) AS DOUBLE) + 1.0E0 < 5.0E0) AS `t4` ON `t0`.`key` = `t4`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/rand_partitionpruner1.q.out b/ql/src/test/results/clientpositive/llap/rand_partitionpruner1.q.out index 5729e51ac8c3..c94bfa58fdb0 100644 --- a/ql/src/test/results/clientpositive/llap/rand_partitionpruner1.q.out +++ b/ql/src/test/results/clientpositive/llap/rand_partitionpruner1.q.out @@ -8,7 +8,7 @@ POSTHOOK: Input: default@src #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `src.key`, `value` AS `src.value` FROM `default`.`src` -WHERE RAND(1) < 0.1 +WHERE RAND(1) < 1E-1 STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/rand_partitionpruner2.q.out b/ql/src/test/results/clientpositive/llap/rand_partitionpruner2.q.out index 05ba8e818654..2b5d833357cf 100644 --- a/ql/src/test/results/clientpositive/llap/rand_partitionpruner2.q.out +++ b/ql/src/test/results/clientpositive/llap/rand_partitionpruner2.q.out @@ -24,7 +24,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Output: default@tmptable_n1 OPTIMIZED SQL: SELECT `key` AS `a.key`, `value` AS `a.value`, CAST('2008-04-08' AS STRING) AS `a.ds`, `hr` AS `a.hr` FROM `default`.`srcpart` -WHERE RAND(1) < 0.1 AND `ds` = '2008-04-08' +WHERE RAND(1) < 1E-1 AND `ds` = '2008-04-08' STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/rand_partitionpruner3.q.out b/ql/src/test/results/clientpositive/llap/rand_partitionpruner3.q.out index c541873417e9..809b965ef107 100644 --- a/ql/src/test/results/clientpositive/llap/rand_partitionpruner3.q.out +++ b/ql/src/test/results/clientpositive/llap/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` AS `a.key`, `value` AS `a.value`, CAST('2008-04-08' AS STRING) AS `a.ds`, `hr` AS `a.hr` FROM `default`.`srcpart` -WHERE CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND RAND(1) < 0.1 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' +WHERE CAST(`key` AS DOUBLE) BETWEEN 1.00E1 AND 5.00E1 AND RAND(1) < 1E-1 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' STAGE DEPENDENCIES: Stage-0 is a root stage @@ -90,7 +90,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `a.key`, `value` AS `a.value`, CAST('2008-04-08' AS STRING) AS `a.ds`, `hr` AS `a.hr` FROM `default`.`srcpart` -WHERE CAST(`key` AS DOUBLE) BETWEEN 10 AND 50 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' +WHERE CAST(`key` AS DOUBLE) BETWEEN 1.00E1 AND 5.00E1 AND `ds` = '2008-04-08' AND `hr` LIKE '%2' STAGE DEPENDENCIES: Stage-0 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out index d1008168c788..7fb7d51837c8 100644 --- a/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 15 AND `key` < 20 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 15 AND `key` < 20 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out b/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out index 76c1cef46821..e85b0dbcb7fc 100644 --- a/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out +++ b/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out @@ -21,13 +21,13 @@ HiveProject(src1.key=[$0], src1.value=[$1], src2.key=[$2], src2.value=[$3], src3 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) HiveTableScan(table=[[default, src]], table:alias=[src3]) PREHOOK: query: EXPLAIN CBO @@ -61,7 +61,7 @@ HiveProject(src1.key=[$4], src1.value=[$5], src2.key=[$2], src2.value=[$3], src3 HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) PREHOOK: query: EXPLAIN CBO @@ -93,7 +93,7 @@ HiveProject(src1.key=[$4], src1.value=[$5], src2.key=[$2], src2.value=[$3], src3 HiveProject(key=[$0], value=[$1]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) PREHOOK: query: EXPLAIN CBO @@ -125,7 +125,7 @@ HiveProject(src1.key=[$4], src1.value=[$5], src2.key=[$2], src2.value=[$3], src3 HiveProject(key=[$0], value=[$1]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 1E1), <(CAST($0):DOUBLE, 2E1))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) PREHOOK: query: EXPLAIN CBO diff --git a/ql/src/test/results/clientpositive/llap/semijoin4.q.out b/ql/src/test/results/clientpositive/llap/semijoin4.q.out index f98a0a210f50..bad675701b80 100644 --- a/ql/src/test/results/clientpositive/llap/semijoin4.q.out +++ b/ql/src/test/results/clientpositive/llap/semijoin4.q.out @@ -114,7 +114,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: tt2 - filterExpr: ((decimal1911_col_16 is not null and timestamp_col_19 is not null) or ((tinyint_col_21 = -92Y) and UDFToLong(tinyint_col_18) is not null and decimal2709_col_9 is not null)) (type: boolean) + filterExpr: ((decimal1911_col_16 is not null and timestamp_col_19 is not null) or ((tinyint_col_21 = -92Y) and tinyint_col_18 is not null and decimal2709_col_9 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_19 is not null) (type: boolean) @@ -130,7 +130,7 @@ STAGE PLANS: Map-reduce partition columns: _col0 (type: decimal(19,11)), _col1 (type: timestamp) Statistics: Num rows: 1 Data size: 152 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((tinyint_col_21 = -92Y) and UDFToLong(tinyint_col_18) is not null and decimal2709_col_9 is not null) (type: boolean) + predicate: ((tinyint_col_21 = -92Y) and tinyint_col_18 is not null and decimal2709_col_9 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: decimal2709_col_9 (type: decimal(27,9)), tinyint_col_18 (type: tinyint) diff --git a/ql/src/test/results/clientpositive/llap/semijoin5.q.out b/ql/src/test/results/clientpositive/llap/semijoin5.q.out index f3d0036d99da..a63f6750254f 100644 --- a/ql/src/test/results/clientpositive/llap/semijoin5.q.out +++ b/ql/src/test/results/clientpositive/llap/semijoin5.q.out @@ -106,10 +106,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (((smallint_col_19 = -92S) and UDFToLong(tinyint_col_15) is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) or (timestamp_col_18 is not null and decimal1911_col_16 is not null)) (type: boolean) + filterExpr: (((smallint_col_19 = -92S) and tinyint_col_15 is not null and decimal2709_col_9 is not null and tinyint_col_20 is not null) or (timestamp_col_18 is not null and decimal1911_col_16 is not null)) (type: boolean) Statistics: Num rows: 1 Data size: 128 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: ((smallint_col_19 = -92S) 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: ((smallint_col_19 = -92S) and tinyint_col_15 is not null and decimal2709_col_9 is not null and tinyint_col_20 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), tinyint_col_20 (type: tinyint) diff --git a/ql/src/test/results/clientpositive/llap/sharedwork.q.out b/ql/src/test/results/clientpositive/llap/sharedwork.q.out index e94f9826ed78..0902a5e45895 100644 --- a/ql/src/test/results/clientpositive/llap/sharedwork.q.out +++ b/ql/src/test/results/clientpositive/llap/sharedwork.q.out @@ -115,7 +115,7 @@ FROM `default`.`my_table_0003` WHERE `col_24` IS NOT NULL) AS `t6` ON `t4`.`col_22` = `t6`.`col_24` LEFT JOIN (SELECT `col_1` FROM `default`.`my_table_0001_01` -WHERE `col_100` = 210 AND `col_1` IS NOT NULL) AS `t8` ON `t0`.`col_1` = `t8`.`col_1` +WHERE `col_100` = 2.100E2 AND `col_1` IS NOT NULL) AS `t8` ON `t0`.`col_1` = `t8`.`col_1` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/sharedwork_map_side_aggregations.q.out b/ql/src/test/results/clientpositive/llap/sharedwork_map_side_aggregations.q.out index bbe864529e20..afa4632b1f1e 100644 --- a/ql/src/test/results/clientpositive/llap/sharedwork_map_side_aggregations.q.out +++ b/ql/src/test/results/clientpositive/llap/sharedwork_map_side_aggregations.q.out @@ -53,7 +53,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: ((key like '%0%') or ((key like '%3%') and (key like '%0%') and key is not null) or ((key like '%2%') and (key like '%0%') and key is not null)) (type: boolean) + filterExpr: ((key like '%0%') or ((key like '%3%') and (key like '%0%')) or ((key like '%2%') and (key like '%0%'))) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key like '%0%') (type: boolean) @@ -71,7 +71,7 @@ STAGE PLANS: Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 250 Data size: 21750 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key like '%3%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%3%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -88,7 +88,7 @@ STAGE PLANS: Statistics: Num rows: 125 Data size: 11875 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Filter Operator - predicate: ((key like '%2%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%2%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -110,10 +110,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: (((key like '%6%') and (key like '%0%') and key is not null) or ((key like '%1%') and (key like '%0%') and key is not null)) (type: boolean) + filterExpr: (((key like '%6%') and (key like '%0%')) or ((key like '%1%') and (key like '%0%'))) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key like '%6%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%6%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -130,7 +130,7 @@ STAGE PLANS: Statistics: Num rows: 125 Data size: 11875 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Filter Operator - predicate: ((key like '%1%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%1%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -152,10 +152,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: (((key like '%7%') and (key like '%0%') and key is not null) or ((key like '%4%') and (key like '%0%') and key is not null) or ((key like '%5%') and (key like '%0%') and key is not null)) (type: boolean) + filterExpr: (((key like '%7%') and (key like '%0%')) or ((key like '%4%') and (key like '%0%')) or ((key like '%5%') and (key like '%0%'))) (type: boolean) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((key like '%7%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%7%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -172,7 +172,7 @@ STAGE PLANS: Statistics: Num rows: 125 Data size: 11875 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Filter Operator - predicate: ((key like '%4%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%4%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() @@ -189,7 +189,7 @@ STAGE PLANS: Statistics: Num rows: 125 Data size: 11875 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Filter Operator - predicate: ((key like '%5%') and (key like '%0%') and key is not null) (type: boolean) + predicate: ((key like '%5%') and (key like '%0%')) (type: boolean) Statistics: Num rows: 125 Data size: 10875 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() diff --git a/ql/src/test/results/clientpositive/llap/sharedwork_mapjoin_datasize_check.q.out b/ql/src/test/results/clientpositive/llap/sharedwork_mapjoin_datasize_check.q.out index 907d8c276082..534ac5fd5235 100644 --- a/ql/src/test/results/clientpositive/llap/sharedwork_mapjoin_datasize_check.q.out +++ b/ql/src/test/results/clientpositive/llap/sharedwork_mapjoin_datasize_check.q.out @@ -48,18 +48,18 @@ OPTIMIZED SQL: SELECT `t5`.`$f0` AS `aa.a`, `t12`.`$f1` AS `aa.b`, `t12`.`$f2` A FROM (SELECT `t0`.`key` AS `$f0`, SUM(CAST(`t0`.`value` AS DOUBLE)) / COUNT(CAST(`t0`.`value` AS DOUBLE)) AS `$f1`, SUM(`t2`.`value`) AS `$f2` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `value` > 1000001 AND `key` IS NOT NULL) AS `t0` +WHERE `value` > 1.0000010E6 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000001 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `value` > 1.0000010E6 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` GROUP BY `t0`.`key`) AS `t5` INNER JOIN (SELECT `t7`.`key` AS `$f0`, SUM(CAST(`t7`.`value` AS DOUBLE)) / COUNT(CAST(`t7`.`value` AS DOUBLE)) AS `$f1`, SUM(`t9`.`value`) AS `$f2` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t7` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t7` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t9` ON `t7`.`key` = `t9`.`key` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t9` ON `t7`.`key` = `t9`.`key` GROUP BY `t7`.`key`) AS `t12` ON `t5`.`$f0` = `t12`.`$f0` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -503,36 +503,36 @@ POSTHOOK: Input: default@src1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `t4`.`$f0` AS `aa.a`, `t11`.`$f1` AS `aa.b`, `t11`.`$f2` AS `aa.c`, `t4`.`$f0` AS `bb.a`, `t4`.`$f1` AS `bb.b`, `t4`.`$f2` AS `bb.c`, `t17`.`$f0` AS `cc.a`, `t17`.`$f1` AS `cc.b`, `t17`.`$f2` AS `cc.c`, `t23`.`$f0` AS `dd.a`, `t23`.`$f1` AS `dd.b`, `t23`.`$f2` AS `dd.c` FROM (SELECT `t0`.`key` AS `$f0`, SUM(`t0`.`b`) / COUNT(`t0`.`b`) AS `$f1`, SUM(`t2`.`value`) AS `$f2` -FROM (SELECT `key`, 2 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 2.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000001 AND `key` IS NOT NULL) AS `t0` +WHERE `value` > 1.0000010E6 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000001 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `value` > 1.0000010E6 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` GROUP BY `t0`.`key`) AS `t4` INNER JOIN (SELECT `t6`.`key` AS `$f0`, SUM(CAST(`t6`.`value` AS DOUBLE)) / COUNT(CAST(`t6`.`value` AS DOUBLE)) AS `$f1`, SUM(`t8`.`value`) AS `$f2` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t6` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t6` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` GROUP BY `t6`.`key`) AS `t11` ON `t4`.`$f0` = `t11`.`$f0` INNER JOIN (SELECT `t13`.`key` AS `$f0`, SUM(`t13`.`b`) / COUNT(`t13`.`b`) AS `$f1`, SUM(`t15`.`value`) AS `$f2` -FROM (SELECT `key`, 3 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 3.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000002 AND `key` IS NOT NULL) AS `t13` +WHERE `value` > 1.0000020E6 AND `key` IS NOT NULL) AS `t13` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000002 AND `key` IS NOT NULL) AS `t15` ON `t13`.`key` = `t15`.`key` +WHERE `value` > 1.0000020E6 AND `key` IS NOT NULL) AS `t15` ON `t13`.`key` = `t15`.`key` GROUP BY `t13`.`key`) AS `t17` ON `t4`.`$f0` = `t17`.`$f0` INNER JOIN (SELECT `t19`.`key` AS `$f0`, SUM(`t19`.`b`) / COUNT(`t19`.`b`) AS `$f1`, SUM(`t21`.`value`) AS `$f2` -FROM (SELECT `key`, 4 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 4.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000003 AND `key` IS NOT NULL) AS `t19` +WHERE `value` > 1.0000030E6 AND `key` IS NOT NULL) AS `t19` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000003 AND `key` IS NOT NULL) AS `t21` ON `t19`.`key` = `t21`.`key` +WHERE `value` > 1.0000030E6 AND `key` IS NOT NULL) AS `t21` ON `t19`.`key` = `t21`.`key` GROUP BY `t19`.`key`) AS `t23` ON `t4`.`$f0` = `t23`.`$f0` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1199,36 +1199,36 @@ POSTHOOK: Input: default@src1 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `t4`.`$f0` AS `aa.a`, `t11`.`$f1` AS `aa.b`, `t11`.`$f2` AS `aa.c`, `t4`.`$f0` AS `bb.a`, `t4`.`$f1` AS `bb.b`, `t4`.`$f2` AS `bb.c`, `t17`.`$f0` AS `cc.a`, `t17`.`$f1` AS `cc.b`, `t17`.`$f2` AS `cc.c`, `t23`.`$f0` AS `dd.a`, `t23`.`$f1` AS `dd.b`, `t23`.`$f2` AS `dd.c` FROM (SELECT `t0`.`key` AS `$f0`, SUM(`t0`.`b`) / COUNT(`t0`.`b`) AS `$f1`, SUM(`t2`.`value`) AS `$f2` -FROM (SELECT `key`, 2 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 2.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t0` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000001 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `value` > 1.0000010E6 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` GROUP BY `t0`.`key`) AS `t4` INNER JOIN (SELECT `t6`.`key` AS `$f0`, SUM(CAST(`t6`.`value` AS DOUBLE)) / COUNT(CAST(`t6`.`value` AS DOUBLE)) AS `$f1`, SUM(`t8`.`value`) AS `$f2` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t6` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t6` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` GROUP BY `t6`.`key`) AS `t11` ON `t4`.`$f0` = `t11`.`$f0` INNER JOIN (SELECT `t13`.`key` AS `$f0`, SUM(`t13`.`b`) / COUNT(`t13`.`b`) AS `$f1`, SUM(`t15`.`value`) AS `$f2` -FROM (SELECT `key`, 3 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 3.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t13` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t13` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000002 AND `key` IS NOT NULL) AS `t15` ON `t13`.`key` = `t15`.`key` +WHERE `value` > 1.0000020E6 AND `key` IS NOT NULL) AS `t15` ON `t13`.`key` = `t15`.`key` GROUP BY `t13`.`key`) AS `t17` ON `t4`.`$f0` = `t17`.`$f0` INNER JOIN (SELECT `t19`.`key` AS `$f0`, SUM(`t19`.`b`) / COUNT(`t19`.`b`) AS `$f1`, SUM(`t21`.`value`) AS `$f2` -FROM (SELECT `key`, 4 * CAST(`value` AS DOUBLE) AS `b` +FROM (SELECT `key`, 4.0E0 * CAST(`value` AS DOUBLE) AS `b` FROM `default`.`src` -WHERE `value` > 1000000 AND `key` IS NOT NULL) AS `t19` +WHERE `value` > 1.0000000E6 AND `key` IS NOT NULL) AS `t19` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE `value` > 1000003 AND `key` IS NOT NULL) AS `t21` ON `t19`.`key` = `t21`.`key` +WHERE `value` > 1.0000030E6 AND `key` IS NOT NULL) AS `t21` ON `t19`.`key` = `t21`.`key` GROUP BY `t19`.`key`) AS `t23` ON `t4`.`$f0` = `t23`.`$f0` STAGE DEPENDENCIES: Stage-1 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/stats_unset_hilo.q.out b/ql/src/test/results/clientpositive/llap/stats_unset_hilo.q.out index 8ea2e8fdc117..f2a6f4b8b8cf 100644 --- a/ql/src/test/results/clientpositive/llap/stats_unset_hilo.q.out +++ b/ql/src/test/results/clientpositive/llap/stats_unset_hilo.q.out @@ -857,7 +857,7 @@ POSTHOOK: Input: default@stats_both_unset #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_both_unset` -WHERE `col_float` > 50 +WHERE `col_float` > 5.00E1 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1006,7 +1006,7 @@ POSTHOOK: Input: default@stats_both_unset #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_both_unset` -WHERE `col_double` < 500 +WHERE `col_double` < 5.000E2 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1751,7 +1751,7 @@ POSTHOOK: Input: default@stats_min_only #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_min_only` -WHERE `col_float` > 50 +WHERE `col_float` > 5.00E1 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1900,7 +1900,7 @@ POSTHOOK: Input: default@stats_min_only #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_min_only` -WHERE `col_double` > 200 +WHERE `col_double` > 2.000E2 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -2645,7 +2645,7 @@ POSTHOOK: Input: default@stats_max_only #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_max_only` -WHERE `col_float` < 50 +WHERE `col_float` < 5.00E1 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -2794,7 +2794,7 @@ POSTHOOK: Input: default@stats_max_only #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`stats_max_only` -WHERE `col_double` < 500 +WHERE `col_double` < 5.000E2 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/subquery_ANY.q.out b/ql/src/test/results/clientpositive/llap/subquery_ANY.q.out index a3eb9ed1fde7..0362c26e8e1f 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_ANY.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_ANY.q.out @@ -701,7 +701,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2976 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 > _col3) is not true (type: boolean) + expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 <= _col3) (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2784 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator @@ -1591,7 +1591,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2976 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 > _col3) is not true (type: boolean) + expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 <= _col3) (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2784 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator @@ -1789,7 +1789,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2976 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 > _col3) is not true (type: boolean) + expressions: _col1 (type: int), _col0 (type: string), (_col2 <> 0L) (type: boolean), (_col2 <= _col3) (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 24 Data size: 2784 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator 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 598b05aa0600..6deb35203568 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out @@ -4300,10 +4300,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_type is not null and UDFToLong(p_size) is not null) or p_type is not null) (type: boolean) + filterExpr: ((p_type is not null and p_size is not null) or p_type is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_type is not null and UDFToLong(p_size) 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) @@ -5308,10 +5308,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t_n22 - filterExpr: UDFToLong(i) is not null (type: boolean) + filterExpr: i is not null (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToLong(i) is not null (type: boolean) + predicate: i is not null (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: i (type: int) @@ -5543,10 +5543,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t_n22 - filterExpr: (UDFToLong(i) is not null and j is not null) (type: boolean) + filterExpr: (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: (UDFToLong(i) is not null and j is not null) (type: boolean) + predicate: (i is not null and j 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) 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 3d09b512cee6..86c14c454d84 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out @@ -959,7 +959,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 102 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: bigint), _col1 (type: bigint) Filter Operator - predicate: CAST( c AS STRING) is not null (type: boolean) + predicate: c is not null (type: boolean) Statistics: Num rows: 1 Data size: 86 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: c (type: char(2)) 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 fa79cd87dd13..aca491862f6d 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out @@ -1671,7 +1671,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (((p_size <> 340) and (p_brand <> 'Brand#14')) or p_type is not null or (((p_size * p_size) <> 340) and p_type is not null and p_size is not null)) (type: boolean) + filterExpr: (((p_size <> 340) and (p_brand <> 'Brand#14')) or p_type is not null or (((p_size * p_size) <> 340) 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_size <> 340) and (p_brand <> 'Brand#14')) (type: boolean) @@ -1709,7 +1709,7 @@ STAGE PLANS: Statistics: Num rows: 24 Data size: 2880 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (((p_size * p_size) <> 340) and p_type is not null and p_size is not null) (type: boolean) + predicate: (((p_size * p_size) <> 340) and p_type 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) diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin_having.q.out b/ql/src/test/results/clientpositive/llap/subquery_notin_having.q.out index a6574555f204..750210c25b09 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notin_having.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notin_having.q.out @@ -345,7 +345,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 5 Data size: 570 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 - _col1) > 600.0D) and _col1 is not null) (type: boolean) + predicate: ((_col2 - _col1) > 600.0D) (type: boolean) Statistics: Num rows: 1 Data size: 114 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col1 (type: double) @@ -391,7 +391,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 5 Data size: 570 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((_col2 - _col1) > 600.0D) and _col1 is not null) (type: boolean) + predicate: ((_col2 - _col1) > 600.0D) (type: boolean) Statistics: Num rows: 1 Data size: 114 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), true (type: boolean), _col1 (type: double) 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 8b6d00df553f..469599efd823 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out @@ -2703,7 +2703,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: bigint) Filter Operator - predicate: UDFToLong(p_size) is not null (type: boolean) + predicate: 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), UDFToLong(p_size) (type: bigint) @@ -5142,10 +5142,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: emps_n4 - filterExpr: (name is not null and UDFToLong(empno) is not null) (type: boolean) + filterExpr: (name is not null and empno is not null) (type: boolean) Statistics: Num rows: 5 Data size: 1650 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (name is not null and UDFToLong(empno) is not null) (type: boolean) + predicate: (name is not null and 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) diff --git a/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_coltype.q.out index e7087c42ad18..30d868729387 100644 --- a/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_coltype.q.out +++ b/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_coltype.q.out @@ -138,7 +138,7 @@ POSTHOOK: Input: default@alter_coltype_temp@dt=100/ts=6.30 #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`alter_coltype_temp` -WHERE `ts` = 6.30 +WHERE `ts` = 6.3E0 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -327,7 +327,7 @@ POSTHOOK: Input: default@alter_coltype_temp@dt=100/ts=6.30 #### A masked pattern was here #### OPTIMIZED SQL: SELECT COUNT(*) AS `_c0` FROM `default`.`alter_coltype_temp` -WHERE `ts` = 3 AND `dt` = 100 +WHERE `ts` = 3.0E0 AND `dt` = 1.000E2 STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out index 4dbe7350050c..1df2ddaadf92 100644 --- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out @@ -46,21 +46,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -243,7 +243,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 5 (CUSTOM_SIMPLE_EDGE) Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### @@ -252,21 +252,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -298,16 +298,19 @@ STAGE PLANS: Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 - Execution mode: llap + Execution mode: vectorized, llap Reduce Operator Tree: - Merge Join Operator + Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 _col12 (type: int) - 1 _col0 (type: int) + 0 KEY.reducesinkkey0 (type: int) + 1 KEY.reducesinkkey0 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 + input vertices: + 1 Map 5 Statistics: Num rows: 1084 Data size: 314 Basic stats: COMPLETE Column stats: COMPLETE + DynamicPartitionHashJoin: true Reduce Output Operator key expressions: _col12 (type: int) null sort order: z @@ -449,7 +452,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 5 (CUSTOM_SIMPLE_EDGE) Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### @@ -458,21 +461,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -504,16 +507,19 @@ STAGE PLANS: Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 - Execution mode: llap + Execution mode: vectorized, llap Reduce Operator Tree: - Merge Join Operator + Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 _col12 (type: int) - 1 _col0 (type: int) + 0 KEY.reducesinkkey0 (type: int) + 1 KEY.reducesinkkey0 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 + input vertices: + 1 Map 5 Statistics: Num rows: 1084 Data size: 314 Basic stats: COMPLETE Column stats: COMPLETE + DynamicPartitionHashJoin: true Reduce Output Operator key expressions: _col12 (type: int) null sort order: z diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out index 4dbe7350050c..1df2ddaadf92 100644 --- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out @@ -46,21 +46,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -243,7 +243,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 5 (CUSTOM_SIMPLE_EDGE) Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### @@ -252,21 +252,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -298,16 +298,19 @@ STAGE PLANS: Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 - Execution mode: llap + Execution mode: vectorized, llap Reduce Operator Tree: - Merge Join Operator + Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 _col12 (type: int) - 1 _col0 (type: int) + 0 KEY.reducesinkkey0 (type: int) + 1 KEY.reducesinkkey0 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 + input vertices: + 1 Map 5 Statistics: Num rows: 1084 Data size: 314 Basic stats: COMPLETE Column stats: COMPLETE + DynamicPartitionHashJoin: true Reduce Output Operator key expressions: _col12 (type: int) null sort order: z @@ -449,7 +452,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 5 (CUSTOM_SIMPLE_EDGE) Reducer 3 <- Map 5 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE) Reducer 4 <- Reducer 3 (SIMPLE_EDGE) #### A masked pattern was here #### @@ -458,21 +461,21 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) + filterExpr: (csmallint < 100S) (type: boolean) Statistics: Num rows: 12288 Data size: 2844090 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((csmallint < 100S) and UDFToInteger(csmallint) is not null) (type: boolean) - Statistics: Num rows: 4615 Data size: 1068260 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (csmallint < 100S) (type: boolean) + Statistics: Num rows: 6182 Data size: 1430960 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), UDFToInteger(csmallint) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col12 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col12 (type: int) - Statistics: Num rows: 4615 Data size: 1082044 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6182 Data size: 1449424 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized, llap LLAP IO: all inputs @@ -504,16 +507,19 @@ STAGE PLANS: Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 - Execution mode: llap + Execution mode: vectorized, llap Reduce Operator Tree: - Merge Join Operator + Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 _col12 (type: int) - 1 _col0 (type: int) + 0 KEY.reducesinkkey0 (type: int) + 1 KEY.reducesinkkey0 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12 + input vertices: + 1 Map 5 Statistics: Num rows: 1084 Data size: 314 Basic stats: COMPLETE Column stats: COMPLETE + DynamicPartitionHashJoin: true Reduce Output Operator key expressions: _col12 (type: int) null sort order: z diff --git a/ql/src/test/results/clientpositive/llap/tpch18.q.out b/ql/src/test/results/clientpositive/llap/tpch18.q.out index de0c9991b3db..9bd634f15a18 100644 --- a/ql/src/test/results/clientpositive/llap/tpch18.q.out +++ b/ql/src/test/results/clientpositive/llap/tpch18.q.out @@ -121,7 +121,7 @@ HiveSortLimit(sort0=[$4], sort1=[$3], dir0=[DESC], dir1=[ASC], fetch=[100]) HiveProject(o_orderkey=[$0], o_custkey=[$1], o_totalprice=[$3], o_orderdate=[$4]) HiveTableScan(table=[[tpch_0_001, orders]], table:alias=[orders]) HiveProject($f0=[$0]) - HiveFilter(condition=[>($1, 3E2)]) + HiveFilter(condition=[>($1, 300.0E0)]) HiveAggregate(group=[{0}], agg#0=[sum($4)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[tpch_0_001, lineitem]], table:alias=[lineitem]) @@ -273,7 +273,7 @@ HiveSortLimit(sort0=[$4], sort1=[$3], dir0=[DESC], dir1=[ASC], fetch=[100]) HiveProject(c_custkey=[$0], c_name=[$1]) HiveTableScan(table=[[tpch_0_001, customer]], table:alias=[customer]) HiveProject($f0=[$0]) - HiveFilter(condition=[>($1, 3E2)]) + HiveFilter(condition=[>($1, 300.0E0)]) HiveAggregate(group=[{0}], agg#0=[sum($4)]) HiveTableScan(table=[[tpch_0_001, lineitem]], table:alias=[lineitem]) @@ -371,7 +371,7 @@ HiveSortLimit(sort0=[$4], sort1=[$3], dir0=[DESC], dir1=[ASC], fetch=[100]) HiveProject(o_orderkey=[$0], o_custkey=[$1], o_totalprice=[$3], o_orderdate=[$4]) HiveTableScan(table=[[tpch_0_001, orders]], table:alias=[orders]) HiveProject($f0=[$0]) - HiveFilter(condition=[>($1, 3E2)]) + HiveFilter(condition=[>($1, 300.0E0)]) HiveAggregate(group=[{0}], agg#0=[sum($4)]) HiveTableScan(table=[[tpch_0_001, lineitem]], table:alias=[lineitem]) HiveProject(c_custkey=[$0], c_name=[$1]) diff --git a/ql/src/test/results/clientpositive/llap/union22.q.out b/ql/src/test/results/clientpositive/llap/union22.q.out index 7fcdac19d1d2..82d8d6a1459b 100644 --- a/ql/src/test/results/clientpositive/llap/union22.q.out +++ b/ql/src/test/results/clientpositive/llap/union22.q.out @@ -83,15 +83,15 @@ POSTHOOK: Output: default@dst_union22@ds=2 OPTIMIZED SQL: SELECT `k1` AS `subq.k1`, `k2` AS `subq.k2`, `k3` AS `subq.k3`, `k4` AS `subq.k4` FROM (SELECT `k1`, `k2`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `k0` <= 50 AND `ds` = '1' +WHERE `k0` <= 5.00E1 AND `ds` = '1' UNION ALL SELECT `t2`.`k1`, `t2`.`k2`, `t4`.`k3`, `t4`.`k4` FROM (SELECT `k1`, `k2`, `ds` = '1' AS `EXPR$0` FROM `default`.`dst_union22` -WHERE `k1` > 20) AS `t2` +WHERE `k1` > 2.00E1) AS `t2` LEFT JOIN (SELECT `k1`, `k3`, `k4` FROM `default`.`dst_union22_delta` -WHERE `k0` > 50 AND `k1` > 20 AND `ds` = '1') AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`EXPR$0`) AS `t6` +WHERE `k0` > 5.00E1 AND `k1` > 2.00E1 AND `ds` = '1') AS `t4` ON `t2`.`k1` = `t4`.`k1` AND `t2`.`EXPR$0`) AS `t6` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/union24.q.out b/ql/src/test/results/clientpositive/llap/union24.q.out index be3dc7e06826..1f7001e12339 100644 --- a/ql/src/test/results/clientpositive/llap/union24.q.out +++ b/ql/src/test/results/clientpositive/llap/union24.q.out @@ -81,19 +81,19 @@ POSTHOOK: Input: default@src5_n3 OPTIMIZED SQL: SELECT `key` AS `s.key`, `count` AS `s.count` FROM (SELECT `key`, `count` FROM `default`.`src2_n6` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `key`, `count` FROM `default`.`src3_n2` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `key`, `count` FROM `default`.`src4_n0` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `key`, COUNT(*) AS `$f1` FROM `default`.`src5_n3` -WHERE `key` < 10 +WHERE `key` < 1.00E1 GROUP BY `key`) AS `t8` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -540,19 +540,19 @@ POSTHOOK: Input: default@src5_n3 OPTIMIZED SQL: SELECT `key` AS `s.key`, `count` AS `s.count` FROM (SELECT `key`, `count` FROM `default`.`src2_n6` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `key`, `count` FROM `default`.`src3_n2` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `t4`.`key`, `t6`.`count` FROM (SELECT `key` FROM `default`.`src4_n0` -WHERE `key` < 10) AS `t4` +WHERE `key` < 1.00E1) AS `t4` INNER JOIN (SELECT `key`, `count` FROM `default`.`src5_n3` -WHERE `key` < 10) AS `t6` ON `t4`.`key` = `t6`.`key`) AS `t8` +WHERE `key` < 1.00E1) AS `t6` ON `t4`.`key` = `t6`.`key`) AS `t8` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -977,19 +977,19 @@ POSTHOOK: Input: default@src5_n3 OPTIMIZED SQL: SELECT `key` AS `s.key`, `count` AS `s.count` FROM (SELECT `key`, `count` FROM `default`.`src2_n6` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `key`, `count` FROM `default`.`src3_n2` -WHERE `key` < 10 +WHERE `key` < 1.00E1 UNION ALL SELECT `t4`.`key`, COUNT(*) AS `$f1` FROM (SELECT `key` FROM `default`.`src4_n0` -WHERE `key` < 10) AS `t4` +WHERE `key` < 1.00E1) AS `t4` INNER JOIN (SELECT `key` FROM `default`.`src5_n3` -WHERE `key` < 10) AS `t6` ON `t4`.`key` = `t6`.`key` +WHERE `key` < 1.00E1) AS `t6` ON `t4`.`key` = `t6`.`key` GROUP BY `t4`.`key`) AS `t9` STAGE DEPENDENCIES: Stage-1 is a root stage diff --git a/ql/src/test/results/clientpositive/llap/union_all_filter_transpose.q.out b/ql/src/test/results/clientpositive/llap/union_all_filter_transpose.q.out index f1160ae7e80e..a40582feeeea 100644 --- a/ql/src/test/results/clientpositive/llap/union_all_filter_transpose.q.out +++ b/ql/src/test/results/clientpositive/llap/union_all_filter_transpose.q.out @@ -92,9 +92,9 @@ CBO PLAN: HiveProject(t2.a=[$0], t2.b=[$1]) HiveUnion(all=[true]) HiveProject(a=[$0], b=[$1]) - HiveFilter(condition=[=(CAST($0):DOUBLE, 1000)]) + HiveFilter(condition=[=(CAST($0):DOUBLE, 1000.0E0)]) HiveTableScan(table=[[default, t]], table:alias=[t]) HiveProject(a=[$0], _o__c1=[null:VARCHAR(2147483647) CHARACTER SET "UTF-16LE"]) - HiveFilter(condition=[=(CAST($0):DOUBLE, 1000)]) + HiveFilter(condition=[=(CAST($0):DOUBLE, 1000.0E0)]) HiveTableScan(table=[[default, t]], table:alias=[t]) diff --git a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out b/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out index 7801c9f1570f..d4075bd3f664 100644 --- a/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_char_mapjoin1.q.out @@ -525,7 +525,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: CAST( c2 AS STRING) is not null (type: boolean) + filterExpr: c2 is not null (type: boolean) Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -533,8 +533,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: SelectColumnIsNotNull(col 1:string)(children: col 1:char(10)) - predicate: CAST( c2 AS STRING) is not null (type: boolean) + predicateExpression: SelectColumnIsNotNull(col 1:char(10)) + predicate: c2 is not null (type: boolean) Statistics: Num rows: 3 Data size: 273 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), c2 (type: char(10)), CAST( c2 AS STRING) (type: string) diff --git a/ql/src/test/results/clientpositive/llap/vector_varchar_mapjoin1.q.out b/ql/src/test/results/clientpositive/llap/vector_varchar_mapjoin1.q.out index fcd98498c656..83b3dcb58ef8 100644 --- a/ql/src/test/results/clientpositive/llap/vector_varchar_mapjoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_varchar_mapjoin1.q.out @@ -441,10 +441,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: CAST( c2 AS STRING) is not null (type: boolean) + filterExpr: c2 is not null (type: boolean) Statistics: Num rows: 3 Data size: 276 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( c2 AS STRING) is not null (type: boolean) + predicate: c2 is not null (type: boolean) Statistics: Num rows: 3 Data size: 276 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c1 (type: int), c2 (type: varchar(10)), CAST( c2 AS STRING) (type: string) 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 58af789cf254..673c040d6b67 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 @@ -2588,10 +2588,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) is not null (type: boolean) + filterExpr: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) is not null (type: boolean) + predicate: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) (type: string) @@ -2618,10 +2618,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n2 - filterExpr: ((UDFToDouble(hour) = 11.0D) and CAST( hr AS STRING) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and CAST( hr AS STRING) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( hr AS STRING) (type: string) From 61c9f44bed3ec9ed1786aab08c836040d43e11c1 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 8 Jun 2026 15:02:53 +0100 Subject: [PATCH 14/41] Temp: trying to force druid-handler rebuild on Jenkins... --- .../java/org/apache/hadoop/hive/druid/DruidStorageHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index 656fa40c03fa..c7bc6484c37d 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -138,6 +138,9 @@ @SuppressWarnings({ "rawtypes" }) public class DruidStorageHandler extends DefaultHiveMetaHook implements HiveStorageHandler { + // TODO cleanup + private static final String TMP_CACHE_BUSTER_TOKEN = "Force-Recompile-Druid-Module-ASM-9.7"; + private static final Logger LOG = LoggerFactory.getLogger(DruidStorageHandler.class); private static final SessionState.LogHelper CONSOLE = new SessionState.LogHelper(LOG); From 90f3d8ef6de8318ecae4eebdfcc2c261aa02f470 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 8 Jun 2026 15:05:22 +0100 Subject: [PATCH 15/41] Bump Calcite to 1.42 + required code adjustments: 1.40 [CALCITE-6961] Support LogicalRepeatUnion in RelShuttle + [CALCITE-6959] Support LogicalAsofJoin in RelShuttle Add visit(LogicalAsofJoin) and visit(LogicalRepeatUnion) to HiveRelShuttleImpl [CALCITE-5387] Type-mismatch on nullability in JoinPushTransitivePredicatesRule RelRule Adjust RexPermuteInputsShuttle constructor in HiveJoinConstraintsRule 1.41 [CALCITE-7029] Support DPhyp to handle various join types Add visitNodeAndFieldIndex in RexVisitor implementation (HiveCalciteUtil#ConstantFinder) 1.42 [CALCITE-7351] Make getMaxNumericScale() and getMaxNumericPrecision() final Adjust HiveTypeSystemImpl --- pom.xml | 2 +- .../hive/ql/optimizer/calcite/HiveCalciteUtil.java | 6 ++++++ .../ql/optimizer/calcite/HiveRelShuttleImpl.java | 12 ++++++++++++ .../ql/optimizer/calcite/HiveTypeSystemImpl.java | 14 ++------------ .../calcite/rules/HiveJoinConstraintsRule.java | 4 ++-- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 55e9f3deeeee..5973f3ca3099 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 9.7 1.12.0 1.82 - 1.38.0 + 1.42.0 6.0.5 6.0.11 3.2.0-release diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java index 9569e2f66eae..d883c6c997ab 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java @@ -53,6 +53,7 @@ import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexLocalRef; import org.apache.calcite.rex.RexNode; +import org.apache.calcite.rex.RexNodeAndFieldIndex; import org.apache.calcite.rex.RexOver; import org.apache.calcite.rex.RexPatternFieldRef; import org.apache.calcite.rex.RexShuttle; @@ -1151,6 +1152,11 @@ public Boolean visitLambda(RexLambda lambda) { public Boolean visitLambdaRef(RexLambdaRef lambdaRef) { return false; } + + @Override + public Boolean visitNodeAndFieldIndex(RexNodeAndFieldIndex nodeAndFieldIndex) { + return false; + } } public static Set getInputRefs(RexNode expr) { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java index ee85b00d5603..ca1cf9e61f93 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelShuttleImpl.java @@ -24,6 +24,7 @@ import org.apache.calcite.rel.core.TableFunctionScan; import org.apache.calcite.rel.core.TableScan; import org.apache.calcite.rel.logical.LogicalAggregate; +import org.apache.calcite.rel.logical.LogicalAsofJoin; import org.apache.calcite.rel.logical.LogicalCalc; import org.apache.calcite.rel.logical.LogicalCorrelate; import org.apache.calcite.rel.logical.LogicalExchange; @@ -33,6 +34,7 @@ import org.apache.calcite.rel.logical.LogicalMatch; import org.apache.calcite.rel.logical.LogicalMinus; import org.apache.calcite.rel.logical.LogicalProject; +import org.apache.calcite.rel.logical.LogicalRepeatUnion; import org.apache.calcite.rel.logical.LogicalSort; import org.apache.calcite.rel.logical.LogicalTableModify; import org.apache.calcite.rel.logical.LogicalUnion; @@ -177,6 +179,16 @@ public RelNode visit(HiveTableScan scan) { public RelNode visit(HiveJdbcConverter conv) { return visitChild(conv, 0, conv.getInput()); } + + @Override + public RelNode visit(LogicalAsofJoin logicalAsofJoin) { + return visitChildren(logicalAsofJoin); + } + + @Override + public RelNode visit(LogicalRepeatUnion logicalRepeatUnion) { + return visitChildren(logicalRepeatUnion); + } } // End RelShuttleImpl.java diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveTypeSystemImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveTypeSystemImpl.java index 229801bb1544..4cb300232239 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveTypeSystemImpl.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveTypeSystemImpl.java @@ -53,7 +53,7 @@ public class HiveTypeSystemImpl extends RelDataTypeSystemImpl { public int getMaxScale(SqlTypeName typeName) { switch (typeName) { case DECIMAL: - return getMaxNumericScale(); + return MAX_DECIMAL_SCALE; case INTERVAL_YEAR: case INTERVAL_MONTH: case INTERVAL_YEAR_MONTH: @@ -126,7 +126,7 @@ public int getDefaultPrecision(SqlTypeName typeName) { public int getMaxPrecision(SqlTypeName typeName) { switch (typeName) { case DECIMAL: - return getMaxNumericPrecision(); + return MAX_DECIMAL_PRECISION; case VARCHAR: case CHAR: return MAX_CHAR_PRECISION; @@ -157,16 +157,6 @@ public int getMaxPrecision(SqlTypeName typeName) { } } - @Override - public int getMaxNumericScale() { - return MAX_DECIMAL_SCALE; - } - - @Override - public int getMaxNumericPrecision() { - return MAX_DECIMAL_PRECISION; - } - @Override public boolean isSchemaCaseSensitive() { return false; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinConstraintsRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinConstraintsRule.java index 58eb2011ed05..2a984661dd1c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinConstraintsRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveJoinConstraintsRule.java @@ -163,7 +163,7 @@ public void onMatch(RelOptRuleCall call) { } // Then, we start by trying to reference only left side in top projections List swappedTopProjExprs = topProjExprs.stream() - .map(projExpr -> projExpr.accept(new RexPermuteInputsShuttle(mappingRL, call.rel(1)))) + .map(projExpr -> projExpr.accept(new RexPermuteInputsShuttle(mappingRL, false, call.rel(1)))) .collect(Collectors.toList()); rightInputPotentialFK = RelOptUtil.InputFinder.bits(swappedTopProjExprs, null).intersects(rightBits); if (!rightInputPotentialFK) { @@ -171,7 +171,7 @@ public void onMatch(RelOptRuleCall call) { } else { // If it did not work, we try to reference only right side in top projections swappedTopProjExprs = topProjExprs.stream() - .map(projExpr -> projExpr.accept(new RexPermuteInputsShuttle(mappingLR, call.rel(1)))) + .map(projExpr -> projExpr.accept(new RexPermuteInputsShuttle(mappingLR, false, call.rel(1)))) .collect(Collectors.toList()); leftInputPotentialFK = RelOptUtil.InputFinder.bits(swappedTopProjExprs, null).intersects(leftBits); if (!leftInputPotentialFK) { From ca7e9e520999e6c8725db5b4ecbfc006d7f32ea9 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 8 Jun 2026 16:54:30 +0100 Subject: [PATCH 16/41] Adjust test plans due to change in representation of floating point values in RexLiteral: [CALCITE-2067] RexLiteral cannot represent accurately floating point values, including NaN, Infinity (1.38) --- .../perf/tpcds30tb/cte/cbo_query21.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query23.q.out | 6 +++--- .../perf/tpcds30tb/cte/cbo_query28.q.out | 12 ++++++------ .../perf/tpcds30tb/cte/cbo_query33.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query37.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query39.q.out | 8 ++++---- .../perf/tpcds30tb/cte/cbo_query40.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query48.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query49.q.out | 6 +++--- .../perf/tpcds30tb/cte/cbo_query5.q.out | 12 ++++++------ .../perf/tpcds30tb/cte/cbo_query60.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query67.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query77.q.out | 4 ++-- .../perf/tpcds30tb/cte/cbo_query78.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query80.q.out | 6 +++--- .../perf/tpcds30tb/cte/cbo_query82.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query83.q.out | 2 +- 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query21.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query21.q.out index a6d2b3e4911c..50d33992dc6d 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query21.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query21.q.out @@ -1,7 +1,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(x.w_warehouse_name=[$0], x.i_item_id=[$1], x.inv_before=[$2], x.inv_after=[$3]) - HiveFilter(condition=[AND(CASE(>($2, 0), <=(6.66667E-1, /(CAST($3):DOUBLE, CAST($2):DOUBLE)), false), CASE(>($2, 0), <=(/(CAST($3):DOUBLE, CAST($2):DOUBLE), 1.5E0), false))]) + HiveFilter(condition=[AND(CASE(>($2, 0), <=(0.666667E0, /(CAST($3):DOUBLE, CAST($2):DOUBLE)), false), CASE(>($2, 0), <=(/(CAST($3):DOUBLE, CAST($2):DOUBLE), 1.5E0), false))]) HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)]) HiveProject($f0=[$1], $f1=[$10], $f2=[CASE($7, $5, 0)], $f3=[CASE($8, $5, 0)]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query23.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query23.q.out index f4618767652b..9b1db0f22248 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query23.q.out @@ -22,7 +22,7 @@ HiveProject(c_customer_sk=[$0]) HiveProject(ss_customer_sk=[CAST($2):BIGINT NOT NULL], $f1=[*(CAST($9):DECIMAL(10, 0), $12)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(EXPR$0=[*(0.95:DECIMAL(16, 6), $0)]) + HiveProject(EXPR$0=[*(0.950000:DECIMAL(16, 6), $0)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveAggregate(group=[{}], agg#0=[max($1)]) HiveAggregate(group=[{1}], agg#0=[sum($2)]) @@ -80,7 +80,7 @@ HiveProject(_c0=[$0]) HiveProject(ss_customer_sk=[CAST($2):BIGINT NOT NULL], $f1=[*(CAST($9):DECIMAL(10, 0), $12)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(EXPR$0=[*(0.95:DECIMAL(16, 6), $0)]) + HiveProject(EXPR$0=[*(0.950000:DECIMAL(16, 6), $0)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[max($1)]) @@ -124,7 +124,7 @@ HiveProject(_c0=[$0]) HiveProject(ss_customer_sk=[CAST($2):BIGINT NOT NULL], $f1=[*(CAST($9):DECIMAL(10, 0), $12)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(EXPR$0=[*(0.95:DECIMAL(16, 6), $0)]) + HiveProject(EXPR$0=[*(0.950000:DECIMAL(16, 6), $0)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[max($1)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query28.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query28.q.out index ede33acc5e69..9d4087142c5f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query28.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query28.q.out @@ -12,26 +12,26 @@ HiveProject(b1.b1_lp=[$0], b1.b1_cnt=[$1], b1.b1_cntd=[$2], b2.b2_lp=[$15], b2.b HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(b1_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b1_cnt=[$1], b1_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 0, 5), OR(BETWEEN(false, $11, 11:DECIMAL(12, 2), 21:DECIMAL(12, 2)), BETWEEN(false, $18, 460:DECIMAL(12, 2), 1460:DECIMAL(12, 2)), BETWEEN(false, $10, 14:DECIMAL(12, 2), 34:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 0, 5), OR(BETWEEN(false, $11, 11.00:DECIMAL(12, 2), 21.00:DECIMAL(12, 2)), BETWEEN(false, $18, 460.00:DECIMAL(12, 2), 1460.00:DECIMAL(12, 2)), BETWEEN(false, $10, 14.00:DECIMAL(12, 2), 34.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b6_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b6_cnt=[$1], b6_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 26, 30), OR(BETWEEN(false, $11, 28:DECIMAL(12, 2), 38:DECIMAL(12, 2)), BETWEEN(false, $18, 2513:DECIMAL(12, 2), 3513:DECIMAL(12, 2)), BETWEEN(false, $10, 42:DECIMAL(12, 2), 62:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 26, 30), OR(BETWEEN(false, $11, 28.00:DECIMAL(12, 2), 38.00:DECIMAL(12, 2)), BETWEEN(false, $18, 2513.00:DECIMAL(12, 2), 3513.00:DECIMAL(12, 2)), BETWEEN(false, $10, 42.00:DECIMAL(12, 2), 62.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b5_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b5_cnt=[$1], b5_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 21, 25), OR(BETWEEN(false, $11, 135:DECIMAL(12, 2), 145:DECIMAL(12, 2)), BETWEEN(false, $18, 14180:DECIMAL(12, 2), 15180:DECIMAL(12, 2)), BETWEEN(false, $10, 38:DECIMAL(12, 2), 58:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 21, 25), OR(BETWEEN(false, $11, 135.00:DECIMAL(12, 2), 145.00:DECIMAL(12, 2)), BETWEEN(false, $18, 14180.00:DECIMAL(12, 2), 15180.00:DECIMAL(12, 2)), BETWEEN(false, $10, 38.00:DECIMAL(12, 2), 58.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b4_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b4_cnt=[$1], b4_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 16, 20), OR(BETWEEN(false, $11, 142:DECIMAL(12, 2), 152:DECIMAL(12, 2)), BETWEEN(false, $18, 3054:DECIMAL(12, 2), 4054:DECIMAL(12, 2)), BETWEEN(false, $10, 80:DECIMAL(12, 2), 100:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 16, 20), OR(BETWEEN(false, $11, 142.00:DECIMAL(12, 2), 152.00:DECIMAL(12, 2)), BETWEEN(false, $18, 3054.00:DECIMAL(12, 2), 4054.00:DECIMAL(12, 2)), BETWEEN(false, $10, 80.00:DECIMAL(12, 2), 100.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b3_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b3_cnt=[$1], b3_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 11, 15), OR(BETWEEN(false, $11, 66:DECIMAL(12, 2), 76:DECIMAL(12, 2)), BETWEEN(false, $18, 920:DECIMAL(12, 2), 1920:DECIMAL(12, 2)), BETWEEN(false, $10, 4:DECIMAL(12, 2), 24:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 11, 15), OR(BETWEEN(false, $11, 66.00:DECIMAL(12, 2), 76.00:DECIMAL(12, 2)), BETWEEN(false, $18, 920.00:DECIMAL(12, 2), 1920.00:DECIMAL(12, 2)), BETWEEN(false, $10, 4.00:DECIMAL(12, 2), 24.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b2_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b2_cnt=[$1], b2_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 6, 10), OR(BETWEEN(false, $11, 91:DECIMAL(12, 2), 101:DECIMAL(12, 2)), BETWEEN(false, $18, 1430:DECIMAL(12, 2), 2430:DECIMAL(12, 2)), BETWEEN(false, $10, 32:DECIMAL(12, 2), 52:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 6, 10), OR(BETWEEN(false, $11, 91.00:DECIMAL(12, 2), 101.00:DECIMAL(12, 2)), BETWEEN(false, $18, 1430.00:DECIMAL(12, 2), 2430.00:DECIMAL(12, 2)), BETWEEN(false, $10, 32.00:DECIMAL(12, 2), 52.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out index a2522c6e0701..9b0ed9f460e6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query33.q.out @@ -1,5 +1,5 @@ CTE Suggestion: -HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) +HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) @@ -38,7 +38,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveTableSpool(table=[[cte, cte_suggestion_2]]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query37.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query37.q.out index e2ad185eef6f..622a9bea267a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query37.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[BETWEEN(false, $3, 100, 500)]) HiveTableScan(table=[[default, inventory]], table:alias=[inventory]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 678, 849, 918, 964), BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($13, 678, 849, 918, 964), BETWEEN(false, $5, 22.00:DECIMAL(12, 2), 52.00:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-06-02 00:00:00:TIMESTAMP(9), 2001-08-01 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query39.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query39.q.out index 39c458003a1c..585c2eec16c0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query39.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query39.q.out @@ -3,8 +3,8 @@ HiveProject(inv1.w_warehouse_sk=[$0], inv1.i_item_sk=[$1], inv1.d_moy=[CAST(4):I HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$6], sort5=[$7], dir0=[ASC], dir1=[ASC], dir2=[ASC], dir3=[ASC], dir4=[ASC], dir5=[ASC]) HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[$6], cov=[$7], w_warehouse_sk0=[$0], i_item_sk0=[$1], mean0=[$2], cov0=[$3]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) - HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1))]) + HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) + HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1.0E0))]) HiveAggregate(group=[{1, 2}], agg#0=[sum($5)], agg#1=[sum($4)], agg#2=[count($4)], agg#3=[sum($3)], agg#4=[count($3)]) HiveProject($f0=[$6], $f1=[$5], $f2=[$3], $f4=[$2], $f40=[CAST($2):DOUBLE], $f6=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)]) HiveJoin(condition=[=($1, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -16,8 +16,8 @@ HiveProject(inv1.w_warehouse_sk=[$0], inv1.i_item_sk=[$1], inv1.d_moy=[CAST(4):I HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) - HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) - HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1))]) + HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) + HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1.0E0))]) HiveAggregate(group=[{1, 2}], agg#0=[sum($5)], agg#1=[sum($4)], agg#2=[count($4)], agg#3=[sum($3)], agg#4=[count($3)]) HiveProject($f0=[$6], $f1=[$5], $f2=[$3], $f4=[$2], $f40=[CAST($2):DOUBLE], $f6=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)]) HiveJoin(condition=[=($1, $5)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query40.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query40.q.out index 582967b597c1..313eb534ba72 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query40.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(w_state=[$0], i_item_id=[$1], sales_before=[$2], sales_after=[$3]) HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)]) - HiveProject($f0=[$14], $f1=[$12], $f2=[CASE($9, -($3, CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))), 0:DECIMAL(13, 2))], $f3=[CASE($10, -($3, CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))), 0:DECIMAL(13, 2))]) + HiveProject($f0=[$14], $f1=[$12], $f2=[CASE($9, -($3, CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))), 0.00:DECIMAL(13, 2))], $f3=[CASE($10, -($3, CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))), 0.00:DECIMAL(13, 2))]) HiveJoin(condition=[=($0, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($11, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($4, $8)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out index b4874b81abce..32ffaa471159 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query48.q.out @@ -10,7 +10,7 @@ HiveProject(_c0=[$0]) HiveFilter(condition=[AND(=($2, 'M'), =($3, '4 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) + HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0.00:DECIMAL(12, 2), 2000.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150.00:DECIMAL(12, 2), 3000.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50.00:DECIMAL(12, 2), 25000.00:DECIMAL(12, 2))]) HiveFilter(condition=[AND(BETWEEN(false, $12, 50:DECIMAL(3, 0), 200:DECIMAL(3, 0)), IS NOT NULL($21), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out index 6a741aa853d3..d497eed77c95 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query49.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_item_sk=[$1], wr_order_number=[$12], wr_return_quantity=[$13], wr_return_amt=[$14]) HiveFilter(condition=[>($14, 10000:DECIMAL(5, 0))]) @@ -36,7 +36,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_item_sk=[$1], cr_order_number=[$15], cr_return_quantity=[$16], cr_return_amount=[$17]) HiveFilter(condition=[>($17, 10000:DECIMAL(5, 0))]) @@ -51,7 +51,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_item_sk=[$1], sr_ticket_number=[$8], sr_return_quantity=[$9], sr_return_amt=[$10]) HiveFilter(condition=[>($10, 10000:DECIMAL(5, 0))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out index 3078577b3d51..8fe695d2baf7 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query5.q.out @@ -15,10 +15,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(store_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) - HiveProject(store_sk=[$6], date_sk=[$22], sales_price=[$14], profit=[$21], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(store_sk=[$6], date_sk=[$22], sales_price=[$14], profit=[$21], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(store_sk=[$6], date_sk=[$19], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$10], net_loss=[$18]) + HiveProject(store_sk=[$6], date_sk=[$19], sales_price=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$10], net_loss=[$18]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($19))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) @@ -32,10 +32,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(page_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) - HiveProject(page_sk=[$11], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(page_sk=[$11], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($33))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(page_sk=[$11], date_sk=[$26], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$17], net_loss=[$25]) + HiveProject(page_sk=[$11], date_sk=[$26], sales_price=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$17], net_loss=[$25]) HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($26))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) @@ -49,10 +49,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) 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=[$12], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(wsr_web_site_sk=[$12], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($12), IS NOT NULL($33))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) - HiveProject(ws_web_site_sk=[$1], wr_returned_date_sk=[$7], $f2=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], $f3=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], wr_return_amt=[$5], wr_net_loss=[$6]) + HiveProject(ws_web_site_sk=[$1], wr_returned_date_sk=[$7], $f2=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], $f3=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], wr_return_amt=[$5], wr_net_loss=[$6]) HiveJoin(condition=[AND(=($3, $0), =($4, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_item_sk=[$2], ws_web_site_sk=[$12], ws_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($12)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out index df91809ad9a0..c3c58e32bbbd 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query60.q.out @@ -1,5 +1,5 @@ CTE Suggestion: -HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) +HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) @@ -33,7 +33,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveFilter(condition=[AND(=($6, 1999), =($8, 9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query67.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query67.q.out index e4150989e8da..37e1010d2904 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query67.q.out @@ -8,7 +8,7 @@ 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=[=($1, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_item_sk=[$1], ss_store_sk=[$6], ss_sold_date_sk=[$22], $f8=[CASE(AND(IS NOT NULL($12), IS NOT NULL(CAST($9):DECIMAL(10, 0))), *($12, CAST($9):DECIMAL(10, 0)), 0:DECIMAL(18, 2))]) + HiveProject(ss_item_sk=[$1], ss_store_sk=[$6], ss_sold_date_sk=[$22], $f8=[CASE(AND(IS NOT NULL($12), IS NOT NULL($9)), *($12, CAST($9):DECIMAL(10, 0)), 0.00:DECIMAL(18, 2))]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8], d_qoy=[$10]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out index 1a596dde7964..33297437e349 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query77.q.out @@ -10,7 +10,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0.00:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0.00:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_store_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -52,7 +52,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0.00:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0.00:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_web_page_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query78.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query78.q.out index 68fb16cf9787..3e80cc6a1298 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query78.q.out @@ -6,7 +6,7 @@ HiveProject(d_date_sk=[$0]) CBO PLAN: HiveProject(ss_sold_year=[CAST(2000):INTEGER], ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[$2], store_qty=[$3], store_wholesale_cost=[$4], store_sales_price=[$5], other_chan_qty=[$6], other_chan_wholesale_cost=[$7], other_chan_sales_price=[$8]) HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$9], sort3=[$10], sort4=[$11], sort5=[$6], sort6=[$7], sort7=[$8], sort8=[$12], dir0=[ASC], dir1=[ASC], dir2=[DESC], dir3=[DESC], dir4=[DESC], dir5=[ASC], dir6=[ASC], dir7=[ASC], dir8=[ASC], fetch=[100]) - HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)], store_qty=[$2], store_wholesale_cost=[$3], store_sales_price=[$4], other_chan_qty=[+(CASE(IS NOT NULL($7), $7, 0:BIGINT), CASE(IS NOT NULL($11), $11, 0:BIGINT))], other_chan_wholesale_cost=[+(CASE(IS NOT NULL($8), $8, 0:DECIMAL(17, 2)), CASE(IS NOT NULL($12), $12, 0:DECIMAL(17, 2)))], other_chan_sales_price=[+(CASE(IS NOT NULL($9), $9, 0:DECIMAL(17, 2)), CASE(IS NOT NULL($13), $13, 0:DECIMAL(17, 2)))], ss_qty=[$2], ss_wc=[$3], ss_sp=[$4], (tok_function round (/ (tok_table_or_col ss_qty) (tok_function coalesce (+ (tok_table_or_col ws_qty) (tok_table_or_col cs_qty)) 1)) 2)=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)]) + HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)], store_qty=[$2], store_wholesale_cost=[$3], store_sales_price=[$4], other_chan_qty=[+(CASE(IS NOT NULL($7), $7, 0:BIGINT), CASE(IS NOT NULL($11), $11, 0:BIGINT))], other_chan_wholesale_cost=[+(CASE(IS NOT NULL($8), $8, 0.00:DECIMAL(17, 2)), CASE(IS NOT NULL($12), $12, 0.00:DECIMAL(17, 2)))], other_chan_sales_price=[+(CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(17, 2)), CASE(IS NOT NULL($13), $13, 0.00:DECIMAL(17, 2)))], ss_qty=[$2], ss_wc=[$3], ss_sp=[$4], (tok_function round (/ (tok_table_or_col ss_qty) (tok_function coalesce (+ (tok_table_or_col ws_qty) (tok_table_or_col cs_qty)) 1)) 2)=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)]) HiveJoin(condition=[=($10, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out index 64d0b6298d67..003887337c67 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query80.q.out @@ -21,7 +21,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveUnion(all=[true]) HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $12)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -47,7 +47,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $12)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -67,7 +67,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $12)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query82.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query82.q.out index 44172d451daa..a09396c80713 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query82.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[BETWEEN(false, $3, 100, 500)]) HiveTableScan(table=[[default, inventory]], table:alias=[inventory]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 129, 437, 663, 727), BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($13, 129, 437, 663, 727), BETWEEN(false, $5, 30.00:DECIMAL(12, 2), 60.00:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2002-05-30 00:00:00:TIMESTAMP(9), 2002-07-29 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query83.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query83.q.out index 1dc1f64fc658..786292cc0d75 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query83.q.out @@ -15,7 +15,7 @@ HiveProject(d_date_sk=[$0], d_date=[$2]) CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) - HiveProject(sr_items.item_id=[$0], sr_item_qty=[$3], sr_dev=[*(/(/(CAST($3):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], cr_item_qty=[$1], cr_dev=[*(/(/(CAST($1):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], wr_item_qty=[$5], wr_dev=[*(/(/($6, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], average=[/(CAST(+(+($3, $1), $5)):DECIMAL(19, 0), 3:DECIMAL(1, 0))]) + HiveProject(sr_items.item_id=[$0], sr_item_qty=[$3], sr_dev=[*(/(/(CAST($3):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], cr_item_qty=[$1], cr_dev=[*(/(/(CAST($1):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], wr_item_qty=[$5], wr_dev=[*(/(/($6, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], average=[/(CAST(+(+($3, $1), $5)):DECIMAL(19, 0), 3:DECIMAL(1, 0))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_id=[$0], $f1=[$1]) From 25e170eef038611debad43ecdd68a26ae49027d3 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Tue, 9 Jun 2026 10:14:08 +0100 Subject: [PATCH 17/41] Temp: trying to force druid-handler rebuild on Jenkins... --- druid-handler/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index fa8ed187e56a..78849e3a8eae 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -407,6 +407,8 @@ META-INF/*.RSA META-INF/versions/** static/ + + evict-stale-asm-shade-cache/** From 9dd5a42b2d3db99bc0ae9a30d0e8560010a7de2a Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Tue, 9 Jun 2026 12:27:37 +0100 Subject: [PATCH 18/41] Adjust tests (condition predicates in different order) Adjust test plans due to change in representation of floating point values in RexLiteral: [CALCITE-2067] RexLiteral cannot represent accurately floating point values, including NaN, Infinity (1.38) Adjust test plans simplifications around IS_NOT_NULL: [CALCITE-5639] RexSimplify should remove IS NOT NULL check when LIKE comparison is present (1.35) (actually more generic than just LIKE) [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) (actually more generic than just CAST) Adjust test plans: add missing padding on fixed-length char literals, due to [CALCITE-4590] Incorrect query result with fixed-length string (1.39) Note: this Calcite fix only impacts predicates with OR/IN/SEARCH, and aligns these plans with single value condition ones (which already contained the padding, e.g. ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out) --- .../positive/kudu_complex_queries.q.out | 6 +- .../llap/allcolref_in_udf.q.out | 4 +- .../llap/bucket_map_join_tez2.q.out | 16 +- .../llap/bucket_map_join_tez3.q.out | 96 ++++----- .../cbo_aggregate_reduce_functions_rule.q.out | 2 +- .../clientpositive/llap/collision.q.out | 2 +- .../llap/correlationoptimizer8.q.out | 12 +- .../llap/dynamic_partition_pruning.q.out | 193 +++++++++--------- .../clientpositive/llap/fouter_join_ppr.q.out | 16 +- .../llap/in_typecheck_char.q.out | 2 +- .../results/clientpositive/llap/join2.q.out | 38 ++-- .../results/clientpositive/llap/join34.q.out | 6 +- .../results/clientpositive/llap/join35.q.out | 6 +- .../clientpositive/llap/louter_join_ppr.q.out | 16 +- .../clientpositive/llap/masking_1.q.out | 4 +- .../clientpositive/llap/masking_12.q.out | 6 +- .../clientpositive/llap/masking_2.q.out | 4 +- .../clientpositive/llap/masking_3.q.out | 42 ++-- .../clientpositive/llap/masking_4.q.out | 6 +- .../materialized_view_create_rewrite_6.q.out | 2 +- ...ed_view_create_rewrite_6_aggr_2joins.q.out | 2 +- .../materialized_view_create_rewrite_9.q.out | 2 +- .../llap/materialized_view_rewrite_ssb.q.out | 36 ++-- .../materialized_view_rewrite_ssb_2.q.out | 36 ++-- ...lized_view_rewrite_ssb_grouping_sets.q.out | 12 +- .../llap/optimize_join_ptp.q.out | 4 +- .../clientpositive/llap/outer_join_ppr.q.out | 8 +- .../clientpositive/llap/router_join_ppr.q.out | 16 +- .../llap/rule_exclusion_config.q.out | 8 +- .../llap/swo_pruned_merge.q.out | 4 +- .../perf/tpcds30tb/cte/cbo_query12.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query13.q.out | 6 +- .../perf/tpcds30tb/cte/cbo_query15.q.out | 4 +- .../perf/tpcds30tb/cte/cbo_query20.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query34.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query41.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query45.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query53.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query56.q.out | 12 +- .../perf/tpcds30tb/cte/cbo_query6.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query63.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query64.q.out | 6 +- .../perf/tpcds30tb/cte/cbo_query66.q.out | 10 +- .../perf/tpcds30tb/cte/cbo_query71.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query73.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query85.q.out | 8 +- .../perf/tpcds30tb/cte/cbo_query89.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query91.q.out | 2 +- .../perf/tpcds30tb/cte/cbo_query98.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query12.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query13.q.out | 6 +- .../perf/tpcds30tb/tez/cbo_query15.q.out | 4 +- .../perf/tpcds30tb/tez/cbo_query20.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query21.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query23.q.out | 4 +- .../perf/tpcds30tb/tez/cbo_query28.q.out | 12 +- .../perf/tpcds30tb/tez/cbo_query33.q.out | 6 +- .../perf/tpcds30tb/tez/cbo_query34.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query37.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query39.q.out | 8 +- .../perf/tpcds30tb/tez/cbo_query40.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query41.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query45.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query48.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query49.q.out | 6 +- .../perf/tpcds30tb/tez/cbo_query5.q.out | 12 +- .../perf/tpcds30tb/tez/cbo_query53.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query56.q.out | 12 +- .../perf/tpcds30tb/tez/cbo_query6.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query60.q.out | 6 +- .../perf/tpcds30tb/tez/cbo_query63.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query64.q.out | 4 +- .../perf/tpcds30tb/tez/cbo_query66.q.out | 8 +- .../perf/tpcds30tb/tez/cbo_query67.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query71.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query73.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query77.q.out | 4 +- .../perf/tpcds30tb/tez/cbo_query78.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query80.q.out | 6 +- .../perf/tpcds30tb/tez/cbo_query82.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query83.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query85.q.out | 8 +- .../perf/tpcds30tb/tez/cbo_query89.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query91.q.out | 2 +- .../perf/tpcds30tb/tez/cbo_query98.q.out | 2 +- .../perf/tpcds30tb/tez/query15.q.out | 4 +- .../perf/tpcds30tb/tez/query45.q.out | 2 +- .../perf/tpcds30tb/tez/query6.q.out | 2 +- .../perf/tpcds30tb/tez/query67.q.out | 2 +- .../clientpositive/skewjoinopt18.q.out | 4 +- 90 files changed, 426 insertions(+), 415 deletions(-) diff --git a/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out b/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out index 4cd80f53e759..c5c2ebc28009 100644 --- a/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out +++ b/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out @@ -85,10 +85,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: kv_table - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 309 Data size: 1236 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 309 Data size: 1236 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(key) (type: double) @@ -246,7 +246,7 @@ STAGE PLANS: filterExpr: (key > 100) (type: boolean) Statistics: Num rows: 309 Data size: 29355 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((key % 2) = 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: ((key % 2) = 0) (type: boolean) Statistics: Num rows: 154 Data size: 14630 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/allcolref_in_udf.q.out b/ql/src/test/results/clientpositive/llap/allcolref_in_udf.q.out index 236d52a2ded5..9b6626ad5dc7 100644 --- a/ql/src/test/results/clientpositive/llap/allcolref_in_udf.q.out +++ b/ql/src/test/results/clientpositive/llap/allcolref_in_udf.q.out @@ -76,10 +76,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: (UDFToDouble(key) < 100.0D) (type: boolean) + filterExpr: ((UDFToDouble(key) < 100.0D) and (UDFToDouble(key) + 1.0D) is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(key) < 100.0D) (type: boolean) + predicate: ((UDFToDouble(key) < 100.0D) and (UDFToDouble(key) + 1.0D) 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), concat(key, value) (type: string), (UDFToDouble(key) + 1.0D) (type: double) 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 d4ee8ae77495..08c1c8d2523a 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 @@ -480,10 +480,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) @@ -571,10 +571,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) @@ -1380,10 +1380,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: (UDFToDouble(key) is not null or UDFToDouble(value) is not null) (type: boolean) + filterExpr: (key is not null or UDFToDouble(value) is not null) (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), UDFToDouble(key) (type: double) @@ -1488,10 +1488,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: (UDFToDouble(key) is not null or UDFToDouble(value) is not null) (type: boolean) + filterExpr: (key is not null or UDFToDouble(value) is not null) (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 242 Data size: 22990 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: value (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez3.q.out b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez3.q.out index 56b18f1c9766..31a549366ce6 100644 --- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez3.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez3.q.out @@ -109,10 +109,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t2`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t2`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -129,12 +129,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -229,12 +229,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -336,10 +336,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t3`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t3`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL GROUP BY `date_col`, `decimal_col`) AS `t3` ON `t0`.`date_col` = `t3`.`date_col` AND `t0`.`decimal_col` = `t3`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -358,12 +358,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -458,12 +458,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -586,10 +586,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t2`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t2`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -606,12 +606,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -705,12 +705,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -812,10 +812,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t3`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t3`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL GROUP BY `date_col`, `decimal_col`) AS `t3` ON `t0`.`date_col` = `t3`.`date_col` AND `t0`.`decimal_col` = `t3`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -834,12 +834,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -933,12 +933,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1061,10 +1061,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t2`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t2`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1081,12 +1081,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1181,12 +1181,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1288,10 +1288,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t3`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t3`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL GROUP BY `date_col`, `decimal_col`) AS `t3` ON `t0`.`date_col` = `t3`.`date_col` AND `t0`.`decimal_col` = `t3`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1310,12 +1310,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1410,12 +1410,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1538,10 +1538,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t2`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t2`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t2` ON `t0`.`date_col` = `t2`.`date_col` AND `t0`.`decimal_col` = `t2`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -1558,12 +1558,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1657,12 +1657,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1764,10 +1764,10 @@ POSTHOOK: Input: default@target_table OPTIMIZED SQL: SELECT `t0`.`date_col` AS `target_table.date_col`, CAST('pipeline' AS STRING) AS `target_table.string_col`, `t0`.`decimal_col` AS `target_table.decimal_col`, `t3`.`date_col` AS `s.date_col`, 'pipeline' AS `s.string_col`, `t3`.`decimal_col` AS `s.decimal_col` FROM (SELECT `date_col`, `decimal_col` FROM `default`.`target_table` -WHERE 'pipeline' = `string_col` AND CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL) AS `t0` +WHERE 'pipeline' = `string_col` AND CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL) AS `t0` INNER JOIN (SELECT `date_col`, `decimal_col` FROM `default`.`source_table` -WHERE CASE WHEN `decimal_col` IS NOT NULL THEN CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' ELSE FALSE END AND `date_col` IS NOT NULL AND `decimal_col` IS NOT NULL +WHERE CAST(`decimal_col` AS STRING) = '50000000000000000005905545593' AND `date_col` IS NOT NULL GROUP BY `date_col`, `decimal_col`) AS `t3` ON `t0`.`date_col` = `t3`.`date_col` AND `t0`.`decimal_col` = `t3`.`decimal_col` STAGE DEPENDENCIES: Stage-1 is a root stage @@ -1786,12 +1786,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: target_table - filterExpr: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 20 Data size: 5200 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: ((string_col = 'pipeline') and if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((string_col = 'pipeline') and (CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 10 Data size: 2600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: date_col (type: date), decimal_col (type: decimal(38,0)) @@ -1885,12 +1885,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: source_table - filterExpr: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + filterExpr: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 7 Data size: 1176 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (if(decimal_col is not null, (CAST( decimal_col AS STRING) = '50000000000000000005905545593'), false) and date_col is not null and decimal_col is not null) (type: boolean) + predicate: ((CAST( decimal_col AS STRING) = '50000000000000000005905545593') and date_col is not null) (type: boolean) Statistics: Num rows: 3 Data size: 504 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: date_col (type: date), decimal_col (type: decimal(38,0)) diff --git a/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out b/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out index 6e87e124641d..23f090f774b6 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_aggregate_reduce_functions_rule.q.out @@ -284,7 +284,7 @@ POSTHOOK: query: SELECT FROM test POSTHOOK: type: QUERY POSTHOOK: Input: default@test -POSTHOOK: Output: hdfs://### HDFS PATH ### +#### A masked pattern was here #### 228.0 228.0 0.0 0.0 193.0 193.0 28.5 28.5 NULL NULL 32.166666666666664 32.166666666666664 47.34448225506326 47.34448225506326 NULL NULL 53.52387836802893 53.52387836802893 50.61338050075578 50.61338050075578 NULL NULL 58.63247109466449 58.63247109466449 2241.5 2241.5 NULL NULL 2864.805555555555 2864.805555555555 2561.714285714286 2561.714285714286 NULL NULL 3437.7666666666664 3437.7666666666664 228.0 228.0 NULL NULL 193.0 193.0 8 8 8 0 8 6 PREHOOK: query: SELECT `$SUM0`(c_numeric), diff --git a/ql/src/test/results/clientpositive/llap/collision.q.out b/ql/src/test/results/clientpositive/llap/collision.q.out index b7b17f71f958..f98b14f46784 100644 --- a/ql/src/test/results/clientpositive/llap/collision.q.out +++ b/ql/src/test/results/clientpositive/llap/collision.q.out @@ -479,7 +479,7 @@ POSTHOOK: Input: cpn@mytable_1000_n POSTHOOK: Output: cpn_view@myview_1000_n POSTHOOK: Output: database:cpn_view CBO PLAN: -HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$118], col4=[$3], col5=[$4], col6=[$5], col7=[$6], col8=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(1, 0))], col9=[CASE(IS NOT NULL($8), $8, 0:DECIMAL(28, 0))], col10=[$9], alt_col11=[CASE(CASE(IS NOT NULL($20), =(CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), false), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], alt_col12=[CASE(CASE(IS NOT NULL($91), =(CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), false), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col13=[$10], col14=[CASE(IN(trim($4), 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), CASE(IS NOT NULL($62), $62, -1:DECIMAL(18, 0)), CASE(IS NOT NULL($62), $62, 1:DECIMAL(18, 0)))], col15=[$11], col16=[$12], col17=[$13], col18=[$14], col19=[$15], col20=[$17], col21=[$16], col22=[$18], col23=[$19], col11=[CASE(IS NOT NULL(trim($20)), trim($20), 'Z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col24=[$21], col25=[$22], col26=[$23], col27=[$24], col28=[$25], col29=[$27], col30=[$28], col31=[$29], col32=[$31], col33=[$32], col34=[$33], col35=[$34], col36=[$35], col37=[$36], col38=[$37], col39=[CASE(IS NOT NULL(trim($39)), trim($39), 'N':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], parent_col9=[CASE(IS NOT NULL($40), $40, -999:DECIMAL(28, 0))], col40=[CASE(IS NOT NULL($41), CAST($41):INTEGER, -1)], col41=[$42], col42=[$43], col43=[CASE(=(trim($72), ''), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim($72)), trim($72), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col44=[$83], col45=[$84], col46=[$85], col47=[$86], col48=[$87], col49=[$88], col50=[$89], col51=[$90], col12=[$91], col52=[$92], col53=[$93], col54=[$94], col55=[$95], col56=[$96], col57=[$97], col58=[CASE(IS NOT NULL($98), $98, -1)], col59=[$99], col60=[$100], col61=[$102], col62=[$103], col63=[CASE(=(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ''), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col64=[$107], col65=[$105], col66=[$108], col67=[CASE(IS NOT NULL($68), $68, -999:DECIMAL(18, 0))], col68=[$109], col69=[$110], col70=[$113], col71=[$114], col72=[$30], col73=[$38], col74=[$104], col75=[$26], col76=[$101], col77=[$115], col116=[$116], col117=[$117], col78=[CASE(IS NOT NULL($56), $56, -1:DECIMAL(18, 0))], col79=[$69], col114=[$111], col115=[$112], col92=[CASE(IS NOT NULL($49), CAST($49):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col80=[CASE(IS NOT NULL($52), $52, -1)], col81=[$48], col93=[$50], col82=[$73], col83=[$47], col118=[$44], col84=[CASE(IS NOT NULL($74), CAST($74):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col85=[$64], col86=[$79], col87=[$58], col88=[CASE(IS NOT NULL($80), CAST($80):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) +HiveProject(col0=[$0], col1=[$1], col2=[$2], col3=[$118], col4=[$3], col5=[$4], col6=[$5], col7=[$6], col8=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(1, 0))], col9=[CASE(IS NOT NULL($8), $8, 0:DECIMAL(28, 0))], col10=[$9], alt_col11=[CASE(=(CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($20):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], alt_col12=[CASE(=(CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'X'), 'Y':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CAST($91):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col13=[$10], col14=[CASE(IN(trim($4), 'A':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'B':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'C':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), CASE(IS NOT NULL($62), $62, -1:DECIMAL(18, 0)), CASE(IS NOT NULL($62), $62, 1:DECIMAL(18, 0)))], col15=[$11], col16=[$12], col17=[$13], col18=[$14], col19=[$15], col20=[$17], col21=[$16], col22=[$18], col23=[$19], col11=[CASE(IS NOT NULL(trim($20)), trim($20), 'Z':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col24=[$21], col25=[$22], col26=[$23], col27=[$24], col28=[$25], col29=[$27], col30=[$28], col31=[$29], col32=[$31], col33=[$32], col34=[$33], col35=[$34], col36=[$35], col37=[$36], col38=[$37], col39=[CASE(IS NOT NULL(trim($39)), trim($39), 'N':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], parent_col9=[CASE(IS NOT NULL($40), $40, -999:DECIMAL(28, 0))], col40=[CASE(IS NOT NULL($41), CAST($41):INTEGER, -1)], col41=[$42], col42=[$43], col43=[CASE(=(trim($72), ''), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim($72)), trim($72), 'U':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col44=[$83], col45=[$84], col46=[$85], col47=[$86], col48=[$87], col49=[$88], col50=[$89], col51=[$90], col12=[$91], col52=[$92], col53=[$93], col54=[$94], col55=[$95], col56=[$96], col57=[$97], col58=[CASE(IS NOT NULL($98), $98, -1)], col59=[$99], col60=[$100], col61=[$102], col62=[$103], col63=[CASE(=(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), ''), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", CASE(IS NOT NULL(trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE")), trim(CAST($106):VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), '-1':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))], col64=[$107], col65=[$105], col66=[$108], col67=[CASE(IS NOT NULL($68), $68, -999:DECIMAL(18, 0))], col68=[$109], col69=[$110], col70=[$113], col71=[$114], col72=[$30], col73=[$38], col74=[$104], col75=[$26], col76=[$101], col77=[$115], col116=[$116], col117=[$117], col78=[CASE(IS NOT NULL($56), $56, -1:DECIMAL(18, 0))], col79=[$69], col114=[$111], col115=[$112], col92=[CASE(IS NOT NULL($49), CAST($49):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col80=[CASE(IS NOT NULL($52), $52, -1)], col81=[$48], col93=[$50], col82=[$73], col83=[$47], col118=[$44], col84=[CASE(IS NOT NULL($74), CAST($74):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], col85=[$64], col86=[$79], col87=[$58], col88=[CASE(IS NOT NULL($80), CAST($80):VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '-99':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) HiveTableScan(table=[[cpn, mytable_1000_n]], table:alias=[mytable_1000_n]) PREHOOK: query: CREATE OR REPLACE VIEW cpn_view.myview_1000_n AS diff --git a/ql/src/test/results/clientpositive/llap/correlationoptimizer8.q.out b/ql/src/test/results/clientpositive/llap/correlationoptimizer8.q.out index 19af2ee56349..f0c3769e5a34 100644 --- a/ql/src/test/results/clientpositive/llap/correlationoptimizer8.q.out +++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer8.q.out @@ -82,10 +82,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -282,10 +282,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -922,10 +922,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) 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 a5785cd007af..924f7c6e95b2 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 @@ -581,10 +581,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: CAST( ds AS DATE) is not null (type: boolean) + filterExpr: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( ds AS DATE) is not null (type: boolean) + predicate: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -602,10 +602,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_date_n2 - filterExpr: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + filterExpr: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + predicate: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -732,10 +732,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: CAST( ds AS DATE) is not null (type: boolean) + filterExpr: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( ds AS DATE) is not null (type: boolean) + predicate: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -753,10 +753,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_date_n2 - filterExpr: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + filterExpr: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + predicate: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -1885,37 +1885,40 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n0 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: _col0 (type: double) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - keys: _col0 (type: double) - minReductionHashAggr: 0.4 - mode: hash + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: _col0 (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Dynamic Partitioning Event Operator - Target column: hr (string) - Target Input: srcpart - Partition key expr: UDFToDouble(hr) + Group By Operator + keys: _col0 (type: double) + minReductionHashAggr: 0.4 + mode: hash + outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Target Vertex: Map 1 + Dynamic Partitioning Event Operator + Target column: hr (string) + Target Input: srcpart + Partition key expr: UDFToDouble(hr) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Target Vertex: Map 1 Execution mode: llap LLAP IO: all inputs Reducer 2 @@ -2015,10 +2018,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -2187,21 +2190,24 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n0 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: llap LLAP IO: all inputs Reducer 2 @@ -2301,10 +2307,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -2449,10 +2455,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) (type: string) @@ -4652,10 +4658,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: CAST( ds AS DATE) is not null (type: boolean) + filterExpr: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( ds AS DATE) is not null (type: boolean) + predicate: day(CAST( ds AS DATE)) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -4687,10 +4693,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_date_n2 - filterExpr: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + filterExpr: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 2 Data size: 376 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((date = '2008-04-08') and CAST( ds AS DATE) is not null) (type: boolean) + predicate: ((date = '2008-04-08') and day(CAST( ds AS DATE)) is not null) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: day(CAST( ds AS DATE)) (type: int) @@ -5345,37 +5351,40 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n0 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: _col0 (type: double) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - keys: _col0 (type: double) - minReductionHashAggr: 0.4 - mode: hash + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: _col0 (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Dynamic Partitioning Event Operator - Target column: hr (string) - Target Input: srcpart - Partition key expr: UDFToDouble(hr) + Group By Operator + keys: _col0 (type: double) + minReductionHashAggr: 0.4 + mode: hash + outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Target Vertex: Map 1 + Dynamic Partitioning Event Operator + Target column: hr (string) + Target Input: srcpart + Partition key expr: UDFToDouble(hr) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Target Vertex: Map 1 Execution mode: llap LLAP IO: all inputs Reducer 2 @@ -5454,10 +5463,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -6675,35 +6684,31 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_orc - filterExpr: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 564000 Basic stats: COMPLETE Column stats: COMPLETE - Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) - Statistics: Num rows: 2000 Data size: 376000 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: ds (type: string), UDFToDouble(hr) (type: double) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 2000 Data size: 384000 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 _col0 (type: string), _col1 (type: double) - 1 _col0 (type: string), _col1 (type: double) - input vertices: - 1 Map 3 - Statistics: Num rows: 2000 Data size: 16000 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - aggregations: count() - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0 + Select Operator + expressions: ds (type: string), UDFToDouble(hr) (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 2000 Data size: 384000 Basic stats: COMPLETE Column stats: COMPLETE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col0 (type: string), _col1 (type: double) + 1 _col0 (type: string), _col1 (type: double) + input vertices: + 1 Map 3 + Statistics: Num rows: 2000 Data size: 16000 Basic stats: COMPLETE Column stats: COMPLETE + Group By Operator + aggregations: count() + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + null sort order: + sort order: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - null sort order: - sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col0 (type: bigint) + value expressions: _col0 (type: bigint) Execution mode: llap LLAP IO: all inputs Map 3 diff --git a/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out index d17901d6c637..30cdba117af0 100644 --- a/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/fouter_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out b/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out index c0b3952f9d2f..971bda57d5fd 100644 --- a/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out +++ b/ql/src/test/results/clientpositive/llap/in_typecheck_char.q.out @@ -390,7 +390,7 @@ POSTHOOK: Input: default@ax CBO PLAN: HiveProject(_c0=[$0]) HiveAggregate(group=[{}], agg#0=[count()]) - HiveFilter(condition=[IN($1, 'a', 'aa', 'aaa', 'ab', 'abc', 'ac', 'ba', 'bb', 'bbb', 'bc', 'bca', 'ca', 'cab', 'cb', 'cbc', 'z')]) + HiveFilter(condition=[IN($1, 'a ', 'aa ', 'aaa ', 'ab ', 'abc ', 'ac ', 'ba ', 'bb ', 'bbb ', 'bc ', 'bca ', 'ca ', 'cab ', 'cb ', 'cbc ', 'z ')]) HiveTableScan(table=[[default, ax]], table:alias=[ax]) PREHOOK: query: explain select count(*) from ax where t in diff --git a/ql/src/test/results/clientpositive/llap/join2.q.out b/ql/src/test/results/clientpositive/llap/join2.q.out index 3b46b489faa3..32912e401227 100644 --- a/ql/src/test/results/clientpositive/llap/join2.q.out +++ b/ql/src/test/results/clientpositive/llap/join2.q.out @@ -37,29 +37,32 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 4 Map Operator Tree: TableScan alias: src3 - filterExpr: (UDFToDouble(key) is not null or (key is not null and UDFToDouble(key) is not null)) (type: boolean) + filterExpr: (UDFToDouble(key) is not null or key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: UDFToDouble(key) is not null (type: boolean) @@ -76,19 +79,22 @@ STAGE PLANS: Statistics: Num rows: 500 Data size: 49500 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: string) Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 diff --git a/ql/src/test/results/clientpositive/llap/join34.q.out b/ql/src/test/results/clientpositive/llap/join34.q.out index 7b2ea969f26d..6a979d053d02 100644 --- a/ql/src/test/results/clientpositive/llap/join34.q.out +++ b/ql/src/test/results/clientpositive/llap/join34.q.out @@ -43,7 +43,7 @@ FROM `default`.`src` WHERE `key` > 1.000E2) AS `t3`) AS `t4` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE (`key` < 2.00E1 OR `key` > 1.000E2) AND `key` IS NOT NULL) AS `t6` ON `t4`.`key` = `t6`.`key` +WHERE `key` < 2.00E1 OR `key` > 1.000E2) AS `t6` ON `t4`.`key` = `t6`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -295,12 +295,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/join35.q.out b/ql/src/test/results/clientpositive/llap/join35.q.out index 8bcea997a487..d00471a00933 100644 --- a/ql/src/test/results/clientpositive/llap/join35.q.out +++ b/ql/src/test/results/clientpositive/llap/join35.q.out @@ -45,7 +45,7 @@ WHERE `key` > 1.000E2 GROUP BY `key`) AS `t5`) AS `t6` INNER JOIN (SELECT `key`, `value` FROM `default`.`src1` -WHERE (`key` < 2.00E1 OR `key` > 1.000E2) AND `key` IS NOT NULL) AS `t8` ON `t6`.`key` = `t8`.`key` +WHERE `key` < 2.00E1 OR `key` > 1.000E2) AS `t8` ON `t6`.`key` = `t8`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -156,12 +156,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: x - filterExpr: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 25 Data size: 4375 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) and key is not null) (type: boolean) + predicate: ((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 100.0D)) (type: boolean) Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) diff --git a/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out index 01ce7ce062f5..4e2f1e2245d2 100644 --- a/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/louter_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/masking_1.q.out b/ql/src/test/results/clientpositive/llap/masking_1.q.out index fe6d395dafcb..4bb9fb019a4a 100644 --- a/ql/src/test/results/clientpositive/llap/masking_1.q.out +++ b/ql/src/test/results/clientpositive/llap/masking_1.q.out @@ -195,10 +195,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_n8 - filterExpr: ((key < 10) and ((key % 2) = 0) and UDFToDouble(key) is not null) (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 < 10) and ((key % 2) = 0) and UDFToDouble(key) is not null) (type: boolean) + predicate: ((key < 10) and ((key % 2) = 0)) (type: boolean) Statistics: Num rows: 5 Data size: 475 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), reverse(value) (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/masking_12.q.out b/ql/src/test/results/clientpositive/llap/masking_12.q.out index a216e85100bd..01520eeb8184 100644 --- a/ql/src/test/results/clientpositive/llap/masking_12.q.out +++ b/ql/src/test/results/clientpositive/llap/masking_12.q.out @@ -115,7 +115,7 @@ HiveSortLimit(fetch=[20]) HiveProject(v1_n9.key=[$0], v1_n9.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, masking_test_subq_n1]], table:alias=[masking_test_subq_n1]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -153,12 +153,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n1 - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) properties: insideView TRUE Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: 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), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/masking_2.q.out b/ql/src/test/results/clientpositive/llap/masking_2.q.out index 4a7558349931..a72ba6314b11 100644 --- a/ql/src/test/results/clientpositive/llap/masking_2.q.out +++ b/ql/src/test/results/clientpositive/llap/masking_2.q.out @@ -218,12 +218,12 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10) and UDFToDouble(UDFToInteger(key)) is not null) (type: boolean) + filterExpr: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10)) (type: boolean) properties: insideView TRUE 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 UDFToDouble(UDFToInteger(key)) is not null) (type: boolean) + predicate: (((UDFToInteger(key) % 2) = 0) and (UDFToInteger(key) < 10)) (type: boolean) Statistics: Num rows: 83 Data size: 14774 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/llap/masking_3.q.out b/ql/src/test/results/clientpositive/llap/masking_3.q.out index 1a096a32ab06..325b10279200 100644 --- a/ql/src/test/results/clientpositive/llap/masking_3.q.out +++ b/ql/src/test/results/clientpositive/llap/masking_3.q.out @@ -24,7 +24,7 @@ CBO PLAN: HiveProject(masking_test_subq_n3.key=[$0], masking_test_subq_n3.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -56,10 +56,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: 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 (type: boolean) + predicate: 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), UDFToDouble(key) (type: double) @@ -650,7 +650,7 @@ CBO PLAN: HiveProject(masking_test_subq_n3.key=[$0], masking_test_subq_n3.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(>($0, 0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[>($0, 0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -682,10 +682,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: (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: (key > 0) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) @@ -1273,7 +1273,7 @@ CBO PLAN: HiveProject(key=[$0]) HiveSemiJoin(condition=[AND(=($0, $2), =($3, $1))], joinType=[semi]) HiveProject(key=[$0], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(>($0, 0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[>($0, 0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -1305,10 +1305,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: (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: (key > 0) (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) @@ -1896,7 +1896,7 @@ CBO PLAN: HiveProject(value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(>($0, 0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[>($0, 0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -1928,10 +1928,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: (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: (key > 0) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) @@ -2538,7 +2538,7 @@ HiveProject(masking_test_subq_n3.key=[$5], masking_test_subq_n3.value=[$6], srcp HiveProject(key=[$0], value=[$1], EXPR$0=[CAST($0):DOUBLE]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -2603,10 +2603,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: 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 (type: boolean) + predicate: 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), UDFToDouble(key) (type: double) @@ -6845,7 +6845,7 @@ CBO PLAN: HiveProject(masking_test_subq_n3.key=[$0], masking_test_subq_n3.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(>($0, 0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[>($0, 0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -6877,10 +6877,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: (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: (key > 0) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) @@ -7468,7 +7468,7 @@ CBO PLAN: HiveProject(masking_test_subq_n3.key=[$0], masking_test_subq_n3.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(>($0, 0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[>($0, 0)]) HiveTableScan(table=[[default, masking_test_subq_n3]], table:alias=[masking_test_subq_n3]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -7500,10 +7500,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n3 - filterExpr: ((key > 0) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: (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: (key > 0) (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/masking_4.q.out b/ql/src/test/results/clientpositive/llap/masking_4.q.out index 77d9736377dd..360be41d52dd 100644 --- a/ql/src/test/results/clientpositive/llap/masking_4.q.out +++ b/ql/src/test/results/clientpositive/llap/masking_4.q.out @@ -132,7 +132,7 @@ CBO PLAN: HiveProject(masking_test_subq_n2.key=[$0], masking_test_subq_n2.value=[$1]) HiveSemiJoin(condition=[AND(=($0, $3), =($4, $2))], joinType=[semi]) HiveProject(key=[$0], value=[$1], key1=[CAST($0):DOUBLE]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, masking_test_subq_n2]], table:alias=[masking_test_subq_n2]) HiveProject(key=[$0], key0=[CAST($0):DOUBLE]) HiveFilter(condition=[AND(IS NOT NULL(CAST($0):DOUBLE), IS NOT NULL($0))]) @@ -168,10 +168,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: masking_test_subq_n2 - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: 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 (type: boolean) + predicate: 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), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out index a3fa96f1694e..c2bd14a8df62 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6.q.out @@ -248,7 +248,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(t1.a=[$5], _c1=[CAST(CASE(IS NULL($1), $6, IS NULL($6), $1, +($6, $1))):DECIMAL(17, 2)], _c2=[CASE(IS NULL($2), $7, +($7, $2))], _c3=[CAST(/(CAST(CASE(IS NULL($1), $6, IS NULL($6), $1, +($6, $1))):DECIMAL(17, 2), CASE(IS NULL($2), $7, +($7, $2)))):DECIMAL(11, 6)], _c4=[CASE(IS NULL($3), $8, +($8, $3))]) - HiveFilter(condition=[OR(AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))))]) + HiveFilter(condition=[OR(AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))))]) HiveJoin(condition=[IS NOT DISTINCT FROM($0, $5)], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], _c1=[$1], _c2=[$2], _c4=[$4], $f4=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out index 9b25fd6f2bb9..e499f726ac04 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_6_aggr_2joins.q.out @@ -129,7 +129,7 @@ POSTHOOK: Output: default@cmv_mat_view_n6 POSTHOOK: Output: default@cmv_mat_view_n6 CBO PLAN: HiveProject(cmv_basetable_n6.a=[$5], cmv_basetable_2_n3.c=[$6], cmv_basetable_2_n3.b=[$7], _c3=[CASE(IS NULL($3), $8, +($8, $3))]) - HiveFilter(condition=[OR(AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))), AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))))]) + HiveFilter(condition=[OR(AND(IS NULL($4), OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), =($8, 0)), =(+($8, $3), 0))), AND($4, OR(AND(IS NULL($3), >($8, 0)), >(+($8, $3), 0))))]) HiveJoin(condition=[AND(IS NOT DISTINCT FROM($0, $5), IS NOT DISTINCT FROM($1, $6), IS NOT DISTINCT FROM($2, $7))], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], c=[$1], b=[$2], _c3=[$3], $f4=[true]) HiveTableScan(table=[[default, cmv_mat_view_n6]], table:alias=[default.cmv_mat_view_n6]) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out index c28d0014f1b1..0764a8ed1d70 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_9.q.out @@ -246,7 +246,7 @@ POSTHOOK: Output: default@mat1 POSTHOOK: Output: default@mat1 CBO PLAN: HiveProject(t1.a=[$4], _c1=[CASE(IS NULL($1), $5, IS NULL($5), $1, +($5, $1))], _c2=[CASE(IS NULL($2), $6, +($6, $2))]) - HiveFilter(condition=[OR(AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), =($6, 0)), =(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))))]) + HiveFilter(condition=[OR(AND(IS NULL($3), OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), >($6, 0)), >(+($6, $2), 0))), AND($3, OR(AND(IS NULL($2), =($6, 0)), =(+($6, $2), 0))))]) HiveJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[right], algorithm=[none], cost=[not available]) HiveProject(a=[$0], _c1=[$1], _c2=[$2], $f3=[true]) HiveTableScan(table=[[default, mat1]], table:alias=[default.mat1]) 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 79c2216e9b84..75e08a9762bb 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 @@ -664,10 +664,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: ((lo_quantity < 25.0D) and lo_discount BETWEEN 1.0D AND 3.0D and (d_year = 1993)) (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: ((lo_quantity < 25.0D) and lo_discount BETWEEN 1.0D AND 3.0D and (d_year = 1993)) (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) @@ -754,10 +754,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: (lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 4.0D AND 6.0D and (d_yearmonthnum = 199401)) (type: boolean) + filterExpr: ((d_yearmonthnum = 199401) and lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 4.0D AND 6.0D) (type: boolean) Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 4.0D AND 6.0D and (d_yearmonthnum = 199401)) (type: boolean) + predicate: ((d_yearmonthnum = 199401) and lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 4.0D AND 6.0D) (type: boolean) Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -846,10 +846,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: (lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 5.0D AND 7.0D and (d_year = 1994) and (d_weeknuminyear = 6)) (type: boolean) + filterExpr: ((d_year = 1994) and (d_weeknuminyear = 6) and lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 5.0D AND 7.0D) (type: boolean) Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 5.0D AND 7.0D and (d_year = 1994) and (d_weeknuminyear = 6)) (type: boolean) + predicate: ((d_year = 1994) and (d_weeknuminyear = 6) and lo_quantity BETWEEN 26.0D AND 35.0D and lo_discount BETWEEN 5.0D AND 7.0D) (type: boolean) Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -951,10 +951,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: ((p_category = 'MFGR#12') and (s_region = 'AMERICA')) (type: boolean) + filterExpr: ((s_region = 'AMERICA') and (p_category = 'MFGR#12')) (type: boolean) Statistics: Num rows: 1 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_category = 'MFGR#12') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((s_region = 'AMERICA') and (p_category = 'MFGR#12')) (type: boolean) Statistics: Num rows: 1 Data size: 264 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: d_year (type: int), p_brand1 (type: string), lo_revenue (type: double) @@ -1077,10 +1077,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: (p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228' and (s_region = 'ASIA')) (type: boolean) + filterExpr: ((s_region = 'ASIA') and p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228') (type: boolean) Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228' and (s_region = 'ASIA')) (type: boolean) + predicate: ((s_region = 'ASIA') and p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228') (type: boolean) Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: d_year (type: int), p_brand1 (type: string), lo_revenue (type: double) @@ -1203,10 +1203,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: ((p_brand1 = 'MFGR#2239') and (s_region = 'EUROPE')) (type: boolean) + filterExpr: ((s_region = 'EUROPE') and (p_brand1 = 'MFGR#2239')) (type: boolean) Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_brand1 = 'MFGR#2239') and (s_region = 'EUROPE')) (type: boolean) + predicate: ((s_region = 'EUROPE') and (p_brand1 = 'MFGR#2239')) (type: boolean) Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: d_year (type: int), lo_revenue (type: double) @@ -1333,10 +1333,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: (d_year BETWEEN 1992 AND 1997 and (c_region = 'ASIA') and (s_region = 'ASIA')) (type: boolean) + filterExpr: ((c_region = 'ASIA') and (s_region = 'ASIA') and d_year BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (d_year BETWEEN 1992 AND 1997 and (c_region = 'ASIA') and (s_region = 'ASIA')) (type: boolean) + predicate: ((c_region = 'ASIA') and (s_region = 'ASIA') and d_year BETWEEN 1992 AND 1997) (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), s_nation (type: string), lo_revenue (type: double) @@ -1461,10 +1461,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: (d_year BETWEEN 1992 AND 1997 and (c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES')) (type: boolean) + filterExpr: ((c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES') and d_year BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 348 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (d_year BETWEEN 1992 AND 1997 and (c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES')) (type: boolean) + predicate: ((c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES') and d_year BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 348 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) @@ -1979,10 +1979,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv_n0 - filterExpr: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (d_year) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2')) (type: boolean) + filterExpr: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (d_year) IN (1997, 1998)) (type: boolean) Statistics: Num rows: 1 Data size: 432 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (d_year) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2')) (type: boolean) + predicate: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (d_year) IN (1997, 1998)) (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) 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 72a69cf82214..1cd1c705511e 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 @@ -667,10 +667,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: ((UDFToDouble(lo_quantity) < 25.0D) and UDFToDouble(lo_discount) BETWEEN 1.0D AND 3.0D and (UDFToInteger(d_year) = 1993)) (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 UDFToDouble(lo_discount) BETWEEN 1.0D AND 3.0D and (UDFToInteger(d_year) = 1993)) (type: boolean) + predicate: ((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 Select Operator expressions: discounted_price (type: double) @@ -757,10 +757,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: (UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 4.0D AND 6.0D and (UDFToInteger(d_yearmonthnum) = 199401)) (type: boolean) + filterExpr: ((UDFToInteger(d_yearmonthnum) = 199401) and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 4.0D AND 6.0D) (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 4.0D AND 6.0D and (UDFToInteger(d_yearmonthnum) = 199401)) (type: boolean) + predicate: ((UDFToInteger(d_yearmonthnum) = 199401) and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 4.0D AND 6.0D) (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -849,10 +849,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: (UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D and (UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6)) (type: boolean) + filterExpr: ((UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6) and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D and (UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6)) (type: boolean) + predicate: ((UDFToInteger(d_year) = 1994) and (UDFToInteger(d_weeknuminyear) = 6) and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D and UDFToDouble(lo_discount) BETWEEN 5.0D AND 7.0D) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: discounted_price (type: double) @@ -954,10 +954,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: ((p_category = 'MFGR#12') and (s_region = 'AMERICA')) (type: boolean) + filterExpr: ((s_region = 'AMERICA') and (p_category = 'MFGR#12')) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_category = 'MFGR#12') and (s_region = 'AMERICA')) (type: boolean) + predicate: ((s_region = 'AMERICA') and (p_category = 'MFGR#12')) (type: boolean) Statistics: Num rows: 1 Data size: 344 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(d_year) (type: int), p_brand1 (type: string), lo_revenue (type: double) @@ -1080,10 +1080,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: (p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228' and (s_region = 'ASIA')) (type: boolean) + filterExpr: ((s_region = 'ASIA') and p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228') (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228' and (s_region = 'ASIA')) (type: boolean) + predicate: ((s_region = 'ASIA') and p_brand1 BETWEEN 'MFGR#2221' AND 'MFGR#2228') (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(d_year) (type: int), p_brand1 (type: string), lo_revenue (type: double) @@ -1206,10 +1206,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: ((p_brand1 = 'MFGR#2239') and (s_region = 'EUROPE')) (type: boolean) + filterExpr: ((s_region = 'EUROPE') and (p_brand1 = 'MFGR#2239')) (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((p_brand1 = 'MFGR#2239') and (s_region = 'EUROPE')) (type: boolean) + predicate: ((s_region = 'EUROPE') and (p_brand1 = 'MFGR#2239')) (type: boolean) Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToInteger(d_year) (type: int), lo_revenue (type: double) @@ -1336,10 +1336,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: (UDFToInteger(d_year) BETWEEN 1992 AND 1997 and (c_region = 'ASIA') and (s_region = 'ASIA')) (type: boolean) + filterExpr: ((c_region = 'ASIA') and (s_region = 'ASIA') and UDFToInteger(d_year) BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(d_year) BETWEEN 1992 AND 1997 and (c_region = 'ASIA') and (s_region = 'ASIA')) (type: boolean) + predicate: ((c_region = 'ASIA') and (s_region = 'ASIA') and UDFToInteger(d_year) BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: c_nation (type: string), s_nation (type: string), UDFToInteger(d_year) (type: int), lo_revenue (type: double) @@ -1464,10 +1464,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: (UDFToInteger(d_year) BETWEEN 1992 AND 1997 and (c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES')) (type: boolean) + filterExpr: ((c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES') and UDFToInteger(d_year) BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 428 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(d_year) BETWEEN 1992 AND 1997 and (c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES')) (type: boolean) + predicate: ((c_nation = 'UNITED STATES') and (s_nation = 'UNITED STATES') and UDFToInteger(d_year) BETWEEN 1992 AND 1997) (type: boolean) Statistics: Num rows: 1 Data size: 428 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) @@ -1986,10 +1986,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: default.ssb_mv - filterExpr: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (UDFToInteger(d_year)) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2')) (type: boolean) + filterExpr: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (UDFToInteger(d_year)) IN (1997, 1998)) (type: boolean) Statistics: Num rows: 1 Data size: 512 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (UDFToInteger(d_year)) IN (1997, 1998) and (p_mfgr) IN ('MFGR#1', 'MFGR#2')) (type: boolean) + predicate: ((c_region = 'AMERICA') and (s_region = 'AMERICA') and (p_mfgr) IN ('MFGR#1', 'MFGR#2') and (UDFToInteger(d_year)) IN (1997, 1998)) (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/materialized_view_rewrite_ssb_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out index 22d641c9c63b..a6bc091b2a7c 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets.q.out @@ -697,7 +697,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(<($8, 25.0E0), =(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $7, 1.0E0:DOUBLE, 3.0E0:DOUBLE), =($4, 1993))]) + HiveFilter(condition=[AND(<($8, 25.0E0), =(CAST($18):BIGINT NOT NULL, 29247), =($4, 1993), BETWEEN(false, $7, 1.0E0:DOUBLE, 3.0E0:DOUBLE))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -733,7 +733,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 4.0E0:DOUBLE, 6.0E0:DOUBLE), =($6, 199401))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), =($6, 199401), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 4.0E0:DOUBLE, 6.0E0:DOUBLE))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -771,7 +771,7 @@ POSTHOOK: Input: default@ssb_mv_n3 CBO PLAN: HiveProject(revenue=[$0]) HiveAggregate(group=[{}], agg#0=[sum($16)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 5.0E0:DOUBLE, 7.0E0:DOUBLE), =($4, 1994), =($3, 6))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 29247), =($4, 1994), =($3, 6), BETWEEN(false, $8, 26.0E0:DOUBLE, 35.0E0:DOUBLE), BETWEEN(false, $7, 5.0E0:DOUBLE, 7.0E0:DOUBLE))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -873,7 +873,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$0], p_brand1=[$1]) HiveAggregate(group=[{4, 9}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $9, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($14, 'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($14, 'ASIA'), BETWEEN(false, $9, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -980,7 +980,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_nation=[$0], s_nation=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{1, 4, 13}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($2, 'ASIA'), =($14, 'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($2, 'ASIA'), =($14, 'ASIA'), BETWEEN(false, $4, 1992, 1997))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo @@ -1033,7 +1033,7 @@ CBO PLAN: HiveSortLimit(sort0=[$2], sort1=[$3], dir0=[ASC], dir1=[DESC]) HiveProject(c_city=[$0], s_city=[$2], d_year=[$1], lo_revenue=[$3]) HiveAggregate(group=[{0, 4, 12}], agg#0=[sum($15)]) - HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), BETWEEN(false, $4, 1992, 1997), =($1, 'UNITED STATES'), =($13, 'UNITED STATES'))]) + HiveFilter(condition=[AND(=(CAST($18):BIGINT NOT NULL, 2496), =($1, 'UNITED STATES'), =($13, 'UNITED STATES'), BETWEEN(false, $4, 1992, 1997))]) HiveTableScan(table=[[default, ssb_mv_n3]], table:alias=[default.ssb_mv_n3]) PREHOOK: query: explain cbo diff --git a/ql/src/test/results/clientpositive/llap/optimize_join_ptp.q.out b/ql/src/test/results/clientpositive/llap/optimize_join_ptp.q.out index 509c99f4cc07..ae9bb89227b1 100644 --- a/ql/src/test/results/clientpositive/llap/optimize_join_ptp.q.out +++ b/ql/src/test/results/clientpositive/llap/optimize_join_ptp.q.out @@ -62,10 +62,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t1_n97 - filterExpr: ((k < 15) and UDFToDouble(k) is not null) (type: boolean) + filterExpr: (k < 15) (type: boolean) Statistics: Num rows: 3 Data size: 285 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((k < 15) and UDFToDouble(k) is not null) (type: boolean) + predicate: (k < 15) (type: boolean) Statistics: Num rows: 1 Data size: 95 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: v (type: string), k (type: int) diff --git a/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out index f726e4998174..a06ee2647902 100644 --- a/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/outer_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 diff --git a/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out b/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out index 7fb7d51837c8..d84754e08a56 100644 --- a/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/llap/router_join_ppr.q.out @@ -29,10 +29,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -331,10 +331,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -633,10 +633,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 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 @@ -935,10 +935,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 OPTIMIZED SQL: SELECT `t0`.`key` AS `a.key`, `t0`.`value` AS `a.value`, `t2`.`key` AS `b.key`, `t2`.`value` AS `b.value` FROM (SELECT `key`, `value` FROM `default`.`srcpart` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08' AND `key` IS NOT NULL) AS `t0` +WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `ds` = '2008-04-08') AS `t0` INNER JOIN (SELECT `key`, `value` FROM `default`.`src` -WHERE `key` > 1.50E1 AND `key` < 2.00E1 AND `key` IS NOT NULL) AS `t2` ON `t0`.`key` = `t2`.`key` +WHERE `key` > 1.50E1 AND `key` < 2.00E1) AS `t2` ON `t0`.`key` = `t2`.`key` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out b/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out index e85b0dbcb7fc..e7c0d392ca53 100644 --- a/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out +++ b/ql/src/test/results/clientpositive/llap/rule_exclusion_config.q.out @@ -21,13 +21,13 @@ HiveProject(src1.key=[$0], src1.value=[$1], src2.key=[$2], src2.value=[$3], src3 HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src3]) PREHOOK: query: EXPLAIN CBO @@ -61,7 +61,7 @@ HiveProject(src1.key=[$4], src1.value=[$5], src2.key=[$2], src2.value=[$3], src3 HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, src]], table:alias=[src2]) HiveProject(key=[$0], value=[$1]) - HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0), IS NOT NULL($0))]) + HiveFilter(condition=[AND(>(CAST($0):DOUBLE, 10.0E0), <(CAST($0):DOUBLE, 20.0E0))]) HiveTableScan(table=[[default, src]], table:alias=[src1]) PREHOOK: query: EXPLAIN CBO diff --git a/ql/src/test/results/clientpositive/llap/swo_pruned_merge.q.out b/ql/src/test/results/clientpositive/llap/swo_pruned_merge.q.out index 0327cec5261e..2b18c0348753 100644 --- a/ql/src/test/results/clientpositive/llap/swo_pruned_merge.q.out +++ b/ql/src/test/results/clientpositive/llap/swo_pruned_merge.q.out @@ -261,10 +261,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t - filterExpr: (ds is not null and UDFToDouble(hr) is not null) (type: boolean) + filterExpr: (ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (ds is not null and UDFToDouble(hr) is not null) (type: boolean) + predicate: (ds is not null and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ds (type: string), UDFToDouble(hr) (type: double) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out index 2149474baf7d..ee7e4fae2c2f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query12.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out index 4c343aee7f60..dd697ffc9f4e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query13.q.out @@ -5,7 +5,7 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveJoin(condition=[=($1, $18)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($2, $14), OR(AND($15, $7), AND($16, $8), AND($17, $9)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $13)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_cdemo_sk=[$3], ss_hdemo_sk=[$4], ss_addr_sk=[$5], ss_quantity=[$9], ss_ext_sales_price=[$14], ss_ext_wholesale_cost=[$15], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], EXPR$5=[BETWEEN(false, $12, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$8=[BETWEEN(false, $12, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$11=[BETWEEN(false, $12, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) + HiveProject(ss_cdemo_sk=[$3], ss_hdemo_sk=[$4], ss_addr_sk=[$5], ss_quantity=[$9], ss_ext_sales_price=[$14], ss_ext_wholesale_cost=[$15], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 100.00:DECIMAL(12, 2), 200.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150.00:DECIMAL(12, 2), 300.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50.00:DECIMAL(12, 2), 250.00:DECIMAL(12, 2))], EXPR$5=[BETWEEN(false, $12, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$8=[BETWEEN(false, $12, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$11=[BETWEEN(false, $12, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) HiveFilter(condition=[AND(IS NOT NULL($21), IS NOT NULL($12), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) @@ -17,7 +17,7 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveProject(hd_demo_sk=[$0], EXPR$0=[=($3, 3)], EXPR$1=[=($3, 1)]) HiveFilter(condition=[IN($3, 1, 3)]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) - HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree ')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary ')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree ')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out index 4e5189075790..63ecbe7b9be5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query15.q.out @@ -2,12 +2,12 @@ CBO PLAN: HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(ca_zip=[$0], _c1=[$1]) HiveAggregate(group=[{3}], agg#0=[sum($7)]) - HiveJoin(condition=[AND(=($6, $0), OR($4, $9, $5))], joinType=[inner], algorithm=[none], cost=[not available]) + HiveJoin(condition=[AND(=($6, $0), OR($4, $5, $9))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) - HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, 'CA', 'GA', 'WA')], EXPR$1=[IN(substr($9, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN(substr($9, 1, 5), '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], EXPR$1=[IN($8, 'CA', 'GA', 'WA')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cs_bill_customer_sk=[$0], cs_sales_price=[$1], cs_sold_date_sk=[$2], EXPR$0=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out index 4c518c59b256..bb9c51b7e23e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query20.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out index 2771464b0899..aa62b77134c5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query34.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000 ', 'unknown '), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2E0), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, 'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out index 72cb293d31f0..e045f95dbfa5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query41.q.out @@ -9,6 +9,6 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(i_manufact=[$0]) HiveFilter(condition=[>($1, 0)]) HiveAggregate(group=[{14}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($12, 'Women'), IN($17, 'frosted', 'rose'), IN($18, 'Gross', 'Lb'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'black', 'chocolate'), IN($18, 'Box', 'Dram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'magenta', 'slate'), IN($18, 'Bundle', 'Carton'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cornflower', 'firebrick'), IN($18, 'Oz', 'Pound'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'almond', 'steel'), IN($18, 'Case', 'Tsp'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'aquamarine', 'purple'), IN($18, 'Bunch', 'Gram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'lavender', 'papaya'), IN($18, 'Cup', 'Pallet'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cyan', 'maroon'), IN($18, 'Each', 'N/A'), IN($15, 'large', 'medium'))), IS NOT NULL($14))]) + HiveFilter(condition=[AND(OR(AND(=($12, 'Women '), IN($17, 'frosted ', 'rose '), IN($18, 'Gross ', 'Lb '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'black ', 'chocolate '), IN($18, 'Box ', 'Dram '), IN($15, 'economy ', 'petite ')), AND(=($12, 'Men '), IN($17, 'magenta ', 'slate '), IN($18, 'Bundle ', 'Carton '), IN($15, 'N/A ', 'small ')), AND(=($12, 'Men '), IN($17, 'cornflower ', 'firebrick '), IN($18, 'Oz ', 'Pound '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'almond ', 'steel '), IN($18, 'Case ', 'Tsp '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'aquamarine ', 'purple '), IN($18, 'Bunch ', 'Gram '), IN($15, 'economy ', 'petite ')), AND(=($12, 'Men '), IN($17, 'lavender ', 'papaya '), IN($18, 'Cup ', 'Pallet '), IN($15, 'N/A ', 'small ')), AND(=($12, 'Men '), IN($17, 'cyan ', 'maroon '), IN($18, 'Each ', 'N/A '), IN($15, 'large ', 'medium '))), IS NOT NULL($14))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out index d705bd014511..851b3f59bb73 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query45.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(ca_zip=[$1], ca_county=[$0], _c2=[$2]) HiveAggregate(group=[{7, 8}], agg#0=[sum($2)]) - HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveProject(ws_item_sk=[$5], ws_bill_customer_sk=[$6], ws_sales_price=[$7], ws_sold_date_sk=[$8], c_customer_sk=[$0], c_current_addr_sk=[$1], ca_address_sk=[$2], ca_county=[$3], ca_zip=[$4], d_date_sk=[$9], d_year=[$10], d_qoy=[$11], i_item_sk=[$12], i_item_id=[$13], i_item_id0=[$14], literalTrue=[$15]) HiveJoin(condition=[=($5, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out index 16190e274296..8304296338ad 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query53.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$2], sort1=[$1], sort2=[$0], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) - HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'reference', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'reference', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) + HiveFilter(condition=[AND(IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'exportiunivamalg #9 ', 'importoamalg #1 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants ', 'personal ', 'portable ', 'reference ', 'self-help '), IN($12, 'Books ', 'Children ', 'Electronics ', 'Men ', 'Music ', 'Women '), OR(AND(IN($12, 'Books ', 'Children ', 'Electronics '), IN($10, 'personal ', 'portable ', 'reference ', 'self-help '), IN($8, 'exportiunivamalg #9 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 ')), AND(IN($12, 'Men ', 'Music ', 'Women '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants '), IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'importoamalg #1 '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_qoy=[$10]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out index cf53ca890c2f..95eb1912f9d0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query56.q.out @@ -1,5 +1,5 @@ CTE Suggestion: -HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8:DECIMAL(5, 2)):DECIMAL(5, 2)]) +HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -8:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) @@ -10,7 +10,7 @@ HiveProject(d_date_sk=[$0], d_year=[CAST(2000):INTEGER], d_moy=[CAST(1):INTEGER] CTE Suggestion: HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon ', 'lace ', 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) CBO PLAN: @@ -33,13 +33,13 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(=($6, 2000), =($8, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveTableSpool(table=[[cte, cte_suggestion_0]]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -8:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'chiffon '), =($17, 'lace '), =($17, 'orchid '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -55,7 +55,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'chiffon '), =($17, 'lace '), =($17, 'orchid '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -71,6 +71,6 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[OR(=($17, 'lace'), =($17, 'orchid'), =($17, 'chiffon'))]) + HiveFilter(condition=[OR(=($17, 'chiffon '), =($17, 'lace '), =($17, 'orchid '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query6.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query6.q.out index af759b9b3d0b..59481495f602 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query6.q.out @@ -31,7 +31,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($12))]) HiveTableScan(table=[[default, item]], table:alias=[i]) HiveProject(i_category=[$0], EXPR$0=[*(1.2:DECIMAL(2, 1), CAST(CAST(/($1, $2)):DECIMAL(11, 6)):DECIMAL(16, 6))]) - HiveFilter(condition=[IS NOT NULL(CAST(CAST(/($1, $2)):DECIMAL(11, 6)):DECIMAL(16, 6))]) + HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(11, 6))]) HiveAggregate(group=[{12}], agg#0=[sum($5)], agg#1=[count($5)]) HiveFilter(condition=[IS NOT NULL($12)]) HiveTableScan(table=[[default, item]], table:alias=[j]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out index 254d1388d6ce..ac973817b26b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query63.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manager_id=[$20]) - HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'refernece', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'refernece', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) + HiveFilter(condition=[AND(IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'exportiunivamalg #9 ', 'importoamalg #1 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants ', 'personal ', 'portable ', 'refernece ', 'self-help '), IN($12, 'Books ', 'Children ', 'Electronics ', 'Men ', 'Music ', 'Women '), OR(AND(IN($12, 'Books ', 'Children ', 'Electronics '), IN($10, 'personal ', 'portable ', 'refernece ', 'self-help '), IN($8, 'exportiunivamalg #9 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 ')), AND(IN($12, 'Men ', 'Music ', 'Women '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants '), IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'importoamalg #1 '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out index 32eff473f0c1..3e284272e21c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query64.q.out @@ -4,7 +4,7 @@ HiveJoin(condition=[=($0, $11)], joinType=[inner], algorithm=[none], cost=[not a HiveFilter(condition=[AND(IS NOT NULL($22), IS NOT NULL($6), IS NOT NULL($2), IS NOT NULL($3), IS NOT NULL($7), IS NOT NULL($4), IS NOT NULL($5))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'), BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($17, 'burnished ', 'chocolate ', 'dim ', 'maroon ', 'navajo ', 'steel '), BETWEEN(false, $5, 36.00:DECIMAL(12, 2), 45.00:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) CTE Suggestion: @@ -73,7 +73,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, 'burnished'), =($17, 'chocolate'), =($17, 'dim'), =($17, 'maroon'), =($17, 'navajo'), =($17, 'steel')))]) + HiveFilter(condition=[AND(<=(36.00:DECIMAL(12, 2), $5), <=($5, 45.00:DECIMAL(12, 2)), OR(=($17, 'burnished '), =($17, 'chocolate '), =($17, 'dim '), =($17, 'maroon '), =($17, 'navajo '), =($17, 'steel ')))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -133,7 +133,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(<=(36:DECIMAL(12, 2), $5), <=($5, 45:DECIMAL(12, 2)), OR(=($17, 'burnished'), =($17, 'chocolate'), =($17, 'dim'), =($17, 'maroon'), =($17, 'navajo'), =($17, 'steel')))]) + HiveFilter(condition=[AND(<=(36.00:DECIMAL(12, 2), $5), <=($5, 45.00:DECIMAL(12, 2)), OR(=($17, 'burnished '), =($17, 'chocolate '), =($17, 'dim '), =($17, 'maroon '), =($17, 'navajo '), =($17, 'steel ')))]) 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/tpcds30tb/cte/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out index 8b51923eed73..658f982bf8b0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query66.q.out @@ -5,7 +5,7 @@ HiveProject(d_date_sk=[$0], EXPR$0=[=($8, 1)], EXPR$1=[=($8, 2)], EXPR$2=[=($8, CTE Suggestion: HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE ', 'DIAMOND ')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) CTE Suggestion: @@ -22,7 +22,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveUnion(all=[true]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)]) - HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0:DECIMAL(18, 2))]) + HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0.00:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0.00:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0.00:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0.00:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0.00:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0.00:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0.00:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0.00:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0.00:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0.00:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0.00:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0.00:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0.00:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0.00:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0.00:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0.00:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0.00:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0.00:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0.00:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0.00:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0.00:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0.00:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0.00:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0.00:DECIMAL(18, 2))]) HiveJoin(condition=[=($2, $21)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -38,13 +38,13 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[OR(=($4, 'DIAMOND'), =($4, 'AIRBORNE'))]) + HiveFilter(condition=[OR(=($4, 'AIRBORNE '), =($4, 'DIAMOND '))]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)]) - HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0:DECIMAL(18, 2))]) + HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0.00:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0.00:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0.00:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0.00:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0.00:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0.00:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0.00:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0.00:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0.00:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0.00:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0.00:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0.00:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0.00:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0.00:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0.00:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0.00:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0.00:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0.00:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0.00:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0.00:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0.00:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0.00:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0.00:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0.00:DECIMAL(18, 2))]) HiveJoin(condition=[=($2, $21)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -57,7 +57,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) HiveTableScan(table=[[cte, cte_suggestion_0]], table:alias=[cte_suggestion_0]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[OR(=($4, 'DIAMOND'), =($4, 'AIRBORNE'))]) + HiveFilter(condition=[OR(=($4, 'AIRBORNE '), =($4, 'DIAMOND '))]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out index 380465f5c4bc..4a343c0e2f19 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query71.q.out @@ -37,6 +37,6 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[=($20, 1)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4]) - HiveFilter(condition=[OR(=($9, 'dinner'), =($9, 'breakfast'))]) + HiveFilter(condition=[OR(=($9, 'breakfast '), =($9, 'dinner '))]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out index bcf158a8544e..7c0f8da25cf8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query73.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$5], dir0=[DESC]) 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(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000 ', 'unknown '), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.0E0), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out index 1285cc0bef33..a3c45856a9d8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query85.q.out @@ -6,7 +6,7 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveJoin(condition=[=($35, $15)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($0, $11), =($1, $16), OR(AND($26, $27, $7), AND($28, $29, $8), AND($30, $31, $9)), OR(AND($20, $4), AND($21, $5), AND($22, $6)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $10)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ws_item_sk=[$2], ws_order_number=[$16], ws_quantity=[$17], ws_sold_date_sk=[$33], EXPR$0=[BETWEEN(false, $32, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $32, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $32, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], EXPR$3=[BETWEEN(false, $20, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$4=[BETWEEN(false, $20, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$5=[BETWEEN(false, $20, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) + HiveProject(ws_item_sk=[$2], ws_order_number=[$16], ws_quantity=[$17], ws_sold_date_sk=[$33], EXPR$0=[BETWEEN(false, $32, 100.00:DECIMAL(12, 2), 200.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $32, 150.00:DECIMAL(12, 2), 300.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $32, 50.00:DECIMAL(12, 2), 250.00:DECIMAL(12, 2))], EXPR$3=[BETWEEN(false, $20, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$4=[BETWEEN(false, $20, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$5=[BETWEEN(false, $20, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) HiveFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($11), IS NOT NULL($32), IS NOT NULL($33))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) @@ -22,11 +22,11 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) - HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree ')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary ')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree ')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) HiveProject(r_reason_sk=[$0], r_reason_desc=[$2]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out index 2762a85dfa4a..b03cc014389b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query89.q.out @@ -13,7 +13,7 @@ HiveProject(tmp1.i_category=[$0], tmp1.i_class=[$1], tmp1.i_brand=[$2], tmp1.s_s HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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, 'birdal', 'musical', 'pants', 'parenting', 'wallpaper', 'womens'), IN($12, 'Books', 'Electronics', 'Home', 'Jewelry', 'Men', 'Shoes'), OR(AND(IN($12, 'Books', 'Electronics', 'Home'), IN($10, 'musical', 'parenting', 'wallpaper')), AND(IN($12, 'Jewelry', 'Men', 'Shoes'), IN($10, 'birdal', 'pants', 'womens'))))]) + HiveFilter(condition=[AND(IN($10, 'birdal ', 'musical ', 'pants ', 'parenting ', 'wallpaper ', 'womens '), IN($12, 'Books ', 'Electronics ', 'Home ', 'Jewelry ', 'Men ', 'Shoes '), OR(AND(IN($12, 'Books ', 'Electronics ', 'Home '), IN($10, 'musical ', 'parenting ', 'wallpaper ')), AND(IN($12, 'Jewelry ', 'Men ', 'Shoes '), IN($10, 'birdal ', 'pants ', 'womens '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out index e50094e4420a..542cc0595cfd 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query91.q.out @@ -23,7 +23,7 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= 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($2, 'M', 'W'), IN($3, 'Advanced Degree', 'Unknown'), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) + HiveFilter(condition=[AND(IN($2, 'M', 'W'), IN($3, 'Advanced Degree ', 'Unknown '), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[LIKE($2, '0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out index bd41a4b82589..bd654be79656 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/cte/cbo_query98.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out index 2149474baf7d..ee7e4fae2c2f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query12.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out index 4c343aee7f60..dd697ffc9f4e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query13.q.out @@ -5,7 +5,7 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveJoin(condition=[=($1, $18)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($2, $14), OR(AND($15, $7), AND($16, $8), AND($17, $9)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $13)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_cdemo_sk=[$3], ss_hdemo_sk=[$4], ss_addr_sk=[$5], ss_quantity=[$9], ss_ext_sales_price=[$14], ss_ext_wholesale_cost=[$15], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], EXPR$5=[BETWEEN(false, $12, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$8=[BETWEEN(false, $12, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$11=[BETWEEN(false, $12, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) + HiveProject(ss_cdemo_sk=[$3], ss_hdemo_sk=[$4], ss_addr_sk=[$5], ss_quantity=[$9], ss_ext_sales_price=[$14], ss_ext_wholesale_cost=[$15], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 100.00:DECIMAL(12, 2), 200.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150.00:DECIMAL(12, 2), 300.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50.00:DECIMAL(12, 2), 250.00:DECIMAL(12, 2))], EXPR$5=[BETWEEN(false, $12, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$8=[BETWEEN(false, $12, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$11=[BETWEEN(false, $12, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) HiveFilter(condition=[AND(IS NOT NULL($21), IS NOT NULL($12), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) @@ -17,7 +17,7 @@ HiveProject(_c0=[/(CAST($0):DOUBLE, $1)], _c1=[CAST(/($2, $3)):DECIMAL(11, 6)], HiveProject(hd_demo_sk=[$0], EXPR$0=[=($3, 3)], EXPR$1=[=($3, 1)]) HiveFilter(condition=[IN($3, 1, 3)]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) - HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveProject(cd_demo_sk=[$0], EXPR$3=[=($2, 'M')], EXPR$4=[=($3, '4 yr Degree ')], EXPR$6=[=($2, 'D')], EXPR$7=[=($3, 'Primary ')], EXPR$9=[=($2, 'U')], EXPR$10=[=($3, 'Advanced Degree ')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out index 4e5189075790..63ecbe7b9be5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query15.q.out @@ -2,12 +2,12 @@ CBO PLAN: HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(ca_zip=[$0], _c1=[$1]) HiveAggregate(group=[{3}], agg#0=[sum($7)]) - HiveJoin(condition=[AND(=($6, $0), OR($4, $9, $5))], joinType=[inner], algorithm=[none], cost=[not available]) + HiveJoin(condition=[AND(=($6, $0), OR($4, $5, $9))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $2)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4]) HiveFilter(condition=[IS NOT NULL($4)]) HiveTableScan(table=[[default, customer]], table:alias=[customer]) - HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN($8, 'CA', 'GA', 'WA')], EXPR$1=[IN(substr($9, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) + HiveProject(ca_address_sk=[$0], ca_zip=[$9], EXPR$0=[IN(substr($9, 1, 5), '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")], EXPR$1=[IN($8, 'CA', 'GA', 'WA')]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(cs_bill_customer_sk=[$0], cs_sales_price=[$1], cs_sold_date_sk=[$2], EXPR$0=[$3], d_date_sk=[$4]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out index 4c518c59b256..bb9c51b7e23e 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query20.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query21.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query21.q.out index a6d2b3e4911c..50d33992dc6d 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query21.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query21.q.out @@ -1,7 +1,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(x.w_warehouse_name=[$0], x.i_item_id=[$1], x.inv_before=[$2], x.inv_after=[$3]) - HiveFilter(condition=[AND(CASE(>($2, 0), <=(6.66667E-1, /(CAST($3):DOUBLE, CAST($2):DOUBLE)), false), CASE(>($2, 0), <=(/(CAST($3):DOUBLE, CAST($2):DOUBLE), 1.5E0), false))]) + HiveFilter(condition=[AND(CASE(>($2, 0), <=(0.666667E0, /(CAST($3):DOUBLE, CAST($2):DOUBLE)), false), CASE(>($2, 0), <=(/(CAST($3):DOUBLE, CAST($2):DOUBLE), 1.5E0), false))]) HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)]) HiveProject($f0=[$1], $f1=[$10], $f2=[CASE($7, $5, 0)], $f3=[CASE($8, $5, 0)]) HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query23.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query23.q.out index 290ffed72123..dc4baba65a53 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query23.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query23.q.out @@ -37,7 +37,7 @@ HiveProject(_c0=[$0]) HiveProject(ss_customer_sk=[CAST($2):BIGINT NOT NULL], $f1=[*(CAST($9):DECIMAL(10, 0), $12)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(EXPR$0=[*(0.95:DECIMAL(16, 6), $0)]) + HiveProject(EXPR$0=[*(0.950000:DECIMAL(16, 6), $0)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[max($1)]) @@ -83,7 +83,7 @@ HiveProject(_c0=[$0]) HiveProject(ss_customer_sk=[CAST($2):BIGINT NOT NULL], $f1=[*(CAST($9):DECIMAL(10, 0), $12)]) HiveFilter(condition=[IS NOT NULL($2)]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(EXPR$0=[*(0.95:DECIMAL(16, 6), $0)]) + HiveProject(EXPR$0=[*(0.950000:DECIMAL(16, 6), $0)]) HiveFilter(condition=[IS NOT NULL($0)]) HiveProject($f0=[$0]) HiveAggregate(group=[{}], agg#0=[max($1)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query28.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query28.q.out index ede33acc5e69..9d4087142c5f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query28.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query28.q.out @@ -12,26 +12,26 @@ HiveProject(b1.b1_lp=[$0], b1.b1_cnt=[$1], b1.b1_cntd=[$2], b2.b2_lp=[$15], b2.b HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(b1_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b1_cnt=[$1], b1_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 0, 5), OR(BETWEEN(false, $11, 11:DECIMAL(12, 2), 21:DECIMAL(12, 2)), BETWEEN(false, $18, 460:DECIMAL(12, 2), 1460:DECIMAL(12, 2)), BETWEEN(false, $10, 14:DECIMAL(12, 2), 34:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 0, 5), OR(BETWEEN(false, $11, 11.00:DECIMAL(12, 2), 21.00:DECIMAL(12, 2)), BETWEEN(false, $18, 460.00:DECIMAL(12, 2), 1460.00:DECIMAL(12, 2)), BETWEEN(false, $10, 14.00:DECIMAL(12, 2), 34.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b6_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b6_cnt=[$1], b6_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 26, 30), OR(BETWEEN(false, $11, 28:DECIMAL(12, 2), 38:DECIMAL(12, 2)), BETWEEN(false, $18, 2513:DECIMAL(12, 2), 3513:DECIMAL(12, 2)), BETWEEN(false, $10, 42:DECIMAL(12, 2), 62:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 26, 30), OR(BETWEEN(false, $11, 28.00:DECIMAL(12, 2), 38.00:DECIMAL(12, 2)), BETWEEN(false, $18, 2513.00:DECIMAL(12, 2), 3513.00:DECIMAL(12, 2)), BETWEEN(false, $10, 42.00:DECIMAL(12, 2), 62.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b5_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b5_cnt=[$1], b5_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 21, 25), OR(BETWEEN(false, $11, 135:DECIMAL(12, 2), 145:DECIMAL(12, 2)), BETWEEN(false, $18, 14180:DECIMAL(12, 2), 15180:DECIMAL(12, 2)), BETWEEN(false, $10, 38:DECIMAL(12, 2), 58:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 21, 25), OR(BETWEEN(false, $11, 135.00:DECIMAL(12, 2), 145.00:DECIMAL(12, 2)), BETWEEN(false, $18, 14180.00:DECIMAL(12, 2), 15180.00:DECIMAL(12, 2)), BETWEEN(false, $10, 38.00:DECIMAL(12, 2), 58.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b4_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b4_cnt=[$1], b4_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 16, 20), OR(BETWEEN(false, $11, 142:DECIMAL(12, 2), 152:DECIMAL(12, 2)), BETWEEN(false, $18, 3054:DECIMAL(12, 2), 4054:DECIMAL(12, 2)), BETWEEN(false, $10, 80:DECIMAL(12, 2), 100:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 16, 20), OR(BETWEEN(false, $11, 142.00:DECIMAL(12, 2), 152.00:DECIMAL(12, 2)), BETWEEN(false, $18, 3054.00:DECIMAL(12, 2), 4054.00:DECIMAL(12, 2)), BETWEEN(false, $10, 80.00:DECIMAL(12, 2), 100.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b3_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b3_cnt=[$1], b3_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 11, 15), OR(BETWEEN(false, $11, 66:DECIMAL(12, 2), 76:DECIMAL(12, 2)), BETWEEN(false, $18, 920:DECIMAL(12, 2), 1920:DECIMAL(12, 2)), BETWEEN(false, $10, 4:DECIMAL(12, 2), 24:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 11, 15), OR(BETWEEN(false, $11, 66.00:DECIMAL(12, 2), 76.00:DECIMAL(12, 2)), BETWEEN(false, $18, 920.00:DECIMAL(12, 2), 1920.00:DECIMAL(12, 2)), BETWEEN(false, $10, 4.00:DECIMAL(12, 2), 24.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(b2_lp=[CAST(/($0, $1)):DECIMAL(11, 6)], b2_cnt=[$1], b2_cntd=[$2]) HiveAggregate(group=[{}], agg#0=[sum($11)], agg#1=[count($11)], agg#2=[count(DISTINCT $11)]) - HiveFilter(condition=[AND(BETWEEN(false, $9, 6, 10), OR(BETWEEN(false, $11, 91:DECIMAL(12, 2), 101:DECIMAL(12, 2)), BETWEEN(false, $18, 1430:DECIMAL(12, 2), 2430:DECIMAL(12, 2)), BETWEEN(false, $10, 32:DECIMAL(12, 2), 52:DECIMAL(12, 2))))]) + HiveFilter(condition=[AND(BETWEEN(false, $9, 6, 10), OR(BETWEEN(false, $11, 91.00:DECIMAL(12, 2), 101.00:DECIMAL(12, 2)), BETWEEN(false, $18, 1430.00:DECIMAL(12, 2), 2430.00:DECIMAL(12, 2)), BETWEEN(false, $10, 32.00:DECIMAL(12, 2), 52.00:DECIMAL(12, 2))))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out index c1ebd65079ec..744a642da453 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query33.q.out @@ -16,7 +16,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(3):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) @@ -37,7 +37,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(3):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) @@ -58,7 +58,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(3):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 3))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out index 2771464b0899..aa62b77134c5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query34.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], dir0=[ASC], dir1=[ HiveFilter(condition=[AND(IN($6, 2000, 2001, 2002), OR(BETWEEN(false, $9, 1, 3), BETWEEN(false, $9, 25, 28)))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(hd_demo_sk=[$0]) - HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000 ', 'unknown '), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.2E0), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, 'Barrow County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Fairfield County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Jackson County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Pennington County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query37.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query37.q.out index e2ad185eef6f..622a9bea267a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query37.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query37.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[BETWEEN(false, $3, 100, 500)]) HiveTableScan(table=[[default, inventory]], table:alias=[inventory]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 678, 849, 918, 964), BETWEEN(false, $5, 22:DECIMAL(12, 2), 52:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($13, 678, 849, 918, 964), BETWEEN(false, $5, 22.00:DECIMAL(12, 2), 52.00:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-06-02 00:00:00:TIMESTAMP(9), 2001-08-01 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query39.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query39.q.out index 39c458003a1c..585c2eec16c0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query39.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query39.q.out @@ -3,8 +3,8 @@ HiveProject(inv1.w_warehouse_sk=[$0], inv1.i_item_sk=[$1], inv1.d_moy=[CAST(4):I HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], sort3=[$3], sort4=[$6], sort5=[$7], dir0=[ASC], dir1=[ASC], dir2=[ASC], dir3=[ASC], dir4=[ASC], dir5=[ASC]) HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[$6], cov=[$7], w_warehouse_sk0=[$0], i_item_sk0=[$1], mean0=[$2], cov0=[$3]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) - HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1))]) + HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) + HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1.0E0))]) HiveAggregate(group=[{1, 2}], agg#0=[sum($5)], agg#1=[sum($4)], agg#2=[count($4)], agg#3=[sum($3)], agg#4=[count($3)]) HiveProject($f0=[$6], $f1=[$5], $f2=[$3], $f4=[$2], $f40=[CAST($2):DOUBLE], $f6=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)]) HiveJoin(condition=[=($1, $5)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -16,8 +16,8 @@ HiveProject(inv1.w_warehouse_sk=[$0], inv1.i_item_sk=[$1], inv1.d_moy=[CAST(4):I HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) - HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) - HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1))]) + HiveProject(w_warehouse_sk=[$0], i_item_sk=[$1], mean=[/(CAST($5):DOUBLE, $6)], cov=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), null:DOUBLE, /(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)))]) + HiveFilter(condition=[CASE(=(/(CAST($5):DOUBLE, $6), 0.0E0), false, >(/(POWER(/(-($2, /(*($3, $3), $4)), CASE(=($4, 1), null:BIGINT, -($4, 1))), 0.5:DECIMAL(2, 1)), /(CAST($5):DOUBLE, $6)), 1.0E0))]) HiveAggregate(group=[{1, 2}], agg#0=[sum($5)], agg#1=[sum($4)], agg#2=[count($4)], agg#3=[sum($3)], agg#4=[count($3)]) HiveProject($f0=[$6], $f1=[$5], $f2=[$3], $f4=[$2], $f40=[CAST($2):DOUBLE], $f6=[*(CAST($2):DOUBLE, CAST($2):DOUBLE)]) HiveJoin(condition=[=($1, $5)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query40.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query40.q.out index 582967b597c1..313eb534ba72 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query40.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(w_state=[$0], i_item_id=[$1], sales_before=[$2], sales_after=[$3]) HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)]) - HiveProject($f0=[$14], $f1=[$12], $f2=[CASE($9, -($3, CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))), 0:DECIMAL(13, 2))], $f3=[CASE($10, -($3, CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))), 0:DECIMAL(13, 2))]) + HiveProject($f0=[$14], $f1=[$12], $f2=[CASE($9, -($3, CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))), 0.00:DECIMAL(13, 2))], $f3=[CASE($10, -($3, CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))), 0.00:DECIMAL(13, 2))]) HiveJoin(condition=[=($0, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($11, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($4, $8)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out index 72cb293d31f0..e045f95dbfa5 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query41.q.out @@ -9,6 +9,6 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveProject(i_manufact=[$0]) HiveFilter(condition=[>($1, 0)]) HiveAggregate(group=[{14}], agg#0=[count()]) - HiveFilter(condition=[AND(OR(AND(=($12, 'Women'), IN($17, 'frosted', 'rose'), IN($18, 'Gross', 'Lb'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'black', 'chocolate'), IN($18, 'Box', 'Dram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'magenta', 'slate'), IN($18, 'Bundle', 'Carton'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cornflower', 'firebrick'), IN($18, 'Oz', 'Pound'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'almond', 'steel'), IN($18, 'Case', 'Tsp'), IN($15, 'large', 'medium')), AND(=($12, 'Women'), IN($17, 'aquamarine', 'purple'), IN($18, 'Bunch', 'Gram'), IN($15, 'economy', 'petite')), AND(=($12, 'Men'), IN($17, 'lavender', 'papaya'), IN($18, 'Cup', 'Pallet'), IN($15, 'N/A', 'small')), AND(=($12, 'Men'), IN($17, 'cyan', 'maroon'), IN($18, 'Each', 'N/A'), IN($15, 'large', 'medium'))), IS NOT NULL($14))]) + HiveFilter(condition=[AND(OR(AND(=($12, 'Women '), IN($17, 'frosted ', 'rose '), IN($18, 'Gross ', 'Lb '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'black ', 'chocolate '), IN($18, 'Box ', 'Dram '), IN($15, 'economy ', 'petite ')), AND(=($12, 'Men '), IN($17, 'magenta ', 'slate '), IN($18, 'Bundle ', 'Carton '), IN($15, 'N/A ', 'small ')), AND(=($12, 'Men '), IN($17, 'cornflower ', 'firebrick '), IN($18, 'Oz ', 'Pound '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'almond ', 'steel '), IN($18, 'Case ', 'Tsp '), IN($15, 'large ', 'medium ')), AND(=($12, 'Women '), IN($17, 'aquamarine ', 'purple '), IN($18, 'Bunch ', 'Gram '), IN($15, 'economy ', 'petite ')), AND(=($12, 'Men '), IN($17, 'lavender ', 'papaya '), IN($18, 'Cup ', 'Pallet '), IN($15, 'N/A ', 'small ')), AND(=($12, 'Men '), IN($17, 'cyan ', 'maroon '), IN($18, 'Each ', 'N/A '), IN($15, 'large ', 'medium '))), IS NOT NULL($14))]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out index d705bd014511..851b3f59bb73 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query45.q.out @@ -2,7 +2,7 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(ca_zip=[$1], ca_county=[$0], _c2=[$2]) HiveAggregate(group=[{7, 8}], agg#0=[sum($2)]) - HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) + HiveFilter(condition=[OR(IS NOT NULL($15), IN(substr($8, 1, 5), '80348':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '81792':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '83405':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85392':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85460':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '85669':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86197':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '86475':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", '88274':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveProject(ws_item_sk=[$5], ws_bill_customer_sk=[$6], ws_sales_price=[$7], ws_sold_date_sk=[$8], c_customer_sk=[$0], c_current_addr_sk=[$1], ca_address_sk=[$2], ca_county=[$3], ca_zip=[$4], d_date_sk=[$9], d_year=[$10], d_qoy=[$11], i_item_sk=[$12], i_item_id=[$13], i_item_id0=[$14], literalTrue=[$15]) HiveJoin(condition=[=($5, $12)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out index b4874b81abce..32ffaa471159 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query48.q.out @@ -10,7 +10,7 @@ HiveProject(_c0=[$0]) HiveFilter(condition=[AND(=($2, 'M'), =($3, '4 yr Degree '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0:DECIMAL(12, 2), 2000:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150:DECIMAL(12, 2), 3000:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50:DECIMAL(12, 2), 25000:DECIMAL(12, 2))]) + HiveProject(ss_cdemo_sk=[$3], ss_addr_sk=[$5], ss_quantity=[$9], ss_sold_date_sk=[$22], EXPR$0=[BETWEEN(false, $21, 0.00:DECIMAL(12, 2), 2000.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $21, 150.00:DECIMAL(12, 2), 3000.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $21, 50.00:DECIMAL(12, 2), 25000.00:DECIMAL(12, 2))]) HiveFilter(condition=[AND(BETWEEN(false, $12, 50:DECIMAL(3, 0), 200:DECIMAL(3, 0)), IS NOT NULL($21), IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out index 503043fcf358..11db280ed8a0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query49.q.out @@ -13,7 +13,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(wr_item_sk=[$1], wr_order_number=[$12], wr_return_quantity=[$13], wr_return_amt=[$14]) HiveFilter(condition=[>($14, 10000:DECIMAL(5, 0))]) @@ -30,7 +30,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(cr_item_sk=[$1], cr_order_number=[$15], cr_return_quantity=[$16], cr_return_amount=[$17]) HiveFilter(condition=[>($17, 10000:DECIMAL(5, 0))]) @@ -47,7 +47,7 @@ HiveSortLimit(sort0=[$0], sort1=[$3], sort2=[$4], dir0=[ASC], dir1=[ASC], dir2=[ HiveProject(item=[$0], return_ratio=[/(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4))], rank_window_0=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($1):DECIMAL(15, 4), CAST($2):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], rank_window_1=[rank() OVER (PARTITION BY 0 ORDER BY /(CAST($3):DECIMAL(15, 4), CAST($4):DECIMAL(15, 4)) NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)], agg#3=[sum($4)]) - HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0:DECIMAL(12, 2))]) + HiveProject($f0=[$4], $f1=[CASE(IS NOT NULL($2), $2, 0)], $f2=[CASE(IS NOT NULL($6), $6, 0)], $f3=[CASE(IS NOT NULL($3), $3, 0.00:DECIMAL(12, 2))], $f4=[CASE(IS NOT NULL($7), $7, 0.00:DECIMAL(12, 2))]) HiveJoin(condition=[AND(=($4, $0), =($5, $1))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(sr_item_sk=[$1], sr_ticket_number=[$8], sr_return_quantity=[$9], sr_return_amt=[$10]) HiveFilter(condition=[>($10, 10000:DECIMAL(5, 0))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out index ab73ed07b847..4e4df16b9d55 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query5.q.out @@ -10,10 +10,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(store_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) - HiveProject(store_sk=[$6], date_sk=[$22], sales_price=[$14], profit=[$21], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(store_sk=[$6], date_sk=[$22], sales_price=[$14], profit=[$21], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) - HiveProject(store_sk=[$6], date_sk=[$19], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$10], net_loss=[$18]) + HiveProject(store_sk=[$6], date_sk=[$19], sales_price=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$10], net_loss=[$18]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($19))]) HiveTableScan(table=[[default, store_returns]], table:alias=[store_returns]) HiveProject(d_date_sk=[$0]) @@ -27,10 +27,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(page_sk=[$0], date_sk=[$1], sales_price=[$2], profit=[$3], return_amt=[$4], net_loss=[$5]) HiveUnion(all=[true]) - HiveProject(page_sk=[$11], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(page_sk=[$11], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($33))]) HiveTableScan(table=[[default, catalog_sales]], table:alias=[catalog_sales]) - HiveProject(page_sk=[$11], date_sk=[$26], sales_price=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$17], net_loss=[$25]) + HiveProject(page_sk=[$11], date_sk=[$26], sales_price=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], profit=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], return_amt=[$17], net_loss=[$25]) HiveFilter(condition=[AND(IS NOT NULL($11), IS NOT NULL($26))]) HiveTableScan(table=[[default, catalog_returns]], table:alias=[catalog_returns]) HiveProject(d_date_sk=[$0]) @@ -44,10 +44,10 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveJoin(condition=[=($1, $6)], joinType=[inner], algorithm=[none], cost=[not available]) 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=[$12], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)]) + HiveProject(wsr_web_site_sk=[$12], date_sk=[$33], sales_price=[$22], profit=[$32], return_amt=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], net_loss=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)]) HiveFilter(condition=[AND(IS NOT NULL($12), IS NOT NULL($33))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) - HiveProject(ws_web_site_sk=[$1], wr_returned_date_sk=[$7], $f2=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], $f3=[CAST(0:DECIMAL(7, 2)):DECIMAL(7, 2)], wr_return_amt=[$5], wr_net_loss=[$6]) + HiveProject(ws_web_site_sk=[$1], wr_returned_date_sk=[$7], $f2=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], $f3=[CAST(0.00:DECIMAL(7, 2)):DECIMAL(7, 2)], wr_return_amt=[$5], wr_net_loss=[$6]) HiveJoin(condition=[AND(=($3, $0), =($4, $2))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ws_item_sk=[$2], ws_web_site_sk=[$12], ws_order_number=[$16]) HiveFilter(condition=[IS NOT NULL($12)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out index 16190e274296..8304296338ad 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query53.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$2], sort1=[$1], sort2=[$0], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manufact_id=[$13]) - HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'reference', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'reference', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) + HiveFilter(condition=[AND(IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'exportiunivamalg #9 ', 'importoamalg #1 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants ', 'personal ', 'portable ', 'reference ', 'self-help '), IN($12, 'Books ', 'Children ', 'Electronics ', 'Men ', 'Music ', 'Women '), OR(AND(IN($12, 'Books ', 'Children ', 'Electronics '), IN($10, 'personal ', 'portable ', 'reference ', 'self-help '), IN($8, 'exportiunivamalg #9 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 ')), AND(IN($12, 'Men ', 'Music ', 'Women '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants '), IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'importoamalg #1 '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_qoy=[$10]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out index ecabe181abd2..5229cd83a611 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query56.q.out @@ -16,13 +16,13 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(2000):INTEGER], d_moy=[CAST(1):INTEGER]) HiveFilter(condition=[AND(=($6, 2000), =($8, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -8:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon ', 'lace ', 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -36,13 +36,13 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(2000):INTEGER], d_moy=[CAST(1):INTEGER]) HiveFilter(condition=[AND(=($6, 2000), =($8, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -8:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon ', 'lace ', 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$0], $f1=[$1]) HiveAggregate(group=[{10}], agg#0=[sum($2)]) @@ -56,12 +56,12 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(2000):INTEGER], d_moy=[CAST(1):INTEGER]) HiveFilter(condition=[AND(=($6, 2000), =($8, 1))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-8.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -8:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(i_item_id=[$1]) - HiveFilter(condition=[IN($17, 'chiffon', 'lace', 'orchid')]) + HiveFilter(condition=[IN($17, 'chiffon ', 'lace ', 'orchid ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query6.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query6.q.out index af759b9b3d0b..59481495f602 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query6.q.out @@ -31,7 +31,7 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100]) HiveFilter(condition=[AND(IS NOT NULL($5), IS NOT NULL($12))]) HiveTableScan(table=[[default, item]], table:alias=[i]) HiveProject(i_category=[$0], EXPR$0=[*(1.2:DECIMAL(2, 1), CAST(CAST(/($1, $2)):DECIMAL(11, 6)):DECIMAL(16, 6))]) - HiveFilter(condition=[IS NOT NULL(CAST(CAST(/($1, $2)):DECIMAL(11, 6)):DECIMAL(16, 6))]) + HiveFilter(condition=[IS NOT NULL(CAST(/($1, $2)):DECIMAL(11, 6))]) HiveAggregate(group=[{12}], agg#0=[sum($5)], agg#1=[count($5)]) HiveFilter(condition=[IS NOT NULL($12)]) HiveTableScan(table=[[default, item]], table:alias=[j]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out index 0df9457e9fcd..459ada9b3747 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query60.q.out @@ -16,7 +16,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(9):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) @@ -36,7 +36,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(9):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) @@ -56,7 +56,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], d_moy=[CAST(9):INTEGER]) HiveFilter(condition=[AND(=($6, 1999), =($8, 9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6:DECIMAL(5, 2)):DECIMAL(5, 2)]) + HiveProject(ca_address_sk=[$0], ca_gmt_offset=[CAST(-6.00:DECIMAL(5, 2)):DECIMAL(5, 2)]) HiveFilter(condition=[=($11, -6:DECIMAL(1, 0))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) HiveProject(i_item_sk=[$0], i_item_id=[$1]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out index 254d1388d6ce..ac973817b26b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query63.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], dir0=[ASC], dir1=[ASC], dir2=[ HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_manager_id=[$20]) - HiveFilter(condition=[AND(IN($10, 'accessories', 'classical', 'fragrances', 'pants', 'personal', 'portable', 'refernece', 'self-help'), IN($12, 'Books', 'Children', 'Electronics', 'Men', 'Music', 'Women'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'exportiunivamalg #9', 'importoamalg #1', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9'), OR(AND(IN($12, 'Books', 'Children', 'Electronics'), IN($10, 'personal', 'portable', 'refernece', 'self-help'), IN($8, 'exportiunivamalg #9', 'scholaramalgamalg #14', 'scholaramalgamalg #7', 'scholaramalgamalg #9')), AND(IN($12, 'Men', 'Music', 'Women'), IN($10, 'accessories', 'classical', 'fragrances', 'pants'), IN($8, 'amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg #1'))))]) + HiveFilter(condition=[AND(IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'exportiunivamalg #9 ', 'importoamalg #1 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants ', 'personal ', 'portable ', 'refernece ', 'self-help '), IN($12, 'Books ', 'Children ', 'Electronics ', 'Men ', 'Music ', 'Women '), OR(AND(IN($12, 'Books ', 'Children ', 'Electronics '), IN($10, 'personal ', 'portable ', 'refernece ', 'self-help '), IN($8, 'exportiunivamalg #9 ', 'scholaramalgamalg #14 ', 'scholaramalgamalg #7 ', 'scholaramalgamalg #9 ')), AND(IN($12, 'Men ', 'Music ', 'Women '), IN($10, 'accessories ', 'classical ', 'fragrances ', 'pants '), IN($8, 'amalgimporto #1 ', 'edu packscholar #1 ', 'exportiimporto #1 ', 'importoamalg #1 '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[IN($3, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out index 27f71da51db8..ee9867c5b84f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query64.q.out @@ -32,7 +32,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36.00:DECIMAL(12, 2), 45.00:DECIMAL(12, 2)), IN($17, 'burnished ', 'chocolate ', 'dim ', 'maroon ', 'navajo ', 'steel '))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[=($6, 2001)]) @@ -93,7 +93,7 @@ HiveProject(cs1.product_name=[$0], cs1.store_name=[$1], cs1.store_zip=[$2], cs1. HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT NULL($5), IS NOT NULL($4), IS NOT NULL($2), IS NOT NULL($6), IS NOT NULL($7), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(i_item_sk=[$0], i_product_name=[$21]) - HiveFilter(condition=[AND(BETWEEN(false, $5, 36:DECIMAL(12, 2), 45:DECIMAL(12, 2)), IN($17, 'burnished', 'chocolate', 'dim', 'maroon', 'navajo', 'steel'))]) + HiveFilter(condition=[AND(BETWEEN(false, $5, 36.00:DECIMAL(12, 2), 45.00:DECIMAL(12, 2)), IN($17, 'burnished ', 'chocolate ', 'dim ', 'maroon ', 'navajo ', 'steel '))]) 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/tpcds30tb/tez/cbo_query66.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out index e3a0a3467bea..afa5d74cbee6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query66.q.out @@ -7,7 +7,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveUnion(all=[true]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)]) - HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0:DECIMAL(18, 2))]) + HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0.00:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0.00:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0.00:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0.00:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0.00:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0.00:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0.00:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0.00:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0.00:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0.00:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0.00:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0.00:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0.00:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0.00:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0.00:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0.00:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0.00:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0.00:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0.00:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0.00:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0.00:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0.00:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0.00:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0.00:DECIMAL(18, 2))]) HiveJoin(condition=[=($2, $21)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -22,13 +22,13 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE ', 'DIAMOND ')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], $f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], $f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], $f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], $f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29]) HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)]) - HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0:DECIMAL(18, 2))]) + HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], $f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0.00:DECIMAL(18, 2))], $f8=[CASE($9, $4, 0.00:DECIMAL(18, 2))], $f9=[CASE($10, $4, 0.00:DECIMAL(18, 2))], $f10=[CASE($11, $4, 0.00:DECIMAL(18, 2))], $f11=[CASE($12, $4, 0.00:DECIMAL(18, 2))], $f12=[CASE($13, $4, 0.00:DECIMAL(18, 2))], $f13=[CASE($14, $4, 0.00:DECIMAL(18, 2))], $f14=[CASE($15, $4, 0.00:DECIMAL(18, 2))], $f15=[CASE($16, $4, 0.00:DECIMAL(18, 2))], $f16=[CASE($17, $4, 0.00:DECIMAL(18, 2))], $f17=[CASE($18, $4, 0.00:DECIMAL(18, 2))], $f18=[CASE($19, $4, 0.00:DECIMAL(18, 2))], $f19=[CASE($8, $5, 0.00:DECIMAL(18, 2))], $f20=[CASE($9, $5, 0.00:DECIMAL(18, 2))], $f21=[CASE($10, $5, 0.00:DECIMAL(18, 2))], $f22=[CASE($11, $5, 0.00:DECIMAL(18, 2))], $f23=[CASE($12, $5, 0.00:DECIMAL(18, 2))], $f24=[CASE($13, $5, 0.00:DECIMAL(18, 2))], $f25=[CASE($14, $5, 0.00:DECIMAL(18, 2))], $f26=[CASE($15, $5, 0.00:DECIMAL(18, 2))], $f27=[CASE($16, $5, 0.00:DECIMAL(18, 2))], $f28=[CASE($17, $5, 0.00:DECIMAL(18, 2))], $f29=[CASE($18, $5, 0.00:DECIMAL(18, 2))], $f30=[CASE($19, $5, 0.00:DECIMAL(18, 2))]) HiveJoin(condition=[=($2, $21)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $20)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $7)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -43,7 +43,7 @@ HiveProject(w_warehouse_name=[$0], w_warehouse_sq_ft=[$1], w_city=[$2], w_county HiveFilter(condition=[=($6, 2002)]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(sm_ship_mode_sk=[$0]) - HiveFilter(condition=[IN($4, 'AIRBORNE', 'DIAMOND')]) + HiveFilter(condition=[IN($4, 'AIRBORNE ', 'DIAMOND ')]) HiveTableScan(table=[[default, ship_mode]], table:alias=[ship_mode]) HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], w_country=[$12]) HiveTableScan(table=[[default, warehouse]], table:alias=[warehouse]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query67.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query67.q.out index e4150989e8da..37e1010d2904 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query67.q.out @@ -8,7 +8,7 @@ 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=[=($1, $8)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $4)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ss_item_sk=[$1], ss_store_sk=[$6], ss_sold_date_sk=[$22], $f8=[CASE(AND(IS NOT NULL($12), IS NOT NULL(CAST($9):DECIMAL(10, 0))), *($12, CAST($9):DECIMAL(10, 0)), 0:DECIMAL(18, 2))]) + HiveProject(ss_item_sk=[$1], ss_store_sk=[$6], ss_sold_date_sk=[$22], $f8=[CASE(AND(IS NOT NULL($12), IS NOT NULL($9)), *($12, CAST($9):DECIMAL(10, 0)), 0.00:DECIMAL(18, 2))]) HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) HiveTableScan(table=[[default, store_sales]], table:alias=[store_sales]) HiveProject(d_date_sk=[$0], d_year=[$6], d_moy=[$8], d_qoy=[$10]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out index 758141ba6a0b..955ea36347f4 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query71.q.out @@ -35,6 +35,6 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], ext_price=[$4 HiveFilter(condition=[=($20, 1)]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4]) - HiveFilter(condition=[IN($9, 'breakfast', 'dinner')]) + HiveFilter(condition=[IN($9, 'breakfast ', 'dinner ')]) HiveTableScan(table=[[default, time_dim]], table:alias=[time_dim]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out index bcf158a8544e..7c0f8da25cf8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query73.q.out @@ -18,7 +18,7 @@ HiveSortLimit(sort0=[$5], dir0=[DESC]) 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(>($4, 0), IN($2, '>10000', 'unknown'), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1), false))]) + HiveFilter(condition=[AND(>($4, 0), IN($2, '>10000 ', 'unknown '), CASE(>($4, 0), >(/(CAST($3):DOUBLE, CAST($4):DOUBLE), 1.0E0), false))]) HiveTableScan(table=[[default, household_demographics]], table:alias=[household_demographics]) HiveProject(s_store_sk=[$0]) HiveFilter(condition=[IN($23, 'Huron County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Kittitas County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Maverick County':VARCHAR(30) CHARACTER SET "UTF-16LE", 'Mobile County':VARCHAR(30) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out index 54e9f3482e06..698a472d9218 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query77.q.out @@ -5,7 +5,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], agg#0=[sum($2)], agg#1=[sum($3)], agg#2=[sum($4)]) HiveProject(channel=[$0], id=[$1], sales=[$2], returns=[$3], profit=[$4]) HiveUnion(all=[true]) - HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0.00:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0.00:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ss_store_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) @@ -47,7 +47,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) 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))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) - HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0:DECIMAL(17, 2)))]) + HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[$0], sales=[$1], returns=[CASE(IS NOT NULL($4), $4, 0.00:DECIMAL(17, 2))], profit=[-($2, CASE(IS NOT NULL($5), $5, 0.00:DECIMAL(17, 2)))]) HiveJoin(condition=[=($0, $3)], joinType=[left], algorithm=[none], cost=[not available]) HiveProject(ws_web_page_sk=[$0], $f1=[$1], $f2=[$2]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query78.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query78.q.out index 483d4c87e9df..fa242f0e62c2 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query78.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query78.q.out @@ -1,7 +1,7 @@ CBO PLAN: HiveProject(ss_sold_year=[CAST(2000):INTEGER], ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[$2], store_qty=[$3], store_wholesale_cost=[$4], store_sales_price=[$5], other_chan_qty=[$6], other_chan_wholesale_cost=[$7], other_chan_sales_price=[$8]) HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$9], sort3=[$10], sort4=[$11], sort5=[$6], sort6=[$7], sort7=[$8], sort8=[$12], dir0=[ASC], dir1=[ASC], dir2=[DESC], dir3=[DESC], dir4=[DESC], dir5=[ASC], dir6=[ASC], dir7=[ASC], dir8=[ASC], fetch=[100]) - HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)], store_qty=[$2], store_wholesale_cost=[$3], store_sales_price=[$4], other_chan_qty=[+(CASE(IS NOT NULL($7), $7, 0:BIGINT), CASE(IS NOT NULL($11), $11, 0:BIGINT))], other_chan_wholesale_cost=[+(CASE(IS NOT NULL($8), $8, 0:DECIMAL(17, 2)), CASE(IS NOT NULL($12), $12, 0:DECIMAL(17, 2)))], other_chan_sales_price=[+(CASE(IS NOT NULL($9), $9, 0:DECIMAL(17, 2)), CASE(IS NOT NULL($13), $13, 0:DECIMAL(17, 2)))], ss_qty=[$2], ss_wc=[$3], ss_sp=[$4], (tok_function round (/ (tok_table_or_col ss_qty) (tok_function coalesce (+ (tok_table_or_col ws_qty) (tok_table_or_col cs_qty)) 1)) 2)=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)]) + HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], ratio=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)], store_qty=[$2], store_wholesale_cost=[$3], store_sales_price=[$4], other_chan_qty=[+(CASE(IS NOT NULL($7), $7, 0:BIGINT), CASE(IS NOT NULL($11), $11, 0:BIGINT))], other_chan_wholesale_cost=[+(CASE(IS NOT NULL($8), $8, 0.00:DECIMAL(17, 2)), CASE(IS NOT NULL($12), $12, 0.00:DECIMAL(17, 2)))], other_chan_sales_price=[+(CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(17, 2)), CASE(IS NOT NULL($13), $13, 0.00:DECIMAL(17, 2)))], ss_qty=[$2], ss_wc=[$3], ss_sp=[$4], (tok_function round (/ (tok_table_or_col ss_qty) (tok_function coalesce (+ (tok_table_or_col ws_qty) (tok_table_or_col cs_qty)) 1)) 2)=[round(/(CAST($2):DOUBLE, CAST(CASE(AND(IS NOT NULL($7), IS NOT NULL($11)), +($7, $11), 1:BIGINT)):DOUBLE), 2)]) HiveJoin(condition=[=($10, $1)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($6, $1), =($5, $0))], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(ss_item_sk=[$0], ss_customer_sk=[$1], $f2=[$2], $f3=[$3], $f4=[$4]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out index e84714796d71..d4e8b7925620 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query80.q.out @@ -6,7 +6,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveUnion(all=[true]) HiveProject(channel=['store channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('store':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $12)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -30,7 +30,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, store]], table:alias=[store]) HiveProject(channel=['catalog channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('catalog_page':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($0, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($1, $12)], joinType=[inner], algorithm=[none], cost=[not available]) @@ -54,7 +54,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) HiveTableScan(table=[[default, catalog_page]], table:alias=[catalog_page]) HiveProject(channel=['web channel':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"], id=[||('web_site':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", $0)], sales=[$1], returns=[$2], profit=[$3]) HiveAggregate(group=[{0}], agg#0=[sum($1)], agg#1=[sum($2)], agg#2=[sum($3)]) - HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0:DECIMAL(12, 2)))]) + HiveProject($f0=[$15], $f1=[$4], $f2=[CASE(IS NOT NULL($9), $9, 0.00:DECIMAL(12, 2))], $f3=[-($5, CASE(IS NOT NULL($10), $10, 0.00:DECIMAL(12, 2)))]) HiveJoin(condition=[=($1, $14)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $13)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($0, $12)], joinType=[inner], algorithm=[none], cost=[not available]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query82.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query82.q.out index 44172d451daa..a09396c80713 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query82.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query82.q.out @@ -11,7 +11,7 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100]) HiveFilter(condition=[BETWEEN(false, $3, 100, 500)]) HiveTableScan(table=[[default, inventory]], table:alias=[inventory]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5]) - HiveFilter(condition=[AND(IN($13, 129, 437, 663, 727), BETWEEN(false, $5, 30:DECIMAL(12, 2), 60:DECIMAL(12, 2)))]) + HiveFilter(condition=[AND(IN($13, 129, 437, 663, 727), BETWEEN(false, $5, 30.00:DECIMAL(12, 2), 60.00:DECIMAL(12, 2)))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0]) HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2002-05-30 00:00:00:TIMESTAMP(9), 2002-07-29 00:00:00:TIMESTAMP(9))]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query83.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query83.q.out index 8ddb4e1eca14..564564d77ea6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query83.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query83.q.out @@ -1,6 +1,6 @@ CBO PLAN: HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100]) - HiveProject(sr_items.item_id=[$0], sr_item_qty=[$3], sr_dev=[*(/(/(CAST($3):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], cr_item_qty=[$1], cr_dev=[*(/(/(CAST($1):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], wr_item_qty=[$5], wr_dev=[*(/(/($6, CAST(+(+($3, $1), $5)):DOUBLE), 3), 100)], average=[/(CAST(+(+($3, $1), $5)):DECIMAL(19, 0), 3:DECIMAL(1, 0))]) + HiveProject(sr_items.item_id=[$0], sr_item_qty=[$3], sr_dev=[*(/(/(CAST($3):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], cr_item_qty=[$1], cr_dev=[*(/(/(CAST($1):DOUBLE, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], wr_item_qty=[$5], wr_dev=[*(/(/($6, CAST(+(+($3, $1), $5)):DOUBLE), 3.0E0), 100.0E0)], average=[/(CAST(+(+($3, $1), $5)):DECIMAL(19, 0), 3:DECIMAL(1, 0))]) HiveJoin(condition=[=($0, $4)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($2, $0)], joinType=[inner], algorithm=[none], cost=[not available]) HiveProject(i_item_id=[$0], $f1=[$1]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out index 1285cc0bef33..a3c45856a9d8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query85.q.out @@ -6,7 +6,7 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveJoin(condition=[=($35, $15)], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[AND(=($0, $11), =($1, $16), OR(AND($26, $27, $7), AND($28, $29, $8), AND($30, $31, $9)), OR(AND($20, $4), AND($21, $5), AND($22, $6)))], joinType=[inner], algorithm=[none], cost=[not available]) HiveJoin(condition=[=($3, $10)], joinType=[inner], algorithm=[none], cost=[not available]) - HiveProject(ws_item_sk=[$2], ws_order_number=[$16], ws_quantity=[$17], ws_sold_date_sk=[$33], EXPR$0=[BETWEEN(false, $32, 100:DECIMAL(12, 2), 200:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $32, 150:DECIMAL(12, 2), 300:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $32, 50:DECIMAL(12, 2), 250:DECIMAL(12, 2))], EXPR$3=[BETWEEN(false, $20, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$4=[BETWEEN(false, $20, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$5=[BETWEEN(false, $20, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) + HiveProject(ws_item_sk=[$2], ws_order_number=[$16], ws_quantity=[$17], ws_sold_date_sk=[$33], EXPR$0=[BETWEEN(false, $32, 100.00:DECIMAL(12, 2), 200.00:DECIMAL(12, 2))], EXPR$1=[BETWEEN(false, $32, 150.00:DECIMAL(12, 2), 300.00:DECIMAL(12, 2))], EXPR$2=[BETWEEN(false, $32, 50.00:DECIMAL(12, 2), 250.00:DECIMAL(12, 2))], EXPR$3=[BETWEEN(false, $20, 100:DECIMAL(3, 0), 150:DECIMAL(3, 0))], EXPR$4=[BETWEEN(false, $20, 50:DECIMAL(3, 0), 100:DECIMAL(3, 0))], EXPR$5=[BETWEEN(false, $20, 150:DECIMAL(3, 0), 200:DECIMAL(3, 0))]) HiveFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($11), IS NOT NULL($32), IS NOT NULL($33))]) HiveTableScan(table=[[default, web_sales]], table:alias=[web_sales]) HiveProject(d_date_sk=[$0]) @@ -22,11 +22,11 @@ HiveProject(_c0=[$0], _c1=[$1], _c2=[$2], _c3=[$3]) HiveProject(ca_address_sk=[$0], EXPR$0=[IN($8, 'GA', 'KY', 'NM')], EXPR$1=[IN($8, 'IN', 'MT', 'OR')], EXPR$2=[IN($8, 'MO', 'WI', 'WV')]) HiveFilter(condition=[AND(IN($8, 'GA', 'IN', 'KY', 'MO', 'MT', 'NM', 'OR', 'WI', 'WV'), =($10, 'United States'))]) HiveTableScan(table=[[default, customer_address]], table:alias=[customer_address]) - HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree')]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3], EXPR$0=[=($2, 'M')], EXPR$1=[=($3, '4 yr Degree ')], EXPR$2=[=($2, 'D')], EXPR$3=[=($3, 'Primary ')], EXPR$4=[=($2, 'U')], EXPR$5=[=($3, 'Advanced Degree ')]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd1]) HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2], cd_education_status=[$3]) - HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree', 'Advanced Degree', 'Primary'))]) + HiveFilter(condition=[AND(IN($2, 'D', 'M', 'U'), IN($3, '4 yr Degree ', 'Advanced Degree ', 'Primary '))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[cd2]) HiveProject(r_reason_sk=[$0], r_reason_desc=[$2]) HiveTableScan(table=[[default, reason]], table:alias=[reason]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out index 2762a85dfa4a..b03cc014389b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query89.q.out @@ -13,7 +13,7 @@ HiveProject(tmp1.i_category=[$0], tmp1.i_class=[$1], tmp1.i_brand=[$2], tmp1.s_s HiveFilter(condition=[AND(IS NOT NULL($6), IS NOT NULL($22))]) 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, 'birdal', 'musical', 'pants', 'parenting', 'wallpaper', 'womens'), IN($12, 'Books', 'Electronics', 'Home', 'Jewelry', 'Men', 'Shoes'), OR(AND(IN($12, 'Books', 'Electronics', 'Home'), IN($10, 'musical', 'parenting', 'wallpaper')), AND(IN($12, 'Jewelry', 'Men', 'Shoes'), IN($10, 'birdal', 'pants', 'womens'))))]) + HiveFilter(condition=[AND(IN($10, 'birdal ', 'musical ', 'pants ', 'parenting ', 'wallpaper ', 'womens '), IN($12, 'Books ', 'Electronics ', 'Home ', 'Jewelry ', 'Men ', 'Shoes '), OR(AND(IN($12, 'Books ', 'Electronics ', 'Home '), IN($10, 'musical ', 'parenting ', 'wallpaper ')), AND(IN($12, 'Jewelry ', 'Men ', 'Shoes '), IN($10, 'birdal ', 'pants ', 'womens '))))]) HiveTableScan(table=[[default, item]], table:alias=[item]) HiveProject(d_date_sk=[$0], d_moy=[$8]) HiveFilter(condition=[=($6, 2000)]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out index e50094e4420a..542cc0595cfd 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query91.q.out @@ -23,7 +23,7 @@ HiveProject(call_center=[$0], call_center_name=[$1], manager=[$2], returns_loss= 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($2, 'M', 'W'), IN($3, 'Advanced Degree', 'Unknown'), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) + HiveFilter(condition=[AND(IN($2, 'M', 'W'), IN($3, 'Advanced Degree ', 'Unknown '), IN(ROW($2, $3), ROW('M', 'Unknown '), ROW('W', 'Advanced Degree ')))]) HiveTableScan(table=[[default, customer_demographics]], table:alias=[customer_demographics]) HiveProject(hd_demo_sk=[$0]) HiveFilter(condition=[LIKE($2, '0-500%':VARCHAR(2147483647) CHARACTER SET "UTF-16LE")]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out index bd41a4b82589..bd654be79656 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/cbo_query98.q.out @@ -12,6 +12,6 @@ HiveProject(i_item_desc=[$0], i_category=[$1], i_class=[$2], i_current_price=[$3 HiveFilter(condition=[BETWEEN(false, CAST($2):TIMESTAMP(9), 2001-01-12 00:00:00:TIMESTAMP(9), 2001-02-11 00:00:00:TIMESTAMP(9))]) HiveTableScan(table=[[default, date_dim]], table:alias=[date_dim]) HiveProject(i_item_sk=[$0], i_item_id=[$1], i_item_desc=[$4], i_current_price=[$5], i_class=[$10], i_category=[$12]) - HiveFilter(condition=[IN($12, 'Books', 'Jewelry', 'Sports')]) + HiveFilter(condition=[IN($12, 'Books ', 'Jewelry ', 'Sports ')]) HiveTableScan(table=[[default, item]], table:alias=[item]) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query15.q.out index 771fbbaf8173..4619c17a33cb 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query15.q.out @@ -42,7 +42,7 @@ STAGE PLANS: alias: customer_address Statistics: Num rows: 40000000 Data size: 7320000000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: ca_address_sk (type: bigint), ca_zip (type: char(10)), (ca_state) IN ('CA', 'GA', 'WA') (type: boolean), (substr(ca_zip, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792') (type: boolean) + expressions: ca_address_sk (type: bigint), ca_zip (type: char(10)), (substr(ca_zip, 1, 5)) IN ('80348', '81792', '83405', '85392', '85460', '85669', '86197', '86475', '88274') (type: boolean), (ca_state) IN ('CA', 'GA', 'WA') (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 40000000 Data size: 4200000000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator @@ -159,7 +159,7 @@ STAGE PLANS: Statistics: Num rows: 2146106610 Data size: 445233418138 Basic stats: COMPLETE Column stats: COMPLETE DynamicPartitionHashJoin: true Filter Operator - predicate: (_col4 or _col9 or _col5) (type: boolean) + predicate: (_col4 or _col5 or _col9) (type: boolean) Statistics: Num rows: 2146106610 Data size: 445233418138 Basic stats: COMPLETE Column stats: COMPLETE Top N Key Operator sort order: + diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query45.q.out index 90e29e7317d7..659fae55e736 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query45.q.out @@ -249,7 +249,7 @@ STAGE PLANS: outputColumnNames: _col2, _col7, _col8, _col15 Statistics: Num rows: 1087859571 Data size: 329317176033 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col15 is not null or (substr(_col8, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792')) (type: boolean) + predicate: (_col15 is not null or (substr(_col8, 1, 5)) IN ('80348', '81792', '83405', '85392', '85460', '85669', '86197', '86475', '88274')) (type: boolean) Statistics: Num rows: 1087859571 Data size: 329317176033 Basic stats: COMPLETE Column stats: COMPLETE Top N Key Operator sort order: ++ diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query6.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query6.q.out index 3aaa8ab05d5d..a7c62f23caae 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query6.q.out @@ -274,7 +274,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 11 Data size: 2310 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: CAST( CAST( (_col1 / _col2) AS decimal(11,6)) AS decimal(16,6)) is not null (type: boolean) + predicate: CAST( (_col1 / _col2) AS decimal(11,6)) is not null (type: boolean) Statistics: Num rows: 11 Data size: 2310 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: char(50)), (1.2 * CAST( CAST( (_col1 / _col2) AS decimal(11,6)) AS decimal(16,6))) (type: decimal(14,7)) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query67.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query67.q.out index 4d0da1c88eb5..96320298c78d 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/tez/query67.q.out @@ -25,7 +25,7 @@ STAGE PLANS: predicate: ss_store_sk is not null (type: boolean) Statistics: Num rows: 80569240632 Data size: 11044454229024 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: ss_item_sk (type: bigint), ss_store_sk (type: bigint), ss_sold_date_sk (type: bigint), if((ss_sales_price is not null and CAST( ss_quantity AS decimal(10,0)) is not null), (ss_sales_price * CAST( ss_quantity AS decimal(10,0))), 0) (type: decimal(18,2)) + expressions: ss_item_sk (type: bigint), ss_store_sk (type: bigint), ss_sold_date_sk (type: bigint), if((ss_sales_price is not null and ss_quantity is not null), (ss_sales_price * CAST( ss_quantity AS decimal(10,0))), 0) (type: decimal(18,2)) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 80569240632 Data size: 10942249135488 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator diff --git a/ql/src/test/results/clientpositive/skewjoinopt18.q.out b/ql/src/test/results/clientpositive/skewjoinopt18.q.out index 22e98c4e86df..d44d8e2acf04 100644 --- a/ql/src/test/results/clientpositive/skewjoinopt18.q.out +++ b/ql/src/test/results/clientpositive/skewjoinopt18.q.out @@ -72,10 +72,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 6 Data size: 540 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), val (type: string), UDFToDouble(key) (type: double) From 0b2ddc37adc5fff69fb9cdfb339434c2dcc4c234 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Tue, 9 Jun 2026 15:48:35 +0100 Subject: [PATCH 19/41] Temp: trying to force druid-handler rebuild on Jenkins... --- .../java/org/apache/hadoop/hive/druid/DruidStorageHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index c7bc6484c37d..18076f51192d 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -134,6 +134,7 @@ /** * DruidStorageHandler provides a HiveStorageHandler implementation for Druid. + * @version 4.3.0-ASM-CACHE-EVICT-V4 TODO cleanup */ @SuppressWarnings({ "rawtypes" }) public class DruidStorageHandler extends DefaultHiveMetaHook implements HiveStorageHandler { From f708353a3a026f61e99ef9f90fb2ceae79804ff3 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Tue, 9 Jun 2026 16:16:38 +0100 Subject: [PATCH 20/41] Adjust test plans on array construction due to: [CALCITE-6417] Map value constructor and Array value constructor unparsed incorrectly for HiveSqlDialect (1.38) --- .../test/results/clientpositive/llap/autoColumnStats_5a.q.out | 4 ++-- .../results/clientpositive/llap/murmur_hash_migration2.q.out | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out index 9c94c3e61797..1c19909492f1 100644 --- a/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out +++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out @@ -18,7 +18,7 @@ POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@partitioned1@part=1 Explain OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1, 'original')])) +FROM TABLE(INLINE(ARRAY ((1, 'original')))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 @@ -279,7 +279,7 @@ POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@partitioned1@part=1 Explain OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(2, 'original'), (3, 'original'), (4, 'original')])) +FROM TABLE(INLINE(ARRAY ((2, 'original'), (3, 'original'), (4, 'original')))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 diff --git a/ql/src/test/results/clientpositive/llap/murmur_hash_migration2.q.out b/ql/src/test/results/clientpositive/llap/murmur_hash_migration2.q.out index e7ab8dabb9c6..12ca205166d6 100644 --- a/ql/src/test/results/clientpositive/llap/murmur_hash_migration2.q.out +++ b/ql/src/test/results/clientpositive/llap/murmur_hash_migration2.q.out @@ -19,7 +19,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@acid_ptn_bucket1 OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1, 2, 'today'), (1, 3, 'today'), (1, 4, 'yesterday'), (2, 2, 'yesterday'), (2, 3, 'today'), (2, 4, 'today')])) +FROM TABLE(INLINE(ARRAY ((1, 2, 'today'), (1, 3, 'today'), (1, 4, 'yesterday'), (2, 2, 'yesterday'), (2, 3, 'today'), (2, 4, 'today')))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 From 2655b36b504cacb26d93cbfac91da8c7b1918eaf Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Tue, 9 Jun 2026 16:18:48 +0100 Subject: [PATCH 21/41] Adjust test plans: add missing padding on fixed-length char literals, due to [CALCITE-4590] Incorrect query result with fixed-length string (1.39) Adjust tests (condition predicates in different order) Adjust test plans due to change in representation of floating point values in RexLiteral: [CALCITE-2067] RexLiteral cannot represent accurately floating point values, including NaN, Infinity (1.38) Adjust test plans simplifications around IS_NOT_NULL: [CALCITE-5639] RexSimplify should remove IS NOT NULL check when LIKE comparison is present (1.35) (actually more generic than just LIKE) [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) (actually more generic than just CAST) Adjust test plans: add missing padding on fixed-length char literals, due to [CALCITE-4590] Incorrect query result with fixed-length string (1.39) Adjust test files: MINUS type added to Json due to [CALCITE-5607] Serialize return type during RelJson.toJson(RexNode node) for SqlKind.MINUS (1.37) --- .../TestHivePointLookupOptimizerRule.java | 2 +- .../llap/external_jdbc_table_perf.q.out | 18 +- ...zed_view_rewrite_ssb_grouping_sets_2.q.out | 6 +- .../llap/nested_column_pruning.q.out | 4 +- .../llap/orc_nested_column_pruning.q.out | 4 +- .../llap/vector_identity_reuse.q.out | 16 +- .../clientpositive/llap/vector_if_expr.q.out | 15 +- .../vector_orc_nested_column_pruning.q.out | 8 +- .../llap/vectorization_short_regress.q.out | 6 +- .../perf/tpcds30tb/json/query11.q.out | 32 ++- .../perf/tpcds30tb/json/query12.q.out | 12 +- .../perf/tpcds30tb/json/query13.q.out | 24 +- .../perf/tpcds30tb/json/query15.q.out | 100 ++++---- .../perf/tpcds30tb/json/query17.q.out | 72 +++++- .../perf/tpcds30tb/json/query2.q.out | 6 +- .../perf/tpcds30tb/json/query20.q.out | 12 +- .../perf/tpcds30tb/json/query34.q.out | 8 +- .../perf/tpcds30tb/json/query39.q.out | 48 +++- .../perf/tpcds30tb/json/query4.q.out | 96 +++++++- .../perf/tpcds30tb/json/query40.q.out | 16 +- .../perf/tpcds30tb/json/query41.q.out | 224 +++++++++--------- .../perf/tpcds30tb/json/query45.q.out | 18 +- .../perf/tpcds30tb/json/query47.q.out | 22 +- .../perf/tpcds30tb/json/query5.q.out | 24 +- .../perf/tpcds30tb/json/query50.q.out | 48 +++- .../perf/tpcds30tb/json/query53.q.out | 218 ++++++++--------- .../perf/tpcds30tb/json/query56.q.out | 36 +-- .../perf/tpcds30tb/json/query57.q.out | 22 +- .../perf/tpcds30tb/json/query59.q.out | 6 +- .../perf/tpcds30tb/json/query6.q.out | 61 ++--- .../perf/tpcds30tb/json/query62.q.out | 48 +++- .../perf/tpcds30tb/json/query63.q.out | 218 ++++++++--------- .../perf/tpcds30tb/json/query64.q.out | 48 ++-- .../perf/tpcds30tb/json/query66.q.out | 16 +- .../perf/tpcds30tb/json/query67.q.out | 19 +- .../perf/tpcds30tb/json/query71.q.out | 8 +- .../perf/tpcds30tb/json/query73.q.out | 8 +- .../perf/tpcds30tb/json/query75.q.out | 98 ++++++-- .../perf/tpcds30tb/json/query77.q.out | 24 +- .../perf/tpcds30tb/json/query80.q.out | 24 +- .../perf/tpcds30tb/json/query85.q.out | 36 +-- .../perf/tpcds30tb/json/query89.q.out | 112 +++++---- .../perf/tpcds30tb/json/query91.q.out | 8 +- .../perf/tpcds30tb/json/query93.q.out | 6 +- .../perf/tpcds30tb/json/query98.q.out | 12 +- .../perf/tpcds30tb/json/query99.q.out | 48 +++- 46 files changed, 1181 insertions(+), 736 deletions(-) diff --git a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java index afb089edb356..b96f4a9a2ee7 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java @@ -519,7 +519,7 @@ public void testSameDecimalLiteralDifferentPrecision() { HiveFilter filter = (HiveFilter) optimizedRelNode; RexNode condition = filter.getCondition(); System.out.println(condition); - assertEquals("IN($1, 10000:DECIMAL(19, 5), 11000:DECIMAL(19, 5))", condition.toString()); + assertEquals("IN($1, 10000.00000:DECIMAL(19, 5), 11000.00000:DECIMAL(19, 5))", condition.toString()); } @Test 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 a06b1eb40f82..639cb0cc6e31 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 @@ -1482,7 +1482,7 @@ STAGE PLANS: properties: hive.sql.query SELECT "t29"."w_warehouse_sk", "t29"."i_item_sk", CAST(1 AS INTEGER) AS "d_moy", "t29"."mean", "t29"."cov", "t29"."w_warehouse_sk0" AS "w_warehouse_sk1", "t29"."i_item_sk0" AS "i_item_sk1", CAST(2 AS INTEGER) AS "d_moy1", "t29"."mean0" AS "mean1", "t29"."cov0" AS "cov1" FROM (SELECT "t13"."w_warehouse_sk", "t13"."i_item_sk", "t13"."mean", "t13"."cov", "t28"."w_warehouse_sk" AS "w_warehouse_sk0", "t28"."i_item_sk" AS "i_item_sk0", "t28"."mean" AS "mean0", "t28"."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 "w_warehouse_sk", "i_item_sk", CAST("$f3" AS DOUBLE) / "$f4" AS "mean", CASE WHEN CAST("$f3" AS DOUBLE) / "$f4" = 0E0 THEN NULL ELSE CAST("$f3" AS DOUBLE) / (CAST("$f3" AS DOUBLE) / "$f4") END AS "cov" FROM (SELECT "t9"."w_warehouse_name", "t9"."w_warehouse_sk", "t3"."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" @@ -1500,8 +1500,8 @@ FROM (SELECT "w_warehouse_sk", "w_warehouse_name" FROM "WAREHOUSE") AS "t7" WHERE "w_warehouse_sk" IS NOT NULL) AS "t9" ON "t0"."inv_warehouse_sk" = "t9"."w_warehouse_sk" GROUP BY "t3"."i_item_sk", "t9"."w_warehouse_sk", "t9"."w_warehouse_name") AS "t11" -WHERE CASE WHEN CAST("t11"."$f3" AS DOUBLE) / "t11"."$f4" = 0 THEN FALSE ELSE CAST("t11"."$f3" AS DOUBLE) / (CAST("t11"."$f3" AS DOUBLE) / "t11"."$f4") > 1 END) AS "t13" -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" +WHERE CASE WHEN CAST("t11"."$f3" AS DOUBLE) / "t11"."$f4" = 0E0 THEN FALSE ELSE CAST("t11"."$f3" AS DOUBLE) / (CAST("t11"."$f3" AS DOUBLE) / "t11"."$f4") > 1.0E0 END) AS "t13" +INNER JOIN (SELECT "w_warehouse_sk", "i_item_sk", CAST("$f3" AS DOUBLE) / "$f4" AS "mean", CASE WHEN CAST("$f3" AS DOUBLE) / "$f4" = 0E0 THEN NULL ELSE CAST("$f3" AS DOUBLE) / (CAST("$f3" AS DOUBLE) / "$f4") END AS "cov" FROM (SELECT "t24"."w_warehouse_name", "t24"."w_warehouse_sk", "t18"."i_item_sk", SUM("t15"."inv_quantity_on_hand") AS "$f3", COUNT("t15"."inv_quantity_on_hand") AS "$f4" FROM (SELECT "inv_date_sk", "inv_item_sk", "inv_warehouse_sk", "inv_quantity_on_hand" FROM "INVENTORY" @@ -1519,7 +1519,7 @@ FROM (SELECT "w_warehouse_sk", "w_warehouse_name" FROM "WAREHOUSE") AS "t22" WHERE "w_warehouse_sk" IS NOT NULL) AS "t24" ON "t15"."inv_warehouse_sk" = "t24"."w_warehouse_sk" GROUP BY "t18"."i_item_sk", "t24"."w_warehouse_sk", "t24"."w_warehouse_name") AS "t26" -WHERE CASE WHEN CAST("t26"."$f3" AS DOUBLE) / "t26"."$f4" = 0 THEN FALSE ELSE CAST("t26"."$f3" AS DOUBLE) / (CAST("t26"."$f3" AS DOUBLE) / "t26"."$f4") > 1 END) AS "t28" ON "t13"."i_item_sk" = "t28"."i_item_sk" AND "t13"."w_warehouse_sk" = "t28"."w_warehouse_sk" +WHERE CASE WHEN CAST("t26"."$f3" AS DOUBLE) / "t26"."$f4" = 0E0 THEN FALSE ELSE CAST("t26"."$f3" AS DOUBLE) / (CAST("t26"."$f3" AS DOUBLE) / "t26"."$f4") > 1.0E0 END) AS "t28" ON "t13"."i_item_sk" = "t28"."i_item_sk" AND "t13"."w_warehouse_sk" = "t28"."w_warehouse_sk" ORDER BY "t13"."w_warehouse_sk", "t13"."i_item_sk", "t13"."mean", "t13"."cov", "t28"."mean", "t28"."cov") AS "t29" hive.sql.query.fieldNames w_warehouse_sk,i_item_sk,d_moy,mean,cov,w_warehouse_sk1,i_item_sk1,d_moy1,mean1,cov1 hive.sql.query.fieldTypes int,int,int,double,double,int,int,int,double,double @@ -3212,7 +3212,7 @@ WHERE "d_year" = 2000 AND "d_moy" = 1 AND "d_date_sk" IS NOT NULL) AS "t10" ON " hive.sql.query SELECT "i_item_id" FROM (SELECT "i_item_id", "i_color" FROM "ITEM") AS "t" -WHERE "i_color" IN ('chiffon', 'lace', 'orchid') AND "i_item_id" IS NOT NULL +WHERE "i_color" IN ('chiffon ', 'lace ', 'orchid ') 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 @@ -6066,16 +6066,16 @@ INNER JOIN (SELECT "ca_address_sk", "ca_state" IN ('IN', 'NJ', 'OH') AS "EXPR$0" FROM (SELECT "ca_address_sk", "ca_state", "ca_country" FROM "CUSTOMER_ADDRESS") AS "t5" WHERE "ca_state" IN ('AR', 'CT', 'IA', 'IN', 'KY', 'LA', 'NJ', 'OH', 'WI') AND "ca_country" = 'United States' AND "ca_address_sk" IS NOT NULL) AS "t7" ON "t1"."wr_refunded_addr_sk" = "t7"."ca_address_sk" -INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status", "cd_marital_status" = 'M' AS "EXPR$0", "cd_education_status" = 'Advanced Degree' AS "EXPR$1", "cd_marital_status" = 'S' AS "EXPR$2", "cd_education_status" = 'College' AS "EXPR$3", "cd_marital_status" = 'W' AS "EXPR$4", "cd_education_status" = '2 yr Degree' AS "EXPR$5" +INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status", "cd_marital_status" = 'M' AS "EXPR$0", "cd_education_status" = 'Advanced Degree ' AS "EXPR$1", "cd_marital_status" = 'S' AS "EXPR$2", "cd_education_status" = 'College ' AS "EXPR$3", "cd_marital_status" = 'W' AS "EXPR$4", "cd_education_status" = '2 yr Degree ' AS "EXPR$5" FROM (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status" FROM "CUSTOMER_DEMOGRAPHICS") AS "t8" -WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('2 yr Degree', 'Advanced Degree', 'College') AND "cd_demo_sk" IS NOT NULL) AS "t10" ON "t1"."wr_refunded_cdemo_sk" = "t10"."cd_demo_sk" +WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('2 yr Degree ', 'Advanced Degree ', 'College ') AND "cd_demo_sk" IS NOT NULL) AS "t10" ON "t1"."wr_refunded_cdemo_sk" = "t10"."cd_demo_sk" INNER JOIN (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status" FROM (SELECT "cd_demo_sk", "cd_marital_status", "cd_education_status" FROM "CUSTOMER_DEMOGRAPHICS") AS "t11" -WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('2 yr Degree', 'Advanced Degree', 'College') AND "cd_demo_sk" IS NOT NULL) AS "t13" ON "t1"."wr_returning_cdemo_sk" = "t13"."cd_demo_sk" AND "t10"."cd_marital_status" = "t13"."cd_marital_status" AND "t10"."cd_education_status" = "t13"."cd_education_status" +WHERE "cd_marital_status" IN ('M', 'S', 'W') AND "cd_education_status" IN ('2 yr Degree ', 'Advanced Degree ', 'College ') AND "cd_demo_sk" IS NOT NULL) AS "t13" ON "t1"."wr_returning_cdemo_sk" = "t13"."cd_demo_sk" AND "t10"."cd_marital_status" = "t13"."cd_marital_status" AND "t10"."cd_education_status" = "t13"."cd_education_status" INNER JOIN (SELECT "t16"."ws_sold_date_sk", "t16"."ws_item_sk", "t16"."ws_order_number", "t16"."ws_quantity", "t16"."EXPR$0", "t16"."EXPR$1", "t16"."EXPR$2", "t16"."EXPR$3", "t16"."EXPR$4", "t16"."EXPR$5", "t19"."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 "EXPR$0", "ws_net_profit" BETWEEN 150 AND 300 AS "EXPR$1", "ws_net_profit" BETWEEN 50 AND 250 AS "EXPR$2", "ws_sales_price" BETWEEN 100 AND 150 AS "EXPR$3", "ws_sales_price" BETWEEN 50 AND 100 AS "EXPR$4", "ws_sales_price" BETWEEN 150 AND 200 AS "EXPR$5" +FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_order_number", "ws_quantity", "ws_net_profit" BETWEEN 100.00 AND 200.00 AS "EXPR$0", "ws_net_profit" BETWEEN 150.00 AND 300.00 AS "EXPR$1", "ws_net_profit" BETWEEN 50.00 AND 250.00 AS "EXPR$2", "ws_sales_price" BETWEEN 100 AND 150 AS "EXPR$3", "ws_sales_price" BETWEEN 50 AND 100 AS "EXPR$4", "ws_sales_price" BETWEEN 150 AND 200 AS "EXPR$5" FROM (SELECT "ws_sold_date_sk", "ws_item_sk", "ws_order_number", "ws_quantity", "ws_sales_price", "ws_net_profit" FROM "WEB_SALES") AS "t14" WHERE "ws_item_sk" IS NOT NULL AND "ws_order_number" IS NOT NULL AND "ws_sold_date_sk" IS NOT NULL AND "ws_sales_price" IS NOT NULL AND "ws_net_profit" IS NOT NULL) AS "t16" diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out index 220e6c63f519..6ab26d57c652 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_grouping_sets_2.q.out @@ -668,7 +668,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$1], p_brand1=[$0]) HiveAggregate(group=[{0, 7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($1, 'MFGR#12'), =($4, 'AMERICA'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =('AMERICA', $4), =('MFGR#12', $1))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: explain cbo @@ -719,7 +719,7 @@ CBO PLAN: HiveSortLimit(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC]) HiveProject(lo_revenue=[$2], d_year=[$1], p_brand1=[$0]) HiveAggregate(group=[{0, 7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), BETWEEN(false, $0, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"), =($4, 'ASIA'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($4, 'ASIA'), BETWEEN(false, $0, 'MFGR#2221':VARCHAR(2147483647) CHARACTER SET "UTF-16LE", 'MFGR#2228':VARCHAR(2147483647) CHARACTER SET "UTF-16LE"))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: explain cbo @@ -771,7 +771,7 @@ HiveProject(lo_revenue=[$0], d_year=[$1], p_brand1=[CAST('MFGR#2239':VARCHAR(214 HiveSortLimit(sort0=[$1], dir0=[ASC]) HiveProject(lo_revenue=[$1], d_year=[$0]) HiveAggregate(group=[{7}], agg#0=[sum($9)]) - HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =($0, 'MFGR#2239'), =($4, 'EUROPE'))]) + HiveFilter(condition=[AND(=(CAST($8):BIGINT NOT NULL, 0), =('EUROPE', $4), =('MFGR#2239', $0))]) HiveTableScan(table=[[default, ssb_mv_n4]], table:alias=[default.ssb_mv_n4]) PREHOOK: query: DROP MATERIALIZED VIEW `ssb_mv_n4` diff --git a/ql/src/test/results/clientpositive/llap/nested_column_pruning.q.out b/ql/src/test/results/clientpositive/llap/nested_column_pruning.q.out index 8bea70caf714..e6c25965917a 100644 --- a/ql/src/test/results/clientpositive/llap/nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/nested_column_pruning.q.out @@ -1113,10 +1113,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + filterExpr: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + predicate: ((not s2.f8.f9) and s1.f6 is not null) (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>>) diff --git a/ql/src/test/results/clientpositive/llap/orc_nested_column_pruning.q.out b/ql/src/test/results/clientpositive/llap/orc_nested_column_pruning.q.out index cf072186c1ab..9c3818ff2482 100644 --- a/ql/src/test/results/clientpositive/llap/orc_nested_column_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_nested_column_pruning.q.out @@ -1113,10 +1113,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + filterExpr: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + predicate: ((not s2.f8.f9) and s1.f6 is not null) (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>>) diff --git a/ql/src/test/results/clientpositive/llap/vector_identity_reuse.q.out b/ql/src/test/results/clientpositive/llap/vector_identity_reuse.q.out index 273a92b28dec..d59b68d1e27c 100644 --- a/ql/src/test/results/clientpositive/llap/vector_identity_reuse.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_identity_reuse.q.out @@ -285,7 +285,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a2 - filterExpr: UDFToLong(if(int_col_5 is not null, int_col_5, UDFToInteger(smallint_col_22))) is not null (type: boolean) + filterExpr: (smallint_col_22 is not null or int_col_5 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -294,8 +294,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: SelectColumnIsNotNull(col 5:bigint)(children: IfExprColumnCondExpr(col 4:boolean, col 1:intcol 0:smallint)(children: IsNotNull(col 1:int) -> 4:boolean, col 1:int, col 0:smallint) -> 5:int) - predicate: UDFToLong(if(int_col_5 is not null, int_col_5, UDFToInteger(smallint_col_22))) is not null (type: boolean) + predicateExpression: FilterExprOrExpr(children: SelectColumnIsNotNull(col 0:smallint), SelectColumnIsNotNull(col 1:int)) + predicate: (smallint_col_22 is not null or int_col_5 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: int_col_5 (type: int), smallint_col_22 (type: smallint), if(int_col_5 is not null, int_col_5, UDFToInteger(smallint_col_22)) (type: int) @@ -303,8 +303,8 @@ STAGE PLANS: Select Vectorization: className: VectorSelectOperator native: true - projectedOutputColumnNums: [1, 0, 7] - selectExpressions: IfExprColumnCondExpr(col 6:boolean, col 1:intcol 0:smallint)(children: IsNotNull(col 1:int) -> 6:boolean, col 1:int, col 0:smallint) -> 7:int + projectedOutputColumnNums: [1, 0, 5] + selectExpressions: IfExprColumnCondExpr(col 4:boolean, col 1:intcol 0:smallint)(children: IsNotNull(col 1:int) -> 4:boolean, col 1:int, col 0:smallint) -> 5:int Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: UDFToLong(_col2) (type: bigint) @@ -313,10 +313,10 @@ STAGE PLANS: Map-reduce partition columns: UDFToLong(_col2) (type: bigint) Reduce Sink Vectorization: className: VectorReduceSinkLongOperator - keyColumns: 7:bigint + keyColumns: 5:bigint native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - valueColumns: 1:int, 0:smallint, 7:int + valueColumns: 1:int, 0:smallint, 5:int Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: smallint), _col2 (type: int) Execution mode: vectorized, llap @@ -335,7 +335,7 @@ STAGE PLANS: includeColumns: [0, 1] dataColumns: smallint_col_22:smallint, int_col_5:int partitionColumnCount: 0 - scratchColumnTypeNames: [bigint, bigint, bigint, bigint] + scratchColumnTypeNames: [bigint, bigint] Map 4 Map Operator Tree: TableScan diff --git a/ql/src/test/results/clientpositive/llap/vector_if_expr.q.out b/ql/src/test/results/clientpositive/llap/vector_if_expr.q.out index 724ed8f4bfc8..227e81b3293f 100644 --- a/ql/src/test/results/clientpositive/llap/vector_if_expr.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_if_expr.q.out @@ -28,7 +28,6 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - filterExpr: (cboolean1 and cboolean1 is not null) (type: boolean) Statistics: Num rows: 12288 Data size: 36700 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -36,9 +35,9 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsTrue(col 10:boolean), SelectColumnIsNotNull(col 10:boolean)) - predicate: (cboolean1 and cboolean1 is not null) (type: boolean) - Statistics: Num rows: 4587 Data size: 13704 Basic stats: COMPLETE Column stats: COMPLETE + predicateExpression: SelectColumnIsTrue(col 10:boolean) + predicate: cboolean1 (type: boolean) + Statistics: Num rows: 6138 Data size: 18336 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: cboolean1 (type: boolean), if(cboolean1, 'first', 'second') (type: string) outputColumnNames: _col0, _col1 @@ -47,7 +46,7 @@ STAGE PLANS: native: true projectedOutputColumnNums: [10, 14] selectExpressions: IfExprStringScalarStringScalar(col 10:boolean, val first, val second) -> 14:string - Statistics: Num rows: 4587 Data size: 426534 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6138 Data size: 570756 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: boolean) null sort order: z @@ -56,7 +55,7 @@ STAGE PLANS: className: VectorReduceSinkObjectHashOperator native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - Statistics: Num rows: 4587 Data size: 426534 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6138 Data size: 570756 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: string) Execution mode: vectorized, llap LLAP IO: all inputs @@ -85,13 +84,13 @@ STAGE PLANS: className: VectorSelectOperator native: true projectedOutputColumnNums: [0, 1] - Statistics: Num rows: 4587 Data size: 426534 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6138 Data size: 570756 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false File Sink Vectorization: className: VectorFileSinkOperator native: false - Statistics: Num rows: 4587 Data size: 426534 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 6138 Data size: 570756 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/vector_orc_nested_column_pruning.q.out b/ql/src/test/results/clientpositive/llap/vector_orc_nested_column_pruning.q.out index 651d95b2cdc3..afd819be44c8 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 @@ -1505,7 +1505,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2 - filterExpr: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + filterExpr: ((not s2.f8.f9) and s1.f6 is not null) (type: boolean) Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE TableScan Vectorization: native: true @@ -1513,8 +1513,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 9:int)(children: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 9:int), SelectColumnIsFalse(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)) - predicate: (s1.f6 is not null and (not s2.f8.f9)) (type: boolean) + predicateExpression: FilterExprAndExpr(children: 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), SelectColumnIsNotNull(col 11:int)(children: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 11:int)) + predicate: ((not s2.f8.f9) and s1.f6 is not null) (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>>) @@ -1531,7 +1531,7 @@ STAGE PLANS: Map-reduce partition columns: _col0.f6 (type: int) Reduce Sink Vectorization: className: VectorReduceSinkLongOperator - keyExpressions: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 9:int + keyExpressions: VectorUDFStructField(col 1:struct,f6:int>, col 3:int) -> 10:int native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true Statistics: Num rows: 1 Data size: 1468 Basic stats: COMPLETE Column stats: NONE 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 418538ff44de..e2771eea5711 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 @@ -875,7 +875,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc - 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) + 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: 1889990 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -883,8 +883,8 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprOrExpr(children: 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), FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 15: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) + predicateExpression: FilterExprOrExpr(children: 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)), FilterExprAndExpr(children: FilterTimestampColLessEqualTimestampColumn(col 9:timestamp, col 8:timestamp), FilterDoubleColNotEqualDoubleColumn(col 15:double, col 5:double)(children: CastLongToDouble(col 3:bigint) -> 15: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: 2824 Data size: 434454 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ctinyint (type: tinyint), cbigint (type: bigint), cfloat (type: float), UDFToDouble(cint) (type: double), (UDFToDouble(cint) * UDFToDouble(cint)) (type: double), UDFToDouble(cbigint) (type: double), (UDFToDouble(cbigint) * UDFToDouble(cbigint)) (type: double) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query11.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query11.q.out index bd93eade32d8..03b358109c5f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query11.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query11.q.out @@ -438,7 +438,13 @@ "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 6.6833812750590004E10 @@ -1349,7 +1355,13 @@ "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 6.6833812750590004E10 @@ -2428,7 +2440,13 @@ "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.7491657141260002E10 @@ -2754,7 +2772,13 @@ "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.7491657141260002E10 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query12.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query12.q.out index 0c0651b9de01..fa019787fd82 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query12.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query12.q.out @@ -1262,27 +1262,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Jewelry", + "literal": "Jewelry ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "Sports", + "literal": "Sports ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query13.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query13.q.out index 6d1952d92d18..96fdc04b5395 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query13.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query13.q.out @@ -2114,27 +2114,27 @@ "name": "$3" }, { - "literal": "4 yr Degree", + "literal": "4 yr Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 20 } }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } }, { - "literal": "Primary", + "literal": "Primary ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] @@ -2193,11 +2193,11 @@ "name": "$3" }, { - "literal": "4 yr Degree", + "literal": "4 yr Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 20 } } ] @@ -2235,11 +2235,11 @@ "name": "$3" }, { - "literal": "Primary", + "literal": "Primary ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] @@ -2277,11 +2277,11 @@ "name": "$3" }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query15.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query15.q.out index dc20a8819e17..a098ab16c126 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query15.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query15.q.out @@ -492,43 +492,6 @@ "input": 9, "name": "$9" }, - { - "op": { - "name": "IN", - "kind": "OTHER_FUNCTION", - "syntax": "SPECIAL" - }, - "operands": [ - { - "input": 8, - "name": "$8" - }, - { - "literal": "CA", - "type": { - "type": "CHAR", - "nullable": false, - "precision": 2 - } - }, - { - "literal": "GA", - "type": { - "type": "CHAR", - "nullable": false, - "precision": 2 - } - }, - { - "literal": "WA", - "type": { - "type": "CHAR", - "nullable": false, - "precision": 2 - } - } - ] - }, { "op": { "name": "IN", @@ -572,7 +535,7 @@ "dynamic": false }, { - "literal": "85669", + "literal": "80348", "type": { "type": "VARCHAR", "nullable": false, @@ -580,7 +543,7 @@ } }, { - "literal": "86197", + "literal": "81792", "type": { "type": "VARCHAR", "nullable": false, @@ -588,7 +551,7 @@ } }, { - "literal": "88274", + "literal": "83405", "type": { "type": "VARCHAR", "nullable": false, @@ -596,7 +559,7 @@ } }, { - "literal": "83405", + "literal": "85392", "type": { "type": "VARCHAR", "nullable": false, @@ -604,7 +567,7 @@ } }, { - "literal": "86475", + "literal": "85460", "type": { "type": "VARCHAR", "nullable": false, @@ -612,7 +575,7 @@ } }, { - "literal": "85392", + "literal": "85669", "type": { "type": "VARCHAR", "nullable": false, @@ -620,7 +583,7 @@ } }, { - "literal": "85460", + "literal": "86197", "type": { "type": "VARCHAR", "nullable": false, @@ -628,7 +591,7 @@ } }, { - "literal": "80348", + "literal": "86475", "type": { "type": "VARCHAR", "nullable": false, @@ -636,7 +599,7 @@ } }, { - "literal": "81792", + "literal": "88274", "type": { "type": "VARCHAR", "nullable": false, @@ -644,6 +607,43 @@ } } ] + }, + { + "op": { + "name": "IN", + "kind": "OTHER_FUNCTION", + "syntax": "SPECIAL" + }, + "operands": [ + { + "input": 8, + "name": "$8" + }, + { + "literal": "CA", + "type": { + "type": "CHAR", + "nullable": false, + "precision": 2 + } + }, + { + "literal": "GA", + "type": { + "type": "CHAR", + "nullable": false, + "precision": 2 + } + }, + { + "literal": "WA", + "type": { + "type": "CHAR", + "nullable": false, + "precision": 2 + } + } + ] } ], "rowCount": 40000000 @@ -1749,13 +1749,13 @@ "input": 4, "name": "$4" }, - { - "input": 9, - "name": "$9" - }, { "input": 5, "name": "$5" + }, + { + "input": 9, + "name": "$9" } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query17.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query17.q.out index a9e25b6517a4..ae4e2b3e47d3 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query17.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query17.q.out @@ -4221,7 +4221,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -4275,7 +4279,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -4354,7 +4362,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -4408,7 +4420,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -4546,7 +4562,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -4600,7 +4620,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -4679,7 +4703,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -4733,7 +4761,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -4878,7 +4910,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -4932,7 +4968,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -5043,7 +5083,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -5097,7 +5141,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query2.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query2.q.out index d40e2be2746a..37d5098c5908 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query2.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query2.q.out @@ -3333,7 +3333,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } } ] }, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query20.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query20.q.out index 13ce90905910..8242781d5440 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query20.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query20.q.out @@ -1262,27 +1262,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Jewelry", + "literal": "Jewelry ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "Sports", + "literal": "Sports ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query34.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query34.q.out index c5099314aaa3..50206741b9e6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query34.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query34.q.out @@ -1390,19 +1390,19 @@ "name": "$2" }, { - "literal": ">10000", + "literal": ">10000 ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 15 } }, { - "literal": "unknown", + "literal": "unknown ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 15 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query39.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query39.q.out index 4933f902e512..c2e01b82861f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query39.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query39.q.out @@ -1143,7 +1143,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -1197,7 +1201,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -1429,7 +1437,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -1483,7 +1495,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -2034,7 +2050,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -2088,7 +2108,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } @@ -2320,7 +2344,11 @@ } ] } - ] + ], + "type": { + "type": "DOUBLE", + "nullable": true + } }, { "op": { @@ -2374,7 +2402,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query4.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query4.q.out index 453170c2c18b..dc86cc188db1 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query4.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query4.q.out @@ -596,13 +596,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, @@ -1873,13 +1885,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, @@ -2488,13 +2512,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, @@ -3378,13 +3414,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, @@ -3758,13 +3806,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, @@ -4309,13 +4369,25 @@ "input": 3, "name": "$3" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } }, { "input": 1, "name": "$1" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 9, + "scale": 2 + } }, { "input": 2, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query40.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query40.q.out index 4dd0c6c7eaf6..ecd7fbba3bcb 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query40.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query40.q.out @@ -2189,7 +2189,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 13, + "scale": 2 + } }, { "literal": 0, @@ -2259,7 +2265,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 13, + "scale": 2 + } }, { "literal": 0, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query41.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query41.q.out index ee37027b55f2..5af299cdbb5f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query41.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query41.q.out @@ -697,11 +697,11 @@ "name": "$12" }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -718,19 +718,19 @@ "name": "$17" }, { - "literal": "frosted", + "literal": "frosted ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "rose", + "literal": "rose ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 20 } } ] @@ -747,19 +747,19 @@ "name": "$18" }, { - "literal": "Gross", + "literal": "Gross ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 10 } }, { - "literal": "Lb", + "literal": "Lb ", "type": { "type": "CHAR", "nullable": false, - "precision": 2 + "precision": 10 } } ] @@ -776,19 +776,19 @@ "name": "$15" }, { - "literal": "large", + "literal": "large ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } }, { - "literal": "medium", + "literal": "medium ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -814,11 +814,11 @@ "name": "$12" }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -835,19 +835,19 @@ "name": "$17" }, { - "literal": "black", + "literal": "black ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } }, { - "literal": "chocolate", + "literal": "chocolate ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } } ] @@ -864,19 +864,19 @@ "name": "$18" }, { - "literal": "Box", + "literal": "Box ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 10 } }, { - "literal": "Dram", + "literal": "Dram ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 10 } } ] @@ -893,19 +893,19 @@ "name": "$15" }, { - "literal": "economy", + "literal": "economy ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "petite", + "literal": "petite ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -931,11 +931,11 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } } ] @@ -952,19 +952,19 @@ "name": "$17" }, { - "literal": "magenta", + "literal": "magenta ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "slate", + "literal": "slate ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] @@ -981,19 +981,19 @@ "name": "$18" }, { - "literal": "Bundle", + "literal": "Bundle ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 10 } }, { - "literal": "Carton", + "literal": "Carton ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 10 } } ] @@ -1010,19 +1010,19 @@ "name": "$15" }, { - "literal": "N/A", + "literal": "N/A ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 20 } }, { - "literal": "small", + "literal": "small ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] @@ -1048,11 +1048,11 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } } ] @@ -1069,19 +1069,19 @@ "name": "$17" }, { - "literal": "cornflower", + "literal": "cornflower ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 20 } }, { - "literal": "firebrick", + "literal": "firebrick ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } } ] @@ -1098,19 +1098,19 @@ "name": "$18" }, { - "literal": "Oz", + "literal": "Oz ", "type": { "type": "CHAR", "nullable": false, - "precision": 2 + "precision": 10 } }, { - "literal": "Pound", + "literal": "Pound ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 10 } } ] @@ -1127,19 +1127,19 @@ "name": "$15" }, { - "literal": "large", + "literal": "large ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } }, { - "literal": "medium", + "literal": "medium ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1165,11 +1165,11 @@ "name": "$12" }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1186,19 +1186,19 @@ "name": "$17" }, { - "literal": "almond", + "literal": "almond ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } }, { - "literal": "steel", + "literal": "steel ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] @@ -1215,19 +1215,19 @@ "name": "$18" }, { - "literal": "Case", + "literal": "Case ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 10 } }, { - "literal": "Tsp", + "literal": "Tsp ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 10 } } ] @@ -1244,19 +1244,19 @@ "name": "$15" }, { - "literal": "large", + "literal": "large ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } }, { - "literal": "medium", + "literal": "medium ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1282,11 +1282,11 @@ "name": "$12" }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1303,19 +1303,19 @@ "name": "$17" }, { - "literal": "aquamarine", + "literal": "aquamarine ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 20 } }, { - "literal": "purple", + "literal": "purple ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1332,19 +1332,19 @@ "name": "$18" }, { - "literal": "Bunch", + "literal": "Bunch ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 10 } }, { - "literal": "Gram", + "literal": "Gram ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 10 } } ] @@ -1361,19 +1361,19 @@ "name": "$15" }, { - "literal": "economy", + "literal": "economy ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "petite", + "literal": "petite ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1399,11 +1399,11 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } } ] @@ -1420,19 +1420,19 @@ "name": "$17" }, { - "literal": "lavender", + "literal": "lavender ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 20 } }, { - "literal": "papaya", + "literal": "papaya ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1449,19 +1449,19 @@ "name": "$18" }, { - "literal": "Cup", + "literal": "Cup ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 10 } }, { - "literal": "Pallet", + "literal": "Pallet ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 10 } } ] @@ -1478,19 +1478,19 @@ "name": "$15" }, { - "literal": "N/A", + "literal": "N/A ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 20 } }, { - "literal": "small", + "literal": "small ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] @@ -1516,11 +1516,11 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } } ] @@ -1537,19 +1537,19 @@ "name": "$17" }, { - "literal": "cyan", + "literal": "cyan ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 20 } }, { - "literal": "maroon", + "literal": "maroon ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -1566,19 +1566,19 @@ "name": "$18" }, { - "literal": "Each", + "literal": "Each ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 10 } }, { - "literal": "N/A", + "literal": "N/A ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 10 } } ] @@ -1595,19 +1595,19 @@ "name": "$15" }, { - "literal": "large", + "literal": "large ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } }, { - "literal": "medium", + "literal": "medium ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query45.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query45.q.out index 69f67c983ba2..5e644f40234f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query45.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query45.q.out @@ -2297,7 +2297,7 @@ "dynamic": false }, { - "literal": "85669", + "literal": "80348", "type": { "type": "VARCHAR", "nullable": false, @@ -2305,7 +2305,7 @@ } }, { - "literal": "86197", + "literal": "81792", "type": { "type": "VARCHAR", "nullable": false, @@ -2313,7 +2313,7 @@ } }, { - "literal": "88274", + "literal": "83405", "type": { "type": "VARCHAR", "nullable": false, @@ -2321,7 +2321,7 @@ } }, { - "literal": "83405", + "literal": "85392", "type": { "type": "VARCHAR", "nullable": false, @@ -2329,7 +2329,7 @@ } }, { - "literal": "86475", + "literal": "85460", "type": { "type": "VARCHAR", "nullable": false, @@ -2337,7 +2337,7 @@ } }, { - "literal": "85392", + "literal": "85669", "type": { "type": "VARCHAR", "nullable": false, @@ -2345,7 +2345,7 @@ } }, { - "literal": "85460", + "literal": "86197", "type": { "type": "VARCHAR", "nullable": false, @@ -2353,7 +2353,7 @@ } }, { - "literal": "80348", + "literal": "86475", "type": { "type": "VARCHAR", "nullable": false, @@ -2361,7 +2361,7 @@ } }, { - "literal": "81792", + "literal": "88274", "type": { "type": "VARCHAR", "nullable": false, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query47.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query47.q.out index a1d5d7542c1a..64c50f718a7f 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query47.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query47.q.out @@ -2035,7 +2035,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } } ], "rowCount": 4.787275490831158E19 @@ -3609,7 +3613,13 @@ "input": 7, "name": "$7" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ] }, @@ -3979,7 +3989,13 @@ "input": 19, "name": "$19" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ], "rowCount": 1.1862579161225682E49 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query5.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query5.q.out index 58f01d7257b5..38f6f8fde55c 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query5.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query5.q.out @@ -1926,7 +1926,13 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 5152110310471199 @@ -3500,7 +3506,13 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 72456986829068304 @@ -5791,7 +5803,13 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 2.8028234423693355E21 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query50.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query50.q.out index 65724838bad1..a622bcefbdcc 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query50.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query50.q.out @@ -1863,7 +1863,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -1939,7 +1943,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -1972,7 +1980,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -2050,7 +2062,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -2083,7 +2099,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -2161,7 +2181,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -2194,7 +2218,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, @@ -2265,7 +2293,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query53.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query53.q.out index deeb7d2d0a79..9ee9ac51d231 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query53.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query53.q.out @@ -709,71 +709,71 @@ }, "operands": [ { - "input": 10, - "name": "$10" + "input": 8, + "name": "$8" }, { - "literal": "accessories", + "literal": "amalgimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "classical", + "literal": "edu packscholar #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "fragrances", + "literal": "exportiimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 50 } }, { - "literal": "pants", + "literal": "exportiunivamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "personal", + "literal": "importoamalg #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "portable", + "literal": "scholaramalgamalg #14 ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "reference", + "literal": "scholaramalgamalg #7 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "self-help", + "literal": "scholaramalgamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } } ] @@ -786,132 +786,132 @@ }, "operands": [ { - "input": 12, - "name": "$12" + "input": 10, + "name": "$10" }, { - "literal": "Books", + "literal": "accessories ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Children", + "literal": "classical ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "fragrances ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "Men", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Music", + "literal": "personal ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Women", + "literal": "portable ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } - } - ] - }, - { - "op": { - "name": "IN", - "kind": "OTHER_FUNCTION", - "syntax": "SPECIAL" - }, - "operands": [ - { - "input": 8, - "name": "$8" }, { - "literal": "amalgimporto #1", + "literal": "reference ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "edu packscholar #1", + "literal": "self-help ", "type": { "type": "CHAR", "nullable": false, - "precision": 18 + "precision": 50 } + } + ] + }, + { + "op": { + "name": "IN", + "kind": "OTHER_FUNCTION", + "syntax": "SPECIAL" + }, + "operands": [ + { + "input": 12, + "name": "$12" }, { - "literal": "exportiimporto #1", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 17 + "precision": 50 } }, { - "literal": "exportiunivamalg #9", + "literal": "Children ", "type": { "type": "CHAR", "nullable": false, - "precision": 19 + "precision": 50 } }, { - "literal": "importoamalg #1", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "scholaramalgamalg #14", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 21 + "precision": 50 } }, { - "literal": "scholaramalgamalg #7", + "literal": "Music ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } }, { - "literal": "scholaramalgamalg #9", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } } ] @@ -942,27 +942,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Children", + "literal": "Children ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } } ] @@ -979,35 +979,35 @@ "name": "$10" }, { - "literal": "personal", + "literal": "personal ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "portable", + "literal": "portable ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "reference", + "literal": "reference ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "self-help", + "literal": "self-help ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } } ] @@ -1024,35 +1024,35 @@ "name": "$8" }, { - "literal": "exportiunivamalg #9", + "literal": "exportiunivamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 19 + "precision": 50 } }, { - "literal": "scholaramalgamalg #14", + "literal": "scholaramalgamalg #14 ", "type": { "type": "CHAR", "nullable": false, - "precision": 21 + "precision": 50 } }, { - "literal": "scholaramalgamalg #7", + "literal": "scholaramalgamalg #7 ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } }, { - "literal": "scholaramalgamalg #9", + "literal": "scholaramalgamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } } ] @@ -1078,27 +1078,27 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Music", + "literal": "Music ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1115,35 +1115,35 @@ "name": "$10" }, { - "literal": "accessories", + "literal": "accessories ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "classical", + "literal": "classical ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "fragrances", + "literal": "fragrances ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 50 } }, { - "literal": "pants", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1160,35 +1160,35 @@ "name": "$8" }, { - "literal": "amalgimporto #1", + "literal": "amalgimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "edu packscholar #1", + "literal": "edu packscholar #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 18 + "precision": 50 } }, { - "literal": "exportiimporto #1", + "literal": "exportiimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 17 + "precision": 50 } }, { - "literal": "importoamalg #1", + "literal": "importoamalg #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } } ] @@ -1937,7 +1937,13 @@ "input": 2, "name": "$2" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ] }, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query56.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query56.q.out index a256e47e96fc..c731d8073fc0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query56.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query56.q.out @@ -1826,27 +1826,27 @@ "name": "$17" }, { - "literal": "chiffon", + "literal": "chiffon ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "lace", + "literal": "lace ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 20 } }, { - "literal": "orchid", + "literal": "orchid ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -2779,27 +2779,27 @@ "name": "$17" }, { - "literal": "chiffon", + "literal": "chiffon ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "lace", + "literal": "lace ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 20 } }, { - "literal": "orchid", + "literal": "orchid ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] @@ -3735,27 +3735,27 @@ "name": "$17" }, { - "literal": "chiffon", + "literal": "chiffon ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } }, { - "literal": "lace", + "literal": "lace ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 20 } }, { - "literal": "orchid", + "literal": "orchid ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query57.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query57.q.out index d145fb626734..b6703f0bae9a 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query57.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query57.q.out @@ -2136,7 +2136,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } } ], "rowCount": 976194609469717760 @@ -3609,7 +3613,13 @@ "input": 6, "name": "$6" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ] }, @@ -3945,7 +3955,13 @@ "input": 16, "name": "$16" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ], "rowCount": 4.4703400466242126E45 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query59.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query59.q.out index 0edbc184ccba..566895b03996 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query59.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query59.q.out @@ -3595,7 +3595,11 @@ "nullable": false } } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query6.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query6.q.out index eda0be9752a0..9f77985bf9ec 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query6.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query6.q.out @@ -490,12 +490,6 @@ Warning: Map Join MAPJOIN[168][bigTable=?] in task 'Map 1' is a cross product "nullable": false }, "colStats": [ - { - "name": "d_date_sk", - "ndv": 67850, - "minValue": 2415022, - "maxValue": 2488070 - }, { "name": "d_month_seq", "ndv": 2439, @@ -514,6 +508,12 @@ Warning: Map Join MAPJOIN[168][bigTable=?] in task 'Map 1' is a cross product "minValue": 1, "maxValue": 12 }, + { + "name": "d_date_sk", + "ndv": 67850, + "minValue": 2415022, + "maxValue": 2488070 + }, { "name": "d_date_id", "ndv": 71022 @@ -1981,12 +1981,6 @@ Warning: Map Join MAPJOIN[168][bigTable=?] in task 'Map 1' is a cross product "nullable": false }, "colStats": [ - { - "name": "i_item_sk", - "ndv": 464811, - "minValue": 1, - "maxValue": 462000 - }, { "name": "i_current_price", "ndv": 9391, @@ -1997,6 +1991,12 @@ Warning: Map Join MAPJOIN[168][bigTable=?] in task 'Map 1' is a cross product "name": "i_category", "ndv": 11 }, + { + "name": "i_item_sk", + "ndv": 464811, + "minValue": 1, + "maxValue": 462000 + }, { "name": "i_item_id", "ndv": 247524 @@ -2172,41 +2172,26 @@ Warning: Map Join MAPJOIN[168][bigTable=?] in task 'Map 1' is a cross product "operands": [ { "op": { - "name": "CAST", - "kind": "CAST", - "syntax": "SPECIAL" + "name": "/", + "kind": "DIVIDE", + "syntax": "BINARY" }, "operands": [ { - "op": { - "name": "/", - "kind": "DIVIDE", - "syntax": "BINARY" - }, - "operands": [ - { - "input": 1, - "name": "$1" - }, - { - "input": 2, - "name": "$2" - } - ] + "input": 1, + "name": "$1" + }, + { + "input": 2, + "name": "$2" } - ], - "type": { - "type": "DECIMAL", - "nullable": true, - "precision": 11, - "scale": 6 - } + ] } ], "type": { "type": "DECIMAL", "nullable": true, - "precision": 16, + "precision": 11, "scale": 6 } } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query62.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query62.q.out index 45c5ad5fb860..da40bb283945 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query62.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query62.q.out @@ -597,7 +597,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -673,7 +677,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -706,7 +714,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -784,7 +796,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -817,7 +833,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -895,7 +915,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -928,7 +952,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, @@ -999,7 +1027,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query63.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query63.q.out index 969b6c059ac7..2fb961054aff 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query63.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query63.q.out @@ -709,71 +709,71 @@ }, "operands": [ { - "input": 10, - "name": "$10" + "input": 8, + "name": "$8" }, { - "literal": "accessories", + "literal": "amalgimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "classical", + "literal": "edu packscholar #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "fragrances", + "literal": "exportiimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 50 } }, { - "literal": "pants", + "literal": "exportiunivamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "personal", + "literal": "importoamalg #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "portable", + "literal": "scholaramalgamalg #14 ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "refernece", + "literal": "scholaramalgamalg #7 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "self-help", + "literal": "scholaramalgamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } } ] @@ -786,132 +786,132 @@ }, "operands": [ { - "input": 12, - "name": "$12" + "input": 10, + "name": "$10" }, { - "literal": "Books", + "literal": "accessories ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Children", + "literal": "classical ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "fragrances ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "Men", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Music", + "literal": "personal ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Women", + "literal": "portable ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } - } - ] - }, - { - "op": { - "name": "IN", - "kind": "OTHER_FUNCTION", - "syntax": "SPECIAL" - }, - "operands": [ - { - "input": 8, - "name": "$8" }, { - "literal": "amalgimporto #1", + "literal": "refernece ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "edu packscholar #1", + "literal": "self-help ", "type": { "type": "CHAR", "nullable": false, - "precision": 18 + "precision": 50 } + } + ] + }, + { + "op": { + "name": "IN", + "kind": "OTHER_FUNCTION", + "syntax": "SPECIAL" + }, + "operands": [ + { + "input": 12, + "name": "$12" }, { - "literal": "exportiimporto #1", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 17 + "precision": 50 } }, { - "literal": "exportiunivamalg #9", + "literal": "Children ", "type": { "type": "CHAR", "nullable": false, - "precision": 19 + "precision": 50 } }, { - "literal": "importoamalg #1", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "scholaramalgamalg #14", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 21 + "precision": 50 } }, { - "literal": "scholaramalgamalg #7", + "literal": "Music ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } }, { - "literal": "scholaramalgamalg #9", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } } ] @@ -942,27 +942,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Children", + "literal": "Children ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } } ] @@ -979,35 +979,35 @@ "name": "$10" }, { - "literal": "personal", + "literal": "personal ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "portable", + "literal": "portable ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 50 } }, { - "literal": "refernece", + "literal": "refernece ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "self-help", + "literal": "self-help ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } } ] @@ -1024,35 +1024,35 @@ "name": "$8" }, { - "literal": "exportiunivamalg #9", + "literal": "exportiunivamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 19 + "precision": 50 } }, { - "literal": "scholaramalgamalg #14", + "literal": "scholaramalgamalg #14 ", "type": { "type": "CHAR", "nullable": false, - "precision": 21 + "precision": 50 } }, { - "literal": "scholaramalgamalg #7", + "literal": "scholaramalgamalg #7 ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } }, { - "literal": "scholaramalgamalg #9", + "literal": "scholaramalgamalg #9 ", "type": { "type": "CHAR", "nullable": false, - "precision": 20 + "precision": 50 } } ] @@ -1078,27 +1078,27 @@ "name": "$12" }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Music", + "literal": "Music ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Women", + "literal": "Women ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1115,35 +1115,35 @@ "name": "$10" }, { - "literal": "accessories", + "literal": "accessories ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "classical", + "literal": "classical ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "fragrances", + "literal": "fragrances ", "type": { "type": "CHAR", "nullable": false, - "precision": 10 + "precision": 50 } }, { - "literal": "pants", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -1160,35 +1160,35 @@ "name": "$8" }, { - "literal": "amalgimporto #1", + "literal": "amalgimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } }, { - "literal": "edu packscholar #1", + "literal": "edu packscholar #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 18 + "precision": 50 } }, { - "literal": "exportiimporto #1", + "literal": "exportiimporto #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 17 + "precision": 50 } }, { - "literal": "importoamalg #1", + "literal": "importoamalg #1 ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 50 } } ] @@ -1937,7 +1937,13 @@ "input": 2, "name": "$2" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ] }, diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query64.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query64.q.out index 370dcc8fd0e5..8bda4c5d0557 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query64.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query64.q.out @@ -1760,51 +1760,51 @@ "name": "$17" }, { - "literal": "burnished", + "literal": "burnished ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } }, { - "literal": "chocolate", + "literal": "chocolate ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } }, { - "literal": "dim", + "literal": "dim ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 20 } }, { - "literal": "maroon", + "literal": "maroon ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } }, { - "literal": "navajo", + "literal": "navajo ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } }, { - "literal": "steel", + "literal": "steel ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] @@ -6423,51 +6423,51 @@ "name": "$17" }, { - "literal": "burnished", + "literal": "burnished ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } }, { - "literal": "chocolate", + "literal": "chocolate ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } }, { - "literal": "dim", + "literal": "dim ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 20 } }, { - "literal": "maroon", + "literal": "maroon ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } }, { - "literal": "navajo", + "literal": "navajo ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } }, { - "literal": "steel", + "literal": "steel ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query66.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query66.q.out index f0ff6d58f024..6476d2cd3866 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query66.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query66.q.out @@ -1673,19 +1673,19 @@ "name": "$4" }, { - "literal": "AIRBORNE", + "literal": "AIRBORNE ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 20 } }, { - "literal": "DIAMOND", + "literal": "DIAMOND ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] @@ -4349,19 +4349,19 @@ "name": "$4" }, { - "literal": "AIRBORNE", + "literal": "AIRBORNE ", "type": { "type": "CHAR", "nullable": false, - "precision": 8 + "precision": 20 } }, { - "literal": "DIAMOND", + "literal": "DIAMOND ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query67.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query67.q.out index f0cbd12e2bbc..97f2bbae92f8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query67.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query67.q.out @@ -434,23 +434,8 @@ }, "operands": [ { - "op": { - "name": "CAST", - "kind": "CAST", - "syntax": "SPECIAL" - }, - "operands": [ - { - "input": 9, - "name": "$9" - } - ], - "type": { - "type": "DECIMAL", - "nullable": true, - "precision": 10, - "scale": 0 - } + "input": 9, + "name": "$9" } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query71.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query71.q.out index 63bc9cf602cd..a044e850b2cd 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query71.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query71.q.out @@ -2771,19 +2771,19 @@ "name": "$9" }, { - "literal": "breakfast", + "literal": "breakfast ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 20 } }, { - "literal": "dinner", + "literal": "dinner ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query73.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query73.q.out index 5175001d564f..6f8b9bd84ff8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query73.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query73.q.out @@ -1347,19 +1347,19 @@ "name": "$2" }, { - "literal": ">10000", + "literal": ">10000 ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 15 } }, { - "literal": "unknown", + "literal": "unknown ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 15 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query75.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query75.q.out index 33cf9fafff8b..7a65397e1ce9 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query75.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query75.q.out @@ -1907,7 +1907,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -1955,7 +1959,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 4.218117522679961E25 @@ -3025,7 +3035,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -3073,7 +3087,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.6171414807076423E26 @@ -4416,7 +4436,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -4464,7 +4488,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.058808760561964E25 @@ -5095,7 +5125,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -5143,7 +5177,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 4.218117522679961E25 @@ -5586,7 +5626,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -5634,7 +5678,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.6171414807076423E26 @@ -6179,7 +6229,11 @@ } ] } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } }, { "op": { @@ -6227,7 +6281,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 8, + "scale": 2 + } } ], "rowCount": 1.058808760561964E25 @@ -6627,7 +6687,11 @@ "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "op": { @@ -6644,7 +6708,13 @@ "input": 5, "name": "$5" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 19, + "scale": 2 + } } ], "rowCount": 2.4290202464284087E43 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query77.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query77.q.out index b12c95eb69df..527ebb8adcdf 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query77.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query77.q.out @@ -1676,7 +1676,13 @@ Warning: Map Join MAPJOIN[213][bigTable=?] in task 'Reducer 9' is a cross produc } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 5.077429615006786E24 @@ -3007,7 +3013,13 @@ Warning: Map Join MAPJOIN[213][bigTable=?] in task 'Reducer 9' is a cross produc "input": 4, "name": "$4" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 1.0602495705939385E13 @@ -4507,7 +4519,13 @@ Warning: Map Join MAPJOIN[213][bigTable=?] in task 'Reducer 9' is a cross produc } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 18, + "scale": 2 + } } ], "rowCount": 3.2896973217973334E23 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query80.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query80.q.out index 93bf3a645ee0..ed342dbf4d78 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query80.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query80.q.out @@ -2457,7 +2457,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 13, + "scale": 2 + } } ], "rowCount": 1.4671066877753214E31 @@ -4143,7 +4149,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 13, + "scale": 2 + } } ], "rowCount": 1.033048226619305E32 @@ -5974,7 +5986,13 @@ } ] } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 13, + "scale": 2 + } } ], "rowCount": 4.735228068068781E28 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query85.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query85.q.out index 134436ff9762..d812967fefde 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query85.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query85.q.out @@ -2347,27 +2347,27 @@ "name": "$3" }, { - "literal": "4 yr Degree", + "literal": "4 yr Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 20 } }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } }, { - "literal": "Primary", + "literal": "Primary ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] @@ -2436,11 +2436,11 @@ "name": "$3" }, { - "literal": "4 yr Degree", + "literal": "4 yr Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 20 } } ] @@ -2478,11 +2478,11 @@ "name": "$3" }, { - "literal": "Primary", + "literal": "Primary ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] @@ -2520,11 +2520,11 @@ "name": "$3" }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } } ] @@ -2771,27 +2771,27 @@ "name": "$3" }, { - "literal": "4 yr Degree", + "literal": "4 yr Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 20 } }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } }, { - "literal": "Primary", + "literal": "Primary ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query89.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query89.q.out index 0518783f7ee8..323629041c86 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query89.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query89.q.out @@ -718,51 +718,51 @@ "name": "$10" }, { - "literal": "birdal", + "literal": "birdal ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } }, { - "literal": "musical", + "literal": "musical ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "pants", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "parenting", + "literal": "parenting ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "wallpaper", + "literal": "wallpaper ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "womens", + "literal": "womens ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } } ] @@ -779,51 +779,51 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "Home", + "literal": "Home ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 50 } }, { - "literal": "Jewelry", + "literal": "Jewelry ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Shoes", + "literal": "Shoes ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -854,27 +854,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Electronics", + "literal": "Electronics ", "type": { "type": "CHAR", "nullable": false, - "precision": 11 + "precision": 50 } }, { - "literal": "Home", + "literal": "Home ", "type": { "type": "CHAR", "nullable": false, - "precision": 4 + "precision": 50 } } ] @@ -891,27 +891,27 @@ "name": "$10" }, { - "literal": "musical", + "literal": "musical ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "parenting", + "literal": "parenting ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } }, { - "literal": "wallpaper", + "literal": "wallpaper ", "type": { "type": "CHAR", "nullable": false, - "precision": 9 + "precision": 50 } } ] @@ -937,27 +937,27 @@ "name": "$12" }, { - "literal": "Jewelry", + "literal": "Jewelry ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "Men", + "literal": "Men ", "type": { "type": "CHAR", "nullable": false, - "precision": 3 + "precision": 50 } }, { - "literal": "Shoes", + "literal": "Shoes ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } } ] @@ -974,27 +974,27 @@ "name": "$10" }, { - "literal": "birdal", + "literal": "birdal ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } }, { - "literal": "pants", + "literal": "pants ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "womens", + "literal": "womens ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } } ] @@ -2175,7 +2175,13 @@ "input": 7, "name": "$7" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ] }, @@ -2269,7 +2275,13 @@ "input": 7, "name": "$7" } - ] + ], + "type": { + "type": "DECIMAL", + "nullable": true, + "precision": 22, + "scale": 6 + } } ], "rowCount": 760058726253485952 diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query91.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query91.q.out index beebfacedd73..11ca81dfcfa0 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query91.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query91.q.out @@ -1668,19 +1668,19 @@ "name": "$3" }, { - "literal": "Advanced Degree", + "literal": "Advanced Degree ", "type": { "type": "CHAR", "nullable": false, - "precision": 15 + "precision": 20 } }, { - "literal": "Unknown", + "literal": "Unknown ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 20 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query93.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query93.q.out index 58f48602e832..91de5fcfbfd8 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query93.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query93.q.out @@ -987,7 +987,11 @@ "input": 8, "name": "$8" } - ] + ], + "type": { + "type": "INTEGER", + "nullable": true + } } ], "type": { diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query98.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query98.q.out index 60ab4eda30ab..0ce77d1627a2 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query98.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query98.q.out @@ -1135,27 +1135,27 @@ "name": "$12" }, { - "literal": "Books", + "literal": "Books ", "type": { "type": "CHAR", "nullable": false, - "precision": 5 + "precision": 50 } }, { - "literal": "Jewelry", + "literal": "Jewelry ", "type": { "type": "CHAR", "nullable": false, - "precision": 7 + "precision": 50 } }, { - "literal": "Sports", + "literal": "Sports ", "type": { "type": "CHAR", "nullable": false, - "precision": 6 + "precision": 50 } } ] diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query99.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query99.q.out index d589e67ac45c..36e83c6ff05b 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query99.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query99.q.out @@ -597,7 +597,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -673,7 +677,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 30, @@ -706,7 +714,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -784,7 +796,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 60, @@ -817,7 +833,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -895,7 +915,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 90, @@ -928,7 +952,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, @@ -999,7 +1027,11 @@ "input": 33, "name": "$33" } - ] + ], + "type": { + "type": "BIGINT", + "nullable": true + } }, { "literal": 120, From 8d547bd933372f59390f149b53f003d895029f5f Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 10 Jun 2026 09:53:22 +0100 Subject: [PATCH 22/41] revert all pom changes that tried to fix the druid-handler asm javadoc issue on Jenkins (still tbd) --- druid-handler/pom.xml | 39 ++++--------------- .../hive/druid/DruidStorageHandler.java | 4 -- pom.xml | 21 ---------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index 78849e3a8eae..dcc5ebd8a481 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -134,6 +134,14 @@ org.codehaus.plexus plexus-utils + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm + org.checkerframework checker-qual @@ -308,18 +316,6 @@ ${log4j2.version} test - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-util - @@ -407,31 +403,12 @@ META-INF/*.RSA META-INF/versions/** static/ - - evict-stale-asm-shade-cache/** - - - org.ow2.asm - asm - ${asm.version} - - - org.ow2.asm - asm-commons - ${asm.version} - - - org.ow2.asm - asm-util - ${asm.version} - - diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index 18076f51192d..656fa40c03fa 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -134,14 +134,10 @@ /** * DruidStorageHandler provides a HiveStorageHandler implementation for Druid. - * @version 4.3.0-ASM-CACHE-EVICT-V4 TODO cleanup */ @SuppressWarnings({ "rawtypes" }) public class DruidStorageHandler extends DefaultHiveMetaHook implements HiveStorageHandler { - // TODO cleanup - private static final String TMP_CACHE_BUSTER_TOKEN = "Force-Recompile-Druid-Module-ASM-9.7"; - private static final Logger LOG = LoggerFactory.getLogger(DruidStorageHandler.class); private static final SessionState.LogHelper CONSOLE = new SessionState.LogHelper(LOG); diff --git a/pom.xml b/pom.xml index 5973f3ca3099..39ea8f9f557b 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,6 @@ 4.9.3 2.0.0-M24 - 9.7 1.12.0 1.82 1.42.0 @@ -359,26 +358,6 @@ ${immutables.version} provided - - org.ow2.asm - asm - ${asm.version} - - - org.ow2.asm - asm-commons - ${asm.version} - - - org.ow2.asm - asm-tree - ${asm.version} - - - org.ow2.asm - asm-util - ${asm.version} - com.sun.jersey jersey-core From 7f971f2d825646f6be71995976f8622218b81dbe Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 10 Jun 2026 09:54:19 +0100 Subject: [PATCH 23/41] Adjust test files: simplify IS NOT DISTINCT FROM into EQUALS due to [CALCITE-7160] Simplify AND/OR with DISTINCT predicates to SEARCH (1.41) Adjust test plans simplifications around IS_NOT_NULL: [CALCITE-5639] RexSimplify should remove IS NOT NULL check when LIKE comparison is present (1.35) (actually more generic than just LIKE) [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) Adjust test plans on array construction due to: [CALCITE-6417] Map value constructor and Array value constructor unparsed incorrectly for HiveSqlDialect (1.38) --- .../test/results/positive/hbase_queries.q.out | 4 +- .../insert_into_dynamic_partitions.q.out | 2 +- .../clientpositive/insert_into_table.q.out | 2 +- .../insert_overwrite_dynamic_partitions.q.out | 2 +- .../insert_overwrite_table.q.out | 2 +- .../encryption_join_unencrypted_tbl.q.out | 6 +- .../clientpositive/llap/auto_join2.q.out | 106 ++++++------ .../clientpositive/llap/auto_join33.q.out | 8 +- .../clientpositive/llap/auto_join_stats.q.out | 76 ++++---- .../llap/auto_join_stats2.q.out | 162 ++++++++++-------- .../llap/auto_sortmerge_join_6.q.out | 16 +- .../clientpositive/llap/cte_mat_5.q.out | 2 +- .../llap/orc_predicate_pushdown.q.out | 6 +- .../llap/parquet_predicate_pushdown.q.out | 6 +- .../llap/subquery_notexists.q.out | 4 +- .../llap/vectorized_decimal64_boundary.q.out | 10 +- 16 files changed, 222 insertions(+), 192 deletions(-) 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 9eb409dc515e..b5d62a886b0c 100644 --- a/hbase-handler/src/test/results/positive/hbase_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -148,7 +148,7 @@ STAGE PLANS: alias: hbase_table_1 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: UDFToDouble(key) (type: double) @@ -604,7 +604,7 @@ STAGE PLANS: alias: hbase_table_1 Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: key is not null (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), value (type: string), UDFToDouble(key) (type: double) diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out index 4735e1978c1d..e04912b5fe1a 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out @@ -87,7 +87,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@table1 OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')])) +FROM TABLE(INLINE(ARRAY ((1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out index bb60ea80cece..322d7eea016d 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out @@ -51,7 +51,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@table1 OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1)])) +FROM TABLE(INLINE(ARRAY ((1)))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5 diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out index 0d804540f98a..e276c42f5ec7 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out @@ -105,7 +105,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@table1 OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')])) +FROM TABLE(INLINE(ARRAY ((1, '101'), (2, '202'), (3, '303'), (4, '404'), (5, '505')))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out index 17e71e96d714..5ec5333af3b2 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out @@ -59,7 +59,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: default@table1 OPTIMIZED SQL: SELECT * -FROM TABLE(INLINE(ARRAY[(1)])) +FROM TABLE(INLINE(ARRAY ((1)))) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5 diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out index c0d2e307305c..d3531c787664 100644 --- a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out +++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out @@ -550,7 +550,7 @@ FROM `default`.`src` WHERE CAST(`key` AS DOUBLE) IS NOT NULL) AS `t0` INNER JOIN (SELECT `key`, `value`, CAST(`key` AS DOUBLE) AS `EXPR$0` FROM `default`.`encrypted_table` -WHERE CAST(`key` AS DOUBLE) IS NOT NULL) AS `t2` ON `t0`.`EXPR$0` = `t2`.`EXPR$0` +WHERE `key` IS NOT NULL) AS `t2` ON `t0`.`EXPR$0` = `t2`.`EXPR$0` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -585,12 +585,12 @@ STAGE PLANS: auto parallelism: false TableScan alias: t2 - filterExpr: UDFToDouble(key) is not null (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE GatherStats: false Filter Operator isSamplingPred: false - predicate: UDFToDouble(key) is not null (type: boolean) + predicate: 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), UDFToDouble(key) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/auto_join2.q.out b/ql/src/test/results/clientpositive/llap/auto_join2.q.out index 4ff363c6a7f1..bc77780295e2 100644 --- a/ql/src/test/results/clientpositive/llap/auto_join2.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_join2.q.out @@ -38,70 +38,73 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) - probeDecodeDetails: cacheKey:HASH_MAP_MAPJOIN_45_container, bigKeyColName:key, smallTablePos:1, keyRatio:0.632 + filterExpr: key is not null (type: boolean) + probeDecodeDetails: cacheKey:HASH_MAP_MAPJOIN_49_container, bigKeyColName:key, smallTablePos:1, keyRatio:0.632 Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 _col0 (type: string) - 1 _col0 (type: string) - outputColumnNames: _col0, _col1, _col3 - input vertices: - 1 Reducer 4 - Statistics: Num rows: 791 Data size: 81473 Basic stats: COMPLETE Column stats: COMPLETE + Filter Operator + predicate: _col1 is not null (type: boolean) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 (_col1 + _col3) (type: double) - 1 _col1 (type: double) - outputColumnNames: _col0, _col4 + 0 _col0 (type: string) + 1 _col0 (type: string) + outputColumnNames: _col0, _col1, _col3 input vertices: - 1 Map 3 - Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - File Output Operator - compressed: false - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - name: default.dest_j2 + 1 Reducer 4 + Statistics: Num rows: 791 Data size: 81473 Basic stats: COMPLETE Column stats: COMPLETE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 (_col1 + _col3) (type: double) + 1 _col1 (type: double) + outputColumnNames: _col0, _col4 + input vertices: + 1 Map 3 + Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: _col0 (type: int), _col1 (type: string) - outputColumnNames: key, value + expressions: UDFToInteger(_col0) (type: int), _col4 (type: string) + outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - aggregations: min(key), max(key), count(1), count(key), compute_bit_vector_hll(key), max(length(value)), avg(COALESCE(length(value),0)), count(value), compute_bit_vector_hll(value) - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 1 Data size: 400 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - null sort order: - sort order: + File Output Operator + compressed: false + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + name: default.dest_j2 + Select Operator + expressions: _col0 (type: int), _col1 (type: string) + outputColumnNames: key, value + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + Group By Operator + aggregations: min(key), max(key), count(1), count(key), compute_bit_vector_hll(key), max(length(value)), avg(COALESCE(length(value),0)), count(value), compute_bit_vector_hll(value) + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 Statistics: Num rows: 1 Data size: 400 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: int), _col6 (type: struct), _col7 (type: bigint), _col8 (type: binary) + Reduce Output Operator + null sort order: + sort order: + Statistics: Num rows: 1 Data size: 400 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col0 (type: int), _col1 (type: int), _col2 (type: bigint), _col3 (type: bigint), _col4 (type: binary), _col5 (type: int), _col6 (type: struct), _col7 (type: bigint), _col8 (type: binary) Execution mode: vectorized, llap LLAP IO: all inputs Map 3 Map Operator Tree: TableScan alias: src3 - filterExpr: (UDFToDouble(key) is not null or (key is not null and UDFToDouble(key) is not null)) (type: boolean) + filterExpr: (UDFToDouble(key) is not null or key is not null) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: UDFToDouble(key) is not null (type: boolean) @@ -118,19 +121,22 @@ STAGE PLANS: Statistics: Num rows: 500 Data size: 49500 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: string) Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 diff --git a/ql/src/test/results/clientpositive/llap/auto_join33.q.out b/ql/src/test/results/clientpositive/llap/auto_join33.q.out index f68a9161f77d..710c6e75684e 100644 --- a/ql/src/test/results/clientpositive/llap/auto_join33.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_join33.q.out @@ -32,10 +32,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: (((UDFToDouble(key) + 1.0D) < 10.0D) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) + 1.0D) < 10.0D) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) + 1.0D) < 10.0D) and UDFToDouble(key) is not null) (type: boolean) + predicate: ((UDFToDouble(key) + 1.0D) < 10.0D) (type: boolean) Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: string), value (type: string) @@ -64,10 +64,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src - filterExpr: (((UDFToDouble(key) + 2.0D) < 10.0D) and UDFToDouble(key) is not null) (type: boolean) + filterExpr: ((UDFToDouble(key) + 2.0D) < 10.0D) (type: boolean) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (((UDFToDouble(key) + 2.0D) < 10.0D) and UDFToDouble(key) is not null) (type: boolean) + predicate: ((UDFToDouble(key) + 2.0D) < 10.0D) (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/llap/auto_join_stats.q.out b/ql/src/test/results/clientpositive/llap/auto_join_stats.q.out index 8ed693529f7c..e4c590dda7e5 100644 --- a/ql/src/test/results/clientpositive/llap/auto_join_stats.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_join_stats.q.out @@ -48,44 +48,50 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 3 Map Operator Tree: TableScan alias: src2 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 4 @@ -213,44 +219,50 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 3 Map Operator Tree: TableScan alias: src2 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 4 diff --git a/ql/src/test/results/clientpositive/llap/auto_join_stats2.q.out b/ql/src/test/results/clientpositive/llap/auto_join_stats2.q.out index f1a52ab82b0c..6b775c286e7b 100644 --- a/ql/src/test/results/clientpositive/llap/auto_join_stats2.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_join_stats2.q.out @@ -14,7 +14,7 @@ POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table sma POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@smalltable -Warning: Map Join MAPJOIN[33][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[37][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: explain select src1.key, src2.key, smalltable.key from src src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + src2.key = smalltable.key) PREHOOK: type: QUERY PREHOOK: Input: default@smalltable @@ -41,47 +41,50 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src2 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 - 1 - outputColumnNames: _col0, _col1, _col2, _col3 - input vertices: - 1 Map 2 - Statistics: Num rows: 500 Data size: 140000 Basic stats: COMPLETE Column stats: NONE + Filter Operator + predicate: _col1 is not null (type: boolean) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 _col0 (type: string) - 1 _col0 (type: string) - outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 input vertices: - 1 Map 3 - residual filter predicates: {((_col5 + _col1) = _col3)} - Statistics: Num rows: 275 Data size: 77000 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: _col4 (type: string), _col0 (type: string), _col2 (type: string) - outputColumnNames: _col0, _col1, _col2 + 1 Map 2 + Statistics: Num rows: 500 Data size: 140000 Basic stats: COMPLETE Column stats: NONE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col0 (type: string) + 1 _col0 (type: string) + outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 + input vertices: + 1 Map 3 + residual filter predicates: {((_col5 + _col1) = _col3)} Statistics: Num rows: 275 Data size: 77000 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false + Select Operator + expressions: _col4 (type: string), _col0 (type: string), _col2 (type: string) + outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 275 Data size: 77000 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: 275 Data size: 77000 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 Execution mode: llap LLAP IO: all inputs Map 2 @@ -108,22 +111,25 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs @@ -133,7 +139,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Map Join MAPJOIN[33][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[37][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: select src1.key, src2.key, smalltable.key from src src1 JOIN src src2 ON (src1.key = src2.key) JOIN smalltable ON (src1.key + src2.key = smalltable.key) PREHOOK: type: QUERY PREHOOK: Input: default@smalltable @@ -198,79 +204,85 @@ STAGE PLANS: Map Operator Tree: TableScan alias: src1 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) - probeDecodeDetails: cacheKey:HASH_MAP_MAPJOIN_51_container, bigKeyColName:key, smallTablePos:1, keyRatio:0.632 + filterExpr: key is not null (type: boolean) + probeDecodeDetails: cacheKey:HASH_MAP_MAPJOIN_55_container, bigKeyColName:key, smallTablePos:1, keyRatio:0.632 Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 _col0 (type: string) - 1 _col0 (type: string) - outputColumnNames: _col0, _col1, _col2, _col3 - input vertices: - 1 Map 2 - Statistics: Num rows: 791 Data size: 150290 Basic stats: COMPLETE Column stats: COMPLETE + Filter Operator + predicate: _col1 is not null (type: boolean) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 keys: - 0 (_col1 + _col3) (type: double) - 1 _col0 (type: double) + 0 _col0 (type: string) + 1 _col0 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 input vertices: - 1 Map 3 - Statistics: Num rows: 870 Data size: 165319 Basic stats: COMPLETE Column stats: NONE + 1 Map 2 + Statistics: Num rows: 791 Data size: 150290 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 keys: 0 (_col1 + _col3) (type: double) - 1 _col1 (type: double) - outputColumnNames: _col0, _col2, _col5 + 1 _col0 (type: double) + outputColumnNames: _col0, _col1, _col2, _col3 input vertices: - 1 Map 4 - Statistics: Num rows: 957 Data size: 181850 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: _col0 (type: string), _col2 (type: string), _col5 (type: string) - outputColumnNames: _col0, _col1, _col2 + 1 Map 3 + Statistics: Num rows: 870 Data size: 165319 Basic stats: COMPLETE Column stats: NONE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 (_col1 + _col3) (type: double) + 1 _col1 (type: double) + outputColumnNames: _col0, _col2, _col5 + input vertices: + 1 Map 4 Statistics: Num rows: 957 Data size: 181850 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false + Select Operator + expressions: _col0 (type: string), _col2 (type: string), _col5 (type: string) + outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 957 Data size: 181850 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: 957 Data size: 181850 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 Execution mode: vectorized, llap LLAP IO: all inputs Map 2 Map Operator Tree: TableScan alias: src2 - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + 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 and UDFToDouble(key) is not null) (type: boolean) + 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), UDFToDouble(key) (type: double) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: string) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: string) + Filter Operator + predicate: _col1 is not null (type: boolean) Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col1 (type: double) + Reduce Output Operator + key expressions: _col0 (type: string) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: string) + Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + value expressions: _col1 (type: double) Execution mode: vectorized, llap LLAP IO: all inputs Map 3 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 5e1727c7a159..5a45b6bae68f 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 @@ -588,10 +588,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + predicate: 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) @@ -601,10 +601,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + predicate: 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) @@ -1200,10 +1200,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + predicate: 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) @@ -1213,10 +1213,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - filterExpr: (key is not null and UDFToDouble(key) is not null) (type: boolean) + filterExpr: key is not null (type: boolean) Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (key is not null and UDFToDouble(key) is not null) (type: boolean) + predicate: 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/cte_mat_5.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out index c5f5810ec36e..59d2e04afb5a 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out @@ -78,7 +78,7 @@ Stage-3 Select Operator [SEL_35] (rows=1 width=12) Output:["_col0","_col1"] Filter Operator [FIL_34] (rows=1 width=4) - predicate:UDFToDouble(colnum) is not null + predicate:colnum is not null TableScan [TS_8] (rows=1 width=4) mydb@q1,a,Tbl:COMPLETE,Col:COMPLETE,Output:["colnum"] <-Map 4 [SIMPLE_EDGE] vectorized, llap 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 6a1d019aa518..63d671495c77 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 @@ -511,7 +511,7 @@ STAGE PLANS: TableScan alias: orc_pred Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + predicate: ((t = -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -541,9 +541,9 @@ STAGE PLANS: Processor Tree: TableScan alias: orc_pred - filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + filterExpr: ((t = -1Y) and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + predicate: ((t = -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 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 fb7360879e71..66fd8c1cf94e 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 @@ -445,7 +445,7 @@ STAGE PLANS: TableScan alias: tbl_pred Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + predicate: ((t = -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 @@ -475,9 +475,9 @@ STAGE PLANS: Processor Tree: TableScan alias: tbl_pred - filterExpr: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + filterExpr: ((t = -1Y) and (s like 'bob%')) (type: boolean) Filter Operator - predicate: ((t IS NOT DISTINCT FROM -1Y) and (s like 'bob%')) (type: boolean) + predicate: ((t = -1Y) and (s like 'bob%')) (type: boolean) Select Operator expressions: -1Y (type: tinyint), s (type: string) outputColumnNames: _col0, _col1 diff --git a/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out b/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out index 4589512ffc33..69514739bce8 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notexists.q.out @@ -646,7 +646,7 @@ HiveProject(p1.p_name=[$0]) HiveProject(p_col0=[CAST($4):DOUBLE]) HiveTableScan(table=[[default, part]], table:alias=[part]) HiveProject(literalTrue=[true], p_partkey0=[CAST($0):DOUBLE]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, part]], table:alias=[pp1]) Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product @@ -688,7 +688,7 @@ STAGE PLANS: Statistics: Num rows: 26 Data size: 3146 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: string) Filter Operator - predicate: UDFToDouble(p_partkey) is not null (type: boolean) + predicate: p_partkey is not null (type: boolean) Statistics: Num rows: 26 Data size: 104 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(p_partkey) (type: double) diff --git a/ql/src/test/results/clientpositive/llap/vectorized_decimal64_boundary.q.out b/ql/src/test/results/clientpositive/llap/vectorized_decimal64_boundary.q.out index 5d100048226c..f8d637c0d0b8 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_decimal64_boundary.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_decimal64_boundary.q.out @@ -122,13 +122,13 @@ STAGE PLANS: predicate: ss_store_sk is not null (type: boolean) Statistics: Num rows: 1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE Select Operator - expressions: ss_store_sk (type: int), if((ss_sales_price is not null and CAST( ss_quantity AS decimal(10,0)) is not null), (ss_sales_price * CAST( ss_quantity AS decimal(10,0))), 0) (type: decimal(18,2)) + expressions: ss_store_sk (type: int), if((ss_sales_price is not null and ss_quantity is not null), (ss_sales_price * CAST( ss_quantity AS decimal(10,0))), 0) (type: decimal(18,2)) outputColumnNames: _col0, _col1 Select Vectorization: className: VectorSelectOperator native: true - projectedOutputColumnNums: [0, 18] - selectExpressions: IfExprDecimal64ColumnDecimal64Scalar(col 15:boolean, col 17:decimal(18,2)/DECIMAL_64, decimal64Val 0, decimalVal 0)(children: ColAndCol(col 12:boolean, col 14:boolean)(children: IsNotNull(col 2:decimal(7,2)/DECIMAL_64) -> 12:boolean, IsNotNull(col 19:decimal(10,0))(children: ConvertDecimal64ToDecimal(col 13:decimal(10,0)/DECIMAL_64)(children: CastLongToDecimal64(col 1:int) -> 13:decimal(10,0)/DECIMAL_64) -> 19:decimal(10,0)) -> 14:boolean) -> 15:boolean, Decimal64ColMultiplyDecimal64Column(col 2:decimal(7,2)/DECIMAL_64, col 16:decimal(10,0)/DECIMAL_64)(children: CastLongToDecimal64(col 1:int) -> 16:decimal(10,0)/DECIMAL_64) -> 17:decimal(18,2)/DECIMAL_64) -> 18:decimal(18,2)/DECIMAL_64 + projectedOutputColumnNums: [0, 16] + selectExpressions: IfExprDecimal64ColumnDecimal64Scalar(col 13:boolean, col 15:decimal(18,2)/DECIMAL_64, decimal64Val 0, decimalVal 0)(children: ColAndCol(col 11:boolean, col 12:boolean)(children: IsNotNull(col 2:decimal(7,2)/DECIMAL_64) -> 11:boolean, IsNotNull(col 1:int) -> 12:boolean) -> 13:boolean, Decimal64ColMultiplyDecimal64Column(col 2:decimal(7,2)/DECIMAL_64, col 14:decimal(10,0)/DECIMAL_64)(children: CastLongToDecimal64(col 1:int) -> 14:decimal(10,0)/DECIMAL_64) -> 15:decimal(18,2)/DECIMAL_64) -> 16:decimal(18,2)/DECIMAL_64 Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) @@ -140,7 +140,7 @@ STAGE PLANS: keyColumns: 0:int native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - valueColumns: 18:decimal(18,2) + valueColumns: 16:decimal(18,2) Statistics: Num rows: 1 Data size: 116 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: decimal(18,2)) Execution mode: vectorized, llap @@ -159,7 +159,7 @@ STAGE PLANS: includeColumns: [0, 1, 2] dataColumns: ss_store_sk:int, ss_quantity:int, ss_sales_price:decimal(7,2)/DECIMAL_64 partitionColumnCount: 0 - scratchColumnTypeNames: [bigint, decimal(10,0)/DECIMAL_64, bigint, bigint, decimal(10,0)/DECIMAL_64, decimal(18,2)/DECIMAL_64, decimal(18,2), bigint, decimal(10,0)/DECIMAL_64, bigint, bigint, decimal(10,0)/DECIMAL_64, decimal(18,2)/DECIMAL_64, decimal(18,2)/DECIMAL_64, decimal(10,0)] + scratchColumnTypeNames: [bigint, bigint, bigint, decimal(10,0)/DECIMAL_64, decimal(18,2)/DECIMAL_64, decimal(18,2), bigint, bigint, bigint, decimal(10,0)/DECIMAL_64, decimal(18,2)/DECIMAL_64, decimal(18,2)/DECIMAL_64] Map 3 Map Operator Tree: TableScan From b61406da93430f5b3a76c0d6381c4c664a369fcb Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 10 Jun 2026 14:53:22 +0100 Subject: [PATCH 24/41] In CalcitePlanner genFilterRelNode: simplify filter condition before creating the filter RelNode. This is required to avoid this exception (new assertion introduced in 1.41 via [CALCITE-7070] FILTER_REDUCE_EXPRESSIONS crashes on expression BETWEEN ( NULL) AND X ) seen in TestMiniLlapLocalCliDriver subquery_null_agg when trying to create a Filter with NULL = NULL condition: java.lang.AssertionError: Comparison with NULL in pulledUpPredicates at org.apache.calcite.util.Litmus.lambda$static$0(Litmus.java:31) at org.apache.calcite.util.Litmus.check(Litmus.java:76) at org.apache.calcite.plan.RelOptPredicateList.(RelOptPredicateList.java:128) ... --- .../java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java | 4 ++++ 1 file changed, 4 insertions(+) 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 ecc226d42a2e..23082cb7777b 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 @@ -58,6 +58,7 @@ import org.apache.calcite.plan.RelOptCostImpl; import org.apache.calcite.plan.RelOptMaterialization; import org.apache.calcite.plan.RelOptPlanner; +import org.apache.calcite.plan.RelOptPredicateList; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptSchema; import org.apache.calcite.plan.RelOptTable; @@ -109,6 +110,7 @@ import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexShuttle; +import org.apache.calcite.rex.RexSimplify; import org.apache.calcite.rex.RexUtil; import org.apache.calcite.rex.RexWindowBound; import org.apache.calcite.schema.SchemaPlus; @@ -3260,6 +3262,8 @@ private RelNode genFilterRelNode(RexNode filterExpression, RelNode srcRel, outerNameToPosMap, outerRR, subqueryId).apply(filterExpression); RexNode factoredFilterExpression = RexUtil .pullFactors(cluster.getRexBuilder(), filterExpression); + factoredFilterExpression = new RexSimplify(cluster.getRexBuilder(), RelOptPredicateList.EMPTY, RexUtil.EXECUTOR) + .simplify(factoredFilterExpression); RelNode filterRel = new HiveFilter(cluster, cluster.traitSetOf(HiveRelNode.CONVENTION), srcRel, HiveCalciteUtil.fixNullability(cluster.getRexBuilder(), factoredFilterExpression, RelOptUtil.getFieldTypeList(srcRel.getRowType()))); From 64282533c4f44278b6ca0e1845dcea50d0e8ddae Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 10 Jun 2026 19:31:05 +0100 Subject: [PATCH 25/41] Move fix from previous commit as earlier as possible (incorrect binary comparison RexCall create in HiveFunctionHelper), and avoid RexSimplify solution on CalcitePlanner (too many side effects) --- .../apache/hadoop/hive/ql/parse/CalcitePlanner.java | 4 ---- .../hive/ql/parse/type/HiveFunctionHelper.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) 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 23082cb7777b..ecc226d42a2e 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 @@ -58,7 +58,6 @@ import org.apache.calcite.plan.RelOptCostImpl; import org.apache.calcite.plan.RelOptMaterialization; import org.apache.calcite.plan.RelOptPlanner; -import org.apache.calcite.plan.RelOptPredicateList; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptSchema; import org.apache.calcite.plan.RelOptTable; @@ -110,7 +109,6 @@ import org.apache.calcite.rex.RexLiteral; import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexShuttle; -import org.apache.calcite.rex.RexSimplify; import org.apache.calcite.rex.RexUtil; import org.apache.calcite.rex.RexWindowBound; import org.apache.calcite.schema.SchemaPlus; @@ -3262,8 +3260,6 @@ private RelNode genFilterRelNode(RexNode filterExpression, RelNode srcRel, outerNameToPosMap, outerRR, subqueryId).apply(filterExpression); RexNode factoredFilterExpression = RexUtil .pullFactors(cluster.getRexBuilder(), filterExpression); - factoredFilterExpression = new RexSimplify(cluster.getRexBuilder(), RelOptPredicateList.EMPTY, RexUtil.EXECUTOR) - .simplify(factoredFilterExpression); RelNode filterRel = new HiveFilter(cluster, cluster.traitSetOf(HiveRelNode.CONVENTION), srcRel, HiveCalciteUtil.fixNullability(cluster.getRexBuilder(), factoredFilterExpression, RelOptUtil.getFieldTypeList(srcRel.getRowType()))); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/type/HiveFunctionHelper.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/type/HiveFunctionHelper.java index 556388c71914..7c9b0cd629bf 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/type/HiveFunctionHelper.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/type/HiveFunctionHelper.java @@ -332,6 +332,19 @@ public RexNode getExpression(String functionText, FunctionInfo fi, RexUtil.flatten(call.getOperands(), call.getOperator())); } + // Avoid creating incorrect expressions like $1 < NULL or $1 = NULL or NULL = NULL + // which may be problematic for Calcite later on + if (expr.isA(SqlKind.BINARY_COMPARISON) && expr.getKind() != SqlKind.IS_DISTINCT_FROM + && expr.getKind() != SqlKind.IS_NOT_DISTINCT_FROM) { + RexCall call = (RexCall) expr; + RexNode op0 = call.getOperands().get(0); + RexNode op1 = call.getOperands().get(1); + if ((op0.getKind() == SqlKind.LITERAL && ((RexLiteral) op0).isNull()) || + (op1.getKind() == SqlKind.LITERAL && ((RexLiteral) op1).isNull())) { + expr = rexBuilder.makeNullLiteral(expr.getType()); + } + } + return expr; } From 95a67d47b60313690e0de4356d62966bdfe09372 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 11 Jun 2026 14:52:44 +0100 Subject: [PATCH 26/41] Avoid incorrect comparison ($snapshotIdInputRef <= NULL) in HiveAugmentSnapshotMaterializationRule, use snapshotId -1 instead, and then switch it back in HivePushdownSnapshotFilterRule; this is required because an incorrect NULL comparison predicate would trigger a new assertion introduced in 1.41 (via [CALCITE-7070] FILTER_REDUCE_EXPRESSIONS crashes on expression BETWEEN ( NULL) AND X ): java.lang.AssertionError: Comparison with NULL in pulledUpPredicates at org.apache.calcite.util.Litmus.lambda$static$0(Litmus.java:31) at org.apache.calcite.util.Litmus.check(Litmus.java:76) at org.apache.calcite.plan.RelOptPredicateList.(RelOptPredicateList.java:128) --- .../rules/views/HiveAugmentSnapshotMaterializationRule.java | 6 ++++++ .../calcite/rules/views/HivePushdownSnapshotFilterRule.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAugmentSnapshotMaterializationRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAugmentSnapshotMaterializationRule.java index f5f2e46c0f1c..07d5082d3e7a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAugmentSnapshotMaterializationRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAugmentSnapshotMaterializationRule.java @@ -146,6 +146,12 @@ public void onMatch(RelOptRuleCall call) { final RelBuilder relBuilder = call.builder(); relBuilder.push(tableScan); + if (snapshotId == null) { + // Avoid creating an incorrect expression $snapshotIdInputRef <= NULL + // which may be problematic for Calcite later on; instead use a special value -1, + // which will be later interpreted by HivePushdownSnapshotFilterRule (and removed) + snapshotId = -1L; + } final RexNode snapshotIdLiteral = rexBuilder.makeLiteral( snapshotId, snapshotIdType(relBuilder.getTypeFactory()), false); final RexNode predicateWithSnapShotId = rexBuilder.makeCall( diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HivePushdownSnapshotFilterRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HivePushdownSnapshotFilterRule.java index 0965c81977c5..f54f31be00e0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HivePushdownSnapshotFilterRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HivePushdownSnapshotFilterRule.java @@ -116,6 +116,11 @@ private boolean setSnapShotId(RexNode op1, RexNode op2) { } Long snapshotId = literal.getValueAs(Long.class); + if (snapshotId != null && snapshotId == -1L) { + // HiveAugmentSnapshotMaterializationRule uses snapshotId -1 (instead of null) to avoid generating + // an incorrect predicate ($snapshotIdInputRef <= NULL), so replace it back here + snapshotId = null; + } RelOptTable relOptTable = getRelOptTableOf(op2); if (relOptTable == null) { From 6321adb3d678a4dc20049df83dbba38dd96a0d5b Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Thu, 11 Jun 2026 16:02:32 +0100 Subject: [PATCH 27/41] Adjust test files --- .../clientpositive/llap/orc_predicate_pushdown.q.out | 6 +++--- .../clientpositive/llap/parquet_predicate_pushdown.q.out | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 63d671495c77..33d820d06c67 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 @@ -627,7 +627,7 @@ STAGE PLANS: alias: orc_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -695,10 +695,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: orc_pred - filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), 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 66fd8c1cf94e..52c1c2f2e98a 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 @@ -561,7 +561,7 @@ STAGE PLANS: alias: tbl_pred Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) @@ -629,10 +629,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: tbl_pred - filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + filterExpr: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 1049 Data size: 105941 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (t <> -3Y) and (t <> -2Y) and (t <> -1Y) and (s like 'bob%')) (type: boolean) + predicate: (UDFToInteger(t) BETWEEN 25 AND 30 and (s like 'bob%') and (t <> -3Y) and (t <> -2Y) and (t <> -1Y)) (type: boolean) Statistics: Num rows: 262 Data size: 26462 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: t (type: tinyint), s (type: string) From b2848e0d08c9ce0b96cc1a193b47a938523efb9d Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 08:10:52 +0100 Subject: [PATCH 28/41] Adjust TestHiveAugmentSnapshotMaterializationRule to reflect the change on HiveAugmentSnapshotMaterializationRule: generate $snapshotId <= -1 instead of $snapshotId <= null (which can lead to a Calcite error) --- .../rules/views/TestHiveAugmentSnapshotMaterializationRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/TestHiveAugmentSnapshotMaterializationRule.java b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/TestHiveAugmentSnapshotMaterializationRule.java index cbed5c062189..663b1e6bdb8c 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/TestHiveAugmentSnapshotMaterializationRule.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/TestHiveAugmentSnapshotMaterializationRule.java @@ -57,7 +57,7 @@ public void testWhenNoSnapshotButTableHasNewDataAFilterWithDefaultSnapshotIDAdde assertThat(newRoot, instanceOf(HiveFilter.class)); HiveFilter filter = (HiveFilter) newRoot; - assertThat(filter.getCondition().toString(), is("<=($3, null)")); + assertThat(filter.getCondition().toString(), is("<=($3, -1)")); } @Test From 37111aea39ef83d6d157719b3c66ff80efa08da4 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 11:39:30 +0100 Subject: [PATCH 29/41] In druid-handler pom add dependency to asm 9.6 to avoid error on javadoc generation: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-shade-plugin:3.6.0:shade (default) on project hive-druid-handler: Error creating shaded jar: Problem shading JAR /../hive/druid-handler/target/hive-druid-handler-4.3.0-SNAPSHOT.jar entry org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: org.apache.maven.plugin.MojoExecutionException: Error in ASM processing class org/apache/hive/druid/org/apache/calcite/runtime/SqlFunctions.class: Index 65536 out of bounds for length 334 --- druid-handler/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index dcc5ebd8a481..f074c9a9d175 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -409,6 +409,17 @@ + + + org.ow2.asm + asm + 9.6 + + org.ow2.asm + asm-commons + 9.6 + + From 7cca2ca5932721325601c70c1b6330608469afdb Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 12:36:06 +0100 Subject: [PATCH 30/41] minor: adjust test plan, use ORDER BY ... instead or repeating the expression SUBSTR(`value`, 5) --- .../llap/offset_limit_global_optimizer.q.out | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ql/src/test/results/clientpositive/llap/offset_limit_global_optimizer.q.out b/ql/src/test/results/clientpositive/llap/offset_limit_global_optimizer.q.out index 5300b89cce31..9a016d2f5d1d 100644 --- a/ql/src/test/results/clientpositive/llap/offset_limit_global_optimizer.q.out +++ b/ql/src/test/results/clientpositive/llap/offset_limit_global_optimizer.q.out @@ -18,7 +18,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `srcpart.key`, SUBSTR(`value`, 5) AS `csubstr`, `ds`, `hr` FROM `default`.`srcpart` -ORDER BY `key`, SUBSTR(`value`, 5), `ds`, `hr` +ORDER BY `key`, 2, `ds`, `hr` LIMIT 10 OFFSET 400 STAGE DEPENDENCIES: @@ -301,7 +301,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `srcpart.key`, SUBSTR(`value`, 5) AS `csubstr`, `ds`, `hr` FROM `default`.`srcpart` -ORDER BY `key`, SUBSTR(`value`, 5), `ds`, `hr` +ORDER BY `key`, 2, `ds`, `hr` LIMIT 10 OFFSET 490 STAGE DEPENDENCIES: @@ -584,7 +584,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `srcpart.key`, SUBSTR(`value`, 5) AS `csubstr`, `ds`, `hr` FROM `default`.`srcpart` -ORDER BY `key`, SUBSTR(`value`, 5), `ds`, `hr` +ORDER BY `key`, 2, `ds`, `hr` LIMIT 20 OFFSET 490 STAGE DEPENDENCIES: @@ -877,7 +877,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### OPTIMIZED SQL: SELECT `key` AS `srcpart.key`, SUBSTR(`value`, 5) AS `csubstr`, `ds`, `hr` FROM `default`.`srcpart` -ORDER BY `key`, SUBSTR(`value`, 5), `ds`, `hr` +ORDER BY `key`, 2, `ds`, `hr` LIMIT 600 OFFSET 490 STAGE DEPENDENCIES: From c185e78000ef70abefb01c46b1a31a82612e3dea Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 13:53:48 +0100 Subject: [PATCH 31/41] Test adjustments: some IS [NOT] NULL simplifications have been removed from RexSimplify for "non-safe" operations, e.g. division (if it could "hide" a runtime division by zero) or operations involving cast (only "lossless" casts can be simplified), via: [CALCITE-7145] RexSimplify should not simplify IS NULL(10/0) (1.42) [CALCITE-7296] RexSimplify should not simplify IS (NOT) NULL(CAST(10/0 AS BIGINT)) (1.42) [CALCITE-7032] Simplify 'NULL>ALL (ARRAY[1,2,NULL])' to 'NULL' (1.41) --- .../clientpositive/llap/explainuser_1.q.out | 6 +-- .../clientpositive/llap/interval_3.q.out | 4 +- .../clientpositive/llap/subquery_in.q.out | 14 +++---- .../clientpositive/llap/subquery_multi.q.out | 2 +- .../clientpositive/llap/subquery_notin.q.out | 37 +++++++++--------- .../clientpositive/llap/subquery_select.q.out | 16 ++++---- .../llap/vector_interval_mapjoin.q.out | 38 +++++++++---------- 7 files changed, 57 insertions(+), 60 deletions(-) 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 b078ff203d6e..fcde373c805c 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out @@ -2807,7 +2807,7 @@ Stage-0 Select Operator [SEL_10] (rows=1 width=12) Output:["_col0","_col1"] Filter Operator [FIL_9] (rows=1 width=16) - predicate:(_col1 is not null and UDFToDouble(_col0) is not null) + predicate:(UDFToDouble(_col0) / _col1) is not null Please refer to the previous Group By Operator [GBY_7] PREHOOK: query: explain select b.p_mfgr, min(p_retailprice) @@ -6562,7 +6562,7 @@ Stage-0 <-Select Operator [SEL_5] (rows=500 width=12) Output:["_col0","_col1"] Filter Operator [FIL_19] (rows=500 width=87) - predicate:UDFToDouble(key) is not null + predicate:(UDFToDouble(key) + 1.0D) is not null TableScan [TS_3] (rows=500 width=87) default@src,c,Tbl:COMPLETE,Col:COMPLETE,Output:["key"] @@ -6813,7 +6813,7 @@ Stage-0 Select Operator [SEL_4] (rows=1 width=184) Output:["_col0","_col1"] Filter Operator [FIL_17] (rows=1 width=184) - predicate:UDFToDouble(key) is not null + predicate:(UDFToDouble(key) + 1.0D) is not null TableScan [TS_2] (rows=1 width=184) default@t2_n70,c,Tbl:COMPLETE,Col:NONE,Output:["key"] <-Select Operator [SEL_1] (rows=1 width=368) diff --git a/ql/src/test/results/clientpositive/llap/interval_3.q.out b/ql/src/test/results/clientpositive/llap/interval_3.q.out index f004b3e990a2..40a8a3df742b 100644 --- a/ql/src/test/results/clientpositive/llap/interval_3.q.out +++ b/ql/src/test/results/clientpositive/llap/interval_3.q.out @@ -159,10 +159,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - filterExpr: CAST( d_date AS DATE) is not null (type: boolean) + filterExpr: (((((((CAST( d_date AS DATE) + INTERVAL'1-0') + INTERVAL'0-2') + INTERVAL'5 00:00:00.000000000') + INTERVAL'0 04:00:00.000000000') + INTERVAL'0 00:10:00.000000000') + INTERVAL'0 00:00:09.000000000') is not null and (CAST( d_date AS DATE) + INTERVAL'1-2') is not null) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: CAST( d_date AS DATE) is not null (type: boolean) + predicate: (((((((CAST( d_date AS DATE) + INTERVAL'1-0') + INTERVAL'0-2') + INTERVAL'5 00:00:00.000000000') + INTERVAL'0 04:00:00.000000000') + INTERVAL'0 00:10:00.000000000') + INTERVAL'0 00:00:09.000000000') is not null and (CAST( d_date AS DATE) + INTERVAL'1-2') is not null) (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: d_week_seq (type: int), ((((((CAST( d_date AS DATE) + INTERVAL'1-0') + INTERVAL'0-2') + INTERVAL'5 00:00:00.000000000') + INTERVAL'0 04:00:00.000000000') + INTERVAL'0 00:10:00.000000000') + INTERVAL'0 00:00:09.000000000') (type: timestamp), (CAST( d_date AS DATE) + INTERVAL'1-2') (type: date) 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 6deb35203568..550a427829b3 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out @@ -314,7 +314,7 @@ STAGE PLANS: Map-reduce partition columns: p_mfgr (type: string) Statistics: Num rows: 26 Data size: 2652 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(p_size) is not null (type: boolean) + predicate: p_size is not null (type: boolean) Statistics: Num rows: 26 Data size: 3250 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_name (type: string), p_size (type: int) @@ -384,7 +384,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) + predicate: (UDFToDouble(_col0) / _col1) 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) @@ -1415,7 +1415,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 100 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and _col2 is not null) (type: boolean) + predicate: (_col1 / _col2) is not null (type: boolean) Statistics: Num rows: 100 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (_col1 / _col2) (type: double), _col0 (type: int) @@ -4478,10 +4478,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: ((p_partkey is not null and UDFToDouble(p_size) is not null) or p_partkey is not null) (type: boolean) + filterExpr: ((p_partkey is not null and p_size is not null) or p_partkey is not null) (type: boolean) Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (p_partkey is not null and UDFToDouble(p_size) is not null) (type: boolean) + predicate: (p_partkey 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) @@ -4541,7 +4541,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 25 Data size: 500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) + predicate: (UDFToDouble(_col1) / _col2) is not null (type: boolean) Statistics: Num rows: 25 Data size: 500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), (UDFToDouble(_col1) / _col2) (type: double) @@ -5181,7 +5181,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 25 Data size: 500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col2 is not null and UDFToDouble(_col1) is not null) (type: boolean) + predicate: (UDFToDouble(_col1) / _col2) is not null (type: boolean) Statistics: Num rows: 25 Data size: 500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(_col1) / _col2) (type: double), true (type: boolean), _col0 (type: int) 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 86c14c454d84..af1ba20448ec 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out @@ -3151,7 +3151,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col0 is not null and _col1 is not null) (type: boolean) + predicate: (_col0 / _col1) is not null (type: boolean) Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (_col0 / _col1) (type: double), true (type: boolean) 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 aca491862f6d..bfbc465981bc 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out @@ -790,7 +790,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) + predicate: (UDFToDouble(_col0) / _col1) 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) @@ -3145,7 +3145,7 @@ STAGE PLANS: Statistics: Num rows: 16 Data size: 1728 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) Filter Operator - predicate: (p_brand is not null and UDFToDouble(p_type) is not null) (type: boolean) + predicate: (p_brand is not null and (UDFToDouble(p_type) + 2.0D) 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) @@ -5663,12 +5663,12 @@ HiveProject(c1=[$0]) HiveProject(c10=[$0], c=[$1], ck=[$2]) HiveAggregate(group=[{0}], c=[COUNT()], ck=[COUNT($1)]) HiveProject(c10=[CAST($0):DOUBLE], c1=[$0]) - HiveFilter(condition=[IS NOT NULL(CAST($0):DOUBLE)]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, t2_n0]], table:alias=[t2_n0]) HiveProject(c1=[$0], literalTrue=[true], c10=[$1]) HiveAggregate(group=[{0, 1}]) HiveProject(c1=[$0], c10=[CAST($0):DOUBLE]) - HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL(CAST($0):DOUBLE))]) + HiveFilter(condition=[IS NOT NULL($0)]) HiveTableScan(table=[[default, t2_n0]], table:alias=[t2_n0]) PREHOOK: query: explain SELECT c1 FROM t1_n0 WHERE c1 NOT IN (SELECT c1 FROM t2_n0 where t1_n0.c2=t2_n0.c1) @@ -5718,10 +5718,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: t2_n0 - filterExpr: (UDFToDouble(c1) is not null or (c1 is not null and UDFToDouble(c1) is not null)) (type: boolean) + filterExpr: 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) + predicate: c1 is not null (type: boolean) Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(c1) (type: double), c1 (type: int) @@ -5741,25 +5741,22 @@ STAGE PLANS: Map-reduce partition columns: _col0 (type: double) Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint), _col2 (type: bigint) - Filter Operator - 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) outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator keys: _col0 (type: int), _col1 (type: double) minReductionHashAggr: 0.4 mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: double) null sort order: zz sort order: ++ Map-reduce partition columns: _col0 (type: int), _col1 (type: double) - Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: vectorized, llap LLAP IO: all inputs Reducer 2 @@ -5790,21 +5787,21 @@ STAGE PLANS: 0 _col0 (type: int), _col2 (type: double) 1 _col0 (type: int), _col2 (type: double) outputColumnNames: _col0, _col4, _col5, _col7 - Statistics: Num rows: 5 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 76 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col4 (type: bigint), _col5 (type: bigint), _col7 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col5 - Statistics: Num rows: 5 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 76 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (_col1 is null or (_col1 = 0L) or (_col0 is null or _col5 is not null or (_col2 < _col1)) is not true) (type: boolean) - Statistics: Num rows: 5 Data size: 92 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 76 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 4 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -5832,17 +5829,17 @@ STAGE PLANS: keys: KEY._col0 (type: int), KEY._col1 (type: double) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), true (type: boolean), _col1 (type: double) outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int), _col2 (type: double) null sort order: zz sort order: ++ Map-reduce partition columns: _col0 (type: int), _col2 (type: double) - Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 2 Data size: 32 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: boolean) Stage: Stage-0 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 69beb9d179b0..e1bf4e5fbf33 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_select.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_select.q.out @@ -656,10 +656,10 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col6 Statistics: Num rows: 26 Data size: 3136 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: int) + key expressions: _col1 (type: int), _col0 (type: string) null sort order: zz sort order: ++ - Map-reduce partition columns: _col0 (type: string), _col1 (type: int) + Map-reduce partition columns: _col1 (type: int), _col0 (type: string) Statistics: Num rows: 26 Data size: 3136 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col2 (type: boolean), _col4 (type: bigint), _col5 (type: boolean), _col6 (type: boolean) Reducer 4 @@ -669,8 +669,8 @@ STAGE PLANS: condition map: Left Outer Join 0 to 1 keys: - 0 _col0 (type: string), _col1 (type: int) - 1 _col2 (type: string), _col0 (type: int) + 0 _col1 (type: int), _col0 (type: string) + 1 _col0 (type: int), _col2 (type: string) outputColumnNames: _col1, _col2, _col4, _col5, _col6, _col8 Statistics: Num rows: 48 Data size: 1068 Basic stats: COMPLETE Column stats: COMPLETE Select Operator @@ -701,10 +701,10 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 24 Data size: 2688 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator - key expressions: _col2 (type: string), _col0 (type: int) + key expressions: _col0 (type: int), _col2 (type: string) null sort order: zz sort order: ++ - Map-reduce partition columns: _col2 (type: string), _col0 (type: int) + Map-reduce partition columns: _col0 (type: int), _col2 (type: string) Statistics: Num rows: 24 Data size: 2688 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: boolean) Group By Operator @@ -4225,7 +4225,7 @@ STAGE PLANS: Statistics: Num rows: 26 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: int) Filter Operator - predicate: UDFToDouble(p_size) is not null (type: boolean) + predicate: p_size is not null (type: boolean) Statistics: Num rows: 26 Data size: 208 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: p_partkey (type: int), UDFToDouble(p_size) (type: double) @@ -4247,7 +4247,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) + predicate: (UDFToDouble(_col0) / _col1) 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) 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 2bbf69ab5033..76f4387f95ee 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 @@ -206,7 +206,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vectortab_a_1korc - filterExpr: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) + filterExpr: ((dt - CAST( ts AS DATE)) is not null and s is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 185480 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -214,18 +214,18 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 12:date), SelectColumnIsNotNull(col 15:date)(children: CastTimestampToDate(col 10:timestamp) -> 15:date), SelectColumnIsNotNull(col 8:string)) - predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) - Statistics: Num rows: 905 Data size: 167854 Basic stats: COMPLETE Column stats: COMPLETE + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 16:interval_day_time)(children: DateColSubtractDateColumn(col 12:date, col 15:date)(children: CastTimestampToDate(col 10:timestamp) -> 15:date) -> 16:interval_day_time), SelectColumnIsNotNull(col 8:string)) + predicate: ((dt - CAST( ts AS DATE)) is not null and s is not null) (type: boolean) + Statistics: Num rows: 949 Data size: 176022 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) outputColumnNames: _col0, _col1 Select Vectorization: className: VectorSelectOperator native: true - projectedOutputColumnNums: [8, 17] - selectExpressions: DateColSubtractDateColumn(col 12:date, col 16:date)(children: CastTimestampToDate(col 10:timestamp) -> 16:date) -> 17:interval_day_time - Statistics: Num rows: 905 Data size: 95930 Basic stats: COMPLETE Column stats: COMPLETE + projectedOutputColumnNums: [8, 18] + selectExpressions: DateColSubtractDateColumn(col 12:date, col 17:date)(children: CastTimestampToDate(col 10:timestamp) -> 17:date) -> 18:interval_day_time + Statistics: Num rows: 949 Data size: 100594 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 @@ -240,21 +240,21 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 input vertices: 1 Map 2 - Statistics: Num rows: 890 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 943 Data size: 188600 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: string), _col2 (type: string), _col1 (type: interval_day_time) outputColumnNames: _col0, _col1, _col2 Select Vectorization: className: VectorSelectOperator native: true - projectedOutputColumnNums: [8, 8, 17] - Statistics: Num rows: 890 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE + projectedOutputColumnNums: [8, 8, 18] + Statistics: Num rows: 943 Data size: 188600 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false File Sink Vectorization: className: VectorFileSinkOperator native: false - Statistics: Num rows: 890 Data size: 178000 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 943 Data size: 188600 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -274,7 +274,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: vectortab_b_1korc - filterExpr: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) + filterExpr: ((dt - CAST( ts AS DATE)) is not null and s is not null) (type: boolean) Statistics: Num rows: 1000 Data size: 184664 Basic stats: COMPLETE Column stats: COMPLETE TableScan Vectorization: native: true @@ -282,18 +282,18 @@ STAGE PLANS: Filter Vectorization: className: VectorFilterOperator native: true - predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 12:date), SelectColumnIsNotNull(col 15:date)(children: CastTimestampToDate(col 10:timestamp) -> 15:date), SelectColumnIsNotNull(col 8:string)) - predicate: (dt is not null and CAST( ts AS DATE) is not null and s is not null) (type: boolean) - Statistics: Num rows: 890 Data size: 164340 Basic stats: COMPLETE Column stats: COMPLETE + predicateExpression: FilterExprAndExpr(children: SelectColumnIsNotNull(col 16:interval_day_time)(children: DateColSubtractDateColumn(col 12:date, col 15:date)(children: CastTimestampToDate(col 10:timestamp) -> 15:date) -> 16:interval_day_time), SelectColumnIsNotNull(col 8:string)) + predicate: ((dt - CAST( ts AS DATE)) is not null and s is not null) (type: boolean) + Statistics: Num rows: 943 Data size: 174122 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: s (type: string), (dt - CAST( ts AS DATE)) (type: interval_day_time) outputColumnNames: _col0, _col1 Select Vectorization: className: VectorSelectOperator native: true - projectedOutputColumnNums: [8, 17] - selectExpressions: DateColSubtractDateColumn(col 12:date, col 16:date)(children: CastTimestampToDate(col 10:timestamp) -> 16:date) -> 17:interval_day_time - Statistics: Num rows: 890 Data size: 94340 Basic stats: COMPLETE Column stats: COMPLETE + projectedOutputColumnNums: [8, 18] + selectExpressions: DateColSubtractDateColumn(col 12:date, col 17:date)(children: CastTimestampToDate(col 10:timestamp) -> 17:date) -> 18:interval_day_time + Statistics: Num rows: 943 Data size: 99958 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string), _col1 (type: interval_day_time) null sort order: zz @@ -303,7 +303,7 @@ STAGE PLANS: className: VectorReduceSinkMultiKeyOperator native: true nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true - Statistics: Num rows: 890 Data size: 94340 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 943 Data size: 99958 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: vectorized, llap LLAP IO: all inputs Map Vectorization: From 57af126a4497de2e4ae57df4d828c08cc8d46ad2 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 14:04:38 +0100 Subject: [PATCH 32/41] Adjust test plans simplifications around IS_NOT_NULL: [CALCITE-5639] RexSimplify should remove IS NOT NULL check when LIKE comparison is present (1.35) (actually more generic than just LIKE) [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) --- .../positive/merge_iceberg_copy_on_write_unpartitioned.q.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_copy_on_write_unpartitioned.q.out b/iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_copy_on_write_unpartitioned.q.out index 4b413fb80f16..115992d60112 100644 --- a/iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_copy_on_write_unpartitioned.q.out +++ b/iceberg/iceberg-handler/src/test/results/positive/merge_iceberg_copy_on_write_unpartitioned.q.out @@ -621,7 +621,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((((_col5 <> _col8) or (_col5 <= 100)) and _col5 is not null) or (_col5 is null or ((_col5 = _col8) and (_col5 > 100))) is null) (type: boolean) + predicate: ((_col5 <> _col8) or (_col5 <= 100) or (_col5 is null or ((_col5 = _col8) and (_col5 > 100))) is null) (type: boolean) Statistics: Num rows: 8 Data size: 3884 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: string), _col3 (type: bigint), _col4 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: int) From e17269575f532601d56c1a7bc0470d7f56ea0ca7 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Fri, 12 Jun 2026 17:17:41 +0100 Subject: [PATCH 33/41] Adjust test: simplify A IS NOT TRUE => A IS NULL OR NOT A [CALCITE-7005] Invalid unparse for IS TRUE,IS FALSE,IS NOT TRUE and IS NOT FALSE in Hive/Presto Dialect (1.40) --- ql/src/test/results/clientpositive/llap/sharedwork.q.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ql/src/test/results/clientpositive/llap/sharedwork.q.out b/ql/src/test/results/clientpositive/llap/sharedwork.q.out index 0902a5e45895..c8273fac8df5 100644 --- a/ql/src/test/results/clientpositive/llap/sharedwork.q.out +++ b/ql/src/test/results/clientpositive/llap/sharedwork.q.out @@ -607,7 +607,7 @@ INNER JOIN (SELECT `p_size` + 1 AS `$f0` FROM `default`.`part` WHERE `p_size` IS NOT NULL GROUP BY `p_size` + 1) AS `t15` ON `t11`.`$f1` = `t15`.`$f0`) AS `t16` ON `t`.`p_type` = `t16`.`p_type` AND `t`.`size` = `t16`.`size`) AS `t17` -WHERE (`t17`.`$f2` IS NULL OR `t17`.`c` IS NULL OR `t17`.`c` = 0) AND (`t17`.`p_type` IS NULL OR `t17`.`c` IS NULL OR `t17`.`c` = 0 OR `t17`.`ck` < `t17`.`c` IS NOT TRUE OR `t17`.`$f2` IS NOT NULL) AND (`t17`.`c` IS NULL OR `t17`.`c` = 0 OR `t17`.`p_type` IS NOT NULL OR `t17`.`$f2` IS NOT NULL) +WHERE (`t17`.`$f2` IS NULL OR `t17`.`c` IS NULL OR `t17`.`c` = 0) AND (`t17`.`p_type` IS NULL OR `t17`.`c` IS NULL OR `t17`.`c` = 0 OR (`t17`.`ck` < `t17`.`c` IS NULL OR NOT `t17`.`ck` < `t17`.`c`) OR `t17`.`$f2` IS NOT NULL) AND (`t17`.`c` IS NULL OR `t17`.`c` = 0 OR `t17`.`p_type` IS NOT NULL OR `t17`.`$f2` IS NOT NULL) STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 From 91aa2328118148a5d785f66d4c917ed671f43dea Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Sun, 14 Jun 2026 18:53:30 +0100 Subject: [PATCH 34/41] minor (formatting) --- druid-handler/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index f074c9a9d175..dba8943628d9 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -413,7 +413,8 @@ org.ow2.asm asm - 9.6 + 9.6 + org.ow2.asm asm-commons From 18a6961deb1d2e802394c920ffd234e444a16ae1 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 15 Jun 2026 11:51:39 +0100 Subject: [PATCH 35/41] Identify NOT BETWEEN expression in SearchTransformer to avoid plan change in udf_between.q The plan difference comes from: 1.33 BETWEEN -> RexSimplify: 100 <= x AND x <= 200 -> HivePointLookupOptimizerRule: x BETWEEN 100, 200 -> SearchTransformer: no-op NOT BETWEEN -> RexSimplify: x < 100 OR x > 200 -> HivePointLookupOptimizerRule: x NOT BETWEEN 100, 200 -> SearchTransformer: no-op vs 1.42 BETWEEN -> RexSimpliy: Sarg x [100..200] -> HivePointLookupOptimizerRule: no-op -> SearchTransformer: x BETWEEN 100, 200 NOT BETWEEN -> RexSimpliy: Sarg x (-inf..100, 200..+inf) -> HivePointLookupOptimizerRule: no-op -> SearchTransformer: x < 100 OR x > 200 Thus, we need to adjust SearchTransformer to detect the last case and generate: x NOT BETWEEN 100, 200 --- .../optimizer/calcite/SearchTransformer.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java index 565479734b42..2e09dc1d3542 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java @@ -17,6 +17,9 @@ */ package org.apache.hadoop.hive.ql.optimizer.calcite; +import com.google.common.collect.BoundType; +import com.google.common.collect.Range; +import com.google.common.collect.RangeSet; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexCall; @@ -35,8 +38,10 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import java.util.Objects; +import java.util.Set; /** * A class that transforms a call to the internal {@link SqlStdOperatorTable#SEARCH} operator into an equivalent @@ -92,6 +97,16 @@ public RexNode transform() { range -> rexBuilder.makeCall(SqlStdOperatorTable.NOT_EQUALS, ref, rexBuilder.makeLiteral(range.lowerEndpoint(), operandType, true, true))).toList(); orList.add(RexUtil.composeConjunction(rexBuilder, list)); + } else if (isNotBetween(sarg.rangeSet)) { + Iterator> iterator = sarg.rangeSet.asRanges().iterator(); + C lower = iterator.next().upperEndpoint(); + C upper = iterator.next().lowerEndpoint(); + RexNode notBetween = rexBuilder.makeCall(HiveBetween.INSTANCE, + rexBuilder.makeLiteral(true), // inverse flag enabled, i.e. 'NOT BETWEEN' + ref, + rexBuilder.makeLiteral(lower, operandType, true, true), + rexBuilder.makeLiteral(upper, operandType, true, true)); + orList.add(notBetween); } else { RangeConverter consumer = new RangeConverter<>(rexBuilder, operandType, ref); RangeSets.forEach(sarg.rangeSet, consumer); @@ -125,6 +140,19 @@ public RexNode transform() { return x; } + // Identifies a NOT BETWEEN expression: x < 10 OR x > 20 => x NOT BETWEEN 10, 20 + private boolean isNotBetween(RangeSet rangeSet) { + Set> ranges = rangeSet.asRanges(); + if (ranges.size() == 2) { + Iterator> iterator = ranges.iterator(); + Range first = iterator.next(); + Range second = iterator.next(); + return !first.hasLowerBound() && first.hasUpperBound() && first.upperBoundType() == BoundType.OPEN + && !second.hasUpperBound() && second.hasLowerBound() && second.lowerBoundType() == BoundType.OPEN; + } + return false; + } + public static class Shuttle extends RexShuttle { private final RexBuilder rexBuilder; private RexUnknownAs unknownContext; From 2bc99bd56c05b689d008257a0192258db1a1cad4 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Mon, 15 Jun 2026 16:40:39 +0100 Subject: [PATCH 36/41] Previous change (identify NOT BETWEEN expression in SearchTransformer to avoid plan change in udf_between.q) solved 1 plan change but "broke" 8 other tests (see below *); so instead, simply revert the change in SearchTransformer and adjust udf_between.q.out. The "identify NOT BETWEEN expression in SearchTransformer" (to deal with "regression" caused by ""[CALCITE-7194] Simplify comparisons between function calls and literals to SEARCH (1.41)") can be handled in a separate, dedicated PR. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * testCliDriver[vector_between_columns] – org.apache.hadoop.hive.cli.split28.TestMiniLlapLocalCliDriver4s testCliDriver[external_jdbc_table_perf] – org.apache.hadoop.hive.cli.split8.TestMiniLlapLocalCliDriver48s testCliDriver[filter_numeric] – org.apache.hadoop.hive.cli.split8.TestMiniLlapLocalCliDriver3s testCliDriver[correlationoptimizer8] – org.apache.hadoop.hive.cli.split5.TestMiniLlapLocalCliDriver5s testCliDriver[vector_between_in] – org.apache.hadoop.hive.cli.split29.TestMiniLlapLocalCliDriver36s testCliDriver[stats_histogram_null] – org.apache.hadoop.hive.cli.split22.TestMiniLlapLocalCliDriver28s testCliDriver[join34] – org.apache.hadoop.hive.cli.split11.TestMiniLlapLocalCliDriver2s testCliDriver[join35] – org.apache.hadoop.hive.cli.split11.TestMiniLlapLocalCliDriver --- .../optimizer/calcite/SearchTransformer.java | 28 ------------------- .../clientpositive/llap/udf_between.q.out | 4 +-- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java index 2e09dc1d3542..565479734b42 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/SearchTransformer.java @@ -17,9 +17,6 @@ */ package org.apache.hadoop.hive.ql.optimizer.calcite; -import com.google.common.collect.BoundType; -import com.google.common.collect.Range; -import com.google.common.collect.RangeSet; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexBuilder; import org.apache.calcite.rex.RexCall; @@ -38,10 +35,8 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.Objects; -import java.util.Set; /** * A class that transforms a call to the internal {@link SqlStdOperatorTable#SEARCH} operator into an equivalent @@ -97,16 +92,6 @@ public RexNode transform() { range -> rexBuilder.makeCall(SqlStdOperatorTable.NOT_EQUALS, ref, rexBuilder.makeLiteral(range.lowerEndpoint(), operandType, true, true))).toList(); orList.add(RexUtil.composeConjunction(rexBuilder, list)); - } else if (isNotBetween(sarg.rangeSet)) { - Iterator> iterator = sarg.rangeSet.asRanges().iterator(); - C lower = iterator.next().upperEndpoint(); - C upper = iterator.next().lowerEndpoint(); - RexNode notBetween = rexBuilder.makeCall(HiveBetween.INSTANCE, - rexBuilder.makeLiteral(true), // inverse flag enabled, i.e. 'NOT BETWEEN' - ref, - rexBuilder.makeLiteral(lower, operandType, true, true), - rexBuilder.makeLiteral(upper, operandType, true, true)); - orList.add(notBetween); } else { RangeConverter consumer = new RangeConverter<>(rexBuilder, operandType, ref); RangeSets.forEach(sarg.rangeSet, consumer); @@ -140,19 +125,6 @@ public RexNode transform() { return x; } - // Identifies a NOT BETWEEN expression: x < 10 OR x > 20 => x NOT BETWEEN 10, 20 - private boolean isNotBetween(RangeSet rangeSet) { - Set> ranges = rangeSet.asRanges(); - if (ranges.size() == 2) { - Iterator> iterator = ranges.iterator(); - Range first = iterator.next(); - Range second = iterator.next(); - return !first.hasLowerBound() && first.hasUpperBound() && first.upperBoundType() == BoundType.OPEN - && !second.hasUpperBound() && second.hasLowerBound() && second.lowerBoundType() == BoundType.OPEN; - } - return false; - } - public static class Shuttle extends RexShuttle { private final RexBuilder rexBuilder; private RexUnknownAs unknownContext; diff --git a/ql/src/test/results/clientpositive/llap/udf_between.q.out b/ql/src/test/results/clientpositive/llap/udf_between.q.out index 3c01bba352e5..c1e3056adafe 100644 --- a/ql/src/test/results/clientpositive/llap/udf_between.q.out +++ b/ql/src/test/results/clientpositive/llap/udf_between.q.out @@ -84,9 +84,9 @@ STAGE PLANS: Processor Tree: TableScan alias: src - filterExpr: (UDFToDouble(key) + 100.0D) NOT BETWEEN 100.0D AND 200.0D (type: boolean) + filterExpr: (((UDFToDouble(key) + 100.0D) < 100.0D) or ((UDFToDouble(key) + 100.0D) > 200.0D)) (type: boolean) Filter Operator - predicate: (UDFToDouble(key) + 100.0D) NOT BETWEEN 100.0D AND 200.0D (type: boolean) + predicate: (((UDFToDouble(key) + 100.0D) < 100.0D) or ((UDFToDouble(key) + 100.0D) > 200.0D)) (type: boolean) Limit Number of rows: 20 Select Operator From 797dc5efdbb76ed8e74e7e7a8b278de2f413f83c Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 17 Jun 2026 10:01:06 +0100 Subject: [PATCH 37/41] Test adjustments: rowcount changes in TestExplainCBOFormattedCliDriver query24, 30, 38, 54, 81, 87 due to [CALCITE-7083] RelMdDistinctRowCount aggregates implementation problems (1.41) --- .../perf/tpcds30tb/json/query24.q.out | 12 +++---- .../perf/tpcds30tb/json/query30.q.out | 10 +++--- .../perf/tpcds30tb/json/query38.q.out | 22 ++++++------ .../perf/tpcds30tb/json/query54.q.out | 4 +-- .../perf/tpcds30tb/json/query81.q.out | 10 +++--- .../perf/tpcds30tb/json/query87.q.out | 36 +++++++++---------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query24.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query24.q.out index 884aa7a0d68a..9b5a2229d7e6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query24.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query24.q.out @@ -2479,7 +2479,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc "name": null } ], - "rowCount": 6.998796201537001E10 + "rowCount": 2.1331637755562098E35 }, { "id": "26", @@ -2508,7 +2508,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc "name": "$3" } ], - "rowCount": 6.998796201537001E10 + "rowCount": 2.1331637755562098E35 }, { "id": "27", @@ -2526,7 +2526,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc } ] }, - "rowCount": 6.298916581383301E10 + "rowCount": 1.9198473980005887E35 }, { "id": "28", @@ -2555,7 +2555,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc "name": "$3" } ], - "rowCount": 6.298916581383301E10 + "rowCount": 1.9198473980005887E35 }, { "id": "29", @@ -3483,7 +3483,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc "28", "50" ], - "rowCount": 3.1494582906916504E10 + "rowCount": 9.599236990002944E34 }, { "id": "52", @@ -3512,7 +3512,7 @@ Warning: Map Join MAPJOIN[331][bigTable=?] in task 'Reducer 7' is a cross produc "name": "$3" } ], - "rowCount": 3.1494582906916504E10 + "rowCount": 9.599236990002944E34 } ] } diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query30.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query30.q.out index 0adf8bfb0cd6..a793a4ef3301 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query30.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query30.q.out @@ -1947,7 +1947,7 @@ "name": null } ], - "rowCount": 36000000 + "rowCount": 148297282768460832 }, { "id": "33", @@ -1993,7 +1993,7 @@ } ] }, - "rowCount": 32400000 + "rowCount": 133467554491614752 }, { "id": "34", @@ -2058,7 +2058,7 @@ "name": "$0" } ], - "rowCount": 32400000 + "rowCount": 133467554491614752 }, { "id": "35", @@ -2113,7 +2113,7 @@ "21", "34" ], - "rowCount": 2.837205225063129E37 + "rowCount": 1.168749515370393E47 }, { "id": "36", @@ -2187,7 +2187,7 @@ "name": "$17" } ], - "rowCount": 2.837205225063129E37 + "rowCount": 1.168749515370393E47 }, { "id": "37", diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query38.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query38.q.out index 2ceb58dd502a..8ccb2afc1734 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query38.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query38.q.out @@ -1194,7 +1194,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 2.196964434428032E19 }, { "id": "13", @@ -1223,7 +1223,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 2.196964434428032E19 }, { "id": "14", @@ -1952,7 +1952,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 1.1450695362414533E19 }, { "id": "25", @@ -1981,7 +1981,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 1.1450695362414533E19 }, { "id": "26", @@ -2710,7 +2710,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 5749866281303558144 }, { "id": "37", @@ -2739,7 +2739,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 5749866281303558144 }, { "id": "38", @@ -2750,7 +2750,7 @@ "25", "37" ], - "rowCount": 240000000 + "rowCount": 3.917020598799841E19 }, { "id": "39", @@ -2779,7 +2779,7 @@ "name": "$3" } ], - "rowCount": 240000000 + "rowCount": 3.917020598799841E19 }, { "id": "40", @@ -2807,7 +2807,7 @@ "name": null } ], - "rowCount": 240000000 + "rowCount": 3917020598799840768 }, { "id": "41", @@ -2832,7 +2832,7 @@ } ] }, - "rowCount": 36000000 + "rowCount": 587553089819976064 }, { "id": "42", @@ -2861,7 +2861,7 @@ "name": "$3" } ], - "rowCount": 36000000 + "rowCount": 587553089819976064 }, { "id": "43", diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query54.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query54.q.out index 78b5ea15ceb4..3a22fa16c886 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query54.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query54.q.out @@ -5111,7 +5111,7 @@ Warning: Map Join MAPJOIN[286][bigTable=?] in task 'Map 1' is a cross product "name": null } ], - "rowCount": 2952.45 + "rowCount": 11527.107150205546 }, { "id": "72", @@ -5151,7 +5151,7 @@ Warning: Map Join MAPJOIN[286][bigTable=?] in task 'Map 1' is a cross product ] } ], - "rowCount": 2952.45 + "rowCount": 11527.107150205546 }, { "id": "73", diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query81.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query81.q.out index 42396159880e..f0a12270d202 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query81.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query81.q.out @@ -2177,7 +2177,7 @@ "name": null } ], - "rowCount": 36000000 + "rowCount": 310640329339109184 }, { "id": "34", @@ -2223,7 +2223,7 @@ } ] }, - "rowCount": 32400000 + "rowCount": 279576296405198272 }, { "id": "35", @@ -2288,7 +2288,7 @@ "name": "$0" } ], - "rowCount": 32400000 + "rowCount": 279576296405198272 }, { "id": "36", @@ -2343,7 +2343,7 @@ "22", "35" ], - "rowCount": 5.943132261514999E37 + "rowCount": 5.128268230619178E47 }, { "id": "37", @@ -2427,7 +2427,7 @@ "name": "$19" } ], - "rowCount": 5.943132261514999E37 + "rowCount": 5.128268230619178E47 }, { "id": "38", diff --git a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query87.q.out b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query87.q.out index 8723d2fdfa15..4bef73d0a5e6 100644 --- a/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query87.q.out +++ b/ql/src/test/results/clientpositive/perf/tpcds30tb/json/query87.q.out @@ -1194,7 +1194,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 2.196964434428032E19 }, { "id": "13", @@ -1231,7 +1231,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 2.196964434428032E19 }, { "id": "14", @@ -1960,7 +1960,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 1.1450695362414533E19 }, { "id": "25", @@ -1997,7 +1997,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 1.1450695362414533E19 }, { "id": "26", @@ -2007,7 +2007,7 @@ "13", "25" ], - "rowCount": 160000000 + "rowCount": 3.3420339706694853E19 }, { "id": "27", @@ -2054,7 +2054,7 @@ ] } ], - "rowCount": 160000000 + "rowCount": 3.3420339706694853E19 }, { "id": "28", @@ -2098,7 +2098,7 @@ "name": null } ], - "rowCount": 160000000 + "rowCount": 3342033970669485056 }, { "id": "29", @@ -2165,7 +2165,7 @@ } ] }, - "rowCount": 12000000 + "rowCount": 250652547800211360 }, { "id": "30", @@ -2199,7 +2199,7 @@ "name": "$4" } ], - "rowCount": 12000000 + "rowCount": 250652547800211360 }, { "id": "31", @@ -2225,7 +2225,7 @@ "name": null } ], - "rowCount": 12000000 + "rowCount": 25065254780021136 }, { "id": "32", @@ -2262,7 +2262,7 @@ "name": "$3" } ], - "rowCount": 12000000 + "rowCount": 25065254780021136 }, { "id": "33", @@ -2991,7 +2991,7 @@ "name": null } ], - "rowCount": 80000000 + "rowCount": 5749866281303558144 }, { "id": "44", @@ -3028,7 +3028,7 @@ "name": "$3" } ], - "rowCount": 80000000 + "rowCount": 5749866281303558144 }, { "id": "45", @@ -3038,7 +3038,7 @@ "32", "44" ], - "rowCount": 92000000 + "rowCount": 5774931536083578880 }, { "id": "46", @@ -3085,7 +3085,7 @@ ] } ], - "rowCount": 92000000 + "rowCount": 5774931536083578880 }, { "id": "47", @@ -3129,7 +3129,7 @@ "name": null } ], - "rowCount": 92000000 + "rowCount": 577493153608357888 }, { "id": "48", @@ -3196,7 +3196,7 @@ } ] }, - "rowCount": 6900000 + "rowCount": 43311986520626840 }, { "id": "49", @@ -3230,7 +3230,7 @@ "name": "$4" } ], - "rowCount": 6900000 + "rowCount": 43311986520626840 }, { "id": "50", From 2e645166e1511d59a7a95b658f180fc06760ab6e Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 17 Jun 2026 10:51:20 +0100 Subject: [PATCH 38/41] Test adjustments: udtf_explode.q.out plan with GROUP BY + SORT fixed due to [CALCITE-6748] RelToSqlConverter returns the wrong result when Aggregate is on Sort (1.39) (and also array changes due to [CALCITE-6417] Map value constructor and Array value constructor unparsed incorrectly for HiveSqlDialect (1.38)) --- .../clientpositive/llap/udtf_explode.q.out | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ql/src/test/results/clientpositive/llap/udtf_explode.q.out b/ql/src/test/results/clientpositive/llap/udtf_explode.q.out index 94d3cd930a48..f07cf0172144 100644 --- a/ql/src/test/results/clientpositive/llap/udtf_explode.q.out +++ b/ql/src/test/results/clientpositive/llap/udtf_explode.q.out @@ -19,7 +19,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### OPTIMIZED SQL: SELECT `col` AS `mycol` -FROM TABLE(EXPLODE(ARRAY[1, 2, 3])) +FROM TABLE(EXPLODE(ARRAY (1, 2, 3))) LIMIT 3 STAGE DEPENDENCIES: Stage-0 is a root stage @@ -52,11 +52,11 @@ POSTHOOK: query: EXPLAIN EXTENDED SELECT a.myCol, count(1) FROM (SELECT explode( POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -OPTIMIZED SQL: SELECT `col` AS `a.mycol`, `$f1` AS `_c1` -FROM (SELECT `col`, COUNT(*) AS `$f1` -FROM TABLE(EXPLODE(ARRAY[1, 2, 3])) +OPTIMIZED SQL: SELECT `col` AS `a.mycol`, COUNT(*) AS `_c1` +FROM (SELECT `col` +FROM TABLE(EXPLODE(ARRAY (1, 2, 3))) +LIMIT 3) AS `t2` GROUP BY `col` -LIMIT 3) AS `t3` STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -324,11 +324,11 @@ POSTHOOK: query: EXPLAIN EXTENDED SELECT a.myKey, a.myVal, count(1) FROM (SELECT POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -OPTIMIZED SQL: SELECT `key` AS `a.mykey`, `value` AS `a.myval`, `$f2` AS `_c2` -FROM (SELECT `key`, `value`, COUNT(*) AS `$f2` -FROM TABLE(EXPLODE(MAP[1, 'one', 2, 'two', 3, 'three'])) +OPTIMIZED SQL: SELECT `key` AS `a.mykey`, `value` AS `a.myval`, COUNT(*) AS `_c2` +FROM (SELECT `key`, `value` +FROM TABLE(EXPLODE(MAP (1, 'one', 2, 'two', 3, 'three'))) +LIMIT 3) AS `t2` GROUP BY `key`, `value` -LIMIT 3) AS `t3` ORDER BY `key`, `value` STAGE DEPENDENCIES: Stage-1 is a root stage From c338736c6955b6f96b14c495312d3e4d14a4c155 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 17 Jun 2026 12:52:01 +0100 Subject: [PATCH 39/41] Test adjustments: vectorized_dynamic_partition_pruning.q.out Some IS NOT NULL simplifications added, e.g. lossless cast double to int to double + division by non-zero: UDFToDouble(UDFToInteger((hr / 2.0D))) is not null => hr is not null due to [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) (only if "lossless" cast) Some IS NOT NULL simplifications removed, e.g. not lossless cast str to double: UDFToDouble(hr) is not null => (UDFToDouble(hr) * 2.0D) is not null due to [CALCITE-7296] RexSimplify should not simplify IS (NOT) NULL(CAST(10/0 AS BIGINT)) (1.42) (non-lossless cast is considered a non-safe operation, so no simplification is applied) --- ...vectorized_dynamic_partition_pruning.q.out | 169 +++++++++--------- 1 file changed, 87 insertions(+), 82 deletions(-) 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 673c040d6b67..5f7f20b165dd 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 @@ -1909,37 +1909,40 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n2 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: _col0 (type: double) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - keys: _col0 (type: double) - minReductionHashAggr: 0.4 - mode: hash + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: _col0 (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Dynamic Partitioning Event Operator - Target column: hr (string) - Target Input: srcpart - Partition key expr: UDFToDouble(hr) + Group By Operator + keys: _col0 (type: double) + minReductionHashAggr: 0.4 + mode: hash + outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Target Vertex: Map 1 + Dynamic Partitioning Event Operator + Target column: hr (string) + Target Input: srcpart + Partition key expr: UDFToDouble(hr) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Target Vertex: Map 1 Execution mode: vectorized, llap LLAP IO: all inputs Map Vectorization: @@ -2061,10 +2064,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -2273,21 +2276,24 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n2 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE Execution mode: vectorized, llap LLAP IO: all inputs Map Vectorization: @@ -2409,10 +2415,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -2588,10 +2594,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: CAST( (UDFToDouble(hr) * 2.0D) AS STRING) (type: string) @@ -5903,37 +5909,40 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_double_hour_n2 - filterExpr: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + filterExpr: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: ((UDFToDouble(hour) = 11.0D) and UDFToDouble(UDFToInteger((hr / 2.0D))) is not null) (type: boolean) + predicate: ((UDFToDouble(hour) = 11.0D) and hr is not null) (type: boolean) Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(UDFToInteger((hr / 2.0D))) (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - key expressions: _col0 (type: double) - null sort order: z - sort order: + - Map-reduce partition columns: _col0 (type: double) + Filter Operator + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: _col0 (type: double) - outputColumnNames: _col0 - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - keys: _col0 (type: double) - minReductionHashAggr: 0.4 - mode: hash + Reduce Output Operator + key expressions: _col0 (type: double) + null sort order: z + sort order: + + Map-reduce partition columns: _col0 (type: double) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Select Operator + expressions: _col0 (type: double) outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Dynamic Partitioning Event Operator - Target column: hr (string) - Target Input: srcpart - Partition key expr: UDFToDouble(hr) + Group By Operator + keys: _col0 (type: double) + minReductionHashAggr: 0.4 + mode: hash + outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Target Vertex: Map 1 + Dynamic Partitioning Event Operator + Target column: hr (string) + Target Input: srcpart + Partition key expr: UDFToDouble(hr) + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Target Vertex: Map 1 Execution mode: vectorized, llap LLAP IO: all inputs Map Vectorization: @@ -6031,10 +6040,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart - filterExpr: UDFToDouble(hr) is not null (type: boolean) + filterExpr: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 389248 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) + predicate: (UDFToDouble(hr) * 2.0D) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 368000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (UDFToDouble(hr) * 2.0D) (type: double) @@ -7504,35 +7513,31 @@ STAGE PLANS: Map Operator Tree: TableScan alias: srcpart_orc_n0 - filterExpr: UDFToDouble(hr) is not null (type: boolean) Statistics: Num rows: 2000 Data size: 564000 Basic stats: COMPLETE Column stats: COMPLETE - Filter Operator - predicate: UDFToDouble(hr) is not null (type: boolean) - Statistics: Num rows: 2000 Data size: 376000 Basic stats: COMPLETE Column stats: COMPLETE - Select Operator - expressions: ds (type: string), UDFToDouble(hr) (type: double) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 2000 Data size: 384000 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 _col0 (type: string), _col1 (type: double) - 1 _col0 (type: string), _col1 (type: double) - input vertices: - 1 Map 3 - Statistics: Num rows: 2000 Data size: 16000 Basic stats: COMPLETE Column stats: COMPLETE - Group By Operator - aggregations: count() - minReductionHashAggr: 0.99 - mode: hash - outputColumnNames: _col0 + Select Operator + expressions: ds (type: string), UDFToDouble(hr) (type: double) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 2000 Data size: 384000 Basic stats: COMPLETE Column stats: COMPLETE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 _col0 (type: string), _col1 (type: double) + 1 _col0 (type: string), _col1 (type: double) + input vertices: + 1 Map 3 + Statistics: Num rows: 2000 Data size: 16000 Basic stats: COMPLETE Column stats: COMPLETE + Group By Operator + aggregations: count() + minReductionHashAggr: 0.99 + mode: hash + outputColumnNames: _col0 + Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE + Reduce Output Operator + null sort order: + sort order: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - Reduce Output Operator - null sort order: - sort order: - Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE - value expressions: _col0 (type: bigint) + value expressions: _col0 (type: bigint) Execution mode: llap LLAP IO: all inputs Map 3 From 8b3749b510f82026f21fcc374ec410726022555e Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 17 Jun 2026 13:38:51 +0100 Subject: [PATCH 40/41] Test adjustments: subquery_scalar.q.out Changes around IS [NOT] NULL simplifications: [CALCITE-5769] Optimizing 'CAST(e AS t) IS NOT NULL' to 'e IS NOT NULL' (1.35) (only if "lossless" cast) [CALCITE-7296] RexSimplify should not simplify IS (NOT) NULL(CAST(10/0 AS BIGINT)) (1.42) Also if(..) predicate expanded into equivalent OR due to widened SafeRexVisitor's allowlist (enough that simplifyBooleanCaseGeneric could be applied) [CALCITE-7032] Simplify 'NULL>ALL (ARRAY[1,2,NULL])' to 'NULL' (1.41) As a consequence of this simplification, there's a row-count delta in the expression (fallout in Hive's selectivity heuristic) --- .../clientpositive/llap/subquery_scalar.q.out | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) 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 469599efd823..6b9e01a63922 100644 --- a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out +++ b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out @@ -107,10 +107,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: UDFToDouble(p_size) is not null (type: boolean) + filterExpr: 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 (type: boolean) + predicate: 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) @@ -177,7 +177,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col0) is not null and _col1 is not null) (type: boolean) + predicate: (UDFToDouble(_col0) / _col1) is not null (type: boolean) Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col0) / _col1) (type: double) @@ -291,10 +291,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: UDFToDouble(p_size) is not null (type: boolean) + filterExpr: 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 (type: boolean) + predicate: 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) @@ -742,7 +742,7 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int) Filter Operator - predicate: UDFToDouble(p_size) is not null (type: boolean) + predicate: 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) @@ -764,7 +764,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and UDFToDouble(_col0) is not null) (type: boolean) + predicate: (UDFToDouble(_col0) / _col1) 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) @@ -807,7 +807,7 @@ STAGE PLANS: outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: UDFToDouble(_col0) is not null (type: boolean) + predicate: _col0 is not null (type: boolean) Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: UDFToDouble(_col0) (type: double) @@ -1476,10 +1476,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: part - filterExpr: (p_type is not null and UDFToDouble(p_size) is not null) (type: boolean) + 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_type is not null and UDFToDouble(p_size) 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), UDFToDouble(p_size) (type: double) @@ -1552,7 +1552,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Filter Operator - predicate: (UDFToDouble(_col1) is not null and _col2 is not null) (type: boolean) + predicate: (UDFToDouble(_col1) / _col2) is not null (type: boolean) Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (UDFToDouble(_col1) / _col2) (type: double), _col0 (type: string) @@ -2233,15 +2233,15 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 26 Data size: 16406 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: if(_col10 is null, (UDFToLong(_col5) <> 0L), (UDFToLong(_col5) <> _col9)) (type: boolean) - Statistics: Num rows: 13 Data size: 8203 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (((UDFToLong(_col5) <> _col9) and _col10 is not null) or (_col10 is null and (UDFToLong(_col5) <> 0L))) (type: boolean) + Statistics: Num rows: 26 Data size: 16406 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) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 13 Data size: 8047 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 13 Data size: 8047 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -4138,7 +4138,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 100 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: (_col1 is not null and _col2 is not null) (type: boolean) + predicate: (_col1 / _col2) is not null (type: boolean) Statistics: Num rows: 100 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: (_col1 / _col2) (type: double), _col0 (type: int) @@ -4726,15 +4726,15 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 Statistics: Num rows: 8 Data size: 2751 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: if(_col11 is null, (UDFToLong(_col2) <> 0L), (UDFToLong(_col2) <> _col10)) (type: boolean) - Statistics: Num rows: 4 Data size: 1428 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((_col11 is null and (UDFToLong(_col2) <> 0L)) or ((UDFToLong(_col2) <> _col10) and _col11 is not null)) (type: boolean) + Statistics: Num rows: 8 Data size: 2751 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: int), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: date) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 - Statistics: Num rows: 4 Data size: 1404 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 8 Data size: 2703 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 4 Data size: 1404 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 8 Data size: 2703 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat @@ -5012,18 +5012,18 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 Statistics: Num rows: 8 Data size: 2751 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: if(_col11 is null, (UDFToLong(_col2) <> 0L), (UDFToLong(_col2) <> _col10)) (type: boolean) - Statistics: Num rows: 4 Data size: 1428 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((_col11 is null and (UDFToLong(_col2) <> 0L)) or ((UDFToLong(_col2) <> _col10) and _col11 is not null)) (type: boolean) + Statistics: Num rows: 8 Data size: 2751 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: int), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: date), _col11 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col11 - Statistics: Num rows: 4 Data size: 1412 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 8 Data size: 2719 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col2 (type: int) null sort order: z sort order: + Map-reduce partition columns: _col2 (type: int) - Statistics: Num rows: 4 Data size: 1412 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 8 Data size: 2719 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: int), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: date), _col11 (type: boolean) Reducer 3 Execution mode: llap @@ -5035,10 +5035,10 @@ STAGE PLANS: 0 _col2 (type: int) 1 _col1 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col11, _col13 - Statistics: Num rows: 4 Data size: 1444 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 8 Data size: 2783 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: if(_col11 is null, (UDFToLong(_col0) > 0L), (UDFToLong(_col0) > _col13)) (type: boolean) - Statistics: Num rows: 2 Data size: 722 Basic stats: COMPLETE Column stats: COMPLETE + predicate: ((_col11 is null and (UDFToLong(_col0) > 0L)) or ((UDFToLong(_col0) > _col13) and _col11 is not null)) (type: boolean) + Statistics: Num rows: 2 Data size: 726 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: _col0 (type: int), _col1 (type: string), _col2 (type: int), _col3 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: int), _col7 (type: boolean), _col8 (type: boolean), _col9 (type: date) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9 @@ -6126,15 +6126,15 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 26 Data size: 16406 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator - predicate: if(_col10 is null, (UDFToLong(_col5) <> 0L), (UDFToLong(_col5) <> _col9)) (type: boolean) - Statistics: Num rows: 13 Data size: 8203 Basic stats: COMPLETE Column stats: COMPLETE + predicate: (((UDFToLong(_col5) <> _col9) and _col10 is not null) or (_col10 is null and (UDFToLong(_col5) <> 0L))) (type: boolean) + Statistics: Num rows: 26 Data size: 16406 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) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 13 Data size: 8047 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 13 Data size: 8047 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 26 Data size: 16094 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.SequenceFileInputFormat output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat From 3bea9dd19c8c0e71afa9d7c6a7ad48ff50770f37 Mon Sep 17 00:00:00 2001 From: Ruben Quesada Lopez Date: Wed, 17 Jun 2026 17:42:04 +0100 Subject: [PATCH 41/41] Add new "case CHAR_LENGTH" in SqlFunctionConverter#buildAST, since a new SqlKind.CHAR_LENGTH has been added (previously length functions had SqlKind.OTHER_FUNCTION) via [CALCITE-6182] Add LENGTH/LEN function (enabled in Snowflake library) (1.37) Problem observed in several tests, where lenght(x) function not being evaluated (returning 'length' instead of the actual value), e.g. TestJdbcDriver2#testExprCol: Illegal conversion to int from column 2 [length] java.sql.SQLException: Illegal conversion to int from column 2 [length] at org.apache.hive.jdbc.HiveBaseResultSet.getInt(HiveBaseResultSet.java:445) at org.apache.hive.jdbc.TestJdbcDriver2.testExprCol(TestJdbcDriver2.java:2217) --- .../ql/optimizer/calcite/translator/SqlFunctionConverter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/SqlFunctionConverter.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/SqlFunctionConverter.java index d6a93070ff02..52fe86611bfc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/SqlFunctionConverter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/SqlFunctionConverter.java @@ -260,6 +260,7 @@ public static ASTNode buildAST(SqlOperator op, List children, RelDataTy case FLOOR: case CEIL: case LIKE: + case CHAR_LENGTH: case OTHER_FUNCTION: node = (ASTNode) ParseDriver.adaptor.create(HiveParser.TOK_FUNCTION, "TOK_FUNCTION"); node.addChild((ASTNode) ParseDriver.adaptor.create(hToken.type, hToken.text));