Merge remote-tracking branch 'origin/feature/tibero-connector' into feature/tibero-connector

Author: thehkkim

.github/dependabot.yml

@@ -20,3 +20,6 @@ updates:
       exclude:
         - io.airlift:*
         - io.trino:*
+    ignore:
+      # Airbase and Airlift are best updated together. Update Airbase only when updating Airlift.
+      - dependency-name: "io.airlift:airbase"

.github/workflows/ci.yml

@@ -882,7 +882,7 @@ jobs:
           echo "Impacted plugin features:"
           cat impacted-features.log
       - name: Product tests artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: product tests and server tarball
           path: |
@@ -1061,7 +1061,7 @@ jobs:
           # The job doesn't build anything, so the ~/.m2/repository cache isn't useful
           cache: 'false'
       - name: Product tests artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: product tests and server tarball
       - name: Fix artifact permissions

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

README.md

@@ -82,8 +82,8 @@ After opening the project in IntelliJ, double check that the Java SDK is
 properly configured for the project:
 
 * Open the File menu and select Project Structure
-* In the SDKs section, ensure that JDK 24 is selected (create one if none exist)
-* In the Project section, ensure the Project language level is set to 24
+* In the SDKs section, ensure that JDK 25 is selected (create one if none exist)
+* In the Project section, ensure the Project language level is set to 25
 
 ### Running a testing server
 

client/trino-client/src/main/java/io/trino/client/ServerInfo.java

@@ -107,16 +107,20 @@ public boolean equals(Object o)
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-
         ServerInfo that = (ServerInfo) o;
-        return Objects.equals(nodeVersion, that.nodeVersion) &&
-                Objects.equals(environment, that.environment);
+        return coordinator == that.coordinator
+                && starting == that.starting
+                && Objects.equals(nodeVersion, that.nodeVersion)
+                && Objects.equals(environment, that.environment)
+                && Objects.equals(uptime, that.uptime)
+                && Objects.equals(coordinatorId, that.coordinatorId)
+                && Objects.equals(nodeId, that.nodeId);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(nodeVersion, environment);
+        return Objects.hash(nodeVersion, environment, coordinator, starting, uptime, coordinatorId, nodeId);
     }
 
     @Override

client/trino-client/src/test/java/io/trino/client/TestServerInfo.java

@@ -36,14 +36,6 @@ public void testJsonRoundTrip()
         assertJsonRoundTrip(new ServerInfo(UNKNOWN, "test", true, false, Optional.empty(), Optional.empty(), Optional.empty()));
     }
 
-    @Test
-    public void testBackwardsCompatible()
-    {
-        ServerInfo newServerInfo = new ServerInfo(UNKNOWN, "test", true, false, Optional.empty(), Optional.empty(), Optional.empty());
-        ServerInfo legacyServerInfo = SERVER_INFO_CODEC.fromJson("{\"nodeVersion\":{\"version\":\"<unknown>\"},\"environment\":\"test\",\"coordinator\":true}");
-        assertThat(newServerInfo).isEqualTo(legacyServerInfo);
-    }
-
     private static void assertJsonRoundTrip(ServerInfo serverInfo)
     {
         String json = SERVER_INFO_CODEC.toJson(serverInfo);

core/trino-main/pom.xml

@@ -19,6 +19,7 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>com.clearspring.analytics</groupId>
             <artifactId>stream</artifactId>
@@ -342,6 +343,11 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -582,5 +588,11 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 </project>

…io/trino/grammar/type/TypeCalculation.g4 …/antlr4/io/trino/type/TypeCalculation.g4core/trino-grammar/src/main/antlr4/io/trino/grammar/type/TypeCalculation.g4 renamed to core/trino-main/src/main/antlr4/io/trino/type/TypeCalculation.g4 core/trino-grammar/src/main/antlr4/io/trino/grammar/type/TypeCalculation.g4 renamed to core/trino-main/src/main/antlr4/io/trino/type/TypeCalculation.g4

@@ -170,7 +170,7 @@ private void addMaterializedViewForCatalog(Session session, InMemoryRecordSet.Bu
 
             if (needFreshness) {
                 try {
-                    freshness = Optional.of(metadata.getMaterializedViewFreshness(session, name));
+                    freshness = Optional.of(metadata.getMaterializedViewFreshness(session, name, false));
                 }
                 catch (MaterializedViewNotFoundException e) {
                     // Ignore materialized view that was dropped during query execution (race condition)
@@ -196,7 +196,7 @@ private void addMaterializedViewForCatalog(Session session, InMemoryRecordSet.Bu
                             .map(Enum::name)
                             .orElse(null),
                     // last_fresh_time
-                    freshness.flatMap(MaterializedViewFreshness::getLastFreshTime)
+                    freshness.flatMap(MaterializedViewFreshness::getLastKnownFreshTime)
                             .map(instant -> LongTimestampWithTimeZone.fromEpochSecondsAndFraction(
                                     instant.getEpochSecond(),
                                     (long) instant.getNano() * PICOSECONDS_PER_NANOSECOND,

core/trino-main/src/main/java/io/trino/connector/system/MaterializedViewSystemTable.java

@@ -28,6 +28,7 @@
 import io.trino.spi.connector.SchemaTableName;
 import io.trino.spi.connector.SystemTable;
 import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.type.MapType;
 import io.trino.spi.type.TypeManager;
 import io.trino.sql.planner.RuleStatsRecorder;
 import io.trino.sql.planner.iterative.RuleStats;
@@ -41,7 +42,6 @@
 import static io.trino.spi.connector.SystemTable.Distribution.SINGLE_COORDINATOR;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.DoubleType.DOUBLE;
-import static io.trino.spi.type.TypeSignature.mapType;
 import static io.trino.spi.type.VarcharType.VARCHAR;
 import static java.util.Objects.requireNonNull;
 
@@ -64,7 +64,7 @@ public RuleStatsSystemTable(Optional<RuleStatsRecorder> ruleStatsRecorder, TypeM
                 .column("matches", BIGINT)
                 .column("failures", BIGINT)
                 .column("average_time", DOUBLE)
-                .column("time_distribution_percentiles", typeManager.getType(mapType(DOUBLE.getTypeSignature(), DOUBLE.getTypeSignature())))
+                .column("time_distribution_percentiles", new MapType(DOUBLE, DOUBLE, typeManager.getTypeOperators()))
                 .build();
     }