Allow reusing SingleStore container

Author: ebyhr

plugin/trino-singlestore/pom.xml

@@ -174,6 +174,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-containers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing-services</artifactId>

plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/SingleStoreQueryRunner.java

@@ -85,7 +85,7 @@ public DistributedQueryRunner build()
                 queryRunner.installPlugin(new SingleStorePlugin());
                 queryRunner.createCatalog("singlestore", "singlestore", connectorProperties);
 
-                queryRunner.execute("CREATE SCHEMA tpch");
+                queryRunner.execute("CREATE SCHEMA IF NOT EXISTS tpch");
                 copyTpchTables(queryRunner, "tpch", TINY_SCHEMA_NAME, initialTables);
 
                 return queryRunner;

plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java

@@ -17,12 +17,17 @@
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Set;
 
+import static io.trino.testing.containers.TestContainers.startOrReuse;
+
 public class TestingSingleStoreServer
         extends JdbcDatabaseContainer<TestingSingleStoreServer>
 {
@@ -33,6 +38,8 @@ public class TestingSingleStoreServer
 
     public static final Integer SINGLESTORE_PORT = 3306;
 
+    private final Closeable cleanup;
+
     public TestingSingleStoreServer()
     {
         this(DEFAULT_VERSION);
@@ -43,7 +50,7 @@ public TestingSingleStoreServer(String version)
         super(DockerImageName.parse(DEFAULT_TAG));
         addEnv("ROOT_PASSWORD", "memsql_root_password");
         addEnv("SINGLESTORE_VERSION", version);
-        start();
+        cleanup = startOrReuse(this);
     }
 
     @Override
@@ -89,6 +96,17 @@ public String getTestQueryString()
         return "SELECT 1";
     }
 
+    @Override
+    public void close()
+    {
+        try {
+            cleanup.close();
+        }
+        catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void execute(String sql)
     {
         execute(sql, getUsername(), getPassword());