Repository: phoenix Updated Branches: refs/heads/calcite 1327c726a -> 57e1b485b
Revert unnecessary changes to existing Phoenix classes Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/57e1b485 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/57e1b485 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/57e1b485 Branch: refs/heads/calcite Commit: 57e1b485b71f14349704f0d5eb91e97e256db179 Parents: 1327c72 Author: maryannxue <wei....@intel.com> Authored: Thu Jul 2 18:26:54 2015 -0400 Committer: maryannxue <wei....@intel.com> Committed: Thu Jul 2 18:26:54 2015 -0400 ---------------------------------------------------------------------- .../org/apache/phoenix/calcite/rel/PhoenixServerJoin.java | 2 +- .../org/apache/phoenix/calcite/rel/PhoenixTableScan.java | 4 ++-- .../phoenix/expression/ProjectedColumnExpression.java | 9 --------- .../main/java/org/apache/phoenix/parse/SelectStatement.java | 7 ------- 4 files changed, 3 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/57e1b485/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 328549b..e07f345 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 @@ -134,7 +134,7 @@ public class PhoenixServerJoin extends PhoenixAbstractJoin { new int[] {leftTable.getColumns().size() - leftTable.getPKColumns().size()}, postFilterExpr, null); - return HashJoinPlan.create(SelectStatement.SELECT_STAR, leftPlan, hashJoinInfo, new HashJoinPlan.HashSubPlan[] {new HashJoinPlan.HashSubPlan(0, rightPlan, rightExprs, isSingleValueRhs, null, null)}); + return HashJoinPlan.create((SelectStatement) (leftPlan.getStatement()), leftPlan, hashJoinInfo, new HashJoinPlan.HashSubPlan[] {new HashJoinPlan.HashSubPlan(0, rightPlan, rightExprs, isSingleValueRhs, null, null)}); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/57e1b485/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java index 429b73f..2e11c09 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java @@ -90,7 +90,7 @@ public class PhoenixTableScan extends TableScan implements PhoenixRel { TableRef tableRef = new TableRef(CalciteUtils.createTempAlias(), pTable, HConstants.LATEST_TIMESTAMP, false); Implementor tmpImplementor = new PhoenixRelImplementorImpl(); tmpImplementor.setTableRef(tableRef); - SelectStatement select = SelectStatement.SELECT_STAR; + SelectStatement select = SelectStatement.SELECT_ONE; PhoenixStatement stmt = new PhoenixStatement(phoenixTable.pc); ColumnResolver resolver = FromCompiler.getResolver(tableRef); StatementContext context = new StatementContext(stmt, resolver, new Scan(), new SequenceManager(stmt)); @@ -156,7 +156,7 @@ public class PhoenixTableScan extends TableScan implements PhoenixRel { PhoenixStatement stmt = new PhoenixStatement(phoenixTable.pc); ColumnResolver resolver = FromCompiler.getResolver(tableRef); StatementContext context = new StatementContext(stmt, resolver, new Scan(), new SequenceManager(stmt)); - SelectStatement select = SelectStatement.SELECT_STAR; + SelectStatement select = SelectStatement.SELECT_ONE; if (filter != null) { Expression filterExpr = CalciteUtils.toExpression(filter, implementor); filterExpr = WhereOptimizer.pushKeyExpressionsToScan(context, select, filterExpr); http://git-wip-us.apache.org/repos/asf/phoenix/blob/57e1b485/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java index 7956612..97d1aff 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java @@ -56,15 +56,6 @@ public class ProjectedColumnExpression extends ColumnExpression { this.displayName = displayName; } - public ProjectedColumnExpression(KeyValueSchema schema, int position, String displayName) { - super(schema.getField(position)); - this.columns = Collections.emptyList(); - this.schema = schema; - this.bitSet = ValueBitSet.newInstance(schema); - this.position = position; - this.displayName = displayName; - } - public static KeyValueSchema buildSchema(Collection<PColumn> columns) { KeyValueSchemaBuilder builder = new KeyValueSchemaBuilder(0); for (PColumn column : columns) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/57e1b485/phoenix-core/src/main/java/org/apache/phoenix/parse/SelectStatement.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/parse/SelectStatement.java b/phoenix-core/src/main/java/org/apache/phoenix/parse/SelectStatement.java index efbaaa6..362e98d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/parse/SelectStatement.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/SelectStatement.java @@ -38,13 +38,6 @@ import org.apache.phoenix.parse.FunctionParseNode.BuiltInFunctionInfo; * @since 0.1 */ public class SelectStatement implements FilterableStatement { - public static final SelectStatement SELECT_STAR = - new SelectStatement( - null, null, false, - Collections.<AliasedNode>singletonList(new AliasedNode(null, WildcardParseNode.INSTANCE)), - null, Collections.<ParseNode>emptyList(), - null, Collections.<OrderByNode>emptyList(), - null, 0, false, false, Collections.<SelectStatement>emptyList(), new HashMap<String, UDFParseNode>(1)); public static final SelectStatement SELECT_ONE = new SelectStatement( null, null, false,
