Skip to content

Commit 4a3c925

Browse files
committed
Use official Polaris Catalog docker image
1 parent e00bd87 commit 4a3c925

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ public static void main(String[] args)
235235
throws Exception
236236
{
237237
Path warehouseLocation = Files.createTempDirectory(null);
238-
warehouseLocation.toFile().deleteOnExit();
238+
File warehouseDir = warehouseLocation.toFile();
239+
warehouseDir.deleteOnExit();
240+
warehouseDir.setReadable(true, false);
241+
warehouseDir.setWritable(true, false);
242+
warehouseDir.setExecutable(true, false);
239243

240244
@SuppressWarnings("resource")
241245
TestingPolarisCatalog polarisCatalog = new TestingPolarisCatalog(warehouseLocation.toString());

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestIcebergPolarisCatalogConnectorSmokeTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ protected QueryRunner createQueryRunner()
7575
throws Exception
7676
{
7777
warehouseLocation = Files.createTempDirectory(null);
78+
java.io.File warehouseDir = warehouseLocation.toFile();
79+
warehouseDir.setReadable(true, false);
80+
warehouseDir.setWritable(true, false);
81+
warehouseDir.setExecutable(true, false);
7882
polarisCatalog = closeAfterClass(new TestingPolarisCatalog(warehouseLocation.toString()));
7983

8084
return IcebergQueryRunner.builder()

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/rest/TestingPolarisCatalog.java

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,26 @@
2929
import java.io.IOException;
3030
import java.io.UncheckedIOException;
3131
import java.net.URI;
32+
import java.nio.file.Path;
33+
import java.nio.file.Paths;
34+
import java.nio.file.attribute.PosixFilePermission;
35+
import java.util.EnumSet;
36+
import java.util.Set;
3237

3338
import static com.google.common.base.Preconditions.checkState;
3439
import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
3540
import static io.airlift.http.client.StatusResponseHandler.createStatusResponseHandler;
3641
import static io.airlift.http.client.StringResponseHandler.createStringResponseHandler;
37-
import static io.trino.testing.TestingProperties.getDockerImagesVersion;
3842
import static java.nio.charset.StandardCharsets.UTF_8;
43+
import static java.nio.file.attribute.PosixFilePermission.GROUP_EXECUTE;
44+
import static java.nio.file.attribute.PosixFilePermission.GROUP_READ;
45+
import static java.nio.file.attribute.PosixFilePermission.GROUP_WRITE;
46+
import static java.nio.file.attribute.PosixFilePermission.OTHERS_EXECUTE;
47+
import static java.nio.file.attribute.PosixFilePermission.OTHERS_READ;
48+
import static java.nio.file.attribute.PosixFilePermission.OTHERS_WRITE;
49+
import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
50+
import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
51+
import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
3952
import static java.util.Objects.requireNonNull;
4053

4154
public final class TestingPolarisCatalog
@@ -55,9 +68,25 @@ public final class TestingPolarisCatalog
5568
public TestingPolarisCatalog(String warehouseLocation)
5669
{
5770
this.warehouseLocation = requireNonNull(warehouseLocation, "warehouseLocation is null");
71+
Path warehousePath = Paths.get(warehouseLocation);
72+
try {
73+
Set<PosixFilePermission> permissions = EnumSet.of(
74+
OWNER_READ,
75+
OWNER_WRITE,
76+
OWNER_EXECUTE,
77+
GROUP_READ,
78+
GROUP_WRITE,
79+
GROUP_EXECUTE,
80+
OTHERS_READ,
81+
OTHERS_WRITE,
82+
OTHERS_EXECUTE);
83+
java.nio.file.Files.setPosixFilePermissions(warehousePath, permissions);
84+
}
85+
catch (Exception e) {
86+
throw new RuntimeException("Failed to setup warehouse directory", e);
87+
}
5888

59-
// TODO: Use the official docker image once Polaris community provides it
60-
polarisCatalog = new GenericContainer<>("ghcr.io/trinodb/testing/polaris-catalog:" + getDockerImagesVersion());
89+
polarisCatalog = new GenericContainer<>("apache/polaris:1.0.0-incubating");
6190
polarisCatalog.addExposedPort(POLARIS_PORT);
6291
polarisCatalog.withFileSystemBind(warehouseLocation, warehouseLocation, BindMode.READ_WRITE);
6392
polarisCatalog.waitingFor(new LogMessageWaitStrategy().withRegEx(".*Apache Polaris Server.* started.*"));

0 commit comments

Comments
 (0)