Refactor JdbcAdmin

Author: brfrn169

core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminTestUtils.java

@@ -30,25 +30,27 @@ public JdbcAdminTestUtils(Properties properties) {
   @Override
   public void dropNamespacesTable() throws Exception {
     execute(
-        "DROP TABLE " + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.NAMESPACES_TABLE));
+        "DROP TABLE "
+            + rdbEngine.encloseFullTableName(
+                metadataSchema, NamespaceMetadataService.NAMESPACES_TABLE));
   }
 
   @Override
   public void dropMetadataTable() throws Exception {
-    dropTable(metadataSchema, JdbcAdmin.METADATA_TABLE);
+    dropTable(metadataSchema, TableMetadataService.METADATA_TABLE);
   }
 
   @Override
   public void truncateNamespacesTable() throws Exception {
     String truncateTableStatement =
-        rdbEngine.truncateTableSql(metadataSchema, JdbcAdmin.NAMESPACES_TABLE);
+        rdbEngine.truncateTableSql(metadataSchema, NamespaceMetadataService.NAMESPACES_TABLE);
     execute(truncateTableStatement);
   }
 
   @Override
   public void truncateMetadataTable() throws Exception {
     String truncateTableStatement =
-        rdbEngine.truncateTableSql(metadataSchema, JdbcAdmin.METADATA_TABLE);
+        rdbEngine.truncateTableSql(metadataSchema, TableMetadataService.METADATA_TABLE);
     execute(truncateTableStatement);
   }
 
@@ -57,7 +59,7 @@ public void truncateMetadataTable() throws Exception {
   public void corruptMetadata(String namespace, String table) throws Exception {
     String insertCorruptedMetadataStatement =
         "INSERT INTO "
-            + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
+            + rdbEngine.encloseFullTableName(metadataSchema, TableMetadataService.METADATA_TABLE)
             + " VALUES ('"
             + getFullTableName(namespace, table)
             + "','corrupted','corrupted','corrupted','corrupted','0','0')";
@@ -68,9 +70,9 @@ public void corruptMetadata(String namespace, String table) throws Exception {
   public void deleteMetadata(String namespace, String table) throws Exception {
     String deleteMetadataStatement =
         "DELETE FROM "
-            + rdbEngine.encloseFullTableName(metadataSchema, JdbcAdmin.METADATA_TABLE)
+            + rdbEngine.encloseFullTableName(metadataSchema, TableMetadataService.METADATA_TABLE)
             + " WHERE "
-            + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
+            + rdbEngine.enclose(TableMetadataService.METADATA_COL_FULL_TABLE_NAME)
             + " = ?";
     try (Connection connection = dataSource.getConnection();
         PreparedStatement preparedStatement =

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTestUtils.java

@@ -9,12 +9,13 @@
 import com.scalar.db.storage.cassandra.CassandraAdmin;
 import com.scalar.db.storage.cassandra.CassandraConfig;
 import com.scalar.db.storage.cassandra.ClusterManager;
-import com.scalar.db.storage.jdbc.JdbcAdmin;
 import com.scalar.db.storage.jdbc.JdbcConfig;
 import com.scalar.db.storage.jdbc.JdbcTestUtils;
 import com.scalar.db.storage.jdbc.JdbcUtils;
+import com.scalar.db.storage.jdbc.NamespaceMetadataService;
 import com.scalar.db.storage.jdbc.RdbEngineFactory;
 import com.scalar.db.storage.jdbc.RdbEngineStrategy;
+import com.scalar.db.storage.jdbc.TableMetadataService;
 import com.scalar.db.util.AdminTestUtils;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.sql.Connection;
@@ -61,7 +62,8 @@ public void dropNamespacesTable() throws SQLException {
     // for JDBC
     execute(
         "DROP TABLE "
-            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.NAMESPACES_TABLE));
+            + rdbEngine.encloseFullTableName(
+                jdbcMetadataSchema, NamespaceMetadataService.NAMESPACES_TABLE));
   }
 
   @Override
@@ -71,7 +73,8 @@ public void dropMetadataTable() throws SQLException {
     // for JDBC
     execute(
         "DROP TABLE "
-            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE));
+            + rdbEngine.encloseFullTableName(
+                jdbcMetadataSchema, TableMetadataService.METADATA_TABLE));
   }
 
   @Override
@@ -86,7 +89,7 @@ public void truncateNamespacesTable() throws SQLException {
 
     // for JDBC
     String truncateTableStatement =
-        rdbEngine.truncateTableSql(jdbcMetadataSchema, JdbcAdmin.NAMESPACES_TABLE);
+        rdbEngine.truncateTableSql(jdbcMetadataSchema, NamespaceMetadataService.NAMESPACES_TABLE);
     execute(truncateTableStatement);
   }
 
@@ -97,7 +100,8 @@ public void truncateMetadataTable() throws Exception {
     // for JDBC
     String truncateTableStatement =
         "TRUNCATE TABLE "
-            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE);
+            + rdbEngine.encloseFullTableName(
+                jdbcMetadataSchema, TableMetadataService.METADATA_TABLE);
     execute(truncateTableStatement);
   }
 
@@ -109,7 +113,8 @@ public void corruptMetadata(String namespace, String table) throws Exception {
     // for JDBC
     String insertCorruptedMetadataStatement =
         "INSERT INTO "
-            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
+            + rdbEngine.encloseFullTableName(
+                jdbcMetadataSchema, TableMetadataService.METADATA_TABLE)
             + " VALUES ('"
             + getFullTableName(namespace, table)
             + "','corrupted','corrupted','corrupted','corrupted','0','0')";
@@ -123,9 +128,10 @@ public void deleteMetadata(String namespace, String table) throws Exception {
     // for JDBC
     String deleteMetadataStatement =
         "DELETE FROM "
-            + rdbEngine.encloseFullTableName(jdbcMetadataSchema, JdbcAdmin.METADATA_TABLE)
+            + rdbEngine.encloseFullTableName(
+                jdbcMetadataSchema, TableMetadataService.METADATA_TABLE)
             + " WHERE "
-            + rdbEngine.enclose(JdbcAdmin.METADATA_COL_FULL_TABLE_NAME)
+            + rdbEngine.enclose(TableMetadataService.METADATA_COL_FULL_TABLE_NAME)
             + " = ?";
     try (Connection connection = dataSource.getConnection();
         PreparedStatement preparedStatement =