Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,7 @@ private void renamePartitionResourcesOutsideTrino(String tableName, String parti

// Copy whole partition to new location
MinioClient minioClient = hiveMinioDataLake.getMinioClient();
minioClient.listObjects(bucketName, "/")
minioClient.listObjects(bucketName, "")
.forEach(objectKey -> {
if (objectKey.startsWith(partitionS3KeyPrefix)) {
String fileName = objectKey.substring(objectKey.lastIndexOf('/'));
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-iceberg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<!-- Nessie version (compatible with Iceberg release) must be bumped along with Iceberg version bump to avoid compatibility issues -->
<dep.nessie.version>0.93.1</dep.nessie.version>
<dep.nessie.version>0.94.1</dep.nessie.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -633,7 +633,7 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>24.0.4</version>
<version>24.0.5</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,10 @@ public void testS3LocationWithTrailingSlash()
assertThat(location).doesNotContain("#");

assertUpdate("CREATE TABLE " + tableName + " WITH (location='" + location + "') AS SELECT 1 col", 1);

List<String> dataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "/%s/%s/data".formatted(schemaName, tableName));
List<String> dataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "%s/%s/data".formatted(schemaName, tableName));
assertThat(dataFiles).isNotEmpty().filteredOn(filePath -> filePath.contains("#")).isEmpty();

List<String> metadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "/%s/%s/metadata".formatted(schemaName, tableName));
List<String> metadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "%s/%s/metadata".formatted(schemaName, tableName));
assertThat(metadataFiles).isNotEmpty().filteredOn(filePath -> filePath.contains("#")).isEmpty();

// Verify ALTER TABLE succeeds https://github.com/trinodb/trino/issues/14552
Expand Down Expand Up @@ -182,15 +181,15 @@ public void testExpireSnapshotsBatchDeletes()
assertUpdate("INSERT INTO " + tableName + " VALUES ('two', 2)", 1);
assertThat(query("SELECT * FROM " + tableName)).matches("VALUES (VARCHAR 'one', 1), (VARCHAR 'two', 2)");

List<String> initialMetadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "/%s/%s/metadata".formatted(schemaName, tableName));
List<String> initialMetadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "%s/%s/metadata".formatted(schemaName, tableName));
assertThat(initialMetadataFiles).isNotEmpty();

List<Long> initialSnapshots = getSnapshotIds(tableName);
assertThat(initialSnapshots).hasSizeGreaterThan(1);

assertQuerySucceeds(sessionWithShortRetentionUnlocked, "ALTER TABLE " + tableName + " EXECUTE EXPIRE_SNAPSHOTS (retention_threshold => '0s')");

List<String> updatedMetadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "/%s/%s/metadata".formatted(schemaName, tableName));
List<String> updatedMetadataFiles = hiveMinioDataLake.getMinioClient().listObjects(bucketName, "%s/%s/metadata".formatted(schemaName, tableName));
assertThat(updatedMetadataFiles).isNotEmpty().hasSizeLessThan(initialMetadataFiles.size());

List<Long> updatedSnapshots = getSnapshotIds(tableName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class NessieContainer
{
private static final Logger log = Logger.get(NessieContainer.class);

public static final String DEFAULT_IMAGE = "ghcr.io/projectnessie/nessie:0.93.1";
public static final String DEFAULT_IMAGE = "ghcr.io/projectnessie/nessie:0.94.1";
public static final String DEFAULT_HOST_NAME = "nessie";
public static final String VERSION_STORE_TYPE = "IN_MEMORY";

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-openlineage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>io.openlineage</groupId>
<artifactId>openlineage-java</artifactId>
<version>1.18.0</version>
<version>1.19.0</version>
<!-- the reason for exclusion is issue while building plugin manifesting -->
<!-- in following error: -->
<!-- Found duplicate and different classes in -->
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-phoenix5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<air.compiler.fail-warnings>true</air.compiler.fail-warnings>
<dep.hbase.version>2.5.9-hadoop3</dep.hbase.version>
<dep.hbase.version>2.5.10-hadoop3</dep.hbase.version>
<dep.phoenix5.version>5.2.0</dep.phoenix5.version>

<!-- This is required for JDK 17 to start HBase server due to illegal reflective access -->
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<dep.alluxio.version>2.9.6</dep.alluxio.version>
<dep.antlr.version>4.13.1</dep.antlr.version>
<dep.avro.version>1.11.3</dep.avro.version>
<dep.aws-sdk.version>1.12.761</dep.aws-sdk.version>
<dep.aws-sdk.version>1.12.765</dep.aws-sdk.version>
<dep.cassandra.version>4.17.0</dep.cassandra.version>
<dep.confluent.version>7.5.1</dep.confluent.version>
<dep.docker.images.version>99</dep.docker.images.version>
Expand All @@ -207,8 +207,8 @@
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.parquet.version>1.14.1</dep.parquet.version>
<dep.plugin.failsafe.version>${dep.plugin.surefire.version}</dep.plugin.failsafe.version>
<dep.protobuf.version>3.25.3</dep.protobuf.version>
<dep.snowflake.version>3.17.0</dep.snowflake.version>
<dep.protobuf.version>3.25.4</dep.protobuf.version>
<dep.snowflake.version>3.18.0</dep.snowflake.version>
<dep.swagger.version>2.2.22</dep.swagger.version>
<dep.takari.version>2.1.5</dep.takari.version>
<dep.tcnative.version>2.0.65.Final</dep.tcnative.version>
Expand Down Expand Up @@ -311,7 +311,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.26.20</version>
<version>2.26.25</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -480,7 +480,7 @@
<dependency>
<groupId>com.exasol</groupId>
<artifactId>exasol-jdbc</artifactId>
<version>24.1.0</version>
<version>24.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -2075,7 +2075,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.44.0</version>
<version>3.45.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class Minio

private static final String MINIO_ACCESS_KEY = "minio-access-key";
private static final String MINIO_SECRET_KEY = "minio-secret-key";
private static final String MINIO_RELEASE = "RELEASE.2022-05-26T05-48-41Z";
private static final String MINIO_RELEASE = "RELEASE.2024-07-16T23-46-41Z";

private static final int MINIO_PORT = 9080; // minio uses 9000 by default, which conflicts with hadoop
private static final int MINIO_CONSOLE_PORT = 9001;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class EnvSinglenodeSparkIcebergNessie

private static final int SPARK_THRIFT_PORT = 10213;
private static final int NESSIE_PORT = 19120;
private static final String NESSIE_VERSION = "0.93.1";
private static final String NESSIE_VERSION = "0.94.1";
private static final String SPARK = "spark";

private final DockerFiles dockerFiles;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class Minio
{
private static final Logger log = Logger.get(Minio.class);

public static final String DEFAULT_IMAGE = "minio/minio:RELEASE.2023-05-18T00-05-36Z";
public static final String DEFAULT_IMAGE = "minio/minio:RELEASE.2024-07-16T23-46-41Z";
public static final String DEFAULT_HOST_NAME = "minio";

public static final int MINIO_API_PORT = 4566;
Expand Down