Skip to content

[Presto-on-Spark] Move DetachedNativeExecutionProcess from test to src #19435

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
shrinidhijoshi merged 1 commit into from
May 3, 2023
Merged

[Presto-on-Spark] Move DetachedNativeExecutionProcess from test to src #19435

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
16 changes: 1 addition & 15 deletions ...-execution/src/test/java/com/facebook/presto/spark/PrestoSparkNativeQueryRunnerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils;
import com.facebook.presto.spark.classloader_interface.PrestoSparkNativeExecutionShuffleManager;
import com.facebook.presto.spark.execution.NativeExecutionModule;
import com.facebook.presto.spark.execution.TestNativeExecutionModule;
import com.facebook.presto.spi.security.PrincipalType;
import com.facebook.presto.testing.QueryRunner;
import com.google.common.collect.ImmutableList;
Expand Down Expand Up @@ -102,7 +101,7 @@ public static PrestoSparkQueryRunner createPrestoSparkNativeQueryRunner()
Optional.of(getBaseDataPath()),
builder.build(),
getNativeExecutionShuffleConfigs(),
getNativeExecutionModules());
ImmutableList.of(new NativeExecutionModule()));
setupJsonFunctionNamespaceManager(queryRunner);

// Increases log level to reduce log spamming while running test.
Expand Down Expand Up @@ -187,19 +186,6 @@ public static void setupJsonFunctionNamespaceManager(QueryRunner queryRunner)
"json-based-function-manager.path-to-function-definition", "src/test/resources/external_functions.json"));
}

public static ImmutableList<Module> getNativeExecutionModules()
{
ImmutableList.Builder<Module> moduleBuilder = ImmutableList.builder();
if (System.getProperty("NATIVE_PORT") != null) {
moduleBuilder.add(new TestNativeExecutionModule());
}
else {
moduleBuilder.add(new NativeExecutionModule());
}

return moduleBuilder.build();
}

public static synchronized Path getBaseDataPath()
{
if (dataDirectory.isPresent()) {
Expand Down
0 ...ution/DetachedNativeExecutionProcess.java → ...ution/DetachedNativeExecutionProcess.java
View file
Open in desktop
File renamed without changes.
0 ...etachedNativeExecutionProcessFactory.java → ...etachedNativeExecutionProcessFactory.java
View file
Open in desktop
File renamed without changes.
7 changes: 6 additions & 1 deletion ...o-spark-base/src/main/java/com/facebook/presto/spark/execution/NativeExecutionModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public void configure(Binder binder)
config.setMaxConnectionsPerServer(250);
});
binder.bind(PrestoSparkWorkerProperty.class).in(Scopes.SINGLETON);
binder.bind(NativeExecutionProcessFactory.class).in(Scopes.SINGLETON);
if (System.getProperty("NATIVE_PORT") != null) {
Copy link
Contributor

@miaoever miaoever Apr 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we remove the redundant check at https://github.com/prestodb/presto/blob/master/presto-native-execution/src/test/java/com/facebook/presto/spark/AbstractTestPrestoSparkQueries.java#L137 ?

Copy link
Collaborator Author

@shrinidhijoshi shrinidhijoshi Apr 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch @miaoever . Looks like there are a few things we can clean up as a part of this. Will update

Copy link
Contributor

@tanjialiang tanjialiang Apr 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what line it is as that class is no longer there. But things have changed recently so we should double check. Thanks

binder.bind(NativeExecutionProcessFactory.class).to(DetachedNativeExecutionProcessFactory.class).in(Scopes.SINGLETON);
}
else {
binder.bind(NativeExecutionProcessFactory.class).in(Scopes.SINGLETON);
}
}
}
49 changes: 0 additions & 49 deletions ...ark-base/src/test/java/com/facebook/presto/spark/execution/TestNativeExecutionModule.java
View file
Open in desktop

This file was deleted.