Fix broken compilation due to Calcite interface change
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 b17e0aa..4ef0898 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
@@ -24,6 +24,7 @@
import org.apache.calcite.schema.Schema;
import org.apache.calcite.schema.SchemaFactory;
import org.apache.calcite.schema.SchemaPlus;
+import org.apache.calcite.schema.SchemaVersion;
import org.apache.calcite.schema.Table;
import org.apache.calcite.schema.impl.TableFunctionImpl;
import org.apache.calcite.schema.impl.ViewTable;
@@ -551,15 +552,10 @@
}
@Override
- public boolean contentsHaveChangedSince(long lastCheck, long now) {
- return lastCheck != now;
- }
-
- @Override
- public Schema snapshot(long now) {
+ public Schema snapshot(SchemaVersion version) {
return new PhoenixSchema(name, schemaName, parentSchema, pc, typeFactory);
}
-
+
public void defineIndexesAsMaterializations(SchemaPlus parentSchema) {
SchemaPlus schema = parentSchema.getSubSchema(this.name);
SchemaPlus viewSqlSchema =
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java
index 9e45198..bf311c7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java
@@ -17,9 +17,9 @@
*/
package org.apache.phoenix.calcite;
-import org.apache.calcite.sql.validate.SqlConformance;
+import org.apache.calcite.sql.validate.SqlAbstractConformance;
-public class PhoenixSqlConformance implements SqlConformance {
+public class PhoenixSqlConformance extends SqlAbstractConformance {
public static final PhoenixSqlConformance INSTANCE =
new PhoenixSqlConformance();
@@ -37,11 +37,6 @@
}
@Override
- public boolean isSortByAliasObscures() {
- return false;
- }
-
- @Override
public boolean isFromRequired() {
return false;
}
@@ -52,16 +47,6 @@
}
@Override
- public boolean isMinusAllowed() {
- return false;
- }
-
- @Override
- public boolean isApplyAllowed() {
- return false;
- }
-
- @Override
public boolean isInsertSubsetColumnsAllowed() {
return true;
}
@@ -90,9 +75,4 @@
public boolean allowExtend() {
return true;
}
-
- @Override
- public boolean isLimitStartCountAllowed() {
- return false;
- }
}
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/calcite/ToExpressionTest.java b/phoenix-core/src/test/java/org/apache/phoenix/calcite/ToExpressionTest.java
index 5bfc77b..648cd37 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/calcite/ToExpressionTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/calcite/ToExpressionTest.java
@@ -17,6 +17,7 @@
import org.apache.calcite.schema.Function;
import org.apache.calcite.schema.Schema;
import org.apache.calcite.schema.SchemaPlus;
+import org.apache.calcite.schema.SchemaVersion;
import org.apache.calcite.schema.Table;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParser;
@@ -220,12 +221,7 @@
}
@Override
- public boolean contentsHaveChangedSince(long lastCheck, long now) {
- return false;
- }
-
- @Override
- public Schema snapshot(long now) {
+ public Schema snapshot(SchemaVersion version) {
return this;
}
