Skip to content

Simplify Delta Lake query runner #11728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Apr 1, 2022
Merged

Simplify Delta Lake query runner #11728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 1 addition & 42 deletions plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaLakeQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ public static DistributedQueryRunner createDeltaLakeQueryRunner()
return createDeltaLakeQueryRunner(ImmutableMap.of(), ImmutableMap.of());
}

public static DistributedQueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
throws Exception
{
return createDeltaLakeQueryRunner(ImmutableMap.of(), connectorProperties);
}

public static DistributedQueryRunner createDeltaLakeQueryRunner(Map<String, String> extraProperties, Map<String, String> connectorProperties)
throws Exception
{
Expand Down Expand Up @@ -118,25 +112,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<String, String> connectorProperties,
TestingHadoop testingHadoop)
throws Exception
{
return createAbfsDeltaLakeQueryRunner(catalogName, schemaName, ImmutableMap.of(), connectorProperties, testingHadoop);
}

public static QueryRunner createAbfsDeltaLakeQueryRunner(
String catalogName,
String schemaName,
Expand All @@ -148,29 +123,13 @@ public static QueryRunner createAbfsDeltaLakeQueryRunner(
return createDockerizedDeltaLakeQueryRunner(
catalogName,
schemaName,
ImmutableMap.of(),
extraProperties,
ImmutableMap.<String, String>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<String, String> extraProperties,
Map<String, String> connectorProperties,
TestingHadoop testingHadoop)
throws Exception
{
return createDockerizedDeltaLakeQueryRunner(
catalogName,
schemaName,
ImmutableMap.of(),
extraProperties,
connectorProperties,
testingHadoop,
queryRunner -> {});
}
Expand Down
2 changes: 1 addition & 1 deletion ...lta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ DockerizedDataLake createDockerizedDataLake()
QueryRunner createDeltaLakeQueryRunner(Map<String, String> connectorProperties)
throws Exception
{
return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, connectorProperties, dockerizedDataLake.getTestingHadoop());
return createAbfsDeltaLakeQueryRunner(DELTA_CATALOG, SCHEMA, ImmutableMap.of(), connectorProperties, dockerizedDataLake.getTestingHadoop());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...in/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeAdlsStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down