[CALCITE-4839] Remove ImmutableBeans implementation and usage

Also remove superseded rule configuration interfaces
apache · Oct 20, 2021 · bebe473 · bebe473
1 parent bf962b8
commit bebe473
Show file tree

Hide file tree

Showing 41 changed files with 16 additions and 1,498 deletions.
diff --git a/...rc/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java b/...rc/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoinRule.java
@@ -31,7 +31,6 @@
 import org.apache.calcite.rex.RexShuttle;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 
 import org.immutables.value.Value;
@@ -166,8 +165,6 @@ public interface Config extends RelRule.Config {
      *
      * <p>Warning: if the batch size is around or bigger than 1000 there
      * can be an error because the generated code exceeds the size limit. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.IntDefault(100)
     @Value.Default default int batchSize() {
       return 100;
     }

diff --git a/core/src/main/java/org/apache/calcite/plan/RelRule.java b/core/src/main/java/org/apache/calcite/plan/RelRule.java
@@ -19,14 +19,12 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.RelFactories;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import com.google.common.collect.ImmutableList;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.immutables.value.Value;
 
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -128,32 +126,14 @@ protected RelRule(C config) {
   }
 
   /** Rule configuration. */
-  @SuppressWarnings("deprecation")
   public interface Config {
-    /**
-     * Empty configuration.
-     *
-     * This is based on ImmutableBeans and dynamic proxies and has been replaced
-     * by the use of the Immutables annotation processor to pre-generate values.
-     *
-     * This field will be removed in a subsequent release.
-     * */
-    @Deprecated
-    RelRule.Config EMPTY = ImmutableBeans.create(Config.class)
-        .withRelBuilderFactory(RelFactories.LOGICAL_BUILDER)
-        .withOperandSupplier(b -> {
-          throw new IllegalArgumentException("Rules must have at least one "
-              + "operand. Call Config.withOperandSupplier to specify them.");
-        });
 
     /** Creates a rule that uses this configuration. Sub-class must override. */
     RelOptRule toRule();
 
     /** Casts this configuration to another type, usually a sub-class. */
     default <T extends Object> T as(Class<T> class_) {
-      if (Proxy.isProxyClass(this.getClass())) {
-        return ImmutableBeans.copy(class_, this);
-      } else if (class_.isAssignableFrom(this.getClass())) {
+      if (class_.isAssignableFrom(this.getClass())) {
         return class_.cast(this);
       } else {
         throw new UnsupportedOperationException(
@@ -166,7 +146,6 @@ default <T extends Object> T as(Class<T> class_) {
 
     /** The factory that is used to create a
      * {@link org.apache.calcite.tools.RelBuilder} during rule invocations. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @Value.Default default RelBuilderFactory relBuilderFactory() {
       return RelFactories.LOGICAL_BUILDER;
     }
@@ -176,14 +155,12 @@ default <T extends Object> T as(Class<T> class_) {
 
     /** Description of the rule instance. */
     // CALCITE-4831: remove the second nullable annotation once immutables/#1261 is fixed
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @javax.annotation.Nullable @Nullable String description();
 
     /** Sets {@link #description()}. */
     Config withDescription(@Nullable String description);
 
     /** Creates the operands for the rule instance. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @Value.Default default OperandTransform operandSupplier() {
       return s -> {
         throw new IllegalArgumentException("Rules must have at least one "

diff --git a/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java b/core/src/main/java/org/apache/calcite/rel/convert/ConverterRule.java
@@ -24,7 +24,6 @@
 import org.apache.calcite.plan.RelTraitDef;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.immutables.value.Value;
@@ -191,19 +190,16 @@ public interface Config extends RelRule.Config {
           }
         }).build();
 
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     RelTrait inTrait();
 
     /** Sets {@link #inTrait}. */
     Config withInTrait(RelTrait trait);
 
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     RelTrait outTrait();
 
     /** Sets {@link #outTrait}. */
     Config withOutTrait(RelTrait trait);
 
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     Function<Config, ConverterRule> ruleFactory();
 
     /** Sets {@link #outTrait}. */

diff --git a/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java b/core/src/main/java/org/apache/calcite/rel/convert/TraitMatchingRule.java
@@ -24,7 +24,6 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.RelFactories;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.immutables.value.Value;
@@ -98,7 +97,6 @@ public interface Config extends RelRule.Config {
 
     /** Returns the rule to be restricted; rule must take a single
      * operand expecting a single input. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     ConverterRule converterRule();
 
     /** Sets {@link #converterRule()}. */

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandDistinctAggregatesRule.java
@@ -37,7 +37,6 @@
 import org.apache.calcite.sql.fun.SqlSumEmptyIsZeroAggFunction;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.ImmutableIntList;
 import org.apache.calcite.util.Optionality;
@@ -943,8 +942,6 @@ public interface Config extends RelRule.Config {
     }
 
     /** Whether to use GROUPING SETS, default true. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean isUsingGroupingSets() {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandWithinDistinctRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExpandWithinDistinctRule.java
@@ -27,7 +27,6 @@
 import org.apache.calcite.sql.fun.SqlInternalOperators;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.tools.RelBuilder;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.ImmutableIntList;
 import org.apache.calcite.util.Util;
@@ -530,8 +529,6 @@ public interface Config extends RelRule.Config {
      * {@code throwIfNotUnique} is true, the query would throw because of the
      * values [100, 120]; if false, the query would sum the distinct values
      * [100, 120, 150]. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean throwIfNotUnique() {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java
@@ -40,7 +40,6 @@
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
 import org.apache.calcite.util.Bug;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.Util;
 import org.apache.calcite.util.mapping.Mapping;
@@ -470,8 +469,6 @@ public interface Config extends RelRule.Config {
     }
 
     /** Whether to push down aggregate functions, default false. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(false)
     @Value.Default
     default boolean isAllowFunctions() {
       return false;

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateReduceFunctionsRule.java
@@ -34,7 +34,6 @@
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
 import org.apache.calcite.util.CompositeList;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.ImmutableIntList;
 import org.apache.calcite.util.Util;
@@ -850,7 +849,6 @@ public interface Config extends RelRule.Config {
       return new AggregateReduceFunctionsRule(this);
     }
 
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @Nullable Set<SqlKind> functionsToReduce();
 
     /** Sets {@link #functionsToReduce}. */

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java b/core/src/main/java/org/apache/calcite/rel/rules/CoerceInputsRule.java
@@ -23,7 +23,6 @@
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.immutables.value.Value;
@@ -124,8 +123,6 @@ public interface Config extends RelRule.Config {
     }
 
     /** Whether to coerce names. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(false)
     @Value.Default default boolean isCoerceNames() {
       return false;
     }
@@ -134,7 +131,6 @@ public interface Config extends RelRule.Config {
     Config withCoerceNames(boolean coerceNames);
 
     /** Class of {@link RelNode} to coerce to. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     Class<? extends RelNode> consumerRelClass();
 
     /** Sets {@link #consumerRelClass()}. */

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java b/core/src/main/java/org/apache/calcite/rel/rules/DateRangeRules.java
@@ -95,7 +95,7 @@ private DateRangeRules() { }
    * {@code FLOOR} and {@code CEIL} functions to date ranges (typically using
    * the {@code BETWEEN} operator). */
   public static final RelOptRule FILTER_INSTANCE =
-      FilterDateRangeRule.Config.DEFAULT
+      FilterDateRangeRule.FilterDateRangeRuleConfig.DEFAULT
           .as(FilterDateRangeRule.FilterDateRangeRuleConfig.class)
           .toRule();
 
@@ -215,10 +215,6 @@ assert requireNonNull(finder, "finder").timeUnits.isEmpty() && finder.opKinds.is
       call.transformTo(relBuilder.build());
     }
 
-    /** Deprecated, use {@link FilterDateRangeRuleConfig} instead. **/
-    @Deprecated
-    public interface Config extends FilterDateRangeRuleConfig { }
-
     /** Rule configuration. */
     @Value.Immutable
     public interface FilterDateRangeRuleConfig extends RelRule.Config {

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ExchangeRemoveConstantKeysRule.java
@@ -31,7 +31,6 @@
 import org.apache.calcite.rel.logical.LogicalSortExchange;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rex.RexInputRef;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.immutables.value.Value;
 
@@ -195,7 +194,6 @@ public interface Config extends RelRule.Config {
     }
 
     /** Forwards a call to {@link #onMatch(RelOptRuleCall)}. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @Value.Parameter
     MatchHandler<ExchangeRemoveConstantKeysRule> matchHandler();
 

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java
@@ -31,7 +31,6 @@
 import org.apache.calcite.rex.RexUtil;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
@@ -308,10 +307,6 @@ public JoinConditionPushRule(RelFactories.FilterFactory filterFactory,
       perform(call, null, join);
     }
 
-    /** Deprecated, use {@link JoinConditionPushRuleConfig} instead. **/
-    @Deprecated
-    public interface Config extends JoinConditionPushRuleConfig { }
-
     /** Rule configuration. */
     @Value.Immutable(singleton = false)
     public interface JoinConditionPushRuleConfig extends FilterJoinRule.Config {
@@ -371,10 +366,6 @@ public FilterIntoJoinRule(boolean smart,
       perform(call, filter, join);
     }
 
-    /** Deprecated, use {@link FilterIntoJoinRuleConfig} instead. **/
-    @Deprecated
-    public interface Config extends FilterIntoJoinRuleConfig { }
-
     /** Rule configuration. */
     @Value.Immutable(singleton = false)
     public interface FilterIntoJoinRuleConfig extends FilterJoinRule.Config {
@@ -404,8 +395,6 @@ public interface Predicate {
    */
   public interface Config extends RelRule.Config {
     /** Whether to try to strengthen join-type, default false. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(false)
     @Value.Default default boolean isSmart() {
       return false;
     }
@@ -416,7 +405,6 @@ public interface Config extends RelRule.Config {
     /** Predicate that returns whether a filter is valid in the ON clause of a
      * join for this particular kind of join. If not, Calcite will push it back to
      * above the join. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
     @Value.Parameter
     Predicate getPredicate();
 

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterProjectTransposeRule.java
@@ -31,7 +31,6 @@
 import org.apache.calcite.rex.RexUtil;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.immutables.value.Value;
 
@@ -221,8 +220,6 @@ public interface Config extends RelRule.Config {
 
     /** Whether to create a {@link Filter} of the same convention as the
      * matched Filter. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean isCopyFilter() {
       return true;
     }
@@ -232,8 +229,6 @@ public interface Config extends RelRule.Config {
 
     /** Whether to create a {@link Project} of the same convention as the
      * matched Project. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean isCopyProject() {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinAssociateRule.java
@@ -27,7 +27,6 @@
 import org.apache.calcite.rex.RexPermuteInputsShuttle;
 import org.apache.calcite.rex.RexUtil;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.calcite.util.mapping.Mappings;
 
@@ -179,8 +178,6 @@ public interface Config extends RelRule.Config {
      * Whether to emit the new join tree if the new top or bottom join has a condition which
      * is always {@code TRUE}.
      */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean isAllowAlwaysTrueCondition() {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinCommuteRule.java
@@ -34,7 +34,6 @@
 import org.apache.calcite.rex.RexShuttle;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.immutables.value.Value;
@@ -251,8 +250,6 @@ default Config withOperandFor(Class<? extends Join> joinClass) {
     }
 
     /** Whether to swap outer joins; default false. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(false)
     @Value.Default default boolean isSwapOuter() {
       return false;
     }
@@ -262,8 +259,6 @@ default Config withOperandFor(Class<? extends Join> joinClass) {
 
     /** Whether to emit the new join tree if the join condition is {@code TRUE}
      * (that is, cartesian joins); default true. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(true)
     @Value.Default default boolean isAllowAlwaysTrueCondition() {
       return true;
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinProjectTransposeRule.java
@@ -39,7 +39,6 @@
 import org.apache.calcite.sql.validate.SqlValidatorUtil;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.calcite.tools.RelBuilderFactory;
-import org.apache.calcite.util.ImmutableBeans;
 import org.apache.calcite.util.Pair;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -428,8 +427,6 @@ public interface Config extends RelRule.Config {
     }
 
     /** Whether to include outer joins, default false. */
-    @SuppressWarnings("deprecation") @ImmutableBeans.Property
-    @ImmutableBeans.BooleanDefault(false)
     @Value.Default default boolean isIncludeOuter() {
       return false;
     }