Fix integration tests

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWithReservedKeywordIntegrationTest.java

@@ -1,13 +1,29 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.api.DistributedStorageWithReservedKeywordIntegrationTestBase;
+import com.scalar.db.api.TableMetadata;
+import com.scalar.db.io.DataType;
 import java.util.Map;
 import java.util.Properties;
 import org.junit.jupiter.api.Disabled;
 
 public class ObjectStorageWithReservedKeywordIntegrationTest
     extends DistributedStorageWithReservedKeywordIntegrationTestBase {
 
+  @Override
+  protected TableMetadata getTableMetadata() {
+    return TableMetadata.newBuilder()
+        .addColumn(getColumnName1(), DataType.INT)
+        .addColumn(getColumnName2(), DataType.TEXT)
+        .addColumn(getColumnName3(), DataType.INT)
+        .addColumn(getColumnName4(), DataType.INT)
+        .addColumn(getColumnName5(), DataType.BOOLEAN)
+        .addColumn(getColumnName6(), DataType.BLOB)
+        .addPartitionKey(getColumnName1())
+        .addClusteringKey(getColumnName4())
+        .build();
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);

core/src/integration-test/java/com/scalar/db/storage/objectstorage/TwoPhaseConsensusCommitIntegrationTestWithObjectStorage.java

@@ -1,12 +1,36 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.scalar.db.api.TableMetadata;
+import com.scalar.db.io.DataType;
 import com.scalar.db.transaction.consensuscommit.TwoPhaseConsensusCommitIntegrationTestBase;
 import java.util.Properties;
 import org.junit.jupiter.api.Disabled;
 
 public class TwoPhaseConsensusCommitIntegrationTestWithObjectStorage
     extends TwoPhaseConsensusCommitIntegrationTestBase {
 
+  @Override
+  protected TableMetadata getTableMetadata() {
+    return TableMetadata.newBuilder()
+        .addColumn(ACCOUNT_ID, DataType.INT)
+        .addColumn(ACCOUNT_TYPE, DataType.INT)
+        .addColumn(BALANCE, DataType.INT)
+        .addColumn(SOME_COLUMN, DataType.INT)
+        .addColumn(BOOLEAN_COL, DataType.BOOLEAN)
+        .addColumn(BIGINT_COL, DataType.BIGINT)
+        .addColumn(FLOAT_COL, DataType.FLOAT)
+        .addColumn(DOUBLE_COL, DataType.DOUBLE)
+        .addColumn(TEXT_COL, DataType.TEXT)
+        .addColumn(BLOB_COL, DataType.BLOB)
+        .addColumn(DATE_COL, DataType.DATE)
+        .addColumn(TIME_COL, DataType.TIME)
+        .addColumn(TIMESTAMP_COL, DataType.TIMESTAMP)
+        .addColumn(TIMESTAMPTZ_COL, DataType.TIMESTAMPTZ)
+        .addPartitionKey(ACCOUNT_ID)
+        .addClusteringKey(ACCOUNT_TYPE)
+        .build();
+  }
+
   @Override
   protected Properties getProps1(String testName) {
     return ConsensusCommitObjectStorageEnv.getProperties(testName);

integration-test/src/main/java/com/scalar/db/api/TwoPhaseCommitTransactionIntegrationTestBase.java

@@ -122,7 +122,7 @@ protected String getNamespaceBaseName() {
     return NAMESPACE_BASE_NAME;
   }
 
-  private void createTables() throws ExecutionException {
+  protected TableMetadata getTableMetadata() {
     TableMetadata.Builder tableMetadata =
         TableMetadata.newBuilder()
             .addColumn(ACCOUNT_ID, DataType.INT)
@@ -144,13 +144,16 @@ private void createTables() throws ExecutionException {
     if (isTimestampTypeSupported()) {
       tableMetadata.addColumn(TIMESTAMP_COL, DataType.TIMESTAMP);
     }
+    return tableMetadata.build();
+  }
 
+  private void createTables() throws ExecutionException {
     Map<String, String> options = getCreationOptions();
     admin1.createCoordinatorTables(true, options);
     admin1.createNamespace(namespace1, true, options);
-    admin1.createTable(namespace1, TABLE_1, tableMetadata.build(), true, options);
+    admin1.createTable(namespace1, TABLE_1, getTableMetadata(), true, options);
     admin2.createNamespace(namespace2, true, options);
-    admin2.createTable(namespace2, TABLE_2, tableMetadata.build(), true, options);
+    admin2.createTable(namespace2, TABLE_2, getTableMetadata(), true, options);
   }
 
   protected Map<String, String> getCreationOptions() {