diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java index 345845cd9f79..f6ff2262f162 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java @@ -58,12 +58,6 @@ public static DistributedQueryRunner createDeltaLakeQueryRunner() return createDeltaLakeQueryRunner(ImmutableMap.of(), ImmutableMap.of()); } - public static DistributedQueryRunner createDeltaLakeQueryRunner(Map connectorProperties) - throws Exception - { - return createDeltaLakeQueryRunner(ImmutableMap.of(), connectorProperties); - } - public static DistributedQueryRunner createDeltaLakeQueryRunner(Map extraProperties, Map connectorProperties) throws Exception { @@ -126,25 +120,6 @@ public static DistributedQueryRunner createS3DeltaLakeQueryRunner( additionalSetup); } - public static QueryRunner createAbfsDeltaLakeQueryRunner( - String catalogName, - String schemaName, - TestingHadoop testingHadoop) - throws Exception - { - return createAbfsDeltaLakeQueryRunner(catalogName, schemaName, ImmutableMap.of(), ImmutableMap.of(), testingHadoop); - } - - public static QueryRunner createAbfsDeltaLakeQueryRunner( - String catalogName, - String schemaName, - Map connectorProperties, - TestingHadoop testingHadoop) - throws Exception - { - return createAbfsDeltaLakeQueryRunner(catalogName, schemaName, ImmutableMap.of(), connectorProperties, testingHadoop); - } - public static QueryRunner createAbfsDeltaLakeQueryRunner( String catalogName, String schemaName, @@ -156,29 +131,13 @@ public static QueryRunner createAbfsDeltaLakeQueryRunner( return createDockerizedDeltaLakeQueryRunner( catalogName, schemaName, + ImmutableMap.of(), extraProperties, ImmutableMap.builder() .put("hive.azure.abfs-storage-account", requiredNonEmptySystemProperty("hive.hadoop2.azure-abfs-account")) .put("hive.azure.abfs-access-key", requiredNonEmptySystemProperty("hive.hadoop2.azure-abfs-access-key")) .putAll(connectorProperties) .buildOrThrow(), - testingHadoop); - } - - public static DistributedQueryRunner createDockerizedDeltaLakeQueryRunner( - String catalogName, - String schemaName, - Map extraProperties, - Map connectorProperties, - TestingHadoop testingHadoop) - throws Exception - { - return createDockerizedDeltaLakeQueryRunner( - catalogName, - schemaName, - ImmutableMap.of(), - extraProperties, - connectorProperties, testingHadoop, queryRunner -> {}); } 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 65a1b33a8f48..5e85f175c76d 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 @@ -142,7 +142,7 @@ DockerizedDataLake createDockerizedDataLake() QueryRunner createDeltaLakeQueryRunner(Map connectorProperties) throws Exception { - return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, connectorProperties, dockerizedDataLake.getTestingHadoop()); + return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, ImmutableMap.of(), connectorProperties, dockerizedDataLake.getTestingHadoop()); } @Override diff --git a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java index 42b04b566470..af92b4ba8e2b 100644 --- a/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java +++ b/plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java @@ -84,7 +84,7 @@ protected QueryRunner createQueryRunner() ImmutableMap.of(hadoopCoreSiteXmlTempFile.toString(), "/etc/hadoop/conf/core-site.xml"))); testingHadoop = dockerizedDataLake.getTestingHadoop(); - return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA_NAME, testingHadoop); + return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA_NAME, ImmutableMap.of(), ImmutableMap.of(), testingHadoop); } private Path createHadoopCoreSiteXmlTempFileWithAbfsSettings()