Eliminate duplicate random suffix generation code

trinodb · Nov 14, 2022 · cf0bae8 · cf0bae8
1 parent 74d239a
commit cf0bae8
Show file tree

Hide file tree

Showing 51 changed files with 372 additions and 382 deletions.
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestCachingJdbcClient.java
@@ -35,7 +35,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -61,9 +60,7 @@
 import static io.trino.spi.testing.InterfaceTestUtils.assertAllMethodsOverridden;
 import static io.trino.spi.type.IntegerType.INTEGER;
 import static io.trino.testing.TestingConnectorSession.builder;
-import static java.lang.Character.MAX_RADIX;
-import static java.lang.Math.abs;
-import static java.lang.Math.min;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
@@ -78,10 +75,6 @@
 @Test(singleThreaded = true)
 public class TestCachingJdbcClient
 {
-    private static final SecureRandom random = new SecureRandom();
-    // The suffix needs to be long enough to "prevent" collisions in practice. The length of 5 was proven not to be long enough
-    private static final int RANDOM_SUFFIX_LENGTH = 10;
-
     private static final Duration FOREVER = Duration.succinctDuration(1, DAYS);
     private static final Duration ZERO = Duration.succinctDuration(0, MILLISECONDS);
 
@@ -758,7 +751,7 @@ public void testConcurrentSchemaCreateAndDrop()
         List<Future<?>> futures = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             futures.add(executor.submit(() -> {
-                String schemaName = "schema_" + randomSuffix();
+                String schemaName = "schema_" + randomNameSuffix();
                 assertThat(cachingJdbcClient.getSchemaNames(session)).doesNotContain(schemaName);
                 cachingJdbcClient.createSchema(session, schemaName);
                 assertThat(cachingJdbcClient.getSchemaNames(session)).contains(schemaName);
@@ -895,12 +888,6 @@ public void testEverythingImplemented()
         assertAllMethodsOverridden(JdbcClient.class, CachingJdbcClient.class);
     }
 
-    private static String randomSuffix()
-    {
-        String randomSuffix = Long.toString(abs(random.nextLong()), MAX_RADIX);
-        return randomSuffix.substring(0, min(RANDOM_SUFFIX_LENGTH, randomSuffix.length()));
-    }
-
     private static SingleJdbcCacheStatsAssertions assertTableNamesCache(CachingJdbcClient client)
     {
         return assertCacheStats(client, CachingJdbcCache.TABLE_NAMES_CACHE);

diff --git a/plugin/trino-bigquery/pom.xml b/plugin/trino-bigquery/pom.xml
@@ -322,6 +322,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-cassandra/pom.xml b/plugin/trino-cassandra/pom.xml
@@ -171,6 +171,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTable.java b/plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTable.java
@@ -16,25 +16,18 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.testing.sql.SqlExecutor;
 
-import java.security.SecureRandom;
 import java.util.List;
 import java.util.function.Function;
 
 import static com.google.common.base.Verify.verify;
-import static java.lang.Character.MAX_RADIX;
-import static java.lang.Math.abs;
-import static java.lang.Math.min;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.lang.String.join;
 import static java.util.stream.Collectors.joining;
 
 public class TestCassandraTable
         implements AutoCloseable
 {
-    private static final SecureRandom random = new SecureRandom();
-    // The suffix needs to be long enough to "prevent" collisions in practice. The length of 5 was proven not to be long enough
-    private static final int RANDOM_SUFFIX_LENGTH = 10;
-
     private final SqlExecutor sqlExecutor;
     private final String keyspace;
     private final String tableName;
@@ -57,7 +50,7 @@ public TestCassandraTable(
     {
         this.sqlExecutor = sqlExecutor;
         this.keyspace = keyspace;
-        this.tableName = namePrefix + randomTableSuffix();
+        this.tableName = namePrefix + randomNameSuffix();
         sqlExecutor.execute(format("CREATE TABLE %s.%s %s", keyspace, tableName, tableDefinition(columnDefinitions)));
         String columns = columnDefinitions.stream()
                 .map(columnDefinition -> columnDefinition.name)
@@ -116,12 +109,6 @@ public void close()
         sqlExecutor.execute("DROP TABLE " + getTableName());
     }
 
-    private static String randomTableSuffix()
-    {
-        String randomSuffix = Long.toString(abs(random.nextLong()), MAX_RADIX);
-        return randomSuffix.substring(0, min(RANDOM_SUFFIX_LENGTH, randomSuffix.length()));
-    }
-
     public static ColumnDefinition partitionColumn(String name, String type)
     {
         return new ColumnDefinition(name, type, PrimaryKeyType.PARTITION);

diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml
@@ -129,6 +129,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-druid/pom.xml b/plugin/trino-druid/pom.xml
@@ -122,6 +122,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml
@@ -297,6 +297,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with elasticsearch client dependency -->
+                    <groupId>org.openjdk.jmh</groupId>
+                    <artifactId>jmh-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-hive-hadoop2/pom.xml b/plugin/trino-hive-hadoop2/pom.xml
@@ -164,6 +164,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>testing</artifactId>

diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml
@@ -154,6 +154,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/plugin/trino-oracle/pom.xml b/plugin/trino-oracle/pom.xml
@@ -148,6 +148,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing-services</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-tpch</artifactId>

diff --git a/...n/trino-password-authenticators/src/test/java/io/trino/plugin/password/ldap/LdapUtil.java b/...n/trino-password-authenticators/src/test/java/io/trino/plugin/password/ldap/LdapUtil.java
@@ -24,22 +24,15 @@
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 
-import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static java.lang.Character.MAX_RADIX;
-import static java.lang.Math.abs;
-import static java.lang.Math.min;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
 final class LdapUtil
 {
-    private static final SecureRandom random = new SecureRandom();
-    private static final int RANDOM_SUFFIX_LENGTH = 10;
-
     public static final String MEMBER = "member";
 
     private LdapUtil()
@@ -120,10 +113,4 @@ public static LdapObjectDefinition buildLdapUserObject(String organizationName,
                 .setObjectClasses(Arrays.asList("person", "inetOrgPerson"))
                 .build();
     }
-
-    public static String randomSuffix()
-    {
-        String randomSuffix = Long.toString(abs(random.nextLong()), MAX_RADIX);
-        return randomSuffix.substring(0, min(RANDOM_SUFFIX_LENGTH, randomSuffix.length()));
-    }
 }
diff --git a/...ord-authenticators/src/test/java/io/trino/plugin/password/ldap/TestingOpenLdapServer.java b/...ord-authenticators/src/test/java/io/trino/plugin/password/ldap/TestingOpenLdapServer.java
@@ -38,7 +38,7 @@
 import static io.trino.plugin.password.ldap.LdapUtil.buildLdapGroupObject;
 import static io.trino.plugin.password.ldap.LdapUtil.buildLdapOrganizationObject;
 import static io.trino.plugin.password.ldap.LdapUtil.buildLdapUserObject;
-import static io.trino.plugin.password.ldap.LdapUtil.randomSuffix;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -82,13 +82,13 @@ public String getLdapUrl()
     public DisposableSubContext createOrganization()
             throws NamingException
     {
-        return createDisposableSubContext(buildLdapOrganizationObject("organization_" + randomSuffix(), BASE_DISTINGUISED_NAME));
+        return createDisposableSubContext(buildLdapOrganizationObject("organization_" + randomNameSuffix(), BASE_DISTINGUISED_NAME));
     }
 
     public DisposableSubContext createGroup(DisposableSubContext organization)
             throws Exception
     {
-        return createDisposableSubContext(buildLdapGroupObject(organization.getDistinguishedName(), "group_" + randomSuffix()));
+        return createDisposableSubContext(buildLdapGroupObject(organization.getDistinguishedName(), "group_" + randomNameSuffix()));
     }
 
     public DisposableSubContext createUser(DisposableSubContext organization, String userName, String password)

diff --git a/...sts-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java b/...sts-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentContainers.java
@@ -16,19 +16,13 @@
 import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider;
 
 import java.nio.file.Path;
-import java.security.SecureRandom;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.lang.Character.MAX_RADIX;
-import static java.lang.Math.abs;
-import static java.lang.Math.min;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static org.testcontainers.utility.MountableFile.forHostPath;
 
 public final class EnvironmentContainers
 {
-    private static final SecureRandom random = new SecureRandom();
-    private static final int RANDOM_SUFFIX_LENGTH = 5;
-
     public static final String TRINO = "presto";
     public static final String COORDINATOR = TRINO + "-master";
     public static final String WORKER = TRINO + "-worker";
@@ -56,7 +50,7 @@ public static void configureTempto(Environment.Builder builder, ResourceProvider
     {
         builder.configureContainer(TESTS, dockerContainer -> {
             Path path = configDir.getPath("tempto-configuration.yaml");
-            String suffix = getParentDirectoryName(path) + "-" + randomSuffix();
+            String suffix = getParentDirectoryName(path) + "-" + randomNameSuffix();
             String temptoConfig = "/docker/presto-product-tests/conf/tempto/tempto-configuration-for-" + suffix + ".yaml";
             dockerContainer
                     .withCopyFileToContainer(forHostPath(path), temptoConfig)
@@ -72,10 +66,4 @@ private static String getParentDirectoryName(Path path)
         checkArgument(path.getNameCount() >= 2, "Cannot determine parent directory of: %s", path);
         return path.getName(path.getNameCount() - 2).toString();
     }
-
-    private static String randomSuffix()
-    {
-        String randomSuffix = Long.toString(abs(random.nextLong()), MAX_RADIX);
-        return randomSuffix.substring(0, min(RANDOM_SUFFIX_LENGTH, randomSuffix.length()));
-    }
 }
diff --git a/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java b/testing/trino-product-tests/src/main/java/io/trino/tests/product/TestCreateTable.java
@@ -20,8 +20,8 @@
 
 import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
 import static io.trino.tempto.assertions.QueryAssert.assertThat;
+import static io.trino.testing.TestingNames.randomNameSuffix;
 import static io.trino.tests.product.TestGroups.CREATE_TABLE;
-import static io.trino.tests.product.hive.util.TemporaryHiveTable.randomTableSuffix;
 import static io.trino.tests.product.utils.QueryExecutors.onTrino;
 import static java.lang.String.format;
 
@@ -53,8 +53,8 @@ public void shouldCreateTableAsEmptySelect()
     @Test(groups = CREATE_TABLE)
     public void shouldNotCreateTableInNonExistentSchema()
     {
-        String schemaName = "test_schema_" + randomTableSuffix();
-        String table = schemaName + ".test_create_no_schema_" + randomTableSuffix();
+        String schemaName = "test_schema_" + randomNameSuffix();
+        String table = schemaName + ".test_create_no_schema_" + randomNameSuffix();
         assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE " + table + " (a bigint)"))
                 .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): Schema " + schemaName + " not found");
 
@@ -66,8 +66,8 @@ public void shouldNotCreateTableInNonExistentSchema()
     @Test(groups = CREATE_TABLE)
     public void shouldNotCreateExternalTableInNonExistentSchema()
     {
-        String schemaName = "test_schema_" + randomTableSuffix();
-        String table = schemaName + ".test_create_no_schema_" + randomTableSuffix();
+        String schemaName = "test_schema_" + randomNameSuffix();
+        String table = schemaName + ".test_create_no_schema_" + randomNameSuffix();
         assertQueryFailure(() -> onTrino().executeQuery("CREATE TABLE " + table + " (a bigint) WITH (external_location = '/tmp')"))
                 .hasMessageMatching("\\QQuery failed (#\\E\\S+\\Q): Schema " + schemaName + " not found");