Rename PROJECTABLE convention to SERVERJOIN convention
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3f818585 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3f818585 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3f818585 Branch: refs/heads/calcite Commit: 3f81858553751bf26dda1124df805ac43f421aa9 Parents: f7516b5 Author: maryannxue <wei....@intel.com> Authored: Sat Jul 11 14:10:19 2015 -0400 Committer: maryannxue <wei....@intel.com> Committed: Sat Jul 11 14:10:19 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/phoenix/calcite/rel/PhoenixRel.java | 2 +- .../phoenix/calcite/rel/PhoenixServerAggregate.java | 2 +- .../org/apache/phoenix/calcite/rel/PhoenixServerJoin.java | 2 +- .../org/apache/phoenix/calcite/rel/PhoenixServerSort.java | 2 +- .../phoenix/calcite/rules/PhoenixConverterRules.java | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f818585/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRel.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRel.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRel.java index 82afedc..1136ea6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRel.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRel.java @@ -23,7 +23,7 @@ import org.apache.phoenix.schema.TableRef; public interface PhoenixRel extends RelNode { /** Calling conventions for relational operations that occur in Phoenix. */ Convention SERVER_CONVENTION = new Convention.Impl("PHOENIX_SERVER", PhoenixRel.class); - Convention PROJECTABLE_CONVENTION = new Convention.Impl("PHOENIX_PROJECTABLE", PhoenixRel.class); + Convention SERVERJOIN_CONVENTION = new Convention.Impl("PHOENIX_SERVERJOIN", PhoenixRel.class); Convention CLIENT_CONVENTION = new Convention.Impl("PHOENIX_CLIENT", PhoenixRel.class); /** Metadata Provider for PhoenixRel */ http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f818585/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java index f0697e4..8c0c83a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java @@ -44,7 +44,7 @@ public class PhoenixServerAggregate extends PhoenixAbstractAggregate { @Override public RelOptCost computeSelfCost(RelOptPlanner planner) { if (getInput().getConvention() != PhoenixRel.SERVER_CONVENTION - && getInput().getConvention() != PhoenixRel.PROJECTABLE_CONVENTION) + && getInput().getConvention() != PhoenixRel.SERVERJOIN_CONVENTION) return planner.getCostFactory().makeInfiniteCost(); return super.computeSelfCost(planner) http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f818585/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerJoin.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerJoin.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerJoin.java index e07f345..b6a3e1c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerJoin.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerJoin.java @@ -38,7 +38,7 @@ public class PhoenixServerJoin extends PhoenixAbstractJoin { Set<String> variablesStopped, boolean isSingleValueRhs) { RelOptCluster cluster = left.getCluster(); final RelTraitSet traits = - cluster.traitSet().replace(PhoenixRel.PROJECTABLE_CONVENTION) + cluster.traitSet().replace(PhoenixRel.SERVERJOIN_CONVENTION) .replaceIfs(RelCollationTraitDef.INSTANCE, new Supplier<List<RelCollation>>() { public List<RelCollation> get() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f818585/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java index e185a2f..0818ce6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java @@ -39,7 +39,7 @@ public class PhoenixServerSort extends PhoenixAbstractSort { @Override public RelOptCost computeSelfCost(RelOptPlanner planner) { if (getInput().getConvention() != PhoenixRel.SERVER_CONVENTION - && getInput().getConvention() != PhoenixRel.PROJECTABLE_CONVENTION) + && getInput().getConvention() != PhoenixRel.SERVERJOIN_CONVENTION) return planner.getCostFactory().makeInfiniteCost(); return super.computeSelfCost(planner) http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f818585/phoenix-core/src/main/java/org/apache/phoenix/calcite/rules/PhoenixConverterRules.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rules/PhoenixConverterRules.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rules/PhoenixConverterRules.java index df6a213..ea34a1e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rules/PhoenixConverterRules.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rules/PhoenixConverterRules.java @@ -170,7 +170,7 @@ public class PhoenixConverterRules { }; public static final PhoenixServerSortRule SERVER = new PhoenixServerSortRule(PhoenixRel.SERVER_CONVENTION); - public static final PhoenixServerSortRule PROJECTABLE = new PhoenixServerSortRule(PhoenixRel.PROJECTABLE_CONVENTION); + public static final PhoenixServerSortRule PROJECTABLE = new PhoenixServerSortRule(PhoenixRel.SERVERJOIN_CONVENTION); private final Convention inputConvention; @@ -375,7 +375,7 @@ public class PhoenixConverterRules { }; public static final RelOptRule SERVER = new PhoenixServerAggregateRule(PhoenixRel.SERVER_CONVENTION); - public static final RelOptRule PROJECTABLE = new PhoenixServerAggregateRule(PhoenixRel.PROJECTABLE_CONVENTION); + public static final RelOptRule PROJECTABLE = new PhoenixServerAggregateRule(PhoenixRel.SERVERJOIN_CONVENTION); private final Convention inputConvention; @@ -512,7 +512,7 @@ public class PhoenixConverterRules { private PhoenixServerJoinRule() { super(LogicalJoin.class, Predicates.and(Arrays.asList(IS_CONVERTIBLE, NO_RIGHT_OR_FULL_JOIN)), Convention.NONE, - PhoenixRel.PROJECTABLE_CONVENTION, "PhoenixServerJoinRule"); + PhoenixRel.SERVERJOIN_CONVENTION, "PhoenixServerJoinRule"); } public RelNode convert(RelNode rel) { @@ -695,7 +695,7 @@ public class PhoenixConverterRules { /** * Rule to convert a relational expression from - * {@link org.apache.phoenix.calcite.rel.PhoenixRel#PROJECTABLE_CONVENTION} to + * {@link org.apache.phoenix.calcite.rel.PhoenixRel#SERVERJOIN_CONVENTION} to * {@link org.apache.phoenix.calcite.rel.PhoenixRel#CLIENT_CONVENTION}. */ public static class PhoenixProjectableToClientConverterRule extends ConverterRule { @@ -703,7 +703,7 @@ public class PhoenixConverterRules { new PhoenixProjectableToClientConverterRule(); private PhoenixProjectableToClientConverterRule() { - super(RelNode.class, PhoenixRel.PROJECTABLE_CONVENTION, PhoenixRel.CLIENT_CONVENTION, + super(RelNode.class, PhoenixRel.SERVERJOIN_CONVENTION, PhoenixRel.CLIENT_CONVENTION, "PhoenixProjectableToClientConverterRule"); }
