From 45501682b80f839c4f597dfc49cdbbc88c5bc224 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:33:52 +0200 Subject: [PATCH 1/7] Update Flyway to 9.21.0 --- plugin/trino-resource-group-managers/pom.xml | 12 ++++++++ pom.xml | 30 +++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/plugin/trino-resource-group-managers/pom.xml b/plugin/trino-resource-group-managers/pom.xml index 8f24b47c9690..5430f2e82209 100644 --- a/plugin/trino-resource-group-managers/pom.xml +++ b/plugin/trino-resource-group-managers/pom.xml @@ -163,6 +163,18 @@ runtime + + org.flywaydb + flyway-database-oracle + runtime + + + + org.flywaydb + flyway-mysql + runtime + + org.postgresql postgresql diff --git a/pom.xml b/pom.xml index e56c7c687392..b68e69989f0e 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,7 @@ 4.1.93.Final 5.13.0 3.3.0 + 9.21.0 80 @@ -1785,7 +1786,19 @@ org.flywaydb flyway-core - 7.15.0 + ${dep.flyway.version} + + + + org.flywaydb + flyway-database-oracle + ${dep.flyway.version} + + + + org.flywaydb + flyway-mysql + ${dep.flyway.version} @@ -2175,6 +2188,21 @@ mime.types + + + + org.flywaydb + flyway-database-oracle + + + org.flywaydb + flyway-mysql + + + + org/flywaydb/database/version.txt + + From 682093c787154649c0b7f2524542238ba10490b6 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:37:15 +0200 Subject: [PATCH 2/7] Update fastutil to 8.5.12 --- .../src/main/java/io/trino/operator/PagesIndexPageSorter.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java b/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java index 44593e4414d9..03760a796e49 100644 --- a/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java +++ b/core/trino-main/src/main/java/io/trino/operator/PagesIndexPageSorter.java @@ -43,7 +43,7 @@ public long[] sort(List types, List pages, List sortChannel pages.forEach(pagesIndex::addPage); pagesIndex.sort(sortChannels, sortOrders); - return pagesIndex.getValueAddresses().toLongArray(null); + return pagesIndex.getValueAddresses().toLongArray(); } @Override diff --git a/pom.xml b/pom.xml index b68e69989f0e..9fa91f2e0d0f 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,7 +1517,7 @@ it.unimi.dsi fastutil - 8.3.0 + 8.5.12 From fca9871914aba05b4eb65de8f12f4e620d89bdec Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:38:16 +0200 Subject: [PATCH 3/7] Update libthrift to 0.18.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fa91f2e0d0f..bed6671b0864 100644 --- a/pom.xml +++ b/pom.xml @@ -1740,7 +1740,7 @@ org.apache.thrift libthrift - 0.17.0 + 0.18.1 From dbdf9c7372e8c1fd82d685ac8b361ff225510065 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:39:47 +0200 Subject: [PATCH 4/7] Update MariaDB jdbc driver to 3.1.4 --- .../io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java index b0a013115b46..b4285e526d4d 100644 --- a/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java +++ b/plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/BaseMariaDbConnectorTest.java @@ -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 diff --git a/pom.xml b/pom.xml index bed6671b0864..a6a828d3badb 100644 --- a/pom.xml +++ b/pom.xml @@ -1835,7 +1835,7 @@ org.mariadb.jdbc mariadb-java-client - 3.0.5 + 3.1.4 From 30b38ca141d425a5e517d52d3e29c7cff2e24298 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:40:11 +0200 Subject: [PATCH 5/7] Update RoaringBitmap to 0.9.46 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a6a828d3badb..97f7496ce2c1 100644 --- a/pom.xml +++ b/pom.xml @@ -1859,7 +1859,7 @@ org.roaringbitmap RoaringBitmap - 0.9.44 + 0.9.46 From 2cf94d644cbe90fd458d47e661a3715795aa7744 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:40:30 +0200 Subject: [PATCH 6/7] Update snappy-java to 1.1.10.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97f7496ce2c1..b20f2705a2cc 100644 --- a/pom.xml +++ b/pom.xml @@ -1883,7 +1883,7 @@ org.xerial.snappy snappy-java - 1.1.10.1 + 1.1.10.3 org.osgi From 64a389021fe59f22babf3acdecdebb380e1ff65f Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 21:42:28 +0200 Subject: [PATCH 7/7] Update pcollections to 4.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b20f2705a2cc..1461ef17fd7d 100644 --- a/pom.xml +++ b/pom.xml @@ -1847,7 +1847,7 @@ org.pcollections pcollections - 2.1.2 + 4.0.1