You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/06/10 22:47:26 UTC
[4/4] phoenix git commit: Add server/client conventions for
PhoenixRel and use ConvertRules to apply Phoenix server/client operators
Add server/client conventions for PhoenixRel and use ConvertRules to apply Phoenix server/client operators
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f2d95da7
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f2d95da7
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f2d95da7
Branch: refs/heads/calcite
Commit: f2d95da77205384df21bfe277693602afddf276a
Parents: c1396ec
Author: maryannxue <we...@intel.com>
Authored: Wed Jun 10 16:46:57 2015 -0400
Committer: maryannxue <we...@intel.com>
Committed: Wed Jun 10 16:46:57 2015 -0400
----------------------------------------------------------------------
.../org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java | 2 --
.../java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java | 2 --
.../java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java | 1 -
.../org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java | 1 -
.../main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java | 1 -
.../src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java | 2 --
.../org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java | 2 --
.../org/apache/phoenix/calcite/rel/PhoenixServerAggregate.java | 2 --
.../java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java | 2 --
.../java/org/apache/phoenix/calcite/rel/PhoenixServerSort.java | 1 -
10 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java
index db3de2c..7e9ff90 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientAggregate.java
@@ -55,8 +55,6 @@ public class PhoenixClientAggregate extends PhoenixAbstractAggregate {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
TableRef tableRef = implementor.getTableRef();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java
index ecdbc3b..4cbf4d0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientProject.java
@@ -53,8 +53,6 @@ public class PhoenixClientProject extends PhoenixAbstractProject {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
TupleProjector tupleProjector = project(implementor);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java
index 052f078..ab9dfd2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixClientSort.java
@@ -50,7 +50,6 @@ public class PhoenixClientSort extends PhoenixAbstractSort {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
if (this.offset != null)
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java
index 39d7d08..81b5608 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixCompactClientSort.java
@@ -45,7 +45,6 @@ public class PhoenixCompactClientSort extends PhoenixAbstractSort {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
if (this.offset != null)
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java
index d958fe7..7583750 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixFilter.java
@@ -53,7 +53,6 @@ public class PhoenixFilter extends Filter implements PhoenixRel {
}
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
Expression expr = CalciteUtils.toExpression(condition, implementor);
return new ClientScanPlan(plan.getContext(), plan.getStatement(), plan.getTableRef(),
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java
index 52482c1..b66ecbd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixLimit.java
@@ -86,8 +86,6 @@ public class PhoenixLimit extends SingleRel implements PhoenixRel {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
// TODO only wrap with ClientScanPlan
// if (plan.getLimit() != null);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java
index daa2978..0559ba6 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixPostJoinProject.java
@@ -54,8 +54,6 @@ public class PhoenixPostJoinProject extends PhoenixAbstractProject {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
implementor.pushContext(new ImplementorContext(implementor.getCurrentContext().isRetainPKColumns(), false));
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
implementor.popContext();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/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 776ec0d..4231f03 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
@@ -50,8 +50,6 @@ public class PhoenixServerAggregate extends PhoenixAbstractAggregate {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
assert (plan instanceof ScanPlan
|| plan instanceof HashJoinPlan)
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java
index a5d9039..802211a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixServerProject.java
@@ -54,8 +54,6 @@ public class PhoenixServerProject extends PhoenixAbstractProject {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
-
implementor.pushContext(new ImplementorContext(implementor.getCurrentContext().isRetainPKColumns(), false));
QueryPlan plan = implementor.visitInput(0, (PhoenixRel) getInput());
implementor.popContext();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2d95da7/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 a57dd8d..dea751f 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
@@ -45,7 +45,6 @@ public class PhoenixServerSort extends PhoenixAbstractSort {
@Override
public QueryPlan implement(Implementor implementor) {
- assert getConvention() == getInput().getConvention();
if (this.offset != null)
throw new UnsupportedOperationException();