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/13 08:37:53 UTC

(shardingsphere) branch master updated: Refactor StorageContainerConfigurationFactory to use default major version if absent (#36554)

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 6b13d7a642c Refactor StorageContainerConfigurationFactory to use default major version if absent (#36554)
6b13d7a642c is described below

commit 6b13d7a642c3bdde97902458c9d1db4a3d33568d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Sep 13 16:37:46 2025 +0800

    Refactor StorageContainerConfigurationFactory to use default major version if absent (#36554)
---
 .../atomic/storage/config/StorageContainerConfigurationFactory.java   | 4 ++--
 .../option/dialect/MySQLStorageContainerConfigurationOption.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
index 73e08abd2df..8dc64347e36 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
@@ -57,7 +57,7 @@ public final class StorageContainerConfigurationFactory {
      * @return created storage container configuration
      */
     public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final String scenario) {
-        return newInstance(option, databaseType, 0, scenario);
+        return newInstance(option, databaseType, findMajorVersion(option, 0).orElse(0), scenario);
     }
     
     /**
@@ -70,7 +70,7 @@ public final class StorageContainerConfigurationFactory {
      * @return created storage container configuration
      */
     public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion, final String scenario) {
-        Map<String, String> toBeMountedConfigurationFiles = getToBeMountedConfigurationFiles(databaseType, option, 0, scenario);
+        Map<String, String> toBeMountedConfigurationFiles = getToBeMountedConfigurationFiles(databaseType, option, majorVersion, scenario);
         Map<String, String> toBeMountedSQLFiles = getToBeMountedSQLFiles(databaseType, option, majorVersion, scenario);
         Map<String, DatabaseType> actualDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL);
         Map<String, DatabaseType> expectedDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED);
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
index 9e9dcdbf519..1bf7b36dfc1 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -62,7 +62,7 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
     
     @Override
     public List<Integer> getSupportedMajorVersions() {
-        return Arrays.asList(5, 8);
+        return Arrays.asList(8, 5);
     }
     
     @Override