You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/09/13 06:07:59 UTC

(shardingsphere) branch master updated: Refactor ShardingSphereJdbcContainer. (#32842)

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

duanzhengqiang 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 0610c8964c4 Refactor ShardingSphereJdbcContainer. (#32842)
0610c8964c4 is described below

commit 0610c8964c47f8c0d77ab8950b4031ec2b2d75a6
Author: Cong Hu <ia...@gmail.com>
AuthorDate: Fri Sep 13 14:07:54 2024 +0800

    Refactor ShardingSphereJdbcContainer. (#32842)
---
 test/e2e/env/pom.xml                               |  6 ---
 .../e2e/env/container/atomic/ITContainers.java     |  8 ----
 .../atomic/adapter/AdapterContainerFactory.java    |  6 ++-
 .../adapter/impl/ShardingSphereJdbcContainer.java  | 48 ++++++++++++++++++----
 .../container/compose/DockerContainerComposer.java |  6 +--
 .../ClusterShowProcessListContainerComposer.java   |  4 +-
 .../container/compose/DockerContainerComposer.java |  6 +--
 .../compose/mode/ClusterContainerComposer.java     |  2 +-
 .../compose/mode/StandaloneContainerComposer.java  |  2 +-
 9 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/test/e2e/env/pom.xml b/test/e2e/env/pom.xml
index 9363a8a22d7..46e738d569a 100644
--- a/test/e2e/env/pom.xml
+++ b/test/e2e/env/pom.xml
@@ -43,12 +43,6 @@
             <artifactId>HikariCP</artifactId>
             <scope>compile</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dns-cache-manipulator</artifactId>
-            <version>1.8.2</version>
-        </dependency>
     </dependencies>
     
     <build>
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
index 5d26539638d..27551124317 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
@@ -17,8 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic;
 
-import com.alibaba.dcm.DnsCacheManipulator;
-import com.github.dockerjava.api.model.ContainerNetwork;
 import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +31,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * IT containers.
@@ -54,8 +51,6 @@ public final class ITContainers implements Startable {
     
     public ITContainers(final String scenario) {
         this.scenario = scenario;
-        DnsCacheManipulator.setDnsCachePolicy(-1);
-        System.setProperty("socksNonProxyHosts", "localhost|127.*|[::1]|0.0.0.0|[::0]|*.host");
     }
     
     /**
@@ -105,8 +100,6 @@ public final class ITContainers implements Startable {
     private void start(final DockerITContainer dockerITContainer) {
         log.info("Starting container {}...", dockerITContainer.getName());
         dockerITContainer.start();
-        dockerITContainer.getNetworkAliases().forEach(each -> DnsCacheManipulator.setDnsCache(each,
-                dockerITContainer.getContainerInfo().getNetworkSettings().getNetworks().values().stream().map(ContainerNetwork::getIpAddress).collect(Collectors.toList()).toArray(new String[0])));
     }
     
     private void waitUntilReady() {
@@ -132,6 +125,5 @@ public final class ITContainers implements Startable {
         embeddedContainers.forEach(Startable::close);
         dockerContainers.forEach(Startable::close);
         network.close();
-        DnsCacheManipulator.clearDnsCache();
     }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
index 9043922bc76..c3c9cc2ac4a 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
@@ -27,6 +27,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.Shar
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyStandaloneContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 
 /**
  * Adapter container factory.
@@ -42,11 +43,12 @@ public final class AdapterContainerFactory {
      * @param databaseType database type
      * @param scenario scenario
      * @param containerConfig adaptor container configuration
+     * @param storageContainer storage container
      * @return created instance
      * @throws RuntimeException runtime exception
      */
     public static AdapterContainer newInstance(final AdapterMode mode, final AdapterType adapter, final DatabaseType databaseType,
-                                               final String scenario, final AdaptorContainerConfiguration containerConfig) {
+                                               final String scenario, final AdaptorContainerConfiguration containerConfig, final StorageContainer storageContainer) {
         switch (adapter) {
             case PROXY:
                 return AdapterMode.CLUSTER == mode
@@ -55,7 +57,7 @@ public final class AdapterContainerFactory {
             case PROXY_RANDOM:
                 return new ShardingSphereMultiProxyClusterContainer(databaseType, containerConfig);
             case JDBC:
-                return new ShardingSphereJdbcContainer(scenario, databaseType);
+                return new ShardingSphereJdbcContainer(scenario, databaseType, storageContainer);
             default:
                 throw new RuntimeException(String.format("Unknown adapter `%s`.", adapter));
         }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
index d100964054a..16f4042f591 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcContainer.java
@@ -19,17 +19,22 @@ package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
 
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.url.core.ShardingSphereURL;
-import org.apache.shardingsphere.infra.url.core.ShardingSphereURLLoadEngine;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
 
 import javax.sql.DataSource;
+import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
-import java.sql.SQLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -41,11 +46,14 @@ public final class ShardingSphereJdbcContainer implements EmbeddedITContainer, A
     
     private final DatabaseType databaseType;
     
+    private final StorageContainer storageContainer;
+    
     private final AtomicReference<DataSource> targetDataSourceProvider = new AtomicReference<>();
     
-    public ShardingSphereJdbcContainer(final String scenario, final DatabaseType databaseType) {
+    public ShardingSphereJdbcContainer(final String scenario, final DatabaseType databaseType, final StorageContainer storageContainer) {
         scenarioCommonPath = new ScenarioCommonPath(scenario);
         this.databaseType = databaseType;
+        this.storageContainer = storageContainer;
     }
     
     @Override
@@ -61,13 +69,11 @@ public final class ShardingSphereJdbcContainer implements EmbeddedITContainer, A
         return targetDataSourceProvider.get();
     }
     
-    @SneakyThrows({SQLException.class, IOException.class})
+    @SneakyThrows(IOException.class)
     private DataSource createTargetDataSource() {
-        ShardingSphereURLLoadEngine urlLoadEngine = new ShardingSphereURLLoadEngine(ShardingSphereURL.parse("absolutepath:" + scenarioCommonPath.getRuleConfigurationFile(databaseType)));
-        DataSource dataSource = YamlShardingSphereDataSourceFactory.createDataSource(urlLoadEngine.loadContent());
         HikariDataSource result = new HikariDataSource();
         result.setDriverClassName("org.apache.shardingsphere.driver.ShardingSphereDriver");
-        result.setDataSource(dataSource);
+        result.setJdbcUrl("jdbc:shardingsphere:absolutepath:" + processFile(scenarioCommonPath.getRuleConfigurationFile(databaseType), getLinkReplacements()));
         result.setUsername("root");
         result.setPassword("Root@123");
         result.setMaximumPoolSize(2);
@@ -76,6 +82,30 @@ public final class ShardingSphereJdbcContainer implements EmbeddedITContainer, A
         return result;
     }
     
+    private Map<String, String> getLinkReplacements() {
+        Map<String, String> replacements = new HashMap<>();
+        for (String each : ((DockerITContainer) storageContainer).getNetworkAliases()) {
+            for (Integer exposedPort : ((DockerITContainer) storageContainer).getExposedPorts()) {
+                replacements.put(each + ":" + exposedPort, "127.0.0.1:" + ((DockerITContainer) storageContainer).getMappedPort(exposedPort));
+            }
+        }
+        return replacements;
+    }
+    
+    private String processFile(final String filePath, final Map<String, String> replacements) throws IOException {
+        Path path = Paths.get(filePath);
+        String content = new String(Files.readAllBytes(path));
+        for (Map.Entry<String, String> entry : replacements.entrySet()) {
+            content = content.replace(entry.getKey(), entry.getValue());
+        }
+        File tempFile = File.createTempFile("shardingsphere_e2e_jdbc_tmp_config_", null);
+        tempFile.deleteOnExit();
+        try (FileWriter writer = new FileWriter(tempFile)) {
+            writer.write(content);
+        }
+        return tempFile.getAbsolutePath();
+    }
+    
     @Override
     public String getAbbreviation() {
         return "jdbc";
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 040ac586e3b..006a809f841 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -24,11 +24,8 @@ import org.apache.shardingsphere.infra.database.oracle.type.OracleDatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.config.proxy.PipelineProxyClusterContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.data.pipeline.util.DockerImageVersion;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
@@ -74,8 +71,7 @@ public final class DockerContainerComposer extends BaseContainerComposer {
         }
         AdaptorContainerConfiguration containerConfig = PipelineProxyClusterContainerConfigurationFactory.newInstance(databaseType);
         DatabaseType proxyDatabaseType = databaseType instanceof OracleDatabaseType ? TypedSPILoader.getService(DatabaseType.class, "MySQL") : databaseType;
-        ShardingSphereProxyClusterContainer proxyClusterContainer = (ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(
-                AdapterMode.CLUSTER, AdapterType.PROXY, proxyDatabaseType, "", containerConfig);
+        ShardingSphereProxyClusterContainer proxyClusterContainer = new ShardingSphereProxyClusterContainer(proxyDatabaseType, containerConfig);
         for (DockerStorageContainer each : storageContainers) {
             proxyClusterContainer.dependsOn(governanceContainer, each);
         }
diff --git a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index c3c50dc2649..be3ec3eb5cd 100644
--- a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++ b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -61,9 +61,9 @@ public final class ClusterShowProcessListContainerComposer implements AutoClosea
                 getMountedResources(testParam.getScenario(), testParam.getDatabaseType(), testParam.getRunMode(), testParam.getGovernanceCenter()), AdapterContainerUtils.getAdapterContainerImage(),
                 "");
         jdbcContainer = AdapterContainerFactory.newInstance(
-                AdapterMode.valueOf(testParam.getRunMode().toUpperCase()), AdapterType.JDBC, testParam.getDatabaseType(), testParam.getScenario(), containerConfig);
+                AdapterMode.valueOf(testParam.getRunMode().toUpperCase()), AdapterType.JDBC, testParam.getDatabaseType(), testParam.getScenario(), containerConfig, storageContainer);
         proxyContainer = AdapterContainerFactory.newInstance(
-                AdapterMode.valueOf(testParam.getRunMode().toUpperCase()), AdapterType.PROXY, testParam.getDatabaseType(), testParam.getScenario(), containerConfig);
+                AdapterMode.valueOf(testParam.getRunMode().toUpperCase()), AdapterType.PROXY, testParam.getDatabaseType(), testParam.getScenario(), containerConfig, storageContainer);
         if (proxyContainer instanceof DockerITContainer) {
             if (isClusterMode(testParam.getRunMode())) {
                 ((DockerITContainer) proxyContainer).dependsOn(governanceContainer);
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
index 09e2871d44f..9037023ebec 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
@@ -21,9 +21,7 @@ import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
@@ -62,8 +60,8 @@ public final class DockerContainerComposer extends BaseContainerComposer {
                 StorageContainerConfigurationFactory.newInstance(databaseType, testParam.getScenario())));
         if (AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
             jdbcContainer = null;
-            proxyContainer = (ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(AdapterMode.CLUSTER, AdapterType.PROXY,
-                    databaseType, testParam.getScenario(), ProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(), databaseType, testParam.getPortBindings()));
+            proxyContainer = new ShardingSphereProxyClusterContainer(databaseType,
+                    ProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(), databaseType, testParam.getPortBindings()));
             proxyContainer.dependsOn(governanceContainer, storageContainer);
             getContainers().registerContainer(proxyContainer);
         } else {
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
index 5d1565ab033..b9ad5f58eca 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
@@ -58,7 +58,7 @@ public final class ClusterContainerComposer implements ContainerComposer {
         storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(databaseType, "",
                 StorageContainerConfigurationFactory.newInstance(databaseType, scenario)));
         AdaptorContainerConfiguration containerConfig = ProxyClusterContainerConfigurationFactory.newInstance(scenario, databaseType, AdapterContainerUtils.getAdapterContainerImage());
-        AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario, containerConfig);
+        AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario, containerConfig, storageContainer);
         if (adapterContainer instanceof DockerITContainer) {
             ((DockerITContainer) adapterContainer).dependsOn(governanceContainer, storageContainer);
         }
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
index c8dc96a2bdc..2a51b499c28 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
@@ -49,7 +49,7 @@ public final class StandaloneContainerComposer implements ContainerComposer {
         // TODO add more version of databases
         storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(databaseType, "", StorageContainerConfigurationFactory.newInstance(databaseType, scenario)));
         adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario,
-                ProxyStandaloneContainerConfigurationFactory.newInstance(scenario, databaseType)));
+                ProxyStandaloneContainerConfigurationFactory.newInstance(scenario, databaseType), storageContainer));
         if (adapterContainer instanceof DockerITContainer) {
             ((DockerITContainer) adapterContainer).dependsOn(storageContainer);
         }