This is an automated email from the ASF dual-hosted git repository. zabetak pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
commit 92f60df1829879a4aac3727d00b10b30244a45e4 Author: Stamatis Zampetakis <[email protected]> AuthorDate: Wed Oct 12 14:50:40 2022 +0200 HIVE-26626: Cut dependencies between HiveXxPullUpConstantsRule and HiveReduceExpressionsRule (Stamatis Zampetakis reviewed by Krisztian Kasa) Closes #3665 --- .../hive/ql/optimizer/calcite/rules/HiveSortPullUpConstantsRule.java | 4 ++-- .../hive/ql/optimizer/calcite/rules/HiveUnionPullUpConstantsRule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortPullUpConstantsRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortPullUpConstantsRule.java index 5765ddf309e..5cf2eb6a6c6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortPullUpConstantsRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortPullUpConstantsRule.java @@ -125,8 +125,8 @@ public final class HiveSortPullUpConstantsRule { return; } - Map<RexNode, RexNode> conditionsExtracted = HiveReduceExpressionsRule.predicateConstants( - RexNode.class, rexBuilder, predicates); + Map<RexNode, RexNode> conditionsExtracted = + RexUtil.predicateConstants(RexNode.class, rexBuilder, predicates.pulledUpPredicates); Map<RexNode, RexNode> constants = new HashMap<>(); for (int i = 0; i < count; i++) { RexNode expr = rexBuilder.makeInputRef(sortNode.getInput(), i); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveUnionPullUpConstantsRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveUnionPullUpConstantsRule.java index 10d718b9cc0..10d8c1362e7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveUnionPullUpConstantsRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveUnionPullUpConstantsRule.java @@ -82,8 +82,8 @@ public class HiveUnionPullUpConstantsRule extends RelOptRule { return; } - Map<RexNode, RexNode> conditionsExtracted = HiveReduceExpressionsRule.predicateConstants( - RexNode.class, rexBuilder, predicates); + Map<RexNode, RexNode> conditionsExtracted = + RexUtil.predicateConstants(RexNode.class, rexBuilder, predicates.pulledUpPredicates); Map<RexNode, RexNode> constants = new HashMap<>(); for (int i = 0; i < count ; i++) { RexNode expr = rexBuilder.makeInputRef(union, i);
