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 various dependencies #18414

Merged
merged 7 commits into from
Jul 26, 2023
Merged

Update various dependencies #18414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4550168
Update Flyway to 9.21.0
wendigo Jul 25, 2023
682093c
Update fastutil to 8.5.12
wendigo Jul 25, 2023
fca9871
Update libthrift to 0.18.1
wendigo Jul 25, 2023
dbdf9c7
Update MariaDB jdbc driver to 3.1.4
wendigo Jul 25, 2023
30b38ca
Update RoaringBitmap to 0.9.46
wendigo Jul 25, 2023
2cf94d6
Update snappy-java to 1.1.10.3
wendigo Jul 25, 2023
64a3890
Update pcollections to 4.0.1
wendigo Jul 25, 2023
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: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public long[] sort(List<Type> types, List<Page> pages, List<Integer> sortChannel
pages.forEach(pagesIndex::addPage);
pagesIndex.sort(sortChannels, sortOrders);

return pagesIndex.getValueAddresses().toLongArray(null);
return pagesIndex.getValueAddresses().toLongArray();
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,19 +334,19 @@ public void testNativeQueryInsertStatementTableExists()
@Override
protected String errorMessageForCreateTableAsSelectNegativeDate(String date)
{
return format("Failed to insert data: .* \\(conn=.*\\) Incorrect date value: '%s'.*", date);
return format("Failed to insert data: \\(conn=.*\\) Incorrect date value: '%s'.*", date);
}

@Override
protected String errorMessageForInsertNegativeDate(String date)
{
return format("Failed to insert data: .* \\(conn=.*\\) Incorrect date value: '%s'.*", date);
return format("Failed to insert data: \\(conn=.*\\) Incorrect date value: '%s'.*", date);
}

@Override
protected String errorMessageForInsertIntoNotNullColumn(String columnName)
{
return format("Failed to insert data: .* \\(conn=.*\\) Field '%s' doesn't have a default value", columnName);
return format("Failed to insert data: \\(conn=.*\\) Field '%s' doesn't have a default value", columnName);
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions plugin/trino-resource-group-managers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,18 @@
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-oracle</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-mysql</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down
42 changes: 35 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
<dep.netty.version>4.1.93.Final</dep.netty.version>
<dep.jna.version>5.13.0</dep.jna.version>
<dep.okio.version>3.3.0</dep.okio.version>
<dep.flyway.version>9.21.0</dep.flyway.version>

<dep.docker.images.version>80</dep.docker.images.version>

Expand Down Expand Up @@ -1516,7 +1517,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.3.0</version>
<version>8.5.12</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1739,7 +1740,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.17.0</version>
<version>0.18.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1785,7 +1786,19 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>7.15.0</version>
<version>${dep.flyway.version}</version>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-oracle</artifactId>
<version>${dep.flyway.version}</version>
</dependency>

<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-mysql</artifactId>
<version>${dep.flyway.version}</version>
</dependency>

<!-- force newer version to be used for dependencies -->
Expand Down Expand Up @@ -1822,7 +1835,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.5</version>
<version>3.1.4</version>
</dependency>

<dependency>
Expand All @@ -1834,7 +1847,7 @@
<dependency>
<groupId>org.pcollections</groupId>
<artifactId>pcollections</artifactId>
<version>2.1.2</version>
<version>4.0.1</version>
</dependency>

<dependency>
Expand All @@ -1846,7 +1859,7 @@
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
<version>0.9.44</version>
<version>0.9.46</version>
</dependency>

<dependency>
Expand All @@ -1870,7 +1883,7 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.1</version>
<version>1.1.10.3</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
Expand Down Expand Up @@ -2175,6 +2188,21 @@
<resource>mime.types</resource>
</resources>
</exception>
<exception>
<conflictingDependencies>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-oracle</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-mysql</artifactId>
</dependency>
</conflictingDependencies>
<resources>
<resource>org/flywaydb/database/version.txt</resource>
</resources>
</exception>
</exceptions>
</configuration>
</plugin>
Expand Down