Generate unique environment name

Author: electrum

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/integration/TeradataQueryRunner.java

@@ -21,7 +21,6 @@
 import io.trino.Session;
 import io.trino.metadata.QualifiedObjectName;
 import io.trino.plugin.teradata.TeradataPlugin;
-import io.trino.plugin.teradata.integration.clearscape.ClearScapeEnvironmentUtils;
 import io.trino.plugin.tpch.TpchPlugin;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
@@ -52,7 +51,7 @@ public static void main(String[] args)
         Logging logger = Logging.initialize();
         logger.setLevel("io.trino.plugin.teradata", Level.DEBUG);
         logger.setLevel("io.trino", Level.INFO);
-        TestingTeradataServer server = new TestingTeradataServer(ClearScapeEnvironmentUtils.generateUniqueEnvName(TeradataQueryRunner.class));
+        TestingTeradataServer server = new TestingTeradataServer("TeradataQueryRunner", false);
         QueryRunner queryRunner = builder(server).addCoordinatorProperty("http-server.http.port", "8080").setInitialTables(TpchTable.getTables()).build();
 
         Logger log = Logger.get(TeradataQueryRunner.class);

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/integration/TestTeradataConnectorTest.java

@@ -15,7 +15,6 @@
 
 import io.trino.Session;
 import io.trino.plugin.jdbc.BaseJdbcConnectorTest;
-import io.trino.plugin.teradata.integration.clearscape.ClearScapeEnvironmentUtils;
 import io.trino.sql.query.QueryAssertions;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.TestingConnectorBehavior;
@@ -33,6 +32,7 @@
 import java.util.OptionalInt;
 import java.util.function.Consumer;
 
+import static io.trino.plugin.teradata.integration.clearscape.ClearScapeEnvironmentUtils.generateUniqueEnvName;
 import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -65,7 +65,7 @@ protected SqlExecutor onRemoteDatabase()
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        database = closeAfterClass(new TestingTeradataServer(ClearScapeEnvironmentUtils.generateUniqueEnvName(getClass())));
+        database = closeAfterClass(new TestingTeradataServer(generateUniqueEnvName(getClass()), true));
         // Register this specific instance for this test class
         return TeradataQueryRunner.builder(database).setInitialTables(REQUIRED_TPCH_TABLES).build();
     }

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/integration/TestTeradataTypeMapping.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.teradata.integration;
 
-import io.trino.plugin.teradata.integration.clearscape.ClearScapeEnvironmentUtils;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.datatype.CreateAndInsertDataSetup;
@@ -23,6 +22,7 @@
 
 import java.sql.SQLException;
 
+import static io.trino.plugin.teradata.integration.clearscape.ClearScapeEnvironmentUtils.generateUniqueEnvName;
 import static io.trino.spi.type.BigintType.BIGINT;
 import static io.trino.spi.type.CharType.createCharType;
 import static io.trino.spi.type.DateType.DATE;
@@ -38,19 +38,13 @@
 final class TestTeradataTypeMapping
         extends AbstractTestQueryFramework
 {
-    private final String envName;
     private TestingTeradataServer database;
 
-    public TestTeradataTypeMapping()
-    {
-        envName = ClearScapeEnvironmentUtils.generateUniqueEnvName(TestTeradataTypeMapping.class);
-    }
-
     @Override
     protected QueryRunner createQueryRunner()
             throws Exception
     {
-        database = closeAfterClass(new TestingTeradataServer(envName));
+        database = closeAfterClass(new TestingTeradataServer(generateUniqueEnvName(getClass()), true));
         // Register this specific instance for this test class
         return TeradataQueryRunner.builder(database).build();
     }

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/integration/TestingTeradataServer.java

@@ -30,7 +30,7 @@
 import static io.trino.testing.SystemEnvironmentUtils.isEnvSet;
 import static io.trino.testing.SystemEnvironmentUtils.requireEnv;
 
-public class TestingTeradataServer
+public final class TestingTeradataServer
         implements AutoCloseable, SqlExecutor
 {
     private static final int MAX_RETRIES = 3;
@@ -39,13 +39,12 @@ public class TestingTeradataServer
     private DatabaseConfig config;
     private ClearScapeSetup clearScapeSetup;
 
-    public TestingTeradataServer(String envName)
+    public TestingTeradataServer(String envName, boolean destroyEnv)
     {
         config = DatabaseConfigFactory.create(envName);
         String hostName = config.getHostName();
         // Initialize ClearScape Instance and Get the host name from ClearScape API in case config is using clearscape
         if (config.isUseClearScape()) {
-            boolean destroyEnv = false;
             if (isEnvSet("CLEARSCAPE_DESTROY_ENV")) {
                 String destroyEnvValue = requireEnv("CLEARSCAPE_DESTROY_ENV");
                 destroyEnv = Boolean.parseBoolean(destroyEnvValue);

plugin/trino-teradata/src/test/java/io/trino/plugin/teradata/integration/clearscape/ClearScapeEnvironmentUtils.java

@@ -13,21 +13,21 @@
  */
 package io.trino.plugin.teradata.integration.clearscape;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import static java.util.Locale.ENGLISH;
 
 public final class ClearScapeEnvironmentUtils
 {
-    private static final String PREFIX = "trino-test-";
-    private static final int MAX_ENV_NAME_LENGTH = 30; // Adjust based on ClearScape limits
+    private static final int MAX_ENV_NAME_LENGTH = 40; // Adjust based on ClearScape limits
 
-    private ClearScapeEnvironmentUtils()
-    {
-    }
+    private ClearScapeEnvironmentUtils() {}
 
     public static String generateUniqueEnvName(Class<?> testClass)
     {
         String className = testClass.getSimpleName().toLowerCase(ENGLISH);
-        String envName = PREFIX + className;
+        String suffix = Long.toString(ThreadLocalRandom.current().nextLong(Long.MAX_VALUE), 36);
+        String envName = className + "-" + suffix;
         // Truncate if too long
         if (envName.length() > MAX_ENV_NAME_LENGTH) {
             envName = envName.substring(0, MAX_ENV_NAME_LENGTH);