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/calcite.git
The following commit(s) were added to refs/heads/master by this push: new 422599c [CALCITE-4932] Deprecate JdbcCalc and remove JdbcCalcRule 422599c is described below commit 422599cf3f98c270d60973a7f4cc5d4783be08af Author: Francesco Gini <francesco.g...@gmail.com> AuthorDate: Sat Dec 11 17:15:25 2021 +0000 [CALCITE-4932] Deprecate JdbcCalc and remove JdbcCalcRule Close apache/calcite#2642 --- .../org/apache/calcite/adapter/jdbc/JdbcRules.java | 40 ++-------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java index c6adeb6..5b9f8b7 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java @@ -37,7 +37,6 @@ import org.apache.calcite.rel.SingleRel; import org.apache.calcite.rel.convert.ConverterRule; import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.AggregateCall; -import org.apache.calcite.rel.core.Calc; import org.apache.calcite.rel.core.CorrelationId; import org.apache.calcite.rel.core.Filter; import org.apache.calcite.rel.core.Intersect; @@ -57,7 +56,6 @@ import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexInputRef; import org.apache.calcite.rex.RexLiteral; -import org.apache.calcite.rex.RexMultisetUtil; import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexProgram; import org.apache.calcite.rex.RexUtil; @@ -239,7 +237,6 @@ public class JdbcRules { Consumer<RelRule<?>> consumer) { consumer.accept(JdbcToEnumerableConverterRule.create(out)); consumer.accept(JdbcJoinRule.create(out)); - consumer.accept(JdbcCalcRule.create(out)); consumer.accept(JdbcProjectRule.create(out)); consumer.accept(JdbcFilterRule.create(out)); consumer.accept(JdbcAggregateRule.create(out)); @@ -426,42 +423,11 @@ public class JdbcRules { } } - /** - * Rule to convert a {@link org.apache.calcite.rel.core.Calc} to an - * {@link org.apache.calcite.adapter.jdbc.JdbcRules.JdbcCalc}. - */ - private static class JdbcCalcRule extends JdbcConverterRule { - /** Creates a JdbcCalcRule. */ - public static JdbcCalcRule create(JdbcConvention out) { - return Config.INSTANCE - .withConversion(Calc.class, Convention.NONE, out, "JdbcCalcRule") - .withRuleFactory(JdbcCalcRule::new) - .toRule(JdbcCalcRule.class); - } - - /** Called from the Config. */ - protected JdbcCalcRule(Config config) { - super(config); - } - - @Override public @Nullable RelNode convert(RelNode rel) { - final Calc calc = (Calc) rel; - - // If there's a multiset, let FarragoMultisetSplitter work on it - // first. - if (RexMultisetUtil.containsMultiset(calc.getProgram())) { - return null; - } - - return new JdbcCalc(rel.getCluster(), rel.getTraitSet().replace(out), - convert(calc.getInput(), calc.getTraitSet().replace(out)), - calc.getProgram()); - } - } - /** Calc operator implemented in JDBC convention. * - * @see org.apache.calcite.rel.core.Calc */ + * @see org.apache.calcite.rel.core.Calc + * */ + @Deprecated // to be removed before 2.0 public static class JdbcCalc extends SingleRel implements JdbcRel { private final RexProgram program;