Change the Docker Image used by the Presto module to prestodb/presto

linghengqian · linghengqian · commit bb7e05d6b60d · 2024-07-16T11:07:15.000+08:00
diff --git a/docs/modules/databases/presto.md b/docs/modules/databases/presto.md
@@ -1,8 +1,5 @@
 # Presto Module
 
-!!! note
-    This module is deprecated, use Trino module.
-
 See [Database containers](./index.md) for documentation and usage that is common to all database container types.
 
 ## Usage example
@@ -84,6 +81,6 @@ Add the following dependency to your `pom.xml`/`build.gradle` file:
 !!! hint
     Adding this Testcontainers library JAR will not automatically add the Presto JDBC driver JAR to your project.
     You should ensure that your project has the Presto JDBC driver as a dependency, if you plan on using it.
-    Refer to [Presto project download page](https://prestosql.io/download.html) for instructions.
+    Refer to [Presto project download page](https://prestodb.io/getting-started/) for instructions.
 
 
diff --git a/modules/presto/build.gradle b/modules/presto/build.gradle
@@ -4,6 +4,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'io.prestosql:presto-jdbc:350'
+    testRuntimeOnly 'com.facebook.presto:presto-jdbc:0.288'
     compileOnly 'org.jetbrains:annotations:24.1.0'
 }
diff --git a/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java b/modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java
@@ -3,7 +3,9 @@
 import com.google.common.base.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.images.builder.Transferable;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -12,18 +14,21 @@
 import java.util.Set;
 
 /**
- * @deprecated Use {@code TrinoContainer} instead.
+ * Testcontainers implementation for Presto.
+ * <p>
+ * Supported image: {@code prestodb/presto}
+ * <p>
+ * Exposed ports: 8080
  */
-@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");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("prestodb/presto");
 
-    public static final String IMAGE = "ghcr.io/trinodb/presto";
+    public static final String IMAGE = "prestodb/presto";
 
-    public static final String DEFAULT_TAG = "344";
+    public static final String DEFAULT_TAG = "0.288";
 
     public static final Integer PRESTO_PORT = 8080;
 
@@ -53,6 +58,10 @@ public PrestoContainer(final DockerImageName dockerImageName) {
                 .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
 
         addExposedPort(PRESTO_PORT);
+        withCopyFileToContainer(
+            MountableFile.forClasspathResource("default", Transferable.DEFAULT_DIR_MODE),
+            "/opt/presto-server/etc"
+        );
     }
 
     /**
@@ -68,7 +77,7 @@ protected Set<Integer> getLivenessCheckPorts() {
 
     @Override
     public String getDriverClassName() {
-        return "io.prestosql.jdbc.PrestoDriver";
+        return "com.facebook.presto.jdbc.PrestoDriver";
     }
 
     @Override
diff --git a/modules/presto/src/main/resources/default/catalog/memory.properties b/modules/presto/src/main/resources/default/catalog/memory.properties
@@ -0,0 +1 @@
+connector.name=memory
diff --git a/modules/presto/src/main/resources/default/catalog/tpch.properties b/modules/presto/src/main/resources/default/catalog/tpch.properties
@@ -0,0 +1 @@
+connector.name=tpch
diff --git a/modules/presto/src/main/resources/default/config.properties b/modules/presto/src/main/resources/default/config.properties
@@ -0,0 +1,6 @@
+coordinator=true
+node-scheduler.include-coordinator=true
+http-server.http.port=8080
+discovery-server.enabled=true
+discovery.uri=http://localhost:8080
+offset-clause-enabled=true
diff --git a/modules/presto/src/main/resources/default/jvm.config b/modules/presto/src/main/resources/default/jvm.config
@@ -0,0 +1,9 @@
+-server
+-Xmx1G
+-XX:+UseG1GC
+-XX:G1HeapRegionSize=32M
+-XX:+UseGCOverheadLimit
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+HeapDumpOnOutOfMemoryError
+-XX:+ExitOnOutOfMemoryError
+-Djdk.attach.allowAttachSelf=true
diff --git a/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java b/modules/presto/src/test/java/org/testcontainers/PrestoTestImages.java
@@ -3,6 +3,6 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface PrestoTestImages {
-    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:344");
-    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:343");
+    DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestodb/presto:0.288");
+    DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestodb/presto:0.287");
 }
diff --git a/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java b/modules/presto/src/test/java/org/testcontainers/containers/PrestoContainerTest.java
@@ -28,7 +28,7 @@ public void testSimple() throws Exception {
                 assertThat(resultSet.next()).as("has result").isTrue();
                 assertThat(resultSet.getString("node_version"))
                     .as("Presto version")
-                    .isEqualTo(PrestoContainer.DEFAULT_TAG);
+                    .startsWith(PrestoContainer.DEFAULT_TAG);
                 assertHasCorrectExposedAndLivenessCheckPorts(prestoSql);
             }
         }
@@ -48,7 +48,7 @@ public void testSpecificVersion() throws Exception {
                 assertThat(resultSet.next()).as("has result").isTrue();
                 assertThat(resultSet.getString("node_version"))
                     .as("Presto version")
-                    .isEqualTo(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());
+                    .startsWith(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());
             }
         }
     }
@@ -73,15 +73,15 @@ public void testQueryMemoryAndTpch() throws SQLException {
                         "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 "
+                        "CROSS JOIN UNNEST(my_array) a(element) " +
+                        "ORDER BY element OFFSET 1 FETCH FIRST 3 ROWS ONLY "
                     )
                 ) {
                     List<Integer> actualElements = new ArrayList<>();
                     while (resultSet.next()) {
                         actualElements.add(resultSet.getInt("element"));
                     }
-                    assertThat(actualElements).isEqualTo(Arrays.asList(2, 4, 42, 42, 42));
+                    assertThat(actualElements).isEqualTo(Arrays.asList(2, 4, 42));
                 }
             }
         }
@@ -112,8 +112,7 @@ public void testTcJdbcUri() throws Exception {
             )
         ) {
             // Verify metadata with tc: JDBC connection URI
-            assertThat(Integer.parseInt(PrestoContainer.DEFAULT_TAG))
-                .isEqualTo(connection.getMetaData().getDatabaseMajorVersion());
+            assertThat(0).isEqualTo(connection.getMetaData().getDatabaseMajorVersion());
 
             // Verify transactions with tc: JDBC connection URI
             assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();
@@ -128,20 +127,17 @@ public void testTcJdbcUri() throws Exception {
                     .as("Update result")
                     .isEqualTo(0);
                 try (
-                    ResultSet resultSet = statement.executeQuery(
-                        "SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes"
-                    )
+                    ResultSet resultSet = statement.executeQuery("SELECT node_version AS v FROM system.runtime.nodes")
                 ) {
                     assertThat(resultSet.next()).isTrue();
-                    assertThat(resultSet.getString("v")).isEqualTo(PrestoContainer.DEFAULT_TAG);
+                    assertThat(resultSet.getString("v")).startsWith(PrestoContainer.DEFAULT_TAG);
                     assertThat(resultSet.next()).isFalse();
                 }
                 connection.commit();
             } finally {
                 connection.rollback();
             }
-            connection.setAutoCommit(true);
-            assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();
+            assertThat(connection.getAutoCommit()).as("Is autocommit").isFalse();
             assertThat(connection.getTransactionIsolation())
                 .as("Transaction isolation should be retained")
                 .isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED);
diff --git a/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java b/modules/presto/src/test/java/org/testcontainers/jdbc/presto/PrestoJDBCDriverTest.java
@@ -14,7 +14,7 @@ public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {
     public static Iterable<Object[]> data() {
         return Arrays.asList(
             new Object[][] { //
-                { "jdbc:tc:presto:344://hostname/", EnumSet.of(Options.PmdKnownBroken) },
+                { "jdbc:tc:presto:0.288://hostname/", EnumSet.of(Options.PmdKnownBroken) },
             }
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ dependencies {`
`4`	`4`	`api project(':jdbc')`
`5`	`5`
`6`	`6`	`testImplementation project(':jdbc-test')`
`7`		`- testRuntimeOnly 'io.prestosql:presto-jdbc:350'`
	`7`	`+ testRuntimeOnly 'com.facebook.presto:presto-jdbc:0.288'`
`8`	`8`	`compileOnly 'org.jetbrains:annotations:24.1.0'`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`import org.testcontainers.utility.DockerImageName;`
`4`	`4`
`5`	`5`	`public interface PrestoTestImages {`
`6`		`- DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:344");`
`7`		`- DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("ghcr.io/trinodb/presto:343");`
	`6`	`+ DockerImageName PRESTO_TEST_IMAGE = DockerImageName.parse("prestodb/presto:0.288");`
	`7`	`+ DockerImageName PRESTO_PREVIOUS_VERSION_TEST_IMAGE = DockerImageName.parse("prestodb/presto:0.287");`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void testSimple() throws Exception {`
`28`	`28`	`assertThat(resultSet.next()).as("has result").isTrue();`
`29`	`29`	`assertThat(resultSet.getString("node_version"))`
`30`	`30`	`.as("Presto version")`
`31`		`- .isEqualTo(PrestoContainer.DEFAULT_TAG);`
	`31`	`+ .startsWith(PrestoContainer.DEFAULT_TAG);`
`32`	`32`	`assertHasCorrectExposedAndLivenessCheckPorts(prestoSql);`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -48,7 +48,7 @@ public void testSpecificVersion() throws Exception {`
`48`	`48`	`assertThat(resultSet.next()).as("has result").isTrue();`
`49`	`49`	`assertThat(resultSet.getString("node_version"))`
`50`	`50`	`.as("Presto version")`
`51`		`- .isEqualTo(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());`
	`51`	`+ .startsWith(PrestoTestImages.PRESTO_PREVIOUS_VERSION_TEST_IMAGE.getVersionPart());`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -73,15 +73,15 @@ public void testQueryMemoryAndTpch() throws SQLException {`
`73`	`73`	`"SELECT nationkey, element " +`
`74`	`74`	`"FROM tpch.tiny.nation " +`
`75`	`75`	`"JOIN memory.default.table_with_array twa ON nationkey = twa.id " +`
`76`		`- "LEFT JOIN UNNEST(my_array) a(element) ON true " +`
`77`		`- "ORDER BY element OFFSET 1 FETCH NEXT 3 ROWS WITH TIES "`
	`76`	`+ "CROSS JOIN UNNEST(my_array) a(element) " +`
	`77`	`+ "ORDER BY element OFFSET 1 FETCH FIRST 3 ROWS ONLY "`
`78`	`78`	`)`
`79`	`79`	`) {`
`80`	`80`	`List<Integer> actualElements = new ArrayList<>();`
`81`	`81`	`while (resultSet.next()) {`
`82`	`82`	`actualElements.add(resultSet.getInt("element"));`
`83`	`83`	`}`
`84`		`- assertThat(actualElements).isEqualTo(Arrays.asList(2, 4, 42, 42, 42));`
	`84`	`+ assertThat(actualElements).isEqualTo(Arrays.asList(2, 4, 42));`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
`@@ -112,8 +112,7 @@ public void testTcJdbcUri() throws Exception {`
`112`	`112`	`)`
`113`	`113`	`) {`
`114`	`114`	`// Verify metadata with tc: JDBC connection URI`
`115`		`- assertThat(Integer.parseInt(PrestoContainer.DEFAULT_TAG))`
`116`		`- .isEqualTo(connection.getMetaData().getDatabaseMajorVersion());`
	`115`	`+ assertThat(0).isEqualTo(connection.getMetaData().getDatabaseMajorVersion());`
`117`	`116`
`118`	`117`	`// Verify transactions with tc: JDBC connection URI`
`119`	`118`	`assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();`
`@@ -128,20 +127,17 @@ public void testTcJdbcUri() throws Exception {`
`128`	`127`	`.as("Update result")`
`129`	`128`	`.isEqualTo(0);`
`130`	`129`	`try (`
`131`		`- ResultSet resultSet = statement.executeQuery(`
`132`		`- "SELECT sum(cast(node_version AS bigint)) AS v FROM system.runtime.nodes"`
`133`		`- )`
	`130`	`+ ResultSet resultSet = statement.executeQuery("SELECT node_version AS v FROM system.runtime.nodes")`
`134`	`131`	`) {`
`135`	`132`	`assertThat(resultSet.next()).isTrue();`
`136`		`- assertThat(resultSet.getString("v")).isEqualTo(PrestoContainer.DEFAULT_TAG);`
	`133`	`+ assertThat(resultSet.getString("v")).startsWith(PrestoContainer.DEFAULT_TAG);`
`137`	`134`	`assertThat(resultSet.next()).isFalse();`
`138`	`135`	`}`
`139`	`136`	`connection.commit();`
`140`	`137`	`} finally {`
`141`	`138`	`connection.rollback();`
`142`	`139`	`}`
`143`		`- connection.setAutoCommit(true);`
`144`		`- assertThat(connection.getAutoCommit()).as("Is autocommit").isTrue();`
	`140`	`+ assertThat(connection.getAutoCommit()).as("Is autocommit").isFalse();`
`145`	`141`	`assertThat(connection.getTransactionIsolation())`
`146`	`142`	`.as("Transaction isolation should be retained")`
`147`	`143`	`.isEqualTo(Connection.TRANSACTION_READ_UNCOMMITTED);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class PrestoJDBCDriverTest extends AbstractJDBCDriverTest {`
`14`	`14`	`public static Iterable<Object[]> data() {`
`15`	`15`	`return Arrays.asList(`
`16`	`16`	`new Object[][] { //`
`17`		`- { "jdbc:tc:presto:344://hostname/", EnumSet.of(Options.PmdKnownBroken) },`
	`17`	`+ { "jdbc:tc:presto:0.288://hostname/", EnumSet.of(Options.PmdKnownBroken) },`
`18`	`18`	`}`
`19`	`19`	`);`
`20`	`20`	`}`