diff --git a/plugin/trino-raptor-legacy/pom.xml b/plugin/trino-raptor-legacy/pom.xml index da55c51f4c34..097160b7bf56 100644 --- a/plugin/trino-raptor-legacy/pom.xml +++ b/plugin/trino-raptor-legacy/pom.xml @@ -147,8 +147,6 @@ mysql mysql-connector-java - - 5.1.48 diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/DatabaseUtil.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/DatabaseUtil.java index d773318a6c92..bc22e1b8ff3a 100644 --- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/DatabaseUtil.java +++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/DatabaseUtil.java @@ -14,6 +14,7 @@ package io.trino.plugin.raptor.legacy.util; import com.google.common.base.Throwables; +import com.mysql.cj.jdbc.JdbcStatement; import io.trino.spi.TrinoException; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.HandleCallback; @@ -33,7 +34,7 @@ import static com.google.common.base.Throwables.throwIfInstanceOf; import static com.google.common.reflect.Reflection.newProxy; -import static com.mysql.jdbc.MysqlErrorNumbers.ER_TRANS_CACHE_FULL; +import static com.mysql.cj.exceptions.MysqlErrorNumbers.ER_TRANS_CACHE_FULL; import static io.trino.plugin.raptor.legacy.RaptorErrorCode.RAPTOR_METADATA_ERROR; import static java.sql.Types.INTEGER; import static java.util.Objects.requireNonNull; @@ -109,8 +110,8 @@ public static void runIgnoringConstraintViolation(Runnable task) public static void enableStreamingResults(Statement statement) throws SQLException { - if (statement.isWrapperFor(com.mysql.jdbc.Statement.class)) { - statement.unwrap(com.mysql.jdbc.Statement.class).enableStreamingResults(); + if (statement.isWrapperFor(JdbcStatement.class)) { + statement.unwrap(JdbcStatement.class).enableStreamingResults(); } } diff --git a/pom.xml b/pom.xml index 6f67c0b10a79..346a13e28f04 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 1.7.4 2.7.7-1 4.9.3 - 214 + 215 ${dep.airlift.version} 1.12.172 3.14.9