[STORM-3884] Bump calcite-core from 1.14.0 to 1.32.0

pom.xml

@@ -127,7 +127,8 @@
         <hdrhistogram.version>2.1.10</hdrhistogram.version>
         <hamcrest.version>2.2</hamcrest.version>
         <elasticsearch.version>5.2.2</elasticsearch.version>
-        <calcite.version>1.16.0</calcite.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.3</activemq.version>
 

sql/storm-sql-core/pom.xml

@@ -46,7 +46,7 @@
             <email>[email protected]</email>
         </developer>
     </developers>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -142,6 +142,16 @@
             <version>4.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.immutables</groupId>
+            <artifactId>value</artifactId>
+            <version>2.9.3</version>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/jvm</sourceDirectory>
@@ -266,7 +276,7 @@
                     <dependency>
                         <groupId>org.freemarker</groupId>
                         <artifactId>freemarker</artifactId>
-                        <version>2.3.25-incubating</version>
+                        <version>2.3.31</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -306,7 +316,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>

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.
@@ -53,7 +59,15 @@
   dataTypeParserMethods: [
   ]
 
+  # if this list is empty then an empty "()" section is generated and it leads to parsing error in calcite 1.17.0
+  # and higher. Use three keywords arbitrarily chosen to have least impact if removed.
   nonReservedKeywords: [
+    "SPACE",
+    "UPSERT"
+  ]
+
+  nonReservedKeywordsToAdd: [
+    "ALTER"
   ]
 
   createStatementParserMethods: [
@@ -65,6 +79,15 @@
   dropStatementParserMethods: [
   ]
 
+  extraBinaryExpressions: [
+  ]
+
+  builtinFunctionCallMethods: [
+  ]
+
+  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 +96,7 @@
     "parserImpls.ftl"
   ]
 
+  includePosixOperators: true
   includeCompoundIdentifier: true,
   includeBraces: true,
   includeAdditionalDeclarations: false,

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);
     }