(shardingsphere) branch master updated: Refactor NativeStorageContainer (#36451)

[zhangliang]

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 55c48593fcb Refactor NativeStorageContainer (#36451)
55c48593fcb is described below

commit 55c48593fcbec22033491d0a146d67c21b37ecf7
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 2 12:19:22 2025 +0800

    Refactor NativeStorageContainer (#36451)
---
 .../atomic/storage/StorageContainerFactory.java    |  3 +-
 .../storage/impl/NativeStorageContainer.java       | 34 +++++++++++-----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
index 32ff6fca9c4..1a29d1e3157 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
@@ -55,8 +55,7 @@ public final class StorageContainerFactory {
      * @return created instance
      * @throws RuntimeException runtime exception
      */
-    public static StorageContainer newInstance(final DatabaseType 
databaseType, final String storageContainerImage,
-                                               final 
StorageContainerConfiguration storageContainerConfig) {
+    public static StorageContainer newInstance(final DatabaseType 
databaseType, final String storageContainerImage, final 
StorageContainerConfiguration storageContainerConfig) {
         switch (databaseType.getType()) {
             case "MySQL":
                 return new MySQLContainer(storageContainerImage, 
storageContainerConfig);
diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
index 6b94094f1a9..858d0f0b950 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
@@ -85,7 +85,7 @@ public final class NativeStorageContainer implements 
StorageContainer {
     }
     
     private Map<String, DataSource> getDataSourceMap(final Collection<String> 
databaseNames) {
-        Map<String, DataSource> result = new HashMap<>();
+        Map<String, DataSource> result = new HashMap<>(databaseNames.size(), 
1F);
         for (String each : databaseNames) {
             DataSource dataSource = 
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
 E2ETestEnvironment.getInstance().getNativeStorageHost(),
                     
Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort()), 
each),
@@ -95,22 +95,6 @@ public final class NativeStorageContainer implements 
StorageContainer {
         return result;
     }
     
-    @Override
-    public String getAbbreviation() {
-        return databaseType.getType().toLowerCase();
-    }
-    
-    @Override
-    public Map<String, String> getLinkReplacements() {
-        Map<String, String> result = new HashMap<>();
-        for (String each : getNetworkAliases()) {
-            result.put(each + ":" + getExposedPort(), 
E2ETestEnvironment.getInstance().getNativeStorageHost() + ":" + 
E2ETestEnvironment.getInstance().getNativeStoragePort());
-        }
-        result.put(StorageContainerConstants.USERNAME, 
E2ETestEnvironment.getInstance().getNativeStorageUsername());
-        result.put(StorageContainerConstants.PASSWORD, 
E2ETestEnvironment.getInstance().getNativeStoragePassword());
-        return result;
-    }
-    
     /**
      * Get exposed port.
      *
@@ -132,4 +116,20 @@ public final class NativeStorageContainer implements 
StorageContainer {
     @Override
     public void start() {
     }
+    
+    @Override
+    public String getAbbreviation() {
+        return databaseType.getType().toLowerCase();
+    }
+    
+    @Override
+    public Map<String, String> getLinkReplacements() {
+        Map<String, String> result = new HashMap<>(getNetworkAliases().size() 
+ 2, 1F);
+        for (String each : getNetworkAliases()) {
+            result.put(each + ":" + getExposedPort(), 
E2ETestEnvironment.getInstance().getNativeStorageHost() + ":" + 
E2ETestEnvironment.getInstance().getNativeStoragePort());
+        }
+        result.put(StorageContainerConstants.USERNAME, 
E2ETestEnvironment.getInstance().getNativeStorageUsername());
+        result.put(StorageContainerConstants.PASSWORD, 
E2ETestEnvironment.getInstance().getNativeStoragePassword());
+        return result;
+    }
 }