Repository: phoenix Updated Branches: refs/heads/calcite 4f01c91ec -> 14c217bf8
Remove warnings under calcite packages Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/14c217bf Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/14c217bf Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/14c217bf Branch: refs/heads/calcite Commit: 14c217bf8f173a87a5cc5f61b50351740942e84e Parents: 4f01c91 Author: maryannxue <maryann....@gmail.com> Authored: Mon Oct 3 13:19:50 2016 -0700 Committer: maryannxue <maryann....@gmail.com> Committed: Mon Oct 3 13:19:50 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/calcite/sql/SqlOptionNode.java | 1 - .../src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java | 2 +- .../src/main/java/org/apache/phoenix/calcite/PhoenixTable.java | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/14c217bf/phoenix-core/src/main/java/org/apache/calcite/sql/SqlOptionNode.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/calcite/sql/SqlOptionNode.java b/phoenix-core/src/main/java/org/apache/calcite/sql/SqlOptionNode.java index 47654f3..bcec18a 100644 --- a/phoenix-core/src/main/java/org/apache/calcite/sql/SqlOptionNode.java +++ b/phoenix-core/src/main/java/org/apache/calcite/sql/SqlOptionNode.java @@ -26,7 +26,6 @@ import org.apache.phoenix.calcite.CalciteUtils; import org.apache.phoenix.calcite.rel.PhoenixRelImplementor; import org.apache.phoenix.calcite.rel.PhoenixRelImplementorImpl; import org.apache.phoenix.execute.RuntimeContext; -import org.apache.phoenix.execute.RuntimeContextImpl; public class SqlOptionNode extends SqlNode { public final String familyName; http://git-wip-us.apache.org/repos/asf/phoenix/blob/14c217bf/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java index 46a3053..8606588 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java @@ -165,7 +165,7 @@ public class PhoenixSchema implements Schema { this.schemaName == null ? schema : parentSchema; func = ViewTable.viewMacro(schema, viewSql, CalciteSchema.from(viewSqlSchema).path(null), - pTable.getViewType() == ViewType.UPDATABLE); + null, pTable.getViewType() == ViewType.UPDATABLE); views.put(name, func); viewTables.add(tableRef); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/14c217bf/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java index fb9f9c0..fe8d6de 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java @@ -18,7 +18,6 @@ import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.schema.Statistic; import org.apache.calcite.schema.TranslatableTable; import org.apache.calcite.schema.impl.AbstractTable; -import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.util.ImmutableBitSet; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.Scan; @@ -43,7 +42,6 @@ import org.apache.phoenix.schema.TableRef; import org.apache.phoenix.schema.PTable.IndexType; import org.apache.phoenix.schema.PTableType; import org.apache.phoenix.schema.stats.StatisticsUtil; -import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.util.SchemaUtil; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList;
