This is an automated email from the ASF dual-hosted git repository.
mbudiu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new d7e171e3b0 [CALCITE-6183] The second parameter of
RexProgramBuilder#registerInternal is always false
d7e171e3b0 is described below
commit d7e171e3b0296cdbec2f9569faf0c94351e10700
Author: Hongyu Guo <[email protected]>
AuthorDate: Thu Dec 28 23:52:54 2023 +0800
[CALCITE-6183] The second parameter of RexProgramBuilder#registerInternal
is always false
Correct typos
---
.../java/org/apache/calcite/plan/Convention.java | 2 +-
.../calcite/rel/rules/AggregateStarTableRule.java | 2 +-
.../org/apache/calcite/rel/rules/CoreRules.java | 2 +-
.../apache/calcite/rel/rules/FilterToCalcRule.java | 2 +-
.../org/apache/calcite/rex/RexProgramBuilder.java | 32 ++++++++--------------
.../org/apache/calcite/util/mapping/Mappings.java | 4 +--
6 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/plan/Convention.java
b/core/src/main/java/org/apache/calcite/plan/Convention.java
index 059726b4ed..47bfe99e39 100644
--- a/core/src/main/java/org/apache/calcite/plan/Convention.java
+++ b/core/src/main/java/org/apache/calcite/plan/Convention.java
@@ -84,7 +84,7 @@ public interface Convention extends RelTrait {
return false;
}
- /** Return RelFactories struct for this convention. It can can be used to
+ /** Return RelFactories struct for this convention. It can be used to
* build RelNode. */
default RelFactories.Struct getRelFactories() {
return RelFactories.DEFAULT_STRUCT;
diff --git
a/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
b/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
index 7b2e9a1696..95a604c7d6 100644
---
a/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
+++
b/core/src/main/java/org/apache/calcite/rel/rules/AggregateStarTableRule.java
@@ -98,7 +98,7 @@ public class AggregateStarTableRule
final Optional<CalciteConnectionConfig> config =
planner.getContext().maybeUnwrap(CalciteConnectionConfig.class);
if (!(config.isPresent() && config.get().createMaterializations())) {
- // Disable this rule if we if materializations are disabled - in
+ // Disable this rule if materializations are disabled - in
// particular, if we are in a recursive statement that is being used to
// populate a materialization
return;
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CoreRules.java
b/core/src/main/java/org/apache/calcite/rel/rules/CoreRules.java
index 24a104f151..aca746905d 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CoreRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CoreRules.java
@@ -272,7 +272,7 @@ public class CoreRules {
* {@link org.apache.calcite.rel.rules.FilterProjectTransposeRule}.
*
* <p>It does not allow a Filter to be pushed past the Project if
- * {@link RexUtil#containsCorrelation there is a correlation condition})
+ * {@link RexUtil#containsCorrelation there is a correlation condition}
* anywhere in the Filter, since in some cases it can prevent a
* {@link Correlate} from being de-correlated.
*/
diff --git
a/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
b/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
index 5b0a4d4f60..cdeffc0fa6 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterToCalcRule.java
@@ -36,7 +36,7 @@ import org.immutables.value.Value;
*
* <p>The rule does <em>NOT</em> fire if the child is a
* {@link org.apache.calcite.rel.logical.LogicalFilter} or a
- * {@link org.apache.calcite.rel.logical.LogicalProject} (we assume they they
+ * {@link org.apache.calcite.rel.logical.LogicalProject} (we assume that they
* will be converted using {@link FilterToCalcRule} or
* {@link ProjectToCalcRule}) or a
* {@link org.apache.calcite.rel.logical.LogicalCalc}. This
diff --git a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
index 2064c4fb85..40d2c9a759 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java
@@ -80,7 +80,7 @@ public class RexProgramBuilder {
if (inputRowType.isStruct()) {
final List<RelDataTypeField> fields = inputRowType.getFieldList();
for (int i = 0; i < fields.size(); i++) {
- registerInternal(RexInputRef.of(i, fields), false);
+ registerInternal(RexInputRef.of(i, fields));
}
}
}
@@ -322,14 +322,9 @@ public class RexProgramBuilder {
* Registers an expression in the list of common sub-expressions, and
* returns a reference to that expression.
*
- * <p>If an equivalent sub-expression already exists, creates another
- * expression only if <code>force</code> is true.
- *
- * @param expr Expression to register
- * @param force Whether to create a new sub-expression if an equivalent
- * sub-expression exists.
+ * @param expr Expression to register
*/
- private RexLocalRef registerInternal(RexNode expr, boolean force) {
+ private RexLocalRef registerInternal(RexNode expr) {
final RexSimplify simplify =
new RexSimplify(rexBuilder, RelOptPredicateList.EMPTY,
RexUtil.EXECUTOR);
expr = simplify.simplifyPreservingType(expr);
@@ -353,11 +348,6 @@ public class RexProgramBuilder {
// Add expression to list, and return a new reference to it.
ref = addExpr(expr);
exprMap.put(requireNonNull(key, "key"), ref);
- } else {
- if (force) {
- // Add expression to list, but return the previous ref.
- addExpr(expr);
- }
}
for (;;) {
@@ -895,37 +885,37 @@ public class RexProgramBuilder {
private abstract class RegisterShuttle extends RexShuttle {
@Override public RexNode visitCall(RexCall call) {
final RexNode expr = super.visitCall(call);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitOver(RexOver over) {
final RexNode expr = super.visitOver(over);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitLiteral(RexLiteral literal) {
final RexNode expr = super.visitLiteral(literal);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitFieldAccess(RexFieldAccess fieldAccess) {
final RexNode expr = super.visitFieldAccess(fieldAccess);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitDynamicParam(RexDynamicParam dynamicParam) {
final RexNode expr = super.visitDynamicParam(dynamicParam);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitCorrelVariable(RexCorrelVariable variable) {
final RexNode expr = super.visitCorrelVariable(variable);
- return registerInternal(expr, false);
+ return registerInternal(expr);
}
@Override public RexNode visitLambda(RexLambda lambda) {
super.visitLambda(lambda);
- return registerInternal(lambda, false);
+ return registerInternal(lambda);
}
}
@@ -996,7 +986,7 @@ public class RexProgramBuilder {
// Add expression to the list, just so that subsequent
// expressions don't get screwed up. This expression is
// unused, so will be eliminated soon.
- return registerInternal(local, false);
+ return registerInternal(local);
}
}
}
diff --git a/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java
b/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java
index c476a96edb..8b000032ac 100644
--- a/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java
+++ b/core/src/main/java/org/apache/calcite/util/mapping/Mappings.java
@@ -528,8 +528,8 @@ public abstract class Mappings {
final TargetMapping mapping =
create(
MappingType.INVERSE_SURJECTION,
- sourceCount, // aCount + bCount + cCount,
- targetCount); // cCount + bCount
+ sourceCount,
+ targetCount);
for (int i = 0; i < ints.length; i += 3) {
final int target = ints[i];
