Skip to content

Migrate raptor connector to MySQL Connector/J 8.x #11450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hashhar merged 1 commit into from
Apr 27, 2022
Merged

Migrate raptor connector to MySQL Connector/J 8.x #11450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions plugin/trino-raptor-legacy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<!-- TODO (https://github.com/trinodb/trino/issues/8302) update MySQL driver to version used everywhere else -->
<version>5.1.48</version>
</dependency>

<dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...in/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/util/DatabaseUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dep.accumulo.version>1.7.4</dep.accumulo.version>
<dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
<dep.antlr.version>4.9.3</dep.antlr.version>
<dep.airlift.version>214</dep.airlift.version>
<dep.airlift.version>215</dep.airlift.version>
Copy link
Copy Markdown
Member

@findepi findepi Mar 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Copy Markdown
Member Author

@hashhar hashhar Mar 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming that's the airlift version which includes airlift/airlift#986.

This PR is blocked until newer airlift is released.

<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.aws-sdk.version>1.12.172</dep.aws-sdk.version>
<dep.okhttp.version>3.14.9</dep.okhttp.version>
Expand Down