add uuid to database path

Author: wraymo

presto-clp/src/test/java/com/facebook/presto/plugin/clp/ClpMetadataDbSetUp.java

@@ -28,6 +28,7 @@
 import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import static org.testng.Assert.fail;
 
@@ -36,15 +37,34 @@ public final class ClpMetadataDbSetUp
     private static final Logger log = Logger.get(ClpMetadataDbSetUp.class);
 
     public static final String metadataDbUrlTemplate =
-            "jdbc:h2:file:/tmp/%s;MODE=MySQL;DATABASE_TO_UPPER=FALSE";
+            "jdbc:h2:file:%s;MODE=MySQL;DATABASE_TO_UPPER=FALSE";
     public static final String metadataDbTablePrefix = "clp_";
     public static final String metadataDbUser = "sa";
     public static final String metadataDbPassword = "";
-    private final String datasetsTableName = metadataDbTablePrefix + "datasets";
+    private static final String datasetsTableName = metadataDbTablePrefix + "datasets";
 
-    public ClpMetadata setupMetadata(String dbName, Map<String, List<Pair<String, ClpNodeType>>> clpFields)
+    public static final class DbHandle
     {
-        final String metadataDbUrl = String.format(metadataDbUrlTemplate, dbName);
+        DbHandle(String dbPath)
+        {
+            this.dbPath = dbPath;
+        }
+        public String dbPath;
+    }
+
+    private ClpMetadataDbSetUp()
+    {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    public static DbHandle getDbHandle(String dbName)
+    {
+        return new DbHandle(String.format("/tmp/presto-clp-test/%s-%s", dbName, UUID.randomUUID()));
+    }
+
+    public static ClpMetadata setupMetadata(DbHandle dbHandle, Map<String, List<Pair<String, ClpNodeType>>> clpFields)
+    {
+        final String metadataDbUrl = String.format(metadataDbUrlTemplate, dbHandle.dbPath);
         final String columnMetadataTableSuffix = "_column_metadata";
 
         try (Connection conn = DriverManager.getConnection(metadataDbUrl, metadataDbUser, metadataDbPassword);
@@ -88,9 +108,9 @@ public ClpMetadata setupMetadata(String dbName, Map<String, List<Pair<String, Cl
         return new ClpMetadata(config, metadataProvider);
     }
 
-    public ClpMySqlSplitProvider setupSplit(String dbName, Map<String, List<String>> splits)
+    public static ClpMySqlSplitProvider setupSplit(DbHandle dbHandle, Map<String, List<String>> splits)
     {
-        final String metadataDbUrl = String.format(metadataDbUrlTemplate, dbName);
+        final String metadataDbUrl = String.format(metadataDbUrlTemplate, dbHandle.dbPath);
         final String archiveTableSuffix = "_archives";
         final String archiveTableFormat = metadataDbTablePrefix + "%s" + archiveTableSuffix;
 
@@ -135,10 +155,10 @@ public ClpMySqlSplitProvider setupSplit(String dbName, Map<String, List<String>>
                         .setMetadataTablePrefix(metadataDbTablePrefix));
     }
 
-    public void tearDown(String dbName)
+    public static void tearDown(DbHandle dbHandle)
     {
-        File dbFile = new File(String.format("/tmp/%s.mv.db", dbName));
-        File lockFile = new File(String.format("/tmp/%s.trace.db", dbName)); // Optional, H2 sometimes creates this
+        File dbFile = new File(dbHandle.dbPath + ".mv.db");
+        File lockFile = new File(dbHandle.dbPath + ".trace.db"); // Optional, H2 sometimes creates this
         if (dbFile.exists()) {
             dbFile.delete();
             log.info("Deleted database file: " + dbFile.getAbsolutePath());
@@ -148,7 +168,7 @@ public void tearDown(String dbName)
         }
     }
 
-    private void createDatasetsTable(Statement stmt) throws SQLException
+    private static void createDatasetsTable(Statement stmt) throws SQLException
     {
         final String createDatasetTableSQL = String.format(
                 "CREATE TABLE IF NOT EXISTS %s (" +
@@ -158,7 +178,7 @@ private void createDatasetsTable(Statement stmt) throws SQLException
         stmt.execute(createDatasetTableSQL);
     }
 
-    private void updateDatasetsTable(Connection conn, String tableName) throws SQLException
+    private static void updateDatasetsTable(Connection conn, String tableName) throws SQLException
     {
         final String insertDatasetTableSQL = String.format(
                 "INSERT INTO %s (name, archive_storage_type, archive_storage_directory) VALUES (?, ?, ?)", datasetsTableName);

presto-clp/src/test/java/com/facebook/presto/plugin/clp/TestClpMetadata.java

@@ -41,18 +41,17 @@
 @Test(singleThreaded = true)
 public class TestClpMetadata
 {
+    private ClpMetadataDbSetUp.DbHandle dbHandle;
     private ClpMetadata metadata;
-    private ClpMetadataDbSetUp clpMetadataDbSetUp;
 
-    private static final String databaseName = "metadata_testdb";
     private static final String tableName = "test";
 
     @BeforeMethod
     public void setUp()
     {
-        clpMetadataDbSetUp = new ClpMetadataDbSetUp();
-        metadata = clpMetadataDbSetUp.setupMetadata(
-                databaseName,
+        dbHandle = ClpMetadataDbSetUp.getDbHandle("metadata_testdb");
+        metadata = ClpMetadataDbSetUp.setupMetadata(
+                dbHandle,
                 ImmutableMap.of(
                         tableName,
                         ImmutableList.of(
@@ -68,7 +67,7 @@ public void setUp()
     @AfterMethod
     public void tearDown()
     {
-        clpMetadataDbSetUp.tearDown(databaseName);
+        ClpMetadataDbSetUp.tearDown(dbHandle);
     }
 
     @Test

presto-clp/src/test/java/com/facebook/presto/plugin/clp/TestClpSplit.java

@@ -32,16 +32,14 @@
 @Test(singleThreaded = true)
 public class TestClpSplit
 {
+    private ClpMetadataDbSetUp.DbHandle dbHandle;
     private ClpSplitProvider clpSplitProvider;
-    private ClpMetadataDbSetUp clpMetadataDbSetUp;
     private Map<String, List<String>> tableSplits;
 
-    private final String databaseName = "split_testdb";
-
     @BeforeMethod
     public void setUp()
     {
-        clpMetadataDbSetUp = new ClpMetadataDbSetUp();
+        dbHandle = ClpMetadataDbSetUp.getDbHandle("split_testdb");
         tableSplits = new HashMap<>();
 
         int numKeys = 3;
@@ -57,13 +55,13 @@ public void setUp()
 
             tableSplits.put(key, values);
         }
-        clpSplitProvider = clpMetadataDbSetUp.setupSplit(databaseName, tableSplits);
+        clpSplitProvider = ClpMetadataDbSetUp.setupSplit(dbHandle, tableSplits);
     }
 
     @AfterMethod
     public void tearDown()
     {
-        clpMetadataDbSetUp.tearDown(databaseName);
+        ClpMetadataDbSetUp.tearDown(dbHandle);
     }
 
     @Test