Fix compilation errors after merge
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/76e92a96 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/76e92a96 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/76e92a96 Branch: refs/heads/calcite Commit: 76e92a96127fb9c828dab95dc7e6e66e0e4adc12 Parents: 597e001 Author: maryannxue <[email protected]> Authored: Mon Jul 20 13:14:07 2015 -0400 Committer: maryannxue <[email protected]> Committed: Mon Jul 20 13:14:07 2015 -0400 ---------------------------------------------------------------------- .../it/java/org/apache/phoenix/calcite/CalciteTest.java | 12 ++++++------ .../phoenix/calcite/rel/PhoenixRelImplementorImpl.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/76e92a96/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java index 1452ac9..08d272f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java @@ -34,7 +34,7 @@ public class CalciteTest extends BaseClientManagedTimeIT { public static final String ATABLE_NAME = "ATABLE"; public static Start start() { - return new Start(new Properties(), false); + return new Start(getConnectionProps(false), false); } public static Start start(Properties props, boolean connectUsingModel) { @@ -238,11 +238,11 @@ public class CalciteTest extends BaseClientManagedTimeIT { return connection; } - private static Properties getMaterializationEnabledProps() { + private static Properties getConnectionProps(boolean enableMaterialization) { Properties props = new Properties(); props.setProperty( CalciteConnectionProperty.MATERIALIZATIONS_ENABLED.camelName(), - Boolean.toString(true)); + Boolean.toString(enableMaterialization)); props.setProperty( CalciteConnectionProperty.CREATE_MATERIALIZATIONS.camelName(), Boolean.toString(false)); @@ -859,7 +859,7 @@ public class CalciteTest extends BaseClientManagedTimeIT { } catch (Exception e) { throw new RuntimeException(e); } - final Start start = start(getMaterializationEnabledProps(), false); + final Start start = start(getConnectionProps(true), false); start.sql("select x_integer from aTable") .explainIs("PhoenixToEnumerableConverter\n" + " PhoenixToClientConverter\n" + @@ -888,7 +888,7 @@ public class CalciteTest extends BaseClientManagedTimeIT { start.sql("select a_string, b_string from aTable where a_string = 'a'") .explainIs("PhoenixToEnumerableConverter\n" + " PhoenixToClientConverter\n" + - " PhoenixServerProject(0:A_STRING=[$0], 0:B_STRING=[$3])\n" + + " PhoenixServerProject(A_STRING=[$0], B_STRING=[$3])\n" + " PhoenixTableScan(table=[[phoenix, IDX1]], filter=[=($0, 'a')])\n") .close(); start.sql("select a_string, b_string from aTable where b_string = 'b'") @@ -902,7 +902,7 @@ public class CalciteTest extends BaseClientManagedTimeIT { " PhoenixToClientConverter\n" + " PhoenixServerProject(A_STRING=[$3], B_STRING=[$0], X_INTEGER=[$10], Y_INTEGER=[$11])\n" + " PhoenixTableScan(table=[[phoenix, IDX_FULL]], filter=[=($0, 'b')])\n") - .close(); + .close(); } @Test public void testConnectJoinHsqldb() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/76e92a96/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRelImplementorImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRelImplementorImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRelImplementorImpl.java index 2ae3838..28b4f51 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRelImplementorImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixRelImplementorImpl.java @@ -119,7 +119,7 @@ public class PhoenixRelImplementorImpl implements PhoenixRel.Implementor { PTableType.SUBQUERY, null, MetaDataProtocol.MIN_TABLE_TIMESTAMP, PTable.INITIAL_SEQ_NUM, null, null, columns, null, null, Collections.<PTable>emptyList(), false, Collections.<PName>emptyList(), null, null, false, false, false, null, - null, null); + null, null, true); this.setTableRef(new TableRef(CalciteUtils.createTempAlias(), pTable, HConstants.LATEST_TIMESTAMP, false)); } catch (SQLException e) { throw new RuntimeException(e);
