This is an automated email from the ASF dual-hosted git repository.
danny0405 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 4c3cef9 [CALCITE-3856] Remove code to be removed before 1.23
4c3cef9 is described below
commit 4c3cef95377ea16efca037012385c40822b4426e
Author: yuzhao.cyz <[email protected]>
AuthorDate: Thu Mar 12 16:48:10 2020 +0800
[CALCITE-3856] Remove code to be removed before 1.23
---
.../org/apache/calcite/rel/core/RelFactories.java | 79 +-------------------
.../apache/calcite/rel/logical/LogicalJoin.java | 30 --------
.../apache/calcite/rel/logical/LogicalProject.java | 12 ---
.../calcite/rel/logical/LogicalTableScan.java | 6 --
.../calcite/rel/rel2sql/RelToSqlConverter.java | 5 +-
.../org/apache/calcite/rel/stream/StreamRules.java | 16 +++-
.../apache/calcite/sql2rel/SqlToRelConverter.java | 18 -----
.../apache/calcite/sql/parser/SqlParserTest.java | 33 ---------
.../org/apache/calcite/test/RelOptTestBase.java | 33 ---------
.../apache/calcite/test/SqlToRelConverterTest.java | 7 --
.../apache/calcite/test/SqlValidatorTestCase.java | 86 ----------------------
.../calcite/adapter/pig/PigRelFactories.java | 6 --
12 files changed, 18 insertions(+), 313 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
index 55d3a9f..4d838e0 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/RelFactories.java
@@ -22,7 +22,6 @@ import org.apache.calcite.plan.Contexts;
import org.apache.calcite.plan.RelOptCluster;
import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.plan.ViewExpanders;
import org.apache.calcite.rel.RelCollation;
import org.apache.calcite.rel.RelDistribution;
import org.apache.calcite.rel.RelNode;
@@ -49,7 +48,6 @@ import org.apache.calcite.rel.metadata.RelColumnMapping;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rex.RexLiteral;
import org.apache.calcite.rex.RexNode;
-import org.apache.calcite.schema.TranslatableTable;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.tools.RelBuilder;
import org.apache.calcite.tools.RelBuilderFactory;
@@ -162,12 +160,6 @@ public class RelFactories {
*/
RelNode createProject(RelNode input, List<RelHint> hints,
List<? extends RexNode> childExprs, List<String> fieldNames);
-
- @Deprecated // to be removed before 1.23
- default RelNode createProject(RelNode input,
- List<? extends RexNode> childExprs, List<String> fieldNames) {
- return createProject(input, ImmutableList.of(), childExprs, fieldNames);
- }
}
/**
@@ -296,20 +288,6 @@ public class RelFactories {
/** Creates an aggregate. */
RelNode createAggregate(RelNode input, List<RelHint> hints,
ImmutableBitSet groupSet,
ImmutableList<ImmutableBitSet> groupSets, List<AggregateCall>
aggCalls);
-
- @Deprecated // to be removed before 1.23
- default RelNode createAggregate(RelNode input, ImmutableBitSet groupSet,
- ImmutableList<ImmutableBitSet> groupSets, List<AggregateCall>
aggCalls) {
- return createAggregate(input, ImmutableList.of(), groupSet, groupSets,
aggCalls);
- }
-
- @Deprecated // to be removed before 1.23
- default RelNode createAggregate(RelNode input, boolean indicator,
- ImmutableBitSet groupSet, ImmutableList<ImmutableBitSet> groupSets,
- List<AggregateCall> aggCalls) {
- Aggregate.checkIndicator(indicator);
- return createAggregate(input, ImmutableList.of(), groupSet, groupSets,
aggCalls);
- }
}
/**
@@ -386,22 +364,6 @@ public class RelFactories {
RelNode createJoin(RelNode left, RelNode right, List<RelHint> hints,
RexNode condition, Set<CorrelationId> variablesSet, JoinRelType
joinType,
boolean semiJoinDone);
-
- @Deprecated // to be removed before 1.23
- default RelNode createJoin(RelNode left, RelNode right, RexNode condition,
- Set<CorrelationId> variablesSet, JoinRelType joinType,
- boolean semiJoinDone) {
- return createJoin(left, right, ImmutableList.of(), condition,
variablesSet,
- joinType, semiJoinDone);
- }
-
- @Deprecated // to be removed before 1.23
- default RelNode createJoin(RelNode left, RelNode right, RexNode condition,
- JoinRelType joinType, Set<String> variablesStopped,
- boolean semiJoinDone) {
- return createJoin(left, right, ImmutableList.of(), condition,
- CorrelationId.setOf(variablesStopped), joinType, semiJoinDone);
- }
}
/**
@@ -479,8 +441,8 @@ public class RelFactories {
private static class SemiJoinFactoryImpl implements SemiJoinFactory {
public RelNode createSemiJoin(RelNode left, RelNode right,
RexNode condition) {
- return LogicalJoin.create(left, right, condition, ImmutableSet.of(),
JoinRelType.SEMI,
- false, ImmutableList.of());
+ return LogicalJoin.create(left, right, ImmutableList.of(), condition,
+ ImmutableSet.of(), JoinRelType.SEMI, false, ImmutableList.of());
}
}
@@ -517,11 +479,6 @@ public class RelFactories {
* Creates a {@link TableScan}.
*/
RelNode createScan(RelOptTable.ToRelContext toRelContext, RelOptTable
table);
-
- @Deprecated // to be removed before 1.23
- default RelNode createScan(RelOptCluster cluster, RelOptTable table) {
- return createScan(ViewExpanders.simpleContext(cluster), table);
- }
}
/**
@@ -535,38 +492,6 @@ public class RelFactories {
}
/**
- * Creates a {@link TableScanFactory} that uses a
- * {@link org.apache.calcite.plan.RelOptTable.ViewExpander} to handle
- * {@link TranslatableTable} instances, and falls back to a default
- * factory for other tables.
- *
- * @param viewExpander View expander
- * @param tableScanFactory Factory for non-translatable tables
- * @return Table scan factory
- *
- * @deprecated Use the custom context {@code Contexts.of(viewExpander) } for
RelBuilder.
- *
- */
- @Deprecated // to be removed before 1.23
- @Nonnull public static TableScanFactory expandingScanFactory(
- @Nonnull RelOptTable.ViewExpander viewExpander,
- @Nonnull TableScanFactory tableScanFactory) {
- return (toRelContext, table) -> {
- final TranslatableTable translatableTable =
- table.unwrap(TranslatableTable.class);
- final RelOptTable.ToRelContext newToRelContext =
- ViewExpanders.toRelContext(
- viewExpander,
- toRelContext.getCluster(),
- toRelContext.getTableHints());
- if (translatableTable != null) {
- return translatableTable.toRel(newToRelContext, table);
- }
- return tableScanFactory.createScan(newToRelContext, table);
- };
- }
-
- /**
* Can create a {@link TableFunctionScan}
* of the appropriate type for a rule's calling convention.
*/
diff --git a/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
b/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
index f37c3d7..4b55785 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalJoin.java
@@ -170,36 +170,6 @@ public final class LogicalJoin extends Join {
variablesSet, joinType, semiJoinDone, systemFieldList);
}
- @Deprecated // to be removed before 1.23
- public static LogicalJoin create(RelNode left, RelNode right,
- RexNode condition, Set<CorrelationId> variablesSet, JoinRelType
joinType) {
- return create(left, right, ImmutableList.of(), condition, variablesSet,
- joinType, false, ImmutableList.of());
- }
-
- @Deprecated // to be removed before 1.23
- public static LogicalJoin create(RelNode left, RelNode right,
- RexNode condition, Set<CorrelationId> variablesSet, JoinRelType joinType,
- boolean semiJoinDone, ImmutableList<RelDataTypeField> systemFieldList) {
- return create(left, right, ImmutableList.of(), condition, variablesSet,
- joinType, semiJoinDone, systemFieldList);
- }
-
- @Deprecated // to be removed before 2.0
- public static LogicalJoin create(RelNode left, RelNode right,
- RexNode condition, JoinRelType joinType, Set<String> variablesStopped,
- boolean semiJoinDone, ImmutableList<RelDataTypeField> systemFieldList) {
- return create(left, right, condition,
CorrelationId.setOf(variablesStopped),
- joinType, semiJoinDone, systemFieldList);
- }
-
- @Deprecated // to be removed before 2.0
- public static LogicalJoin create(RelNode left, RelNode right,
- RexNode condition, JoinRelType joinType, Set<String> variablesStopped) {
- return create(left, right, condition,
CorrelationId.setOf(variablesStopped),
- joinType, false, ImmutableList.of());
- }
-
//~ Methods ----------------------------------------------------------------
@Override public LogicalJoin copy(RelTraitSet traitSet, RexNode
conditionExpr,
diff --git
a/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
b/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
index 605b875..2696dba 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalProject.java
@@ -123,18 +123,6 @@ public final class LogicalProject extends Project {
return new LogicalProject(cluster, traitSet, hints, input, projects,
rowType);
}
- @Deprecated // to be removed before 1.23
- public static LogicalProject create(final RelNode input,
- final List<? extends RexNode> projects, List<String> fieldNames) {
- return create(input, ImmutableList.of(), projects, fieldNames);
- }
-
- @Deprecated // to be removed before 1.23
- public static LogicalProject create(final RelNode input,
- final List<? extends RexNode> projects, RelDataType rowType) {
- return create(input, ImmutableList.of(), projects, rowType);
- }
-
@Override public LogicalProject copy(RelTraitSet traitSet, RelNode input,
List<RexNode> projects, RelDataType rowType) {
return new LogicalProject(getCluster(), traitSet, hints, input, projects,
rowType);
diff --git
a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
index 9d62e37..07157d0 100644
--- a/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
+++ b/core/src/main/java/org/apache/calcite/rel/logical/LogicalTableScan.java
@@ -114,12 +114,6 @@ public final class LogicalTableScan extends TableScan {
return new LogicalTableScan(cluster, traitSet, hints, relOptTable);
}
- @Deprecated // to be removed before 1.23
- public static LogicalTableScan create(RelOptCluster cluster,
- final RelOptTable relOptTable) {
- return create(cluster, relOptTable, ImmutableList.of());
- }
-
@Override public RelNode withHints(List<RelHint> hintList) {
return new LogicalTableScan(getCluster(), traitSet, hintList, table);
}
diff --git
a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
index 6f6d1df..5cc2606 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
@@ -631,7 +631,10 @@ public class RelToSqlConverter extends SqlImplementor
final Sort sort2 =
LogicalSort.create(aggregate, collation, e.offset, e.fetch);
final Project project2 =
- LogicalProject.create(sort2, project.getProjects(),
+ LogicalProject.create(
+ sort2,
+ ImmutableList.of(),
+ project.getProjects(),
project.getRowType());
return visit(project2);
}
diff --git a/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
b/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
index 03ebb7b..287b376 100644
--- a/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/stream/StreamRules.java
@@ -318,14 +318,22 @@ public class StreamRules {
final RelNode right = join.getRight();
final LogicalDelta rightWithDelta = LogicalDelta.create(right);
- final LogicalJoin joinL = LogicalJoin.create(left, rightWithDelta,
- join.getCondition(), join.getVariablesSet(), join.getJoinType(),
+ final LogicalJoin joinL = LogicalJoin.create(left,
+ rightWithDelta,
+ join.getHints(),
+ join.getCondition(),
+ join.getVariablesSet(),
+ join.getJoinType(),
join.isSemiJoinDone(),
ImmutableList.copyOf(join.getSystemFieldList()));
final LogicalDelta leftWithDelta = LogicalDelta.create(left);
- final LogicalJoin joinR = LogicalJoin.create(leftWithDelta, right,
- join.getCondition(), join.getVariablesSet(), join.getJoinType(),
+ final LogicalJoin joinR = LogicalJoin.create(leftWithDelta,
+ right,
+ join.getHints(),
+ join.getCondition(),
+ join.getVariablesSet(),
+ join.getJoinType(),
join.isSemiJoinDone(),
ImmutableList.copyOf(join.getSystemFieldList()));
diff --git
a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
index f249643..0c83a18 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
@@ -5778,19 +5778,6 @@ public class SqlToRelConverter {
/** Default configuration. */
Config DEFAULT = configBuilder().build();
- /** Returns the {@code convertTableAccess} option. Controls whether table
- * access references are converted to physical rels immediately. The
- * optimizer doesn't like leaf rels to have {@link Convention#NONE}.
- * However, if we are doing further conversion passes (e.g.
- * {@link RelStructuredTypeFlattener}), then we may need to defer
- * conversion.
- *
- * @deprecated Table access references are always converted to
- * logical relational expressions during sql-to-rel conversion.
- * */
- @Deprecated // to be removed before 1.23
- boolean isConvertTableAccess();
-
/** Returns the {@code decorrelationEnabled} option. Controls whether to
* disable sub-query decorrelation when needed. e.g. if outer joins are not
* supported. */
@@ -5860,11 +5847,6 @@ public class SqlToRelConverter {
return this;
}
- @Deprecated // to be removed before 1.23
- public ConfigBuilder withConvertTableAccess(boolean convertTableAccess) {
- return this;
- }
-
public ConfigBuilder withDecorrelationEnabled(boolean enabled) {
this.decorrelationEnabled = enabled;
return this;
diff --git
a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
index ac67a31..83ff169 100644
--- a/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
+++ b/core/src/test/java/org/apache/calcite/sql/parser/SqlParserTest.java
@@ -585,13 +585,6 @@ public class SqlParserTest {
return new TesterImpl();
}
- @Deprecated // to be removed before 1.23
- protected void check(
- String sql,
- String expected) {
- sql(sql).ok(expected);
- }
-
protected Sql sql(String sql) {
return new Sql(sql, false, null, parser -> { });
}
@@ -632,32 +625,6 @@ public class SqlParserTest {
return SqlParser.create(source, config);
}
- @Deprecated // to be removed before 1.23
- protected void checkExp(
- String sql,
- String expected) {
- expr(sql).ok(expected);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkExpSame(String sql) {
- expr(sql).same();
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkFails(
- String sql,
- String expectedMsgPattern) {
- sql(sql).fails(expectedMsgPattern);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkExpFails0(
- String sql,
- String expectedMsgPattern) {
- expr(sql).fails(expectedMsgPattern);
- }
-
/** Returns a {@link Matcher} that succeeds if the given {@link SqlNode} is a
* DDL statement. */
public static Matcher<SqlNode> isDdl() {
diff --git a/core/src/test/java/org/apache/calcite/test/RelOptTestBase.java
b/core/src/test/java/org/apache/calcite/test/RelOptTestBase.java
index fa0f28e..5d610fa 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptTestBase.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptTestBase.java
@@ -66,39 +66,6 @@ abstract class RelOptTestBase extends SqlToRelTestBase {
return getTesterWithDynamicTable();
}
- @Deprecated // to be removed before 1.23
- protected void checkPlanning(
- RelOptRule rule,
- String sql) {
- HepProgramBuilder programBuilder = HepProgram.builder();
- programBuilder.addRuleInstance(rule);
-
- checkPlanning(
- programBuilder.build(),
- sql);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkPlanning(HepProgram program, String sql) {
- checkPlanning(new HepPlanner(program), sql);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkPlanning(RelOptPlanner planner, String sql) {
- checkPlanning(tester, null, planner, sql);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkPlanUnchanged(RelOptPlanner planner, String sql) {
- checkPlanning(tester, null, planner, sql, true);
- }
-
- @Deprecated // to be removed before 1.23
- protected void checkPlanning(Tester tester, HepProgram preProgram,
- RelOptPlanner planner, String sql) {
- checkPlanning(tester, preProgram, planner, sql, false);
- }
-
/**
* Checks the plan for a SQL statement before/after executing a given rule,
* with a pre-program to prepare the tree.
diff --git
a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
index ac78d1b..993a5e2 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
@@ -83,13 +83,6 @@ public class SqlToRelConverterTest extends SqlToRelTestBase {
SqlToRelConverter.Config.DEFAULT, tester.getConformance());
}
- @Deprecated // to be removed before 1.23
- protected final void check(
- String sql,
- String plan) {
- sql(sql).convertsTo(plan);
- }
-
@Test public void testDotLiteralAfterNestedRow() {
final String sql = "select ((1,2),(3,4,5)).\"EXPR$1\".\"EXPR$2\" from emp";
sql(sql).ok();
diff --git
a/core/src/test/java/org/apache/calcite/test/SqlValidatorTestCase.java
b/core/src/test/java/org/apache/calcite/test/SqlValidatorTestCase.java
index 056f4a0..3c5e7e9 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlValidatorTestCase.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorTestCase.java
@@ -126,87 +126,6 @@ public class SqlValidatorTestCase {
return winSql("select " + sql + " from emp");
}
- @Deprecated // to be removed before 1.23
- public void check(String sql) {
- sql(sql).ok();
- }
-
- @Deprecated // to be removed before 1.23
- public void checkExp(String sql) {
- expr(sql).ok();
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkFails(
- String sql,
- String expected) {
- sql(sql).fails(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkExpFails(
- String sql,
- String expected) {
- expr(sql).fails(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkWholeExpFails(
- String sql,
- String expected) {
- wholeExpr(sql).fails(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkExpType(
- String sql,
- String expected) {
- expr(sql).columnType(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkColumnType(
- String sql,
- String expected) {
- sql(sql).columnType(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkResultType(
- String sql,
- String expected) {
- sql(sql).type(expected);
- }
-
- @Deprecated // to be removed before 1.23
- public final void checkIntervalConv(
- String sql,
- String expected) {
- expr(sql).intervalConv(expected);
- }
-
- @Deprecated // to be removed before 1.23
- protected final void assertExceptionIsThrown(
- String sql,
- String expectedMsgPattern) {
- sql(sql).fails(expectedMsgPattern);
- }
-
- @Deprecated // to be removed before 1.23
- public void checkCharset(
- String sql,
- Charset expectedCharset) {
- sql(sql).charset(expectedCharset);
- }
-
- @Deprecated // to be removed before 1.23
- public void checkCollation(
- String sql,
- String expectedCollationName,
- SqlCollation.Coercibility expectedCoercibility) {
- sql(sql).collation(expectedCollationName, expectedCoercibility);
- }
-
/**
* Encapsulates differences between test environments, for example, which
* SQL parser or validator to use.
@@ -350,11 +269,6 @@ public class SqlValidatorTestCase {
this.whole = whole;
}
- @Deprecated // to be removed before 1.23
- Sql tester(SqlTester tester) {
- return withTester(t -> tester);
- }
-
Sql withTester(UnaryOperator<SqlTester> transform) {
return new Sql(transform.apply(tester), sql, query, whole);
}
diff --git
a/pig/src/main/java/org/apache/calcite/adapter/pig/PigRelFactories.java
b/pig/src/main/java/org/apache/calcite/adapter/pig/PigRelFactories.java
index 3e7a1ef..991925d 100644
--- a/pig/src/main/java/org/apache/calcite/adapter/pig/PigRelFactories.java
+++ b/pig/src/main/java/org/apache/calcite/adapter/pig/PigRelFactories.java
@@ -122,11 +122,5 @@ public class PigRelFactories {
Util.discard(semiJoinDone);
return new PigJoin(left.getCluster(), left.getTraitSet(), left, right,
condition, joinType);
}
-
- @SuppressWarnings("deprecation")
- @Override public RelNode createJoin(RelNode left, RelNode right, RexNode
condition,
- JoinRelType joinType, Set<String> variablesStopped, boolean
semiJoinDone) {
- return new PigJoin(left.getCluster(), left.getTraitSet(), left, right,
condition, joinType);
- }
}
}
