Skip to content
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

Update dependencies #610

Merged
merged 16 commits into from
Feb 6, 2025
Merged

Update dependencies #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ec4f7ce
Update MySQL to 9.2.0
oneonestar Feb 5, 2025
d2a60fa
Update java-jwt to 4.5.0
oneonestar Feb 5, 2025
ed559ef
Update nimbus-jose-jwt to 10.0.1
oneonestar Feb 5, 2025
bc99118
Update oauth2-oidc-sdk to 11.21.3
oneonestar Feb 5, 2025
cce0e68
Update Oracle JDBC to 23.7.0.25.01
oneonestar Feb 5, 2025
0389189
Update airbase to 215
oneonestar Feb 5, 2025
acb0e22
Update airlift to 302
oneonestar Feb 5, 2025
49fd6c6
Update jdbi to 3.47.0
oneonestar Feb 5, 2025
babc8bf
Update mockito to 5.15.2
oneonestar Feb 5, 2025
c1abdbe
Update testcontainers to 1.20.4
oneonestar Feb 5, 2025
8799c97
Update trino to 469
oneonestar Feb 5, 2025
fe855ac
Update commons-pool2 to 2.12.1
oneonestar Feb 5, 2025
e301338
Update apache directory api to 2.1.7
oneonestar Feb 5, 2025
3ea7164
Update bouncycastle to 1.80
oneonestar Feb 5, 2025
748c16e
Update flyway to 11.3.1
oneonestar Feb 5, 2025
0dc1767
Update aircompressor to v3
oneonestar Feb 5, 2025
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
36 changes: 23 additions & 13 deletions gateway-ha/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
<frontend.pnpmRegistryURL>https://registry.npmmirror.com</frontend.pnpmRegistryURL>

<!-- dependency versions -->
<dep.flyway.version>11.0.1</dep.flyway.version>
<dep.flyway.version>11.3.1</dep.flyway.version>
<dep.jeasy.version>4.1.0</dep.jeasy.version>
<dep.mockito.version>5.14.2</dep.mockito.version>
<dep.mockito.version>5.15.2</dep.mockito.version>
<dep.okhttp3.version>4.12.0</dep.okhttp3.version>
<dep.trino.version>464</dep.trino.version>
<dep.trino.version>469</dep.trino.version>
</properties>

<dependencies>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -79,13 +79,13 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.41.2</version>
<version>10.0.1</version>
</dependency>

<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<version>11.20.1</version>
<version>11.21.3</version>
<classifier>jdk11</classifier>
</dependency>

Expand All @@ -109,8 +109,8 @@

<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>0.27</version>
<artifactId>aircompressor-v3</artifactId>
<version>3.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -217,13 +217,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.12.0</version>
<version>2.12.1</version>
</dependency>

<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.6</version>
<version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
Expand All @@ -235,7 +235,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.78.1</version>
<version>1.80</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -273,14 +273,14 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.3.0</version>
<version>9.2.0</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11-production</artifactId>
<version>23.6.0.24.10</version>
<version>23.7.0.25.01</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -497,6 +497,16 @@
</configuration>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns combine.children="append">
<ignoredResourcePattern>aircompressor.*</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueryProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import io.airlift.compress.zstd.ZstdDecompressor;
import io.airlift.compress.v3.zstd.ZstdDecompressor;
import io.airlift.json.JsonCodec;
import io.airlift.log.Logger;
import io.trino.sql.parser.ParsingException;
Expand Down Expand Up @@ -106,6 +106,7 @@ public class TrinoQueryProperties
private boolean isNewQuerySubmission;
private Optional<String> errorMessage = Optional.empty();
private Optional<String> queryId = Optional.empty();
private final ZstdDecompressor decompressor = ZstdDecompressor.create();

public static final String TRINO_CATALOG_HEADER_NAME = "X-Trino-Catalog";
public static final String TRINO_SCHEMA_HEADER_NAME = "X-Trino-Schema";
Expand Down Expand Up @@ -269,8 +270,8 @@ private String decodePreparedStatementFromHeader(String headerValue)
String encoded = headerValue.substring(prefix.length());
byte[] compressed = base64Url().decode(encoded);

byte[] preparedStatement = new byte[toIntExact(ZstdDecompressor.getDecompressedSize(compressed, 0, compressed.length))];
new ZstdDecompressor().decompress(compressed, 0, compressed.length, preparedStatement, 0, preparedStatement.length);
byte[] preparedStatement = new byte[toIntExact(decompressor.getDecompressedSize(compressed, 0, compressed.length))];
decompressor.decompress(compressed, 0, compressed.length, preparedStatement, 0, preparedStatement.length);
return new String(preparedStatement, UTF_8);
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>211</version>
<version>215</version>
</parent>

<groupId>io.trino.gateway</groupId>
Expand Down Expand Up @@ -51,23 +51,23 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>bom</artifactId>
<version>296</version>
<version>302</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi3-bom</artifactId>
<version>3.46.0</version>
<version>3.47.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.20.2</version>
<version>1.20.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down