diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java index 2ad36db3caa7..31c9f6695848 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeRegisterTableProcedureTest.java @@ -52,7 +52,7 @@ public abstract class BaseDeltaLakeRegisterTableProcedureTest protected static final String CATALOG_NAME = "delta_lake"; protected static final String SCHEMA = "test_delta_lake_register_table_" + randomNameSuffix(); - private String dataDirectory; + private Path dataDirectory; private HiveMetastore metastore; @Override @@ -65,7 +65,7 @@ protected QueryRunner createQueryRunner() .build(); DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build(); - this.dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data").toString(); + this.dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data"); this.metastore = createTestMetastore(dataDirectory); queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.of(new TestingDeltaLakeMetastoreModule(metastore)), EMPTY_MODULE)); @@ -81,7 +81,7 @@ protected QueryRunner createQueryRunner() return queryRunner; } - protected abstract HiveMetastore createTestMetastore(String dataDirectory); + protected abstract HiveMetastore createTestMetastore(Path dataDirectory); @AfterClass(alwaysRun = true) public void tearDown() @@ -89,7 +89,7 @@ public void tearDown() { if (metastore != null) { metastore.dropDatabase(SCHEMA, false); - deleteRecursively(Path.of(dataDirectory), ALLOW_INSECURE); + deleteRecursively(dataDirectory, ALLOW_INSECURE); } } @@ -181,7 +181,7 @@ public void testRegisterTableWithDifferentTableName() public void testRegisterTableWithTrailingSpaceInLocation() { String tableName = "test_register_table_with_trailing_space_" + randomNameSuffix(); - String tableLocationWithTrailingSpace = dataDirectory + "/" + tableName + " "; + String tableLocationWithTrailingSpace = dataDirectory.toUri() + "/" + tableName + " "; assertQuerySucceeds(format("CREATE TABLE %s WITH (location = '%s') AS SELECT 1 AS a, 'INDIA' AS b, true AS c", tableName, tableLocationWithTrailingSpace)); assertQuery("SELECT * FROM " + tableName, "VALUES (1, 'INDIA', true)"); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java index 772f3c11e9a9..5bbd90695320 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java @@ -45,7 +45,7 @@ public abstract class BaseDeltaLakeSharedMetastoreViewsTest protected static final String HIVE_CATALOG_NAME = "hive"; protected static final String SCHEMA = "test_shared_schema_views_" + randomNameSuffix(); - private String dataDirectory; + private Path dataDirectory; private HiveMetastore metastore; @Override @@ -58,7 +58,7 @@ protected QueryRunner createQueryRunner() .build(); DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).build(); - this.dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data").toString(); + this.dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data"); this.metastore = createTestMetastore(dataDirectory); queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.of(new TestingDeltaLakeMetastoreModule(metastore)), EMPTY_MODULE)); @@ -76,7 +76,7 @@ protected QueryRunner createQueryRunner() return queryRunner; } - protected abstract HiveMetastore createTestMetastore(String dataDirectory); + protected abstract HiveMetastore createTestMetastore(Path dataDirectory); @Test public void testViewWithLiteralColumnCreatedInDeltaLakeIsReadableInHive() @@ -160,7 +160,7 @@ public void cleanup() { if (metastore != null) { metastore.dropDatabase(SCHEMA, false); - deleteRecursively(Path.of(dataDirectory), ALLOW_INSECURE); + deleteRecursively(dataDirectory, ALLOW_INSECURE); } } } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java index a687528dd55a..0067bbb5a1bf 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeRegisterTableProcedureWithFileMetastore.java @@ -15,7 +15,7 @@ import io.trino.plugin.hive.metastore.HiveMetastore; -import java.io.File; +import java.nio.file.Path; import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore; @@ -23,8 +23,8 @@ public class TestDeltaLakeRegisterTableProcedureWithFileMetastore extends BaseDeltaLakeRegisterTableProcedureTest { @Override - protected HiveMetastore createTestMetastore(String dataDirectory) + protected HiveMetastore createTestMetastore(Path dataDirectory) { - return createTestingFileHiveMetastore(new File(dataDirectory)); + return createTestingFileHiveMetastore(dataDirectory.toFile()); } } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java index f41a91d836d4..bc95c4f1c7d6 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedFileMetastoreViews.java @@ -15,7 +15,7 @@ import io.trino.plugin.hive.metastore.HiveMetastore; -import java.io.File; +import java.nio.file.Path; import static io.trino.plugin.hive.metastore.file.FileHiveMetastore.createTestingFileHiveMetastore; @@ -23,8 +23,8 @@ public class TestDeltaLakeSharedFileMetastoreViews extends BaseDeltaLakeSharedMetastoreViewsTest { @Override - protected HiveMetastore createTestMetastore(String dataDirectory) + protected HiveMetastore createTestMetastore(Path dataDirectory) { - return createTestingFileHiveMetastore(new File(dataDirectory)); + return createTestingFileHiveMetastore(dataDirectory.toFile()); } } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreViews.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreViews.java index d46e0d166c52..c9d2b942e75c 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreViews.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreViews.java @@ -15,6 +15,8 @@ import io.trino.plugin.hive.metastore.HiveMetastore; +import java.nio.file.Path; + import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore; /** @@ -25,7 +27,7 @@ public class TestDeltaLakeSharedGlueMetastoreViews extends BaseDeltaLakeSharedMetastoreViewsTest { @Override - protected HiveMetastore createTestMetastore(String dataDirectory) + protected HiveMetastore createTestMetastore(Path dataDirectory) { return createTestingGlueHiveMetastore(dataDirectory); } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java index df1f4ab3eb3e..8febb700f6ea 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java @@ -62,18 +62,18 @@ protected QueryRunner createQueryRunner() "delta_lake", ImmutableMap.builder() .put("hive.metastore", "glue") - .put("hive.metastore.glue.default-warehouse-dir", dataDirectory.toString()) + .put("hive.metastore.glue.default-warehouse-dir", dataDirectory.toUri().toString()) .put("delta.hive-catalog-name", "hive_with_redirections") .buildOrThrow()); - this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory.toString()); + this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory); queryRunner.installPlugin(new TestingHivePlugin(glueMetastore)); queryRunner.createCatalog( "hive_with_redirections", "hive", ImmutableMap.of("hive.delta-lake-catalog-name", "delta_with_redirections")); - queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = '" + dataDirectory.toString() + "')"); + queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = '" + dataDirectory.toUri() + "')"); queryRunner.execute("CREATE TABLE hive_with_redirections." + schema + ".hive_table (a_integer) WITH (format='PARQUET') AS VALUES 1, 2, 3"); queryRunner.execute("CREATE TABLE delta_with_redirections." + schema + ".delta_table (a_varchar) AS VALUES 'a', 'b', 'c'"); @@ -102,7 +102,7 @@ protected String getExpectedHiveCreateSchema(String catalogName) " location = '%s'\n" + ")"; - return format(expectedHiveCreateSchema, catalogName, schema, dataDirectory); + return format(expectedHiveCreateSchema, catalogName, schema, dataDirectory.toUri().toString().replaceFirst("/$", "")); } @Override @@ -112,6 +112,6 @@ protected String getExpectedDeltaLakeCreateSchema(String catalogName) "WITH (\n" + " location = '%s'\n" + ")"; - return format(expectedDeltaLakeCreateSchema, catalogName, schema, dataDirectory, schema); + return format(expectedDeltaLakeCreateSchema, catalogName, schema, dataDirectory.toUri().toString().replaceFirst("/$", "")); } } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java index 14961592b9da..d9c2128884f3 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java @@ -54,12 +54,12 @@ protected QueryRunner createQueryRunner() ImmutableMap.builder() .put("hive.metastore", "glue") .put("hive.metastore.glue.region", "us-east-2") - .put("hive.metastore.glue.default-warehouse-dir", metastoreDir.getPath()) + .put("hive.metastore.glue.default-warehouse-dir", metastoreDir.toURI().toString()) .buildOrThrow()); - metastore = createTestingGlueHiveMetastore(metastoreDir.getPath()); + metastore = createTestingGlueHiveMetastore(metastoreDir.toPath()); - queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = '" + metastoreDir.getPath() + "')"); + queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = '" + metastoreDir.toURI() + "')"); return queryRunner; } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java index 794070f2de66..8d79a92a0dbc 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java @@ -54,7 +54,7 @@ public class TestDeltaLakeConcurrentModificationGlueMetastore { private static final String CATALOG_NAME = "test_delta_lake_concurrent"; private static final String SCHEMA = "test_delta_lake_glue_concurrent_" + randomNameSuffix(); - private String dataDirectory; + private Path dataDirectory; private GlueHiveMetastore metastore; private final AtomicBoolean failNextGlueDeleteTableCall = new AtomicBoolean(false); @@ -69,10 +69,10 @@ protected QueryRunner createQueryRunner() DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(deltaLakeSession).build(); - dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("data_delta_concurrent").toString(); + dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("data_delta_concurrent"); GlueMetastoreStats stats = new GlueMetastoreStats(); GlueHiveMetastoreConfig glueConfig = new GlueHiveMetastoreConfig() - .setDefaultWarehouseDir(dataDirectory); + .setDefaultWarehouseDir(dataDirectory.toUri().toString()); AWSGlueAsync glueClient = createAsyncGlueClient(glueConfig, DefaultAWSCredentialsProviderChain.getInstance(), Optional.empty(), stats.newRequestMetricsCollector()); AWSGlueAsync proxiedGlueClient = newProxy(AWSGlueAsync.class, (proxy, method, args) -> { @@ -123,7 +123,7 @@ public void cleanup() { if (metastore != null) { metastore.dropDatabase(SCHEMA, false); - deleteRecursively(Path.of(dataDirectory), ALLOW_INSECURE); + deleteRecursively(dataDirectory, ALLOW_INSECURE); } } } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRegisterTableProcedureWithGlue.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRegisterTableProcedureWithGlue.java index fd7bc8031474..1aaf0f79f13a 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRegisterTableProcedureWithGlue.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRegisterTableProcedureWithGlue.java @@ -16,13 +16,15 @@ import io.trino.plugin.deltalake.BaseDeltaLakeRegisterTableProcedureTest; import io.trino.plugin.hive.metastore.HiveMetastore; +import java.nio.file.Path; + import static io.trino.plugin.hive.metastore.glue.GlueHiveMetastore.createTestingGlueHiveMetastore; public class TestDeltaLakeRegisterTableProcedureWithGlue extends BaseDeltaLakeRegisterTableProcedureTest { @Override - protected HiveMetastore createTestMetastore(String dataDirectory) + protected HiveMetastore createTestMetastore(Path dataDirectory) { return createTestingGlueHiveMetastore(dataDirectory); } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java index cc84e1471c5e..2de176fe958a 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRenameToWithGlueMetastore.java @@ -22,7 +22,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import java.io.File; +import java.nio.file.Path; import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.testing.TestingSession.testSessionBuilder; @@ -34,7 +34,7 @@ public class TestDeltaLakeRenameToWithGlueMetastore protected static final String SCHEMA = "test_delta_lake_rename_to_with_glue_" + randomNameSuffix(); protected static final String CATALOG_NAME = "test_delta_lake_rename_to_with_glue"; - private File schemaLocation; + private Path schemaLocation; @Override protected QueryRunner createQueryRunner() @@ -49,9 +49,9 @@ protected QueryRunner createQueryRunner() .setCatalogName(CATALOG_NAME) .setDeltaProperties(ImmutableMap.of("hive.metastore", "glue")) .build(); - schemaLocation = new File(queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data").toString()); - schemaLocation.deleteOnExit(); - queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = '" + schemaLocation.getPath() + "')"); + schemaLocation = queryRunner.getCoordinator().getBaseDataDir().resolve("delta_lake_data"); + schemaLocation.toFile().deleteOnExit(); + queryRunner.execute("CREATE SCHEMA " + SCHEMA + " WITH (location = '" + schemaLocation.toUri() + "')"); return queryRunner; } @@ -60,7 +60,7 @@ public void testRenameOfExternalTable() { String oldTable = "test_table_external_to_be_renamed_" + randomNameSuffix(); String newTable = "test_table_external_renamed_" + randomNameSuffix(); - String location = schemaLocation.getPath() + "/tableLocation/"; + String location = schemaLocation.toUri() + "/tableLocation/"; try { assertUpdate(format("CREATE TABLE %s WITH (location = '%s') AS SELECT 1 AS val ", oldTable, location), 1); String oldLocation = (String) computeScalar("SELECT \"$path\" FROM " + oldTable); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java index 178dd6549b40..26b0441953c0 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java @@ -42,10 +42,10 @@ public class TestDeltaLakeViewsGlueMetastore { private static final String SCHEMA = "test_delta_lake_glue_views_" + randomNameSuffix(); private static final String CATALOG_NAME = "test_delta_lake_glue_views"; - private String dataDirectory; + private Path dataDirectory; private HiveMetastore metastore; - private HiveMetastore createTestMetastore(String dataDirectory) + private HiveMetastore createTestMetastore(Path dataDirectory) { return createTestingGlueHiveMetastore(dataDirectory); } @@ -61,7 +61,7 @@ protected QueryRunner createQueryRunner() DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(deltaLakeSession).build(); - dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("data_delta_lake_views").toString(); + dataDirectory = queryRunner.getCoordinator().getBaseDataDir().resolve("data_delta_lake_views"); metastore = createTestMetastore(dataDirectory); queryRunner.installPlugin(new TestingDeltaLakePlugin(Optional.of(new TestingDeltaLakeMetastoreModule(metastore)), EMPTY_MODULE)); @@ -89,7 +89,7 @@ public void cleanup() { if (metastore != null) { metastore.dropDatabase(SCHEMA, false); - deleteRecursively(Path.of(dataDirectory), ALLOW_INSECURE); + deleteRecursively(dataDirectory, ALLOW_INSECURE); } } } diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java index c62e1b560cb3..55b0eeea8a52 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueHiveMetastore.java @@ -217,14 +217,14 @@ public GlueHiveMetastore( } @VisibleForTesting - public static GlueHiveMetastore createTestingGlueHiveMetastore(String defaultWarehouseDir) + public static GlueHiveMetastore createTestingGlueHiveMetastore(java.nio.file.Path defaultWarehouseDir) { HdfsConfig hdfsConfig = new HdfsConfig(); HdfsConfiguration hdfsConfiguration = new DynamicHdfsConfiguration(new HdfsConfigurationInitializer(hdfsConfig), ImmutableSet.of()); HdfsEnvironment hdfsEnvironment = new HdfsEnvironment(hdfsConfiguration, hdfsConfig, new NoHdfsAuthentication()); GlueMetastoreStats stats = new GlueMetastoreStats(); GlueHiveMetastoreConfig glueConfig = new GlueHiveMetastoreConfig() - .setDefaultWarehouseDir(defaultWarehouseDir); + .setDefaultWarehouseDir(defaultWarehouseDir.toUri().toString()); return new GlueHiveMetastore( hdfsEnvironment, glueConfig, diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java index 2ccf36940762..3d6ef0600eb8 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java @@ -108,7 +108,7 @@ protected LocalQueryRunner createQueryRunner() dataDirectory = Files.createTempDirectory("test_iceberg_create_table_failure"); dataDirectory.toFile().deleteOnExit(); - glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory.toString()); + glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory); fileSystem = new HdfsFileSystemFactory(HDFS_ENVIRONMENT).create(TestingConnectorSession.SESSION); Database database = Database.builder() diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java index 9f1ec7318db8..27e320f1bbb8 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java @@ -94,7 +94,7 @@ protected LocalQueryRunner createQueryRunner() Path dataDirectory = Files.createTempDirectory("iceberg_data"); dataDirectory.toFile().deleteOnExit(); - glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory.toString()); + glueHiveMetastore = createTestingGlueHiveMetastore(dataDirectory); Database database = Database.builder() .setDatabaseName(schemaName) diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java index 4db610e7c77b..d8684dfb1f9c 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java @@ -87,7 +87,7 @@ protected QueryRunner createQueryRunner() "hive.metastore.glue.default-warehouse-dir", dataDirectory.toString(), "iceberg.hive-catalog-name", "hive")); - this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory.toString()); + this.glueMetastore = createTestingGlueHiveMetastore(dataDirectory); queryRunner.installPlugin(new TestingHivePlugin(glueMetastore)); queryRunner.createCatalog(HIVE_CATALOG, "hive"); queryRunner.createCatalog( @@ -95,7 +95,7 @@ protected QueryRunner createQueryRunner() "hive", ImmutableMap.of("hive.iceberg-catalog-name", "iceberg")); - queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = '" + dataDirectory.toString() + "')"); + queryRunner.execute("CREATE SCHEMA " + schema + " WITH (location = '" + dataDirectory.toUri() + "')"); copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, icebergSession, ImmutableList.of(TpchTable.NATION)); copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, hiveSession, ImmutableList.of(TpchTable.REGION)); @@ -124,7 +124,7 @@ protected String getExpectedHiveCreateSchema(String catalogName) " location = '%s'\n" + ")"; - return format(expectedHiveCreateSchema, catalogName, schema, dataDirectory); + return format(expectedHiveCreateSchema, catalogName, schema, dataDirectory.toUri().toString().replaceFirst("/$", "")); } @Override @@ -134,6 +134,6 @@ protected String getExpectedIcebergCreateSchema(String catalogName) "WITH (\n" + " location = '%s'\n" + ")"; - return format(expectedIcebergCreateSchema, catalogName, schema, dataDirectory, schema); + return format(expectedIcebergCreateSchema, catalogName, schema, dataDirectory.toUri().toString().replaceFirst("/$", "")); } }