diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java index 88470301c073..eb9f4c07d42d 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeAwsConnectorSmokeTest.java @@ -29,7 +29,7 @@ public abstract class BaseDeltaLakeAwsConnectorSmokeTest protected DockerizedMinioDataLake dockerizedMinioDataLake; @Override - DockerizedDataLake createDockerizedDataLake() + protected DockerizedDataLake createDockerizedDataLake() { dockerizedMinioDataLake = new DockerizedMinioDataLake( bucketName, @@ -40,7 +40,7 @@ DockerizedDataLake createDockerizedDataLake() } @Override - void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner) + protected void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner) { dockerizedMinioDataLake.copyResources(resourcePath, table); queryRunner.execute(format("CREATE TABLE %s (dummy int) WITH (location = '%s')", @@ -49,13 +49,13 @@ void createTableFromResources(String table, String resourcePath, QueryRunner que } @Override - String getLocationForTable(String bucketName, String tableName) + protected String getLocationForTable(String bucketName, String tableName) { return format("s3://%s/%s", bucketName, tableName); } @Override - List getTableFiles(String tableName) + protected List getTableFiles(String tableName) { return dockerizedMinioDataLake.listFiles(tableName).stream() .map(path -> format("s3://%s/%s", bucketName, path)) diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java index 5cd5d249e05b..53856b3b7a0e 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeConnectorSmokeTest.java @@ -104,19 +104,19 @@ public abstract class BaseDeltaLakeConnectorSmokeTest protected DockerizedDataLake dockerizedDataLake; - abstract DockerizedDataLake createDockerizedDataLake() + protected abstract DockerizedDataLake createDockerizedDataLake() throws Exception; - abstract QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) + protected abstract QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) throws Exception; - abstract void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner); + protected abstract void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner); - abstract String getLocationForTable(String bucketName, String tableName); + protected abstract String getLocationForTable(String bucketName, String tableName); - abstract List getTableFiles(String tableName); + protected abstract List getTableFiles(String tableName); - abstract List listCheckpointFiles(String transactionLogDirectory); + protected abstract List listCheckpointFiles(String transactionLogDirectory); @Override protected QueryRunner createQueryRunner() diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java index 19a9a944942d..e101a0ea8bc1 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java @@ -77,7 +77,7 @@ public TestDeltaLakeAdlsConnectorSmokeTest(String container, String account, Str } @Override - DockerizedDataLake createDockerizedDataLake() + protected DockerizedDataLake createDockerizedDataLake() throws Exception { String abfsSpecificCoreSiteXmlContent = Resources.toString(Resources.getResource("io/trino/plugin/deltalake/hdp3.1-core-site.xml.abfs-template"), UTF_8) @@ -96,7 +96,7 @@ DockerizedDataLake createDockerizedDataLake() } @Override - QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) + protected QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) throws Exception { return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, ImmutableMap.of(), connectorProperties, dockerizedDataLake.getTestingHadoop()); @@ -118,7 +118,7 @@ public void removeTestData() } @Override - void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner) + protected void createTableFromResources(String table, String resourcePath, QueryRunner queryRunner) { String targetDirectory = bucketName + "/" + table; @@ -142,13 +142,13 @@ void createTableFromResources(String table, String resourcePath, QueryRunner que } @Override - String getLocationForTable(String bucketName, String tableName) + protected String getLocationForTable(String bucketName, String tableName) { return bucketUrl() + tableName; } @Override - List getTableFiles(String tableName) + protected List getTableFiles(String tableName) { return listAllFilesRecursive(tableName); } diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java index 964ef7503e7d..2b21ef58c287 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorSmokeTest.java @@ -47,7 +47,7 @@ public class TestDeltaLakeConnectorSmokeTest private static final ObjectMapper OBJECT_MAPPER = new ObjectMapperProvider().get(); @Override - QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) + protected QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) throws Exception { verify(!new ParquetWriterConfig().isParquetOptimizedWriterEnabled(), "This test assumes the optimized Parquet writer is disabled by default"); diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOptimizedWriterConnectorSmokeTest.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOptimizedWriterConnectorSmokeTest.java index b7bf0cd0a043..d3c85a4bd497 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOptimizedWriterConnectorSmokeTest.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeOptimizedWriterConnectorSmokeTest.java @@ -24,7 +24,7 @@ public class TestDeltaLakeOptimizedWriterConnectorSmokeTest extends BaseDeltaLakeAwsConnectorSmokeTest { @Override - QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) + protected QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) throws Exception { return DeltaLakeQueryRunner.createS3DeltaLakeQueryRunner(