Update integration tests to remove secondary indexes from metadata

KodaiD · KodaiD · commit 8cef4adfaaaa · 2025-11-11T10:29:53.000+09:00
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitIntegrationTestWithObjectStorage.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitIntegrationTestWithObjectStorage.java
@@ -1,11 +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.ConsensusCommitIntegrationTestBase;
 import java.util.Properties;
 import org.junit.jupiter.api.Disabled;
 
 public class ConsensusCommitIntegrationTestWithObjectStorage
     extends ConsensusCommitIntegrationTestBase {
+
+  @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(TIMESTAMPTZ_COL, DataType.TIMESTAMPTZ)
+        .addColumn(TIMESTAMP_COL, DataType.TIMESTAMP)
+        .addPartitionKey(ACCOUNT_ID)
+        .addClusteringKey(ACCOUNT_TYPE)
+        .build();
+  }
+
   @Override
   protected Properties getProps(String testName) {
     return ConsensusCommitObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitSpecificIntegrationTestWithObjectStorage.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitSpecificIntegrationTestWithObjectStorage.java
@@ -1,5 +1,7 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.scalar.db.api.TableMetadata;
+import com.scalar.db.io.DataType;
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitSpecificIntegrationTestBase;
 import com.scalar.db.transaction.consensuscommit.Isolation;
 import java.util.Properties;
@@ -8,6 +10,18 @@
 public class ConsensusCommitSpecificIntegrationTestWithObjectStorage
     extends ConsensusCommitSpecificIntegrationTestBase {
 
+  @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.TEXT)
+        .addPartitionKey(ACCOUNT_ID)
+        .addClusteringKey(ACCOUNT_TYPE)
+        .build();
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ConsensusCommitObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCaseSensitivityIntegrationTest.java
@@ -1,13 +1,29 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.api.DistributedStorageCaseSensitivityIntegrationTestBase;
+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 ObjectStorageCaseSensitivityIntegrationTest
     extends DistributedStorageCaseSensitivityIntegrationTestBase {
 
+  @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);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageConditionalMutationIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageConditionalMutationIntegrationTest.java
@@ -5,6 +5,12 @@
 
 public class ObjectStorageConditionalMutationIntegrationTest
     extends DistributedStorageConditionalMutationIntegrationTestBase {
+
+  @Override
+  protected int getThreadNum() {
+    return 3;
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCrossPartitionScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCrossPartitionScanIntegrationTest.java
@@ -13,6 +13,11 @@ protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
 
+  @Override
+  protected int getThreadNum() {
+    return 3;
+  }
+
   @Override
   protected boolean isParallelDdlSupported() {
     return false;
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageIntegrationTest.java
@@ -1,11 +1,28 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.api.DistributedStorageIntegrationTestBase;
+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 ObjectStorageIntegrationTest extends DistributedStorageIntegrationTestBase {
+
+  @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);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultipleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultipleClusteringKeyScanIntegrationTest.java
@@ -11,6 +11,11 @@ protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
 
+  @Override
+  protected int getThreadNum() {
+    return 3;
+  }
+
   @Override
   protected boolean isParallelDdlSupported() {
     return false;
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultiplePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultiplePartitionKeyIntegrationTest.java
@@ -5,11 +5,17 @@
 
 public class ObjectStorageMultiplePartitionKeyIntegrationTest
     extends DistributedStorageMultiplePartitionKeyIntegrationTestBase {
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
 
+  @Override
+  protected int getThreadNum() {
+    return 3;
+  }
+
   @Override
   protected boolean isParallelDdlSupported() {
     return false;
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTest.java
@@ -157,7 +157,7 @@ public void update_NonExistingObjectKeyGiven_ShouldThrowPreconditionFailedExcept
   }
 
   @Test
-  public void update_WrongVersionGiven_ShouldThrowPreconditionFailedException() throws Exception {
+  public void update_WrongVersionGiven_ShouldThrowPreconditionFailedException() {
     // Arrange
     String wrongVersion = "wrong-version";
 
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/SingleCrudOperationTransactionIntegrationTestWithObjectStorage.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/SingleCrudOperationTransactionIntegrationTestWithObjectStorage.java
@@ -1,11 +1,35 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.scalar.db.api.TableMetadata;
+import com.scalar.db.io.DataType;
 import com.scalar.db.transaction.singlecrudoperation.SingleCrudOperationTransactionIntegrationTestBase;
 import java.util.Properties;
 
 public class SingleCrudOperationTransactionIntegrationTestWithObjectStorage
     extends SingleCrudOperationTransactionIntegrationTestBase {
 
+  @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(TIMESTAMPTZ_COL, DataType.TIMESTAMPTZ)
+        .addColumn(TIMESTAMP_COL, DataType.TIMESTAMP)
+        .addPartitionKey(ACCOUNT_ID)
+        .addClusteringKey(ACCOUNT_TYPE)
+        .build();
+  }
+
   @Override
   protected Properties getProps(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStoragePartition.java b/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStoragePartition.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.annotations.VisibleForTesting;
 import com.scalar.db.api.Delete;
 import com.scalar.db.api.DeleteIf;
 import com.scalar.db.api.DeleteIfExists;
@@ -52,7 +53,7 @@ public Optional<ObjectStorageRecord> getRecord(String recordId) {
   }
 
   public Map<String, ObjectStorageRecord> getRecords() {
-    return records;
+    return Collections.unmodifiableMap(records);
   }
 
   public boolean isEmpty() {
@@ -127,6 +128,11 @@ public void applyDelete(Delete delete, TableMetadata tableMetadata) throws NoMut
     }
   }
 
+  @VisibleForTesting
+  protected void putRecord(String recordId, ObjectStorageRecord record) {
+    records.put(recordId, record);
+  }
+
   public static final class Builder {
     private String namespaceName;
     private String tableName;
diff --git a/core/src/test/java/com/scalar/db/storage/objectstorage/SelectStatementHandlerTest.java b/core/src/test/java/com/scalar/db/storage/objectstorage/SelectStatementHandlerTest.java
@@ -117,7 +117,7 @@ private void addRecordToPartition(
       Map<String, Object> values) {
     ObjectStorageRecord record = createRecord(partitionKey, clusteringKey, values);
     String recordId = buildRecordId(partitionKey, clusteringKey);
-    partition.getRecords().put(recordId, record);
+    partition.putRecord(recordId, record);
   }
 
   private String buildRecordId(
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageIntegrationTestBase.java
@@ -108,6 +108,20 @@ protected String getColumnName6() {
     return COL_NAME6;
   }
 
+  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())
+        .addSecondaryIndex(getColumnName3())
+        .build();
+  }
+
   protected DistributedStorage getStorage() {
     return storage;
   }
@@ -119,22 +133,7 @@ protected DistributedStorageAdmin getAdmin() {
   private void createTable() throws ExecutionException {
     Map<String, String> options = getCreationOptions();
     admin.createNamespace(namespace, true, options);
-    admin.createTable(
-        namespace,
-        getTableName(),
-        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())
-            .addSecondaryIndex(getColumnName3())
-            .build(),
-        true,
-        options);
+    admin.createTable(namespace, getTableName(), getTableMetadata(), true, options);
   }
 
   protected int getLargeDataSizeInBytes() {
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionIntegrationTestBase.java
@@ -110,7 +110,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)
@@ -132,11 +132,14 @@ 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();
     admin.createCoordinatorTables(true, options);
     admin.createNamespace(namespace, true, options);
-    admin.createTable(namespace, TABLE, tableMetadata.build(), true, options);
+    admin.createTable(namespace, TABLE, getTableMetadata(), true, options);
   }
 
   protected Map<String, String> getCreationOptions() {
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitSpecificIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitSpecificIntegrationTestBase.java
@@ -89,10 +89,10 @@ public abstract class ConsensusCommitSpecificIntegrationTestBase {
   private static final String NAMESPACE_2 = "int_test_" + TEST_NAME + "2";
   private static final String TABLE_1 = "test_table1";
   private static final String TABLE_2 = "test_table2";
-  private static final String ACCOUNT_ID = "account_id";
-  private static final String ACCOUNT_TYPE = "account_type";
-  private static final String BALANCE = "balance";
-  private static final String SOME_COLUMN = "some_column";
+  protected static final String ACCOUNT_ID = "account_id";
+  protected static final String ACCOUNT_TYPE = "account_type";
+  protected static final String BALANCE = "balance";
+  protected static final String SOME_COLUMN = "some_column";
   private static final int INITIAL_BALANCE = 1000;
   private static final int NEW_BALANCE = 2000;
   private static final int NUM_ACCOUNTS = 4;
@@ -148,23 +148,25 @@ protected String getNamespace2() {
     return NAMESPACE_2;
   }
 
+  protected TableMetadata getTableMetadata() {
+    return TableMetadata.newBuilder()
+        .addColumn(ACCOUNT_ID, DataType.INT)
+        .addColumn(ACCOUNT_TYPE, DataType.INT)
+        .addColumn(BALANCE, DataType.INT)
+        .addColumn(SOME_COLUMN, DataType.TEXT)
+        .addPartitionKey(ACCOUNT_ID)
+        .addClusteringKey(ACCOUNT_TYPE)
+        .addSecondaryIndex(BALANCE)
+        .build();
+  }
+
   private void createTables() throws ExecutionException {
     Map<String, String> options = getCreationOptions();
     consensusCommitAdmin.createCoordinatorTables(true, options);
-    TableMetadata tableMetadata =
-        TableMetadata.newBuilder()
-            .addColumn(ACCOUNT_ID, DataType.INT)
-            .addColumn(ACCOUNT_TYPE, DataType.INT)
-            .addColumn(BALANCE, DataType.INT)
-            .addColumn(SOME_COLUMN, DataType.TEXT)
-            .addPartitionKey(ACCOUNT_ID)
-            .addClusteringKey(ACCOUNT_TYPE)
-            .addSecondaryIndex(BALANCE)
-            .build();
     consensusCommitAdmin.createNamespace(namespace1, true, options);
-    consensusCommitAdmin.createTable(namespace1, TABLE_1, tableMetadata, true, options);
+    consensusCommitAdmin.createTable(namespace1, TABLE_1, getTableMetadata(), true, options);
     consensusCommitAdmin.createNamespace(namespace2, true, options);
-    consensusCommitAdmin.createTable(namespace2, TABLE_2, tableMetadata, true, options);
+    consensusCommitAdmin.createTable(namespace2, TABLE_2, getTableMetadata(), true, options);
   }
 
   protected Map<String, String> getCreationOptions() {

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public void update_NonExistingObjectKeyGiven_ShouldThrowPreconditionFailedExcept`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Test`
`160`		`- public void update_WrongVersionGiven_ShouldThrowPreconditionFailedException() throws Exception {`
	`160`	`+ public void update_WrongVersionGiven_ShouldThrowPreconditionFailedException() {`
`161`	`161`	`// Arrange`
`162`	`162`	`String wrongVersion = "wrong-version";`
`163`	`163`