From 224c5ae3dcb6091c556b0c719a51b8b95009dfad Mon Sep 17 00:00:00 2001 From: zhangliang Date: Fri, 19 Sep 2025 19:38:08 +0800 Subject: [PATCH 1/2] Remove AdapterType.PROXY_RANDOM --- test/e2e/sql/src/test/resources/env/it-env.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/sql/src/test/resources/env/it-env.properties b/test/e2e/sql/src/test/resources/env/it-env.properties index 693920dbc6fa7..0864fb7083103 100644 --- a/test/e2e/sql/src/test/resources/env/it-env.properties +++ b/test/e2e/sql/src/test/resources/env/it-env.properties @@ -26,7 +26,7 @@ it.scenarios=db,tbl,readwrite_splitting,encrypt,shadow,dbtbl_with_readwrite_spli # it.cluster.env.type=DOCKER,NATIVE it.cluster.env.type=DOCKER -# it.cluster.adapters=jdbc,proxy,proxy_random +# it.cluster.adapters=jdbc,proxy it.cluster.adapters=proxy # it.cluster.databases=MySQL,PostgreSQL,openGauss,Hive From 53eab0cdb35fcfb29c91fd2fd551417c11f76f3b Mon Sep 17 00:00:00 2001 From: zhangliang Date: Fri, 19 Sep 2025 19:45:37 +0800 Subject: [PATCH 2/2] Refactor ShardingSphereProxyClusterContainer --- .../adapter/impl/ShardingSphereProxyClusterContainer.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java index 2691304a19f0d..d43963d731638 100644 --- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java +++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java @@ -18,15 +18,14 @@ package org.apache.shardingsphere.test.e2e.env.container.adapter.impl; import com.google.common.base.Strings; -import lombok.Setter; import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.database.connector.core.type.DatabaseType; import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer; import org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer; import org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration; import org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants; -import org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils; import org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy; +import org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils; import org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment; import javax.sql.DataSource; @@ -46,9 +45,6 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer private final AtomicReference targetDataSourceProvider = new AtomicReference<>(); - @Setter - private String abbreviation = ProxyContainerConstants.PROXY_CONTAINER_ABBREVIATION; - public ShardingSphereProxyClusterContainer(final DatabaseType databaseType, final AdaptorContainerConfiguration config) { super(ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX, config.getAdapterContainerImage()); this.config = config; @@ -83,6 +79,6 @@ public DataSource getTargetDataSource(final String serverLists) { @Override public String getAbbreviation() { - return abbreviation; + return ProxyContainerConstants.PROXY_CONTAINER_ABBREVIATION; } }