Skip to content

[native] Use builder pattern for native queryRunner #25120

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
pramodsatya merged 1 commit into from
Jun 2, 2025
Merged

[native] Use builder pattern for native queryRunner #25120

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
4 changes: 2 additions & 2 deletions ...ecution/src/test/java/com/facebook/presto/nativeworker/HiveExternalWorkerQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ public static void main(String[] args)
Logging.initialize();

// Create tables before launching distributed runner.
QueryRunner javaQueryRunner = PrestoNativeQueryRunnerUtils.createJavaQueryRunner(false);
QueryRunner javaQueryRunner = PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder().build();
NativeQueryRunnerUtils.createAllTables(javaQueryRunner);
javaQueryRunner.close();

// Launch distributed runner.
DistributedQueryRunner queryRunner = (DistributedQueryRunner) PrestoNativeQueryRunnerUtils.createQueryRunner(false, false, false, false);
DistributedQueryRunner queryRunner = (DistributedQueryRunner) PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder().build();
Thread.sleep(10);
Logger log = Logger.get(DistributedQueryRunner.class);
log.info("======== SERVER STARTED ========");
Expand Down
6 changes: 4 additions & 2 deletions ...tion/src/test/java/com/facebook/presto/nativeworker/IcebergExternalWorkerQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ public static void main(String[] args)
Logging.initialize();

// Create tables before launching distributed runner.
QueryRunner javaQueryRunner = PrestoNativeQueryRunnerUtils.createJavaIcebergQueryRunner(false);
QueryRunner javaQueryRunner = PrestoNativeQueryRunnerUtils.javaIcebergQueryRunnerBuilder().build();
NativeQueryRunnerUtils.createAllIcebergTables(javaQueryRunner);
javaQueryRunner.close();

// Launch distributed runner.
DistributedQueryRunner queryRunner = (DistributedQueryRunner) PrestoNativeQueryRunnerUtils.createNativeIcebergQueryRunner(true, false);
DistributedQueryRunner queryRunner = (DistributedQueryRunner) PrestoNativeQueryRunnerUtils.nativeIcebergQueryRunnerBuilder()
.setUseThrift(true)
.build();
Thread.sleep(10);
Logger log = Logger.get(DistributedQueryRunner.class);
log.info("======== SERVER STARTED ========");
Expand Down
6 changes: 2 additions & 4 deletions ...tive-execution/src/test/java/com/facebook/presto/nativeworker/NativeQueryRunnerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@ public class NativeQueryRunnerUtils
{
private NativeQueryRunnerUtils() {}

public static Map<String, String> getNativeWorkerHiveProperties(String storageFormat)
public static Map<String, String> getNativeWorkerHiveProperties()
{
return ImmutableMap.of("hive.storage-format", storageFormat,
"hive.pushdown-filter-enabled", "true",
"hive.parquet.pushdown-filter-enabled", "true",
return ImmutableMap.of("hive.parquet.pushdown-filter-enabled", "true",
"hive.orc-compression-codec", "ZSTD");
}

Expand Down
589 changes: 238 additions & 351 deletions ...xecution/src/test/java/com/facebook/presto/nativeworker/PrestoNativeQueryRunnerUtils.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion ...n/src/test/java/com/facebook/presto/nativeworker/TestNativeHistoryBasedStatsTracking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ public class TestNativeHistoryBasedStatsTracking
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();
}

@BeforeMethod(alwaysRun = true)
Expand Down
5 changes: 4 additions & 1 deletion ...ve-execution/src/test/java/com/facebook/presto/nativeworker/TestNativePlanValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public class TestNativePlanValidation
{
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(false, true);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.setFailOnNestedLoopJoin(true)
.build();
}
}
8 changes: 6 additions & 2 deletions ...xecution/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeAggregations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ public class TestPrestoNativeAggregations
@Override
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(false);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}
}
8 changes: 6 additions & 2 deletions .../src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeArrayFunctionQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ public class TestPrestoNativeArrayFunctionQueries
@Override
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(false);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}
}
12 changes: 10 additions & 2 deletions .../test/java/com/facebook/presto/nativeworker/TestPrestoNativeAsyncDataCacheCleanupAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,21 @@ public class TestPrestoNativeAsyncDataCacheCleanupAPI
@Override
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createQueryRunner(true, false, true, true);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setCacheMaxSize(4096)
.setUseThrift(true)
.setAddStorageFormatToPath(true)
.setEnableRuntimeMetricsCollection(true)
.setEnableSsdCache(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions ...rc/test/java/com/facebook/presto/nativeworker/TestPrestoNativeBitwiseFunctionQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ public class TestPrestoNativeBitwiseFunctionQueries
@Override
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(false);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}
}
13 changes: 11 additions & 2 deletions ...on/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeCtasQueriesParquet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,26 @@
public class TestPrestoNativeCtasQueriesParquet
extends AbstractTestNativeCtasQueries
{
private final String storageFormat = "PARQUET";

@Override
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true, "PARQUET");
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setStorageFormat(storageFormat)
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner("PARQUET");
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setStorageFormat(storageFormat)
.setAddStorageFormatToPath(true)
.build();
}
}
20 changes: 18 additions & 2 deletions ...n/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeCteExecutionParquet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import com.facebook.presto.Session;
import com.facebook.presto.testing.QueryRunner;
import com.google.common.collect.ImmutableMap;
import org.testng.annotations.Test;

import static com.facebook.presto.SystemSessionProperties.CTE_FILTER_AND_PROJECTION_PUSHDOWN_ENABLED;
Expand All @@ -27,18 +28,33 @@
public class TestPrestoNativeCteExecutionParquet
extends AbstractTestNativeCteExecution
{
private final String storageFormat = "PARQUET";

@Override
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeCteQueryRunner(true, "PARQUET");
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setStorageFormat(this.storageFormat)
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.setExtraProperties(ImmutableMap.of("query.cte-partitioning-provider-catalog", "hive"))
.setHiveProperties(ImmutableMap.<String, String>builder()
.put("hive.enable-parquet-dereference-pushdown", "true")
.put("hive.temporary-table-compression-codec", "NONE")
.put("hive.temporary-table-storage-format", this.storageFormat)
.build())
.build();
}

@Override
protected QueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner("PARQUET");
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setStorageFormat(this.storageFormat)
.setAddStorageFormatToPath(true)
.build();
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions ...on/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeGeneralQueriesJSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,17 @@ public class TestPrestoNativeGeneralQueriesJSON
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(false);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}
}
9 changes: 7 additions & 2 deletions .../src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeGeneralQueriesThrift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ public class TestPrestoNativeGeneralQueriesThrift
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true);
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}
}
9 changes: 5 additions & 4 deletions ...tion/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeGracefulShutdown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package com.facebook.presto.nativeworker;

import com.facebook.presto.spi.NodeState;
import com.facebook.presto.testing.QueryRunner;
import com.facebook.presto.tests.DistributedQueryRunner;
import org.testng.annotations.Test;

Expand All @@ -26,8 +25,10 @@ public class TestPrestoNativeGracefulShutdown
@Test
public void testGracefulShutdown() throws Exception
{
QueryRunner queryRunner = PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true);
DistributedQueryRunner distributedQueryRunner = (DistributedQueryRunner) queryRunner;
DistributedQueryRunner distributedQueryRunner = (DistributedQueryRunner) PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();

int responseCode = distributedQueryRunner.sendWorkerRequest(0, "INVALID_BODY");
assertEquals(responseCode, 400, "Expected a 400 Bad Request response for invalid body");
Expand All @@ -40,6 +41,6 @@ public void testGracefulShutdown() throws Exception
NodeState state = distributedQueryRunner.getWorkerInfoState(0);
assertEquals(state.getValue(), SHUTTING_DOWN.getValue());

queryRunner.close();
distributedQueryRunner.close();
}
}
9 changes: 7 additions & 2 deletions ...rc/test/java/com/facebook/presto/nativeworker/TestPrestoNativeHistoryBasedStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ protected void createTables()
protected QueryRunner createQueryRunner()
throws Exception
{
QueryRunner queryRunner = PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true);
QueryRunner queryRunner = PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();
queryRunner.installPlugin(new Plugin()
{
@Override
Expand All @@ -71,7 +74,9 @@ public Iterable<HistoryBasedPlanStatisticsProvider> getHistoryBasedPlanStatistic
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner();
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setAddStorageFormatToPath(true)
.build();
}

@BeforeMethod(alwaysRun = true)
Expand Down
13 changes: 11 additions & 2 deletions ...com/facebook/presto/nativeworker/TestPrestoNativeHiveExternalTableTpchQueriesParquet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,24 @@
public class TestPrestoNativeHiveExternalTableTpchQueriesParquet
extends AbstractTestNativeHiveExternalTableTpchQueries
{
private final String storageFormat = "PARQUET";

@Override
protected QueryRunner createQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeQueryRunner(true, "PARQUET");
return PrestoNativeQueryRunnerUtils.nativeHiveQueryRunnerBuilder()
.setStorageFormat(storageFormat)
.setAddStorageFormatToPath(true)
.setUseThrift(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner() throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaQueryRunner("PARQUET");
return PrestoNativeQueryRunnerUtils.javaHiveQueryRunnerBuilder()
.setStorageFormat(storageFormat)
.setAddStorageFormatToPath(true)
.build();
}
}
11 changes: 9 additions & 2 deletions ...src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeIcebergGeneralQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.facebook.presto.tests.AbstractTestQueryFramework;
import org.testng.annotations.Test;

import static com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils.ICEBERG_DEFAULT_STORAGE_FORMAT;
import static java.lang.String.format;
import static org.testng.Assert.assertEquals;

Expand All @@ -28,14 +29,20 @@ public class TestPrestoNativeIcebergGeneralQueries
protected QueryRunner createQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createNativeIcebergQueryRunner(false, true);
return PrestoNativeQueryRunnerUtils.nativeIcebergQueryRunnerBuilder()
.setStorageFormat(ICEBERG_DEFAULT_STORAGE_FORMAT)
.setAddStorageFormatToPath(true)
.build();
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
return PrestoNativeQueryRunnerUtils.createJavaIcebergQueryRunner(true);
return PrestoNativeQueryRunnerUtils.javaIcebergQueryRunnerBuilder()
.setStorageFormat(ICEBERG_DEFAULT_STORAGE_FORMAT)
.setAddStorageFormatToPath(true)
.build();
}

@Override
Expand Down
Loading
Loading