Changes to fix test cases

prestodb · Jan 22, 2025 · ecd5c5c · ecd5c5c
1 parent dc1cc7b
commit ecd5c5c
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 1 deletion.
diff --git a/presto-accumulo/pom.xml b/presto-accumulo/pom.xml
@@ -341,6 +341,12 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/presto-accumulo/src/test/java/com/facebook/presto/accumulo/TestAccumuloClient.java b/presto-accumulo/src/test/java/com/facebook/presto/accumulo/TestAccumuloClient.java
@@ -46,7 +46,7 @@ public TestAccumuloClient()
                 .setUsername("root")
                 .setPassword("secret");
 
-        Connector connector = AccumuloQueryRunner.getAccumuloConnector();
+        Connector connector = TestingAccumuloServer.getInstance().getConnector();
         config.setZooKeepers(connector.getInstance().getZooKeepers());
         zooKeeperMetadataManager = new ZooKeeperMetadataManager(config, createTestFunctionAndTypeManager());
         client = new AccumuloClient(connector, config, zooKeeperMetadataManager, new AccumuloTableManager(connector), new IndexLookup(connector, new ColumnCardinalityCache(connector, config)));

diff --git a/presto-accumulo/src/test/java/com/facebook/presto/accumulo/TestingAccumuloServer.java b/presto-accumulo/src/test/java/com/facebook/presto/accumulo/TestingAccumuloServer.java
@@ -0,0 +1,89 @@
+package com.facebook.presto.accumulo;
+
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.testcontainers.containers.FixedHostPortGenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.io.IOException;
+import java.time.Duration;
+
+import static java.lang.String.format;
+public class TestingAccumuloServer
+{
+    private static final int ACCUMULO_MASTER_PORT = 9999;
+    private static final int ACCUMULO_TSERVER_PORT = 9997;
+    private static final int ZOOKEEPER_PORT = 2181;
+    private static final TestingAccumuloServer instance = new TestingAccumuloServer();
+    private final FixedHostPortGenericContainer<?> accumuloContainer;
+    public static TestingAccumuloServer getInstance()
+    {
+        return instance;
+    }
+    private TestingAccumuloServer()
+    {
+        accumuloContainer = new FixedHostPortGenericContainer<>("ghcr.io/trinodb/testing/accumulo:74");
+        accumuloContainer.withFixedExposedPort(ACCUMULO_MASTER_PORT, ACCUMULO_MASTER_PORT);
+        accumuloContainer.withFixedExposedPort(ACCUMULO_TSERVER_PORT, ACCUMULO_TSERVER_PORT);
+        accumuloContainer.withExposedPorts(ZOOKEEPER_PORT);
+        accumuloContainer.withCreateContainerCmdModifier(cmd -> cmd
+                .withHostName("localhost")
+                .withEnv("ADDRESS=0.0.0.0")
+                .withEntrypoint("supervisord", "-c", "/etc/supervisord.conf"));
+        accumuloContainer.waitingFor(Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(10)));
+        // No need for an explicit stop since this server is a singleton
+        // and the container will be stopped by TestContainers on shutdown
+        // TODO Change this class to not be a singleton
+        //  https://github.com/prestosql/presto/issues/5842
+        accumuloContainer.start();
+        try {
+            accumuloContainer.execInContainer("wget", "-P", "/usr/local/lib/accumulo/lib/ext/", "https://repo1.maven.org/maven2/com/facebook/presto/presto-accumulo/0.289/presto-accumulo-0.289.jar");
+            accumuloContainer.execInContainer("mv", "/usr/local/lib/accumulo/lib/ext/presto-accumulo-0.289.jar", "/usr/local/lib/accumulo/lib/ext/presto-accumulo-0.290-SNAPSHOT.jar");
+        }
+        catch (IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    public String getInstanceName()
+    {
+        return "default";
+    }
+    public String getZooKeepers()
+    {
+        return format("%s:%s", accumuloContainer.getHost(), accumuloContainer.getMappedPort(ZOOKEEPER_PORT));
+    }
+    public String getUser()
+    {
+        return "root";
+    }
+    public String getPassword()
+    {
+        return "secret";
+    }
+    public Connector getConnector()
+    {
+        try {
+            ZooKeeperInstance instance = new ZooKeeperInstance(getInstanceName(), getZooKeepers());
+            return instance.getConnector(getUser(), new PasswordToken(getPassword()));
+        }
+        catch (AccumuloException | AccumuloSecurityException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}