Add TrinoContainer (#3668)

Author: findepi

docs/modules/databases/jdbc.md

@@ -39,9 +39,9 @@ Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database
 
 `jdbc:tc:postgis:9.6-2.5:///databasename`
 
-#### Using Presto
+#### Using Trino
 
-`jdbc:tc:presto:344://localhost/memory/default`
+`jdbc:tc:trino:352://localhost/memory/default`
 
 ### Using a classpath init script
 

docs/modules/databases/presto.md

@@ -1,7 +1,7 @@
 # Presto Module
 
 !!! note
-    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+    This module is deprecated, use Trino module.
 
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 

docs/modules/databases/trino.md

@@ -0,0 +1,88 @@
+# Trino Module
+
+!!! note
+    This module is INCUBATING. While it is ready for use and operational in the current version of Testcontainers, it is possible that it may receive breaking changes in the future. See [our contributing guidelines](/contributing/#incubating-modules) for more information on our incubating modules policy.
+
+See [Database containers](./index.md) for documentation and usage that is common to all database container types.
+
+## Usage example
+
+Running Trino as a stand-in for in a test:
+
+```java
+public class SomeTest {
+
+    @Rule
+    public TrinoContainer trino = new TrinoContainer();
+    
+    @Test
+    public void someTestMethod() {
+        String url = trino.getJdbcUrl();
+
+        ... create a connection and run test as normal
+```
+
+Trino comes with several catalogs preconfigured. Most useful ones for testing are
+
+* `tpch` catalog using the [Trino TPCH Connector](https://trino.io/docs/current/connector/tpch.html).
+  This is a read-only catalog that defines standard TPCH schema, so is available for querying without a need
+  to create any tables.
+* `memory` catalog using the [Trino Memory Connector](https://trino.io/docs/current/connector/memory.html).
+  This catalog can be used for creating schemas and tables and does not require any storage, as everything
+  is stored fully in-memory.
+
+Example test using the `tpch` and `memory` catalogs:
+
+```java
+public class SomeTest {
+    @Rule
+    public TrinoContainer trino = new TrinoContainer();
+
+    @Test
+    public void queryMemoryAndTpchConnectors() throws SQLException {
+        try (Connection connection = trino.createConnection();
+             Statement statement = connection.createStatement()) {
+            // Prepare data
+            statement.execute("CREATE TABLE memory.default.table_with_array AS SELECT 1 id, ARRAY[1, 42, 2, 42, 4, 42] my_array");
+
+            // Query Trino using newly created table and a builtin connector
+            try (ResultSet resultSet = statement.executeQuery("" +
+                "SELECT nationkey, element " +
+                "FROM tpch.tiny.nation " +
+                "JOIN memory.default.table_with_array twa ON nationkey = twa.id " +
+                "LEFT JOIN UNNEST(my_array) a(element) ON true " +
+                "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES ")) {
+                List<Integer> actualElements = new ArrayList<>();
+                while (resultSet.next()) {
+                    actualElements.add(resultSet.getInt("element"));
+                }
+                Assert.assertEquals(Arrays.asList(2, 4, 42, 42, 42), actualElements);
+            }
+        }
+    }
+}
+```
+
+## Adding this module to your project dependencies
+
+Add the following dependency to your `pom.xml`/`build.gradle` file:
+
+```groovy tab='Gradle'
+testCompile "org.testcontainers:trino:{{latest_version}}"
+```
+
+```xml tab='Maven'
+<dependency>
+    <groupId>org.testcontainers</groupId>
+    <artifactId>trino</artifactId>
+    <version>{{latest_version}}</version>
+    <scope>test</scope>
+</dependency>
+```
+
+!!! hint
+    Adding this Testcontainers library JAR will not automatically add the Trino JDBC driver JAR to your project.
+    You should ensure that your project has the Trino JDBC driver as a dependency, if you plan on using it.
+    Refer to [Trino project download page](https://trino.io/download.html) for instructions.
+
+

mkdocs.yml

@@ -60,6 +60,7 @@ nav:
                 - modules/databases/orientdb.md
                 - modules/databases/postgres.md
                 - modules/databases/presto.md
+                - modules/databases/trino.md
           - modules/docker_compose.md
           - modules/elasticsearch.md
           - modules/gcloud.md

modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java

@@ -14,6 +14,10 @@
 import static java.lang.String.format;
 import static java.time.temporal.ChronoUnit.SECONDS;
 
+/**
+ * @deprecated Use {@code TrinoContainer} instead.
+ */
+@Deprecated
 public class PrestoContainer<SELF extends PrestoContainer<SELF>> extends JdbcDatabaseContainer<SELF> {
     public static final String NAME = "presto";
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("ghcr.io/trinodb/presto");

modules/trino/build.gradle

@@ -0,0 +1,9 @@
+description = "Testcontainers :: JDBC :: Trino"
+
+dependencies {
+    compile project(':jdbc')
+
+    testCompile project(':jdbc-test')
+    testCompile 'io.trino:trino-jdbc:352'
+    compileOnly 'org.jetbrains:annotations:20.0.0'
+}

modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java

@@ -0,0 +1,89 @@
+package org.testcontainers.containers;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.VisibleForTesting;
+import org.testcontainers.utility.DockerImageName;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.google.common.base.Strings.nullToEmpty;
+import static java.lang.String.format;
+
+public class TrinoContainer extends JdbcDatabaseContainer<TrinoContainer> {
+    static final String NAME = "trino";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("trinodb/trino");
+    static final String IMAGE = "trinodb/trino";
+    @VisibleForTesting
+    static final String DEFAULT_TAG = "352";
+
+    private static final int TRINO_PORT = 8080;
+
+    private String username = "test";
+    private String catalog = null;
+
+    public TrinoContainer(final String dockerImageName) {
+        this(DockerImageName.parse(dockerImageName));
+    }
+
+    public TrinoContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        addExposedPort(TRINO_PORT);
+    }
+
+    @NotNull
+    @Override
+    protected Set<Integer> getLivenessCheckPorts() {
+        return new HashSet<>(getMappedPort(TRINO_PORT));
+    }
+
+    @Override
+    public String getDriverClassName() {
+        return "io.trino.jdbc.TrinoDriver";
+    }
+
+    @Override
+    public String getJdbcUrl() {
+        return format("jdbc:trino://%s:%s/%s", getHost(), getMappedPort(TRINO_PORT), nullToEmpty(catalog));
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return "";
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return catalog;
+    }
+
+    @Override
+    public String getTestQueryString() {
+        return "SELECT count(*) FROM tpch.tiny.nation";
+    }
+
+    @Override
+    public TrinoContainer withUsername(final String username) {
+        this.username = username;
+        return this;
+    }
+
+    @Override
+    public TrinoContainer withDatabaseName(String dbName) {
+        this.catalog = dbName;
+        return this;
+    }
+
+    public Connection createConnection() throws SQLException, NoDriverFoundException {
+        return createConnection("");
+    }
+}

modules/trino/src/main/java/org/testcontainers/containers/TrinoContainerProvider.java

@@ -0,0 +1,23 @@
+package org.testcontainers.containers;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for Trino containers.
+ */
+public class TrinoContainerProvider extends JdbcDatabaseContainerProvider {
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(TrinoContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(TrinoContainer.DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        return new TrinoContainer(DockerImageName.parse(TrinoContainer.IMAGE).withTag(tag));
+    }
+}

modules/trino/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider

@@ -0,0 +1 @@
+org.testcontainers.containers.TrinoContainerProvider

modules/trino/src/test/java/org/testcontainers/TrinoTestImages.java

@@ -0,0 +1,8 @@
+package org.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+public interface TrinoTestImages {
+    DockerImageName TRINO_TEST_IMAGE = DockerImageName.parse("trinodb/trino:352");
+    DockerImageName TRINO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("trinodb/trino:351");
+}