Apply suggestions

Author: KodaiD

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

@@ -130,4 +130,9 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC
   @Override
   @Disabled("Object Storage does not support renaming tables")
   public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
+
+  @Override
+  @Disabled("There is nothing that needs to be upgraded with Object Storage")
+  public void
+      upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() {}
 }

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

@@ -145,4 +145,9 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC
   @Override
   @Disabled("Object Storage does not support renaming tables")
   public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
+
+  @Override
+  @Disabled("There is nothing that needs to be upgraded with Object Storage")
+  public void
+      upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() {}
 }

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

@@ -143,4 +143,9 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC
   @Override
   @Disabled("Object Storage does not support renaming tables")
   public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
+
+  @Override
+  @Disabled("There is nothing that needs to be upgraded with Object Storage")
+  public void
+      upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() {}
 }

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTestBase.java renamed to core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTest.java

@@ -15,9 +15,9 @@
 import org.slf4j.LoggerFactory;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class ObjectStorageWrapperIntegrationTestBase {
+public class ObjectStorageWrapperIntegrationTest {
   private static final Logger logger =
-      LoggerFactory.getLogger(ObjectStorageWrapperIntegrationTestBase.class);
+      LoggerFactory.getLogger(ObjectStorageWrapperIntegrationTest.class);
 
   private static final String TEST_NAME = "object_storage_wrapper_integration_test";
   private static final String TEST_KEY1 = "test-key1";

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

@@ -124,4 +124,9 @@ public void renameTable_ForExistingTableWithIndexes_ShouldRenameTableAndIndexesC
   @Override
   @Disabled("Object Storage does not support renaming tables")
   public void renameTable_IfOnlyOneTableExists_ShouldRenameTableCorrectly() {}
+
+  @Override
+  @Disabled("There is nothing that needs to be upgraded with Object Storage")
+  public void
+      upgrade_WhenMetadataTableExistsButNotNamespacesTable_ShouldCreateNamespacesTableAndImportExistingNamespaces() {}
 }

core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageAdmin.java

@@ -370,33 +370,7 @@ public Set<String> getNamespaceNames() throws ExecutionException {
 
   @Override
   public void upgrade(Map<String, String> options) throws ExecutionException {
-    try {
-      // Get all namespace names from the table metadata table
-      Map<String, ObjectStorageTableMetadata> tableMetadataTable = getTableMetadataTable();
-      List<String> namespaceNames =
-          tableMetadataTable.keySet().stream()
-              .map(ObjectStorageAdmin::getNamespaceNameFromTableMetadataKey)
-              .distinct()
-              .collect(Collectors.toList());
-      // Upsert the namespace metadata table
-      Map<String, String> readVersionMap = new HashMap<>();
-      Map<String, ObjectStorageNamespaceMetadata> namespaceMetadataTable =
-          getNamespaceMetadataTable(readVersionMap);
-      Map<String, ObjectStorageNamespaceMetadata> newNamespaceMetadataTable =
-          namespaceNames.stream()
-              .collect(
-                  Collectors.toMap(namespace -> namespace, ObjectStorageNamespaceMetadata::new));
-      if (namespaceMetadataTable.isEmpty()) {
-        insertMetadataTable(NAMESPACE_METADATA_TABLE, newNamespaceMetadataTable);
-      } else {
-        updateMetadataTable(
-            NAMESPACE_METADATA_TABLE,
-            newNamespaceMetadataTable,
-            readVersionMap.get(NAMESPACE_METADATA_TABLE));
-      }
-    } catch (Exception e) {
-      throw new ExecutionException("Failed to upgrade", e);
-    }
+    // Currently, nothing needs to be upgraded. Do nothing.
   }
 
   private Map<String, ObjectStorageNamespaceMetadata> getNamespaceMetadataTable()

core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageConfig.java

@@ -2,7 +2,6 @@
 
 import static com.scalar.db.config.ConfigUtils.getInt;
 import static com.scalar.db.config.ConfigUtils.getLong;
-import static com.scalar.db.config.ConfigUtils.getString;
 
 import com.scalar.db.common.CoreError;
 import com.scalar.db.config.DatabaseConfig;
@@ -22,10 +21,6 @@ public class BlobStorageConfig implements ObjectStorageConfig {
       PREFIX + "parallel_upload_threshold_in_bytes";
   public static final String REQUEST_TIMEOUT_IN_SECONDS = PREFIX + "request_timeout_in_seconds";
 
-  /** @deprecated As of 5.0, will be removed. */
-  @Deprecated
-  public static final String TABLE_METADATA_NAMESPACE = PREFIX + "table_metadata.namespace";
-
   public static final long DEFAULT_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES = 4 * 1024 * 1024; // 4MB
   public static final int DEFAULT_PARALLEL_UPLOAD_MAX_PARALLELISM = 4;
   public static final long DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES = 4 * 1024 * 1024; // 4MB
@@ -63,20 +58,7 @@ public BlobStorageConfig(DatabaseConfig databaseConfig) {
     }
     username = databaseConfig.getUsername().orElse(null);
     password = databaseConfig.getPassword().orElse(null);
-
-    if (databaseConfig.getProperties().containsKey(TABLE_METADATA_NAMESPACE)) {
-      logger.warn(
-          "The configuration property \""
-              + TABLE_METADATA_NAMESPACE
-              + "\" is deprecated and will be removed in 5.0.0.");
-      metadataNamespace =
-          getString(
-              databaseConfig.getProperties(),
-              TABLE_METADATA_NAMESPACE,
-              DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME);
-    } else {
-      metadataNamespace = databaseConfig.getSystemNamespaceName();
-    }
+    metadataNamespace = databaseConfig.getSystemNamespaceName();
 
     if (databaseConfig.getScanFetchSize() != DatabaseConfig.DEFAULT_SCAN_FETCH_SIZE) {
       logger.warn(

core/src/test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminTest.java

@@ -608,43 +608,10 @@ public void repairTable_ShouldUpsertTableMetadata() throws Exception {
   }
 
   @Test
-  public void upgrade_WithExistingTables_ShouldUpsertNamespaces() throws Exception {
+  public void upgrade_ShouldDoNothing() {
     // Arrange
-    String tableMetadataKey1 = "ns1" + ObjectStorageUtils.CONCATENATED_KEY_DELIMITER + "tbl1";
-    String tableMetadataKey2 = "ns1" + ObjectStorageUtils.CONCATENATED_KEY_DELIMITER + "tbl2";
-    String tableMetadataKey3 = "ns2" + ObjectStorageUtils.CONCATENATED_KEY_DELIMITER + "tbl3";
 
-    String tableMetadataObjectKey =
-        ObjectStorageUtils.getObjectKey(
-            METADATA_NAMESPACE, ObjectStorageAdmin.TABLE_METADATA_TABLE);
-    String namespaceMetadataObjectKey =
-        ObjectStorageUtils.getObjectKey(
-            METADATA_NAMESPACE, ObjectStorageAdmin.NAMESPACE_METADATA_TABLE);
-
-    // Mock table metadata to return existing tables
-    Map<String, ObjectStorageTableMetadata> tableMetadataMap = new HashMap<>();
-    tableMetadataMap.put(tableMetadataKey1, ObjectStorageTableMetadata.newBuilder().build());
-    tableMetadataMap.put(tableMetadataKey2, ObjectStorageTableMetadata.newBuilder().build());
-    tableMetadataMap.put(tableMetadataKey3, ObjectStorageTableMetadata.newBuilder().build());
-    String serializedTableMetadata = Serializer.serialize(tableMetadataMap);
-    ObjectStorageWrapperResponse tableMetadataResponse =
-        new ObjectStorageWrapperResponse(serializedTableMetadata, "version1");
-    when(wrapper.get(tableMetadataObjectKey)).thenReturn(Optional.of(tableMetadataResponse));
-
-    // Mock non-existing namespace metadata
-    when(wrapper.get(namespaceMetadataObjectKey)).thenReturn(Optional.empty());
-
-    // Act
-    admin.upgrade(Collections.emptyMap());
-
-    // Assert
-    verify(wrapper).get(tableMetadataObjectKey);
-    verify(wrapper).insert(objectKeyCaptor.capture(), payloadCaptor.capture());
-
-    Map<String, ObjectStorageNamespaceMetadata> insertedMetadata =
-        Serializer.deserialize(
-            payloadCaptor.getValue(),
-            new TypeReference<Map<String, ObjectStorageNamespaceMetadata>>() {});
-    assertThat(insertedMetadata).containsKeys("ns1", "ns2");
+    // Act Assert
+    assertThatCode(() -> admin.upgrade(Collections.emptyMap())).doesNotThrowAnyException();
   }
 }

core/src/test/java/com/scalar/db/storage/objectstorage/BlobStorageConfigTest.java renamed to core/src/test/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageConfigTest.java

@@ -1,10 +1,9 @@
-package com.scalar.db.storage.objectstorage;
+package com.scalar.db.storage.objectstorage.blobstorage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.scalar.db.config.DatabaseConfig;
-import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageConfig;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;