[STORM-3884] Partially complete migration to calcite 1.34.0

apache · Oct 23, 2023 · dbda79b · dbda79b
1 parent bbcf89d
commit dbda79b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -126,6 +126,7 @@
         <hdrhistogram.version>2.1.10</hdrhistogram.version>
         <hamcrest.version>2.2</hamcrest.version>
         <elasticsearch.version>5.2.2</elasticsearch.version>
+<!--        <calcite.version>1.14.0</calcite.version>-->
         <calcite.version>1.32.0</calcite.version>
         <jedis.version>2.9.0</jedis.version>
         <activemq.version>5.18.2</activemq.version>

diff --git a/sql/storm-sql-core/src/codegen/data/Parser.tdd b/sql/storm-sql-core/src/codegen/data/Parser.tdd
@@ -35,7 +35,13 @@
     "PARALLELISM",
     "STORED",
     "TBLPROPERTIES",
-    "JAR"
+    "JAR",
+    "NEGATE",
+    "TILDE"
+  ]
+
+  # List of joinTypes.
+  joinTypes: [
   ]
 
   # List of methods for parsing custom SQL statements.
@@ -65,6 +71,21 @@
   dropStatementParserMethods: [
   ]
 
+  extraBinaryExpressions: [
+  ]
+
+  builtinFunctionCallMethods: [
+  ]
+
+  nonReservedKeywordsToAdd: [
+    "userkeyword1",
+    "userkeyword2",
+    "userkeyword3"
+  ]
+
+  binaryOperatorsTokens: [
+  ]
+
   # 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
@@ -73,6 +94,7 @@
     "parserImpls.ftl"
   ]
 
+  includePosixOperators: true
   includeCompoundIdentifier: true,
   includeBraces: true,
   includeAdditionalDeclarations: false,

diff --git a/sql/storm-sql-core/src/jvm/org/apache/storm/sql/parser/ColumnConstraint.java b/sql/storm-sql-core/src/jvm/org/apache/storm/sql/parser/ColumnConstraint.java
@@ -19,7 +19,7 @@
 
 public class ColumnConstraint extends SqlLiteral {
     private ColumnConstraint(
-        Object value, SqlTypeName typeName, SqlParserPos pos) {
+            SqlDdlKeywords value, SqlTypeName typeName, SqlParserPos pos) {
         super(value, typeName, pos);
     }