Apply suggestions

KodaiD · KodaiD · commit ed603726c356 · 2025-11-04T21:01:46.000+09:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2122,8 +2122,8 @@ jobs:
           name: tidb_8_5_integration_test_reports_${{ matrix.mode.label }}
           path: core/build/reports/tests/integrationTestJdbc
 
-  integration-test-for-blob:
-    name: Azure Blob Storage integration test (${{ matrix.mode.label }})
+  integration-test-for-blob-storage:
+    name: Blob Storage integration test (${{ matrix.mode.label }})
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ subprojects {
         slf4jVersion = '1.7.36'
         cassandraDriverVersion = '3.11.5'
         azureCosmosVersion = '4.75.0'
-        azureBlobVersion = '12.31.3'
+        azureBlobStorageVersion = '12.31.3'
         jooqVersion = '3.14.16'
         awssdkVersion = '2.36.2'
         commonsDbcp2Version = '2.13.0'
diff --git a/core/build.gradle b/core/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     implementation "org.slf4j:slf4j-api:${slf4jVersion}"
     implementation "com.datastax.cassandra:cassandra-driver-core:${cassandraDriverVersion}"
     implementation "com.azure:azure-cosmos:${azureCosmosVersion}"
-    implementation "com.azure:azure-storage-blob:${azureBlobVersion}"
+    implementation "com.azure:azure-storage-blob:${azureBlobStorageVersion}"
     implementation "org.jooq:jooq:${jooqVersion}"
     implementation platform("software.amazon.awssdk:bom:${awssdkVersion}")
     implementation 'software.amazon.awssdk:applicationautoscaling'
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/BlobWrapperIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/BlobWrapperIntegrationTest.java
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageEnv.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageEnv.java
@@ -1,7 +1,7 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.config.DatabaseConfig;
-import com.scalar.db.storage.objectstorage.blob.BlobConfig;
+import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageConfig;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
@@ -30,7 +30,7 @@ public static Properties getProperties(String testName) {
     properties.setProperty(DatabaseConfig.CONTACT_POINTS, endpoint);
     properties.setProperty(DatabaseConfig.USERNAME, accountName);
     properties.setProperty(DatabaseConfig.PASSWORD, accountKey);
-    properties.setProperty(DatabaseConfig.STORAGE, BlobConfig.STORAGE_NAME);
+    properties.setProperty(DatabaseConfig.STORAGE, BlobStorageConfig.STORAGE_NAME);
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN, "true");
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_FILTERING, "true");
     properties.setProperty(DatabaseConfig.CROSS_PARTITION_SCAN_ORDERING, "false");
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTestBase.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTestBase.java
@@ -15,7 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class ObjectStorageWrapperIntegrationTestBase {
+public class ObjectStorageWrapperIntegrationTestBase {
   private static final Logger logger =
       LoggerFactory.getLogger(ObjectStorageWrapperIntegrationTestBase.class);
 
@@ -56,7 +56,9 @@ public void afterAll() {
     }
   }
 
-  protected abstract Properties getProperties(String testName);
+  protected Properties getProperties(String testName) {
+    return ObjectStorageEnv.getProperties(testName);
+  }
 
   private void createObjects() throws ObjectStorageWrapperException {
     wrapper.insert(TEST_KEY1, TEST_OBJECT1);
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageUtils.java b/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageUtils.java
@@ -1,7 +1,7 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.config.DatabaseConfig;
-import com.scalar.db.storage.objectstorage.blob.BlobConfig;
+import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageConfig;
 import java.util.Objects;
 
 public class ObjectStorageUtils {
@@ -17,8 +17,8 @@ public static String getObjectKey(String namespace, String table) {
   }
 
   public static ObjectStorageConfig getObjectStorageConfig(DatabaseConfig databaseConfig) {
-    if (Objects.equals(databaseConfig.getStorage(), BlobConfig.STORAGE_NAME)) {
-      return new BlobConfig(databaseConfig);
+    if (Objects.equals(databaseConfig.getStorage(), BlobStorageConfig.STORAGE_NAME)) {
+      return new BlobStorageConfig(databaseConfig);
     } else {
       throw new IllegalArgumentException(
           "Unsupported Object Storage: " + databaseConfig.getStorage());
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperFactory.java b/core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperFactory.java
@@ -1,15 +1,15 @@
 package com.scalar.db.storage.objectstorage;
 
-import com.scalar.db.storage.objectstorage.blob.BlobConfig;
-import com.scalar.db.storage.objectstorage.blob.BlobWrapper;
+import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageConfig;
+import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageWrapper;
 import java.util.Objects;
 
 public class ObjectStorageWrapperFactory {
 
   public static ObjectStorageWrapper create(ObjectStorageConfig objectStorageConfig) {
-    if (Objects.equals(objectStorageConfig.getStorageName(), BlobConfig.STORAGE_NAME)) {
-      assert objectStorageConfig instanceof BlobConfig;
-      return new BlobWrapper((BlobConfig) objectStorageConfig);
+    if (Objects.equals(objectStorageConfig.getStorageName(), BlobStorageConfig.STORAGE_NAME)) {
+      assert objectStorageConfig instanceof BlobStorageConfig;
+      return new BlobStorageWrapper((BlobStorageConfig) objectStorageConfig);
     } else {
       throw new IllegalArgumentException(
           "Unsupported Object Storage: " + objectStorageConfig.getStorageName());
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/blob/BlobProvider.java b/core/src/main/java/com/scalar/db/storage/objectstorage/blob/BlobProvider.java
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageConfig.java b/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageConfig.java
@@ -1,4 +1,4 @@
-package com.scalar.db.storage.objectstorage.blob;
+package com.scalar.db.storage.objectstorage.blobstorage;
 
 import static com.scalar.db.config.ConfigUtils.getInt;
 import static com.scalar.db.config.ConfigUtils.getLong;
@@ -10,8 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BlobConfig implements ObjectStorageConfig {
-  public static final String STORAGE_NAME = "blob";
+public class BlobStorageConfig implements ObjectStorageConfig {
+  public static final String STORAGE_NAME = "blob-storage";
   public static final String PREFIX = DatabaseConfig.PREFIX + STORAGE_NAME + ".";
 
   public static final String PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES =
@@ -31,7 +31,7 @@ public class BlobConfig implements ObjectStorageConfig {
   public static final long DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES = 4 * 1024 * 1024; // 4MB
   public static final int DEFAULT_REQUEST_TIMEOUT_IN_SECONDS = 15;
 
-  private static final Logger logger = LoggerFactory.getLogger(BlobConfig.class);
+  private static final Logger logger = LoggerFactory.getLogger(BlobStorageConfig.class);
   private final String endpoint;
   private final String username;
   private final String password;
@@ -43,7 +43,7 @@ public class BlobConfig implements ObjectStorageConfig {
   private final long parallelUploadThresholdInBytes;
   private final int requestTimeoutInSeconds;
 
-  public BlobConfig(DatabaseConfig databaseConfig) {
+  public BlobStorageConfig(DatabaseConfig databaseConfig) {
     String storage = databaseConfig.getStorage();
     if (!storage.equals(STORAGE_NAME)) {
       throw new IllegalArgumentException(
@@ -82,7 +82,7 @@ public BlobConfig(DatabaseConfig databaseConfig) {
       logger.warn(
           "The configuration property \""
               + DatabaseConfig.SCAN_FETCH_SIZE
-              + "\" is not applicable to Blob storage and will be ignored.");
+              + "\" is not applicable to Blob Storage and will be ignored.");
     }
 
     parallelUploadBlockSizeInBytes =
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageProvider.java b/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageProvider.java
@@ -0,0 +1,11 @@
+package com.scalar.db.storage.objectstorage.blobstorage;
+
+import com.scalar.db.storage.objectstorage.ObjectStorageProvider;
+
+public class BlobStorageProvider implements ObjectStorageProvider {
+
+  @Override
+  public String getName() {
+    return BlobStorageConfig.STORAGE_NAME;
+  }
+}
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageWrapper.java b/core/src/main/java/com/scalar/db/storage/objectstorage/blobstorage/BlobStorageWrapper.java
@@ -1,4 +1,4 @@
-package com.scalar.db.storage.objectstorage.blob;
+package com.scalar.db.storage.objectstorage.blobstorage;
 
 import com.azure.core.http.HttpHeaderName;
 import com.azure.core.util.BinaryData;
@@ -23,12 +23,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class BlobWrapper implements ObjectStorageWrapper {
+public class BlobStorageWrapper implements ObjectStorageWrapper {
   private final BlobContainerClient client;
   private final Duration requestTimeoutInSeconds;
   private final ParallelTransferOptions parallelTransferOptions;
 
-  public BlobWrapper(BlobConfig config) {
+  public BlobStorageWrapper(BlobStorageConfig config) {
     this.client =
         new BlobServiceClientBuilder()
             .endpoint(config.getEndpoint())
diff --git a/core/src/main/resources/META-INF/services/com.scalar.db.api.DistributedStorageProvider b/core/src/main/resources/META-INF/services/com.scalar.db.api.DistributedStorageProvider
@@ -2,5 +2,5 @@ com.scalar.db.storage.cassandra.CassandraProvider
 com.scalar.db.storage.cosmos.CosmosProvider
 com.scalar.db.storage.dynamo.DynamoProvider
 com.scalar.db.storage.jdbc.JdbcProvider
-com.scalar.db.storage.objectstorage.blob.BlobProvider
+com.scalar.db.storage.objectstorage.blobstorage.BlobStorageProvider
 com.scalar.db.storage.multistorage.MultiStorageProvider
diff --git a/core/src/test/java/com/scalar/db/storage/objectstorage/BlobStorageConfigTest.java b/core/src/test/java/com/scalar/db/storage/objectstorage/BlobStorageConfigTest.java
@@ -4,17 +4,17 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.scalar.db.config.DatabaseConfig;
-import com.scalar.db.storage.objectstorage.blob.BlobConfig;
+import com.scalar.db.storage.objectstorage.blobstorage.BlobStorageConfig;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
 
-public class BlobConfigTest {
+public class BlobStorageConfigTest {
   private static final String ANY_USERNAME = "any_user";
   private static final String ANY_PASSWORD = "any_password";
   private static final String ANY_BUCKET = "bucket";
   private static final String ANY_ENDPOINT = "http://localhost:10000/" + ANY_USERNAME;
   private static final String ANY_CONTACT_POINT = ANY_ENDPOINT + "/" + ANY_BUCKET;
-  private static final String BLOB_STORAGE = "blob";
+  private static final String BLOB_STORAGE = "blob-storage";
   private static final String ANY_TABLE_METADATA_NAMESPACE = "any_namespace";
   private static final String ANY_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES = "5242880"; // 5MB
   private static final String ANY_PARALLEL_UPLOAD_MAX_PARALLELISM = "4";
@@ -31,15 +31,17 @@ public void constructor_AllPropertiesGiven_ShouldLoadProperly() {
     props.setProperty(DatabaseConfig.STORAGE, BLOB_STORAGE);
     props.setProperty(DatabaseConfig.SYSTEM_NAMESPACE_NAME, ANY_TABLE_METADATA_NAMESPACE);
     props.setProperty(
-        BlobConfig.PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES, ANY_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
+        BlobStorageConfig.PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES,
+        ANY_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
     props.setProperty(
-        BlobConfig.PARALLEL_UPLOAD_MAX_PARALLELISM, ANY_PARALLEL_UPLOAD_MAX_PARALLELISM);
+        BlobStorageConfig.PARALLEL_UPLOAD_MAX_PARALLELISM, ANY_PARALLEL_UPLOAD_MAX_PARALLELISM);
     props.setProperty(
-        BlobConfig.PARALLEL_UPLOAD_THRESHOLD_IN_BYTES, ANY_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
-    props.setProperty(BlobConfig.REQUEST_TIMEOUT_IN_SECONDS, ANY_REQUEST_TIMEOUT_IN_SECONDS);
+        BlobStorageConfig.PARALLEL_UPLOAD_THRESHOLD_IN_BYTES,
+        ANY_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
+    props.setProperty(BlobStorageConfig.REQUEST_TIMEOUT_IN_SECONDS, ANY_REQUEST_TIMEOUT_IN_SECONDS);
 
     // Act
-    BlobConfig config = new BlobConfig(new DatabaseConfig(props));
+    BlobStorageConfig config = new BlobStorageConfig(new DatabaseConfig(props));
 
     // Assert
     assertThat(config.getEndpoint()).isEqualTo(ANY_ENDPOINT);
@@ -68,7 +70,7 @@ public void constructor_PropertiesWithoutOptimizationOptionsGiven_ShouldLoadProp
     props.setProperty(DatabaseConfig.SYSTEM_NAMESPACE_NAME, ANY_TABLE_METADATA_NAMESPACE);
 
     // Act
-    BlobConfig config = new BlobConfig(new DatabaseConfig(props));
+    BlobStorageConfig config = new BlobStorageConfig(new DatabaseConfig(props));
 
     // Assert
     assertThat(config.getEndpoint()).isEqualTo(ANY_ENDPOINT);
@@ -77,13 +79,13 @@ public void constructor_PropertiesWithoutOptimizationOptionsGiven_ShouldLoadProp
     assertThat(config.getBucket()).isEqualTo(ANY_BUCKET);
     assertThat(config.getMetadataNamespace()).isEqualTo(ANY_TABLE_METADATA_NAMESPACE);
     assertThat(config.getParallelUploadBlockSizeInBytes())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
     assertThat(config.getParallelUploadMaxParallelism())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_MAX_PARALLELISM);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_MAX_PARALLELISM);
     assertThat(config.getParallelUploadThresholdInBytes())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
     assertThat(config.getRequestTimeoutInSeconds())
-        .isEqualTo(BlobConfig.DEFAULT_REQUEST_TIMEOUT_IN_SECONDS);
+        .isEqualTo(BlobStorageConfig.DEFAULT_REQUEST_TIMEOUT_IN_SECONDS);
   }
 
   @Test
@@ -95,7 +97,7 @@ public void constructor_WithoutStorage_ShouldThrowIllegalArgumentException() {
     props.setProperty(DatabaseConfig.PASSWORD, ANY_PASSWORD);
 
     // Act Assert
-    assertThatThrownBy(() -> new BlobConfig(new DatabaseConfig(props)))
+    assertThatThrownBy(() -> new BlobStorageConfig(new DatabaseConfig(props)))
         .isInstanceOf(IllegalArgumentException.class);
   }
 
@@ -109,7 +111,7 @@ public void constructor_WithoutSystemNamespaceName_ShouldLoadProperly() {
     props.setProperty(DatabaseConfig.STORAGE, BLOB_STORAGE);
 
     // Act
-    BlobConfig config = new BlobConfig(new DatabaseConfig(props));
+    BlobStorageConfig config = new BlobStorageConfig(new DatabaseConfig(props));
 
     // Assert
     assertThat(config.getEndpoint()).isEqualTo(ANY_ENDPOINT);
@@ -119,13 +121,13 @@ public void constructor_WithoutSystemNamespaceName_ShouldLoadProperly() {
     assertThat(config.getMetadataNamespace())
         .isEqualTo(DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME);
     assertThat(config.getParallelUploadBlockSizeInBytes())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
     assertThat(config.getParallelUploadMaxParallelism())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_MAX_PARALLELISM);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_MAX_PARALLELISM);
     assertThat(config.getParallelUploadThresholdInBytes())
-        .isEqualTo(BlobConfig.DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
+        .isEqualTo(BlobStorageConfig.DEFAULT_PARALLEL_UPLOAD_THRESHOLD_IN_BYTES);
     assertThat(config.getRequestTimeoutInSeconds())
-        .isEqualTo(BlobConfig.DEFAULT_REQUEST_TIMEOUT_IN_SECONDS);
+        .isEqualTo(BlobStorageConfig.DEFAULT_REQUEST_TIMEOUT_IN_SECONDS);
   }
 
   @Test
@@ -137,7 +139,7 @@ public void constructor_WithoutSystemNamespaceName_ShouldLoadProperly() {
     props.setProperty(DatabaseConfig.STORAGE, BLOB_STORAGE);
 
     // Act
-    assertThatThrownBy(() -> new BlobConfig(new DatabaseConfig(props)))
+    assertThatThrownBy(() -> new BlobStorageConfig(new DatabaseConfig(props)))
         .isInstanceOf(IllegalArgumentException.class);
   }
 }
