You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/27 05:58:25 UTC

(shardingsphere) branch master updated: Rename storageContainerImage to databaseContainerImage (#36729)

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 20594af0a3d Rename storageContainerImage to databaseContainerImage (#36729)
20594af0a3d is described below

commit 20594af0a3d4280d84c06e0632966ddf563f5a6b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Sep 27 13:58:19 2025 +0800

    Rename storageContainerImage to databaseContainerImage (#36729)
---
 .../operation/pipeline/cases/PipelineContainerComposer.java  |  2 +-
 .../cases/createtable/CreateTableSQLGeneratorIT.java         |  6 +++---
 .../e2e/operation/pipeline/env/PipelineE2EEnvironment.java   |  6 +++---
 .../compose/docker/PipelineDockerContainerComposer.java      |  4 ++--
 .../pipeline/framework/param/PipelineE2ECondition.java       |  2 +-
 .../param/PipelineE2ETestCaseArgumentsProvider.java          | 12 ++++++------
 .../pipeline/framework/param/PipelineTestParameter.java      |  9 +++------
 .../compose/TransactionDockerContainerComposer.java          |  2 +-
 .../framework/param/TransactionTestParameter.java            |  4 ++--
 9 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
index 7f79a51f05f..a562966c06f 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -126,7 +126,7 @@ public final class PipelineContainerComposer implements AutoCloseable {
         databaseType = testParam.getDatabaseType();
         Type type = E2ETestEnvironment.getInstance().getRunEnvironment().getType();
         containerComposer = Type.DOCKER == type
-                ? new PipelineDockerContainerComposer(testParam.getDatabaseType(), testParam.getStorageContainerImage(), testParam.getStorageContainerCount())
+                ? new PipelineDockerContainerComposer(testParam.getDatabaseType(), testParam.getDatabaseContainerImage(), testParam.getStorageContainerCount())
                 : new PipelineNativeContainerComposer(testParam.getDatabaseType());
         if (Type.DOCKER == type) {
             username = StorageContainerConstants.OPERATION_USER;
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 7492b497495..7819e7a2014 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -73,7 +73,7 @@ class CreateTableSQLGeneratorIT {
     @EnabledIf("isEnabled")
     @ArgumentsSource(PipelineE2ETestCaseArgumentsProvider.class)
     void assertGenerateCreateTableSQL(final PipelineTestParameter testParam) throws SQLException {
-        startStorageContainer(testParam.getDatabaseType(), testParam.getStorageContainerImage());
+        startStorageContainer(testParam.getDatabaseType(), testParam.getDatabaseContainerImage());
         CreateTableSQLGeneratorAssertionsRootEntity rootEntity = JAXB.unmarshal(
                 Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(testParam.getScenario())), CreateTableSQLGeneratorAssertionsRootEntity.class);
         DataSource dataSource = storageContainer.createAccessDataSource(DEFAULT_DATABASE);
@@ -90,8 +90,8 @@ class CreateTableSQLGeneratorIT {
         }
     }
     
-    private void startStorageContainer(final DatabaseType databaseType, final String storageContainerImage) {
-        storageContainer = new DockerStorageContainer(storageContainerImage, DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), null);
+    private void startStorageContainer(final DatabaseType databaseType, final String databaseContainerImage) {
+        storageContainer = new DockerStorageContainer(databaseContainerImage, DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), null);
         storageContainer.start();
     }
     
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index 3384bff240b..49592c5aabb 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -54,12 +54,12 @@ public final class PipelineE2EEnvironment {
     }
     
     /**
-     * List storage container images.
+     * List database container images.
      *
      * @param databaseType database type
-     * @return database storage container images
+     * @return database container images
      */
-    public List<String> listStorageContainerImages(final DatabaseType databaseType) {
+    public List<String> listDatabaseContainerImages(final DatabaseType databaseType) {
         if (RunEnvironment.Type.NATIVE == E2ETestEnvironment.getInstance().getRunEnvironment().getType()) {
             return Collections.emptyList();
         }
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
index b8647848313..5ea59d3b844 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
@@ -52,13 +52,13 @@ public final class PipelineDockerContainerComposer extends PipelineBaseContainer
     @Getter
     private final List<DockerStorageContainer> storageContainers = new LinkedList<>();
     
-    public PipelineDockerContainerComposer(final DatabaseType databaseType, final String storageContainerImage, final int storageContainerCount) {
+    public PipelineDockerContainerComposer(final DatabaseType databaseType, final String databaseContainerImage, final int storageContainerCount) {
         this.databaseType = databaseType;
         ShardingSpherePreconditions.checkState(storageContainerCount >= 1, () -> new InvalidParameterException("storageContainerCount must >= 1"));
         GovernanceContainer governanceContainer = getContainers().registerContainer(new GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class, "ZooKeeper")));
         for (int i = 0; i < storageContainerCount; i++) {
             DockerStorageContainer storageContainer = getContainers().registerContainer(
-                    new DockerStorageContainer(storageContainerImage, DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), null));
+                    new DockerStorageContainer(databaseContainerImage, DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), null));
             storageContainer.setNetworkAliases(Collections.singletonList(String.join(".", databaseType.getType().toLowerCase() + "_" + i, "host")));
             storageContainers.add(storageContainer);
         }
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ECondition.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ECondition.java
index 5193df2efcd..b166b662f3b 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ECondition.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ECondition.java
@@ -45,6 +45,6 @@ public final class PipelineE2ECondition {
         if (0 != databaseTypes.length && Type.NATIVE == E2ETestEnvironment.getInstance().getRunEnvironment().getType()) {
             return true;
         }
-        return 0 == databaseTypes.length || Arrays.stream(databaseTypes).anyMatch(each -> !PipelineE2EEnvironment.getInstance().listStorageContainerImages(each).isEmpty());
+        return 0 == databaseTypes.length || Arrays.stream(databaseTypes).anyMatch(each -> !PipelineE2EEnvironment.getInstance().listDatabaseContainerImages(each).isEmpty());
     }
 }
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
index 9b8babbee82..18a0d399e6e 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineE2ETestCaseArgumentsProvider.java
@@ -52,13 +52,13 @@ public final class PipelineE2ETestCaseArgumentsProvider implements ArgumentsProv
     
     private Collection<Arguments> provideArguments(final PipelineE2ESettings settings, final PipelineE2EDatabaseSettings databaseSettings) {
         DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, databaseSettings.type());
-        List<String> storageContainerImages = PipelineE2EEnvironment.getInstance().listStorageContainerImages(databaseType);
-        return settings.fetchSingle() && !storageContainerImages.isEmpty()
-                ? provideArguments(databaseSettings.scenarioFiles(), databaseType, storageContainerImages.get(0))
-                : storageContainerImages.stream().flatMap(each -> provideArguments(databaseSettings.scenarioFiles(), databaseType, each).stream()).collect(Collectors.toList());
+        List<String> databaseContainerImages = PipelineE2EEnvironment.getInstance().listDatabaseContainerImages(databaseType);
+        return settings.fetchSingle() && !databaseContainerImages.isEmpty()
+                ? provideArguments(databaseSettings.scenarioFiles(), databaseType, databaseContainerImages.get(0))
+                : databaseContainerImages.stream().flatMap(each -> provideArguments(databaseSettings.scenarioFiles(), databaseType, each).stream()).collect(Collectors.toList());
     }
     
-    private Collection<Arguments> provideArguments(final String[] scenarioFiles, final DatabaseType databaseType, final String storageContainerImage) {
-        return Arrays.stream(scenarioFiles).map(each -> Arguments.of(new PipelineTestParameter(databaseType, storageContainerImage, each))).collect(Collectors.toList());
+    private Collection<Arguments> provideArguments(final String[] scenarioFiles, final DatabaseType databaseType, final String databaseContainerImage) {
+        return Arrays.stream(scenarioFiles).map(each -> Arguments.of(new PipelineTestParameter(databaseType, databaseContainerImage, each))).collect(Collectors.toList());
     }
 }
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
index b9cd521d3d9..6856d306325 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/param/PipelineTestParameter.java
@@ -29,17 +29,14 @@ public final class PipelineTestParameter {
     
     private final DatabaseType databaseType;
     
-    private final String storageContainerImage;
+    private final String databaseContainerImage;
     
     // TODO It's not scenario. Remove it later
     private final String scenario;
     
     private final int storageContainerCount;
     
-    public PipelineTestParameter(final DatabaseType databaseType, final String storageContainerImage, final String scenario) {
-        this.databaseType = databaseType;
-        this.storageContainerImage = storageContainerImage;
-        this.scenario = scenario;
-        storageContainerCount = 1;
+    public PipelineTestParameter(final DatabaseType databaseType, final String databaseContainerImage, final String scenario) {
+        this(databaseType, databaseContainerImage, scenario, 1);
     }
 }
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
index 888ed347e3f..fadcd134d05 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
@@ -64,7 +64,7 @@ public final class TransactionDockerContainerComposer extends TransactionBaseCon
         Type type = E2ETestEnvironment.getInstance().getRunEnvironment().getType();
         if (Type.DOCKER == type) {
             storageContainer = getContainers().registerContainer(
-                    new DockerStorageContainer(testParam.getStorageContainerImage(), DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), testParam.getScenario()));
+                    new DockerStorageContainer(testParam.getDatabaseContainerImage(), DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), testParam.getScenario()));
         } else {
             storageContainer = getContainers().registerContainer(new NativeStorageContainer(databaseType, testParam.getScenario()));
         }
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/param/TransactionTestParameter.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/param/TransactionTestParameter.java
index 5e00a9f0277..75fd308c25a 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/param/TransactionTestParameter.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/param/TransactionTestParameter.java
@@ -40,7 +40,7 @@ public final class TransactionTestParameter {
     
     private final List<String> providers;
     
-    private final String storageContainerImage;
+    private final String databaseContainerImage;
     
     private final String scenario;
     
@@ -48,6 +48,6 @@ public final class TransactionTestParameter {
     
     @Override
     public String toString() {
-        return String.format("%s -> %s -> %s -> %s -> %s -> %s", databaseType.getType(), adapter, transactionTypes, providers, storageContainerImage, scenario);
+        return String.format("%s -> %s -> %s -> %s -> %s -> %s", databaseType.getType(), adapter, transactionTypes, providers, databaseContainerImage, scenario);
     }
 }