Skip to content

Refactor ShardingSphereProxyClusterContainer #36637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2025
Merged

Refactor ShardingSphereProxyClusterContainer #36637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
224c5ae
Remove AdapterType.PROXY_RANDOM
terrymanu Sep 19, 2025
53eab0c
Refactor ShardingSphereProxyClusterContainer
terrymanu Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...ardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -46,9 +45,6 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer

private final AtomicReference<DataSource> 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;
Expand Down Expand Up @@ -83,6 +79,6 @@ public DataSource getTargetDataSource(final String serverLists) {

@Override
public String getAbbreviation() {
return abbreviation;
return ProxyContainerConstants.PROXY_CONTAINER_ABBREVIATION;
}
}
2 changes: 1 addition & 1 deletion test/e2e/sql/src/test/resources/env/it-env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down