Skip to content

Rename Presto references to Trino in product tests launcher #14195

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
kokosing merged 4 commits into from
Sep 27, 2022
Merged

Rename Presto references to Trino in product tests launcher #14195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd0ce6c
Rename Presto methods to Trino in product tests launcher
nevillelyh Sep 19, 2022
5e209ed
Rename Presto variables to Trino in product tests launcher
nevillelyh Sep 19, 2022
d1e81cd
Rename PRESTO constants to TRINO in product tests launcher
nevillelyh Sep 19, 2022
e13a6f0
Rename Presto to trino in product tests launcher comments
nevillelyh Sep 19, 2022
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
10 changes: 5 additions & 5 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 @@ -40,7 +40,7 @@

import static io.trino.tests.product.launcher.cli.Commands.runCommand;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
import static io.trino.tests.product.launcher.env.EnvironmentListener.getStandardListeners;
import static java.util.Objects.requireNonNull;
import static picocli.CommandLine.Mixin;
Expand Down Expand Up @@ -109,7 +109,7 @@ public static class Execution
implements Callable<Integer>
{
private final EnvironmentFactory environmentFactory;
private final boolean withoutPrestoMaster;
private final boolean withoutTrinoMaster;
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.withoutPrestoMaster = options.withoutPrestoMaster;
this.withoutTrinoMaster = options.withoutTrinoMaster;
this.background = environmentUpOptions.background;
this.environment = environmentUpOptions.environment;
this.outputMode = requireNonNull(options.output, "options.output is null");
Expand All @@ -139,8 +139,8 @@ public Integer call()
.setLogsBaseDir(environmentLogPath)
.removeContainer(TESTS);

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

log.info("Creating environment '%s' with configuration %s and options %s", environment, environmentConfig, extraOptions);
Expand Down
10 changes: 5 additions & 5 deletions ...product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
import static io.trino.tests.product.launcher.env.DockerContainer.ensurePathExists;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.COORDINATOR;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
import static io.trino.tests.product.launcher.env.Environments.pruneEnvironment;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
import static java.lang.String.format;
import static java.time.Duration.ofMinutes;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -431,15 +431,15 @@ public Builder addConnector(String connectorName, MountableFile configFile)
{
requireNonNull(connectorName, "connectorName is null");
requireNonNull(configFile, "configFile is null");
return addConnector(connectorName, configFile, CONTAINER_PRESTO_ETC + "/catalog/" + connectorName + ".properties");
return addConnector(connectorName, configFile, CONTAINER_TRINO_ETC + "/catalog/" + connectorName + ".properties");
}

public Builder addConnector(String connectorName, MountableFile configFile, String containerPath)
{
requireNonNull(configFile, "configFile is null");
requireNonNull(containerPath, "containerPath is null");
configureContainers(container -> {
if (isPrestoContainer(container.getLogicalName())) {
if (isTrinoContainer(container.getLogicalName())) {
container.withCopyFileToContainer(configFile, containerPath);
}
});
Expand All @@ -458,7 +458,7 @@ public Builder addPasswordAuthenticator(String name, MountableFile configFile)
{
requireNonNull(name, "name is null");
requireNonNull(configFile, "configFile is null");
return addPasswordAuthenticator(name, configFile, CONTAINER_PRESTO_ETC + "/password-authenticator.properties");
return addPasswordAuthenticator(name, configFile, CONTAINER_TRINO_ETC + "/password-authenticator.properties");
}

public Builder addPasswordAuthenticator(String name, MountableFile configFile, String containerPath)
Expand Down
10 changes: 5 additions & 5 deletions ...sts-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public final class EnvironmentContainers
private static final SecureRandom random = new SecureRandom();
private static final int RANDOM_SUFFIX_LENGTH = 5;

public static final String PRESTO = "presto";
public static final String COORDINATOR = PRESTO + "-master";
public static final String WORKER = PRESTO + "-worker";
public static final String TRINO = "presto";
public static final String COORDINATOR = TRINO + "-master";
public static final String WORKER = TRINO + "-worker";
public static final String WORKER_NTH = WORKER + "-";
public static final String HADOOP = "hadoop-master";
public static final String TESTS = "tests";
Expand All @@ -44,9 +44,9 @@ public static String worker(int number)
return WORKER_NTH + number;
}

public static boolean isPrestoContainer(String name)
public static boolean isTrinoContainer(String name)
{
return name.startsWith(PRESTO);
return name.startsWith(TRINO);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...-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 @@ -40,7 +40,7 @@ public final class EnvironmentOptions
public File serverPackage;

@Option(names = "--without-trino", description = "Do not start " + COORDINATOR)
public boolean withoutPrestoMaster;
public boolean withoutTrinoMaster;

public boolean bindPorts = true;
int bindPortsBase;
Expand Down
22 changes: 11 additions & 11 deletions ...oduct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Hadoop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_CONF_ROOT;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_HEALTH_D;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
import static java.util.Objects.requireNonNull;
import static org.testcontainers.containers.wait.strategy.Wait.forHealthcheck;
import static org.testcontainers.utility.MountableFile.forHostPath;
Expand All @@ -37,11 +37,11 @@ public final class Hadoop
implements EnvironmentExtender
{
public static final String CONTAINER_HADOOP_INIT_D = "/etc/hadoop-init.d/";
public static final String CONTAINER_PRESTO_HIVE_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/hive.properties";
public static final String CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/hive_with_external_writes.properties";
public static final String CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS = CONTAINER_PRESTO_ETC + "/catalog/hive_timestamp_nanos.properties";
public static final String CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER = CONTAINER_PRESTO_ETC + "/catalog/hive_with_run_view_as_invoker.properties";
public static final String CONTAINER_PRESTO_ICEBERG_PROPERTIES = CONTAINER_PRESTO_ETC + "/catalog/iceberg.properties";
public static final String CONTAINER_TRINO_HIVE_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/hive.properties";
public static final String CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/hive_with_external_writes.properties";
public static final String CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS = CONTAINER_TRINO_ETC + "/catalog/hive_timestamp_nanos.properties";
public static final String CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER = CONTAINER_TRINO_ETC + "/catalog/hive_with_run_view_as_invoker.properties";
public static final String CONTAINER_TRINO_ICEBERG_PROPERTIES = CONTAINER_TRINO_ETC + "/catalog/iceberg.properties";

private final DockerFiles dockerFiles;
private final PortBinder portBinder;
Expand All @@ -66,11 +66,11 @@ public void extendEnvironment(Environment.Builder builder)
{
builder.addContainer(createHadoopContainer(dockerFiles, portBinder, hadoopBaseImage + ":" + hadoopImagesVersion, HADOOP));

builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_PRESTO_HIVE_PROPERTIES);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_PRESTO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_PRESTO_HIVE_TIMESTAMP_NANOS);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_PRESTO_HIVE_RUN_VIEW_AS_INVOKER);
builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_PRESTO_ICEBERG_PROPERTIES);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_external_writes.properties")), CONTAINER_TRINO_HIVE_WITH_EXTERNAL_WRITES_PROPERTIES);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_timestamp_nanos.properties")), CONTAINER_TRINO_HIVE_TIMESTAMP_NANOS);
builder.addConnector("hive", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive_with_run_view_as_invoker.properties")), CONTAINER_TRINO_HIVE_RUN_VIEW_AS_INVOKER);
builder.addConnector("iceberg", forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/iceberg.properties")), CONTAINER_TRINO_ICEBERG_PROPERTIES);
}

@SuppressWarnings("resource")
Expand Down
4 changes: 2 additions & 2 deletions ...sts-launcher/src/main/java/io/trino/tests/product/launcher/env/common/HadoopKerberos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import static io.trino.tests.product.launcher.env.EnvironmentContainers.HADOOP;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.configureTempto;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_CONFIG_PROPERTIES;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_CONFIG_PROPERTIES;
import static java.util.Objects.requireNonNull;
import static org.testcontainers.utility.MountableFile.forHostPath;

Expand Down Expand Up @@ -69,7 +69,7 @@ public void extendEnvironment(Environment.Builder builder)
portBinder.exposePort(container, 7778);
container
.withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster"))
.withCopyFileToContainer(forHostPath(configDir.getPath("config.properties")), CONTAINER_PRESTO_CONFIG_PROPERTIES)
.withCopyFileToContainer(forHostPath(configDir.getPath("config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
.withCopyFileToContainer(
forHostPath(configDir.getPath("create_kerberos_credential_cache_files.sh")),
"/docker/presto-init.d/create_kerberos_credentials.sh");
Expand Down
10 changes: 5 additions & 5 deletions ...ncher/src/main/java/io/trino/tests/product/launcher/env/common/HydraIdentityProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;

import static io.trino.tests.product.launcher.env.EnvironmentContainers.TESTS;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
import static java.util.Objects.requireNonNull;
import static org.testcontainers.utility.MountableFile.forHostPath;

Expand Down Expand Up @@ -104,14 +104,14 @@ public void extendEnvironment(Environment.Builder builder)
builder.containerDependsOn(hydra.getLogicalName(), databaseContainer.getLogicalName());

builder.configureContainers(dockerContainer -> {
if (isPrestoContainer(dockerContainer.getLogicalName())) {
if (isTrinoContainer(dockerContainer.getLogicalName())) {
dockerContainer
.withCopyFileToContainer(
forHostPath(configDir.getPath("cert/trino.pem")),
CONTAINER_PRESTO_ETC + "/trino.pem")
CONTAINER_TRINO_ETC + "/trino.pem")
.withCopyFileToContainer(
forHostPath(configDir.getPath("cert/hydra.pem")),
CONTAINER_PRESTO_ETC + "/hydra.pem");
CONTAINER_TRINO_ETC + "/hydra.pem");
}
});

Expand Down
8 changes: 4 additions & 4 deletions ...roduct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import java.time.Duration;

import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC;
import static io.trino.tests.product.launcher.env.EnvironmentContainers.isTrinoContainer;
import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_TRINO_ETC;
import static java.util.Objects.requireNonNull;
import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage;
import static org.testcontainers.utility.MountableFile.forHostPath;
Expand Down Expand Up @@ -63,8 +63,8 @@ public void extendEnvironment(Environment.Builder builder)

MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties"));
builder.configureContainers(container -> {
if (isPrestoContainer(container.getLogicalName())) {
container.withCopyFileToContainer(logConfigFile, CONTAINER_PRESTO_ETC + "/log.properties");
if (isTrinoContainer(container.getLogicalName())) {
container.withCopyFileToContainer(logConfigFile, CONTAINER_TRINO_ETC + "/log.properties");
}
});
}
Expand Down
Loading