Repository: phoenix Updated Branches: refs/heads/calcite 26bd75582 -> e003c579c
Fix compilation errors after CALCITE-1384 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e003c579 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e003c579 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e003c579 Branch: refs/heads/calcite Commit: e003c579cebef5bf1b19158984e03f937b042fd9 Parents: 26bd755 Author: maryannxue <[email protected]> Authored: Mon Nov 14 16:03:11 2016 -0800 Committer: maryannxue <[email protected]> Committed: Mon Nov 14 16:03:11 2016 -0800 ---------------------------------------------------------------------- phoenix-core/src/main/codegen/data/Parser.tdd | 6 ++++++ .../java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e003c579/phoenix-core/src/main/codegen/data/Parser.tdd ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/codegen/data/Parser.tdd b/phoenix-core/src/main/codegen/data/Parser.tdd index 6b6bd87..42c060a 100644 --- a/phoenix-core/src/main/codegen/data/Parser.tdd +++ b/phoenix-core/src/main/codegen/data/Parser.tdd @@ -87,6 +87,12 @@ dataTypeParserMethods: [ ] + # List of methods for parsing extensions to ALTER SYSTEM calls. + # Each must accept arguments "(SqlParserPos pos, String scope)". + # Example: "SqlUploadJarNode" + alterStatementParserMethods: [ + ] + # List of files in @includes directory that have parser method # implementations for custom SQL statements, literals or types # given as part of "statementParserMethods", "literalParserMethods" or http://git-wip-us.apache.org/repos/asf/phoenix/blob/e003c579/phoenix-core/src/test/java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java b/phoenix-core/src/test/java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java index 6c234bc..45ebeb9 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/calcite/PhoenixSqlParserTest.java @@ -19,8 +19,6 @@ package org.apache.phoenix.calcite; import java.io.IOException; -import org.apache.calcite.sql.SqlNode; -import org.apache.calcite.sql.parser.SqlParseException; import org.apache.calcite.sql.parser.SqlParser; import org.apache.calcite.sql.parser.SqlParserTest; import org.apache.phoenix.calcite.parser.PhoenixParserImpl; @@ -46,7 +44,8 @@ public class PhoenixSqlParserTest extends SqlParserTest { getTester().checkNode("delete jar '/myjar.jar'", isDdl()); } - private SqlParser getSqlParser(String sql) { + @Override + protected SqlParser getSqlParser(String sql) { return SqlParser.create(sql, SqlParser.configBuilder().setParserFactory(PhoenixParserImpl.FACTORY) .build());
