You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by hy...@apache.org on 2020/05/31 16:11:02 UTC
[calcite] branch master updated: [CALCITE-4023] Deprecate
ProjectSortTransposeRule
This is an automated email from the ASF dual-hosted git repository.
hyuan 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 2fb963c [CALCITE-4023] Deprecate ProjectSortTransposeRule
2fb963c is described below
commit 2fb963c139abc7f655e237c78157f2e4983c4709
Author: Haisheng Yuan <h....@alibaba-inc.com>
AuthorDate: Fri May 29 23:09:55 2020 -0500
[CALCITE-4023] Deprecate ProjectSortTransposeRule
---
.../java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java | 1 +
core/src/test/java/org/apache/calcite/test/TopDownOptTest.java | 2 --
druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
index e380db3..787d52f 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectSortTransposeRule.java
@@ -34,6 +34,7 @@ import com.google.common.collect.ImmutableList;
*
* @see org.apache.calcite.rel.rules.SortProjectTransposeRule
*/
+@Deprecated // to be removed before 1.25
public class ProjectSortTransposeRule extends RelOptRule implements TransformationRule {
public static final ProjectSortTransposeRule INSTANCE =
new ProjectSortTransposeRule(Project.class, Sort.class,
diff --git a/core/src/test/java/org/apache/calcite/test/TopDownOptTest.java b/core/src/test/java/org/apache/calcite/test/TopDownOptTest.java
index 592661a..7f40f08 100644
--- a/core/src/test/java/org/apache/calcite/test/TopDownOptTest.java
+++ b/core/src/test/java/org/apache/calcite/test/TopDownOptTest.java
@@ -25,7 +25,6 @@ import org.apache.calcite.plan.volcano.VolcanoPlanner;
import org.apache.calcite.rel.RelCollationTraitDef;
import org.apache.calcite.rel.rules.JoinCommuteRule;
import org.apache.calcite.rel.rules.JoinPushThroughJoinRule;
-import org.apache.calcite.rel.rules.ProjectSortTransposeRule;
import org.apache.calcite.rel.rules.SortProjectTransposeRule;
import com.google.common.collect.ImmutableList;
@@ -324,7 +323,6 @@ class Query extends RelOptTestBase {
// pushing down sort should be handled by top-down optimization.
planner.removeRule(SortProjectTransposeRule.INSTANCE);
- planner.removeRule(ProjectSortTransposeRule.INSTANCE);
}
public static Query create(String sql) {
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
index e966e5b..3e51f58 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
@@ -91,6 +91,7 @@ public class DruidRules {
new DruidSortRule(RelFactories.LOGICAL_BUILDER);
public static final DruidSortProjectTransposeRule SORT_PROJECT_TRANSPOSE =
new DruidSortProjectTransposeRule(RelFactories.LOGICAL_BUILDER);
+ @Deprecated // to be removed before 1.25
public static final DruidProjectSortTransposeRule PROJECT_SORT_TRANSPOSE =
new DruidProjectSortTransposeRule(RelFactories.LOGICAL_BUILDER);
public static final DruidProjectFilterTransposeRule PROJECT_FILTER_TRANSPOSE =
@@ -119,7 +120,6 @@ public class DruidRules {
AGGREGATE,
FILTER_AGGREGATE_TRANSPOSE,
FILTER_PROJECT_TRANSPOSE,
- PROJECT_SORT_TRANSPOSE,
SORT,
SORT_PROJECT_TRANSPOSE,
DRUID_HAVING_FILTER_RULE);
@@ -730,6 +730,7 @@ public class DruidRules {
* {@link org.apache.calcite.rel.core.Sort}. Useful if after pushing Sort,
* we could not push it inside DruidQuery.
*/
+ @Deprecated // to be removed before 1.25
public static class DruidProjectSortTransposeRule
extends ProjectSortTransposeRule {