Upgrade Apache Calcite from 1.40.0 to 1.42.0

LICENSE-binary

@@ -407,11 +407,11 @@ org.apache.arrow:arrow-memory-netty-buffer-patch:18.3.0
 org.apache.arrow:arrow-memory-netty:18.3.0
 org.apache.arrow:arrow-vector:18.3.0
 org.apache.avro:avro:1.12.1
-org.apache.calcite.avatica:avatica-core:1.26.0
-org.apache.calcite.avatica:avatica-metrics:1.26.0
-org.apache.calcite:calcite-babel:1.40.0
-org.apache.calcite:calcite-core:1.40.0
-org.apache.calcite:calcite-linq4j:1.40.0
+org.apache.calcite.avatica:avatica-core:1.28.0
+org.apache.calcite.avatica:avatica-metrics:1.28.0
+org.apache.calcite:calcite-babel:1.42.0
+org.apache.calcite:calcite-core:1.42.0
+org.apache.calcite:calcite-linq4j:1.42.0
 org.apache.commons:commons-collections4:4.5.0
 org.apache.commons:commons-compress:1.28.0
 org.apache.commons:commons-configuration2:2.13.0
@@ -527,6 +527,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.10
 org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.10
 org.jetbrains.kotlin:kotlin-stdlib:2.3.10
 org.jetbrains:annotations:26.1.0
+org.jooq:joou-java-6:0.9.5
 org.jspecify:jspecify:1.0.0
 org.locationtech.proj4j:proj4j:1.2.2
 org.lz4:lz4-java:1.8.0

pinot-common/src/main/codegen/config.fmpp

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-# Copied from Calcite 1.40.0 babel and modified for Pinot syntax. Update this file when upgrading Calcite version.
+# Copied from Calcite 1.42.0 babel and modified for Pinot syntax. Update this file when upgrading Calcite version.
 
 data: {
   default: tdd("../default_config.fmpp")
@@ -89,6 +89,9 @@ data: {
       "DATETIME"
       "VARIANT"
       "UUID"
+      # UNSIGNED became a reserved keyword in Calcite 1.41.0 (CALCITE-1466, unsigned integer types). Keep it
+      # non-reserved so existing queries/columns that use "unsigned" as an identifier keep working.
+      "UNSIGNED"
       # Pinot DDL keywords kept non-reserved so users can still use them as identifiers
       "DIMENSION"
       "METRIC"
@@ -681,6 +684,14 @@ data: {
     customIdentifierToken: "< IDENTIFIER: (<LETTER>|<DIGIT>|[\"\\200\"-\"\\377\"]) (<LETTER>|<DIGIT>|<DOLLAR>|[\"\\200\"-\"\\377\"])* >"
 
     includeParsingStringLiteralAsArrayLiteral: true
+    # Calcite 1.42 babel enables includeIntervalWithoutQualifier / includeStarExclude / includeSelectBy (bare INTERVAL
+    # in CAST, SELECT * EXCLUDE/REPLACE, and the SELECT ... BY clause). Pinot intentionally keeps all three OFF: the
+    # grammar productions are synced into Parser.jj but stay inactive because Pinot's multi-stage engine has no
+    # downstream support for these features yet. includeIntervalWithoutQualifier and includeStarExclude mirror the
+    # upstream core defaults (both false in default_config.fmpp); includeSelectBy has no upstream core default (upstream
+    # Parser.jj guards it with a literal "!false"), so Pinot defines it false in default_config.fmpp to keep all three
+    # guarded uniformly via "default.parser.<flag>". Enable them in a dedicated, tested change if/when they are
+    # supported end-to-end.
   }
 }
 

pinot-common/src/main/codegen/default_config.fmpp

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-# Copied from Calcite 1.40.0 and modified for Pinot syntax. Update this file when upgrading Calcite version.
+# Copied from Calcite 1.42.0 and modified for Pinot syntax. Update this file when upgrading Calcite version.
 
 # Default data declarations for parsers.
 # Each of these may be overridden in a parser's config.fmpp file.
@@ -465,4 +465,9 @@ parser: {
   includeBraces: true
   includeAdditionalDeclarations: false
   includeParsingStringLiteralAsArrayLiteral: false
+  includeIntervalWithoutQualifier: false
+  includeStarExclude: false
+  # Pinot addition: upstream core default_config.fmpp has no includeSelectBy (its Parser.jj uses a literal "!false").
+  # Defined here so Pinot's Parser.jj can guard all three 1.42 babel flags uniformly via "default.parser.<flag>".
+  includeSelectBy: false
 }