Skip to content

Rename method to use Trino terminology #16760

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
Mar 30, 2023
Merged

Rename method to use Trino terminology #16760

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
6 changes: 3 additions & 3 deletions ...oduct-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static class Execution
implements Callable<Integer>
{
private final EnvironmentFactory environmentFactory;
private final boolean withoutTrinoMaster;
private final boolean withoutCoordinator;
private final boolean background;
private final String environment;
private final EnvironmentConfig environmentConfig;
Expand All @@ -122,7 +122,7 @@ public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig enviro
{
this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null");
this.withoutTrinoMaster = options.withoutTrinoMaster;
this.withoutCoordinator = options.withoutCoordinator;
this.background = environmentUpOptions.background;
this.environment = environmentUpOptions.environment;
this.outputMode = requireNonNull(options.output, "options.output is null");
Expand All @@ -139,7 +139,7 @@ public Integer call()
.setLogsBaseDir(environmentLogPath)
.removeContainer(TESTS);

if (withoutTrinoMaster) {
if (withoutCoordinator) {
builder.removeContainers(container -> isTrinoContainer(container.getLogicalName()));
}

Expand Down
4 changes: 2 additions & 2 deletions ...-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public final class EnvironmentOptions
@Option(names = "--server-package", paramLabel = "<package>", description = "Path to Trino server package " + DEFAULT_VALUE, defaultValue = "${server.module}/target/${server.name}-${project.version}.tar.gz")
public File serverPackage;

@Option(names = "--without-trino", description = "Do not start " + COORDINATOR)
public boolean withoutTrinoMaster;
@Option(names = {"--without-trino", "--no-coordinator"}, description = "Do not start " + COORDINATOR)
public boolean withoutCoordinator;

public boolean bindPorts = true;
int bindPortsBase;
Expand Down
4 changes: 2 additions & 2 deletions ...uct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public Standard(
@Override
public void extendEnvironment(Environment.Builder builder)
{
builder.addContainers(createTrinoMaster(), createTestsContainer());
builder.addContainers(createTrinoCoordinator(), createTestsContainer());
// default catalogs copied from /docker/presto-product-tests
builder.addConnector("blackhole");
builder.addConnector("jmx");
Expand All @@ -114,7 +114,7 @@ public void extendEnvironment(Environment.Builder builder)
}

@SuppressWarnings("resource")
private DockerContainer createTrinoMaster()
private DockerContainer createTrinoCoordinator()
{
DockerContainer container =
createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, COORDINATOR)
Expand Down