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 03ee8ff3202 Remove AutoDataSource and unused test yaml (#31023)
03ee8ff3202 is described below
commit 03ee8ff3202629df1e9d24a75b5df4ec8c806c0c
Author: ZhangCheng <[email protected]>
AuthorDate: Fri Apr 26 16:07:15 2024 +0800
Remove AutoDataSource and unused test yaml (#31023)
* Remove AutoDataSource and unused test yaml
* Remove AutoDataSource and unused test yaml
* fix
* Revert "Remove AutoDataSource and unused test yaml"
This reverts commit cd3e530d82afce7602807b2836adb162c6a6d93d.
* fix test
* fix test
* fix test
---
.../BroadcastTableTransactionTestCase.java | 2 +-
.../ExceptionInTransactionTestCase.java | 1 -
.../transaction/engine/base/AutoDataSource.java | 86 ----------------------
.../transaction/engine/base/JdbcDataSource.java | 57 --------------
.../transaction/engine/base/ProxyDataSource.java | 69 -----------------
.../engine/base/TransactionBaseE2EIT.java | 20 ++---
.../engine/base/TransactionContainerComposer.java | 21 ++----
.../container/compose/BaseContainerComposer.java | 8 --
.../container/compose/DockerContainerComposer.java | 6 --
.../container/compose/NativeContainerComposer.java | 14 +---
.../ProxyClusterContainerConfigurationFactory.java | 8 +-
.../proxy/conf/opengauss/database-sharding.yaml | 2 +-
.../conf/mysql/database-readwrite-splitting.yaml | 2 +-
.../opengauss/database-readwrite-splitting.yaml | 2 +-
.../postgresql/database-readwrite-splitting.yaml | 2 +-
15 files changed, 27 insertions(+), 273 deletions(-)
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
index ae7a8e86f94..2fd81f15758 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
@@ -81,7 +81,7 @@ public final class BroadcastTableTransactionTestCase extends
BaseTransactionTest
assertTableRowCount(connection, T_ADDRESS, 0);
executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'nanjing');");
assertTableRowCount(connection, T_ADDRESS, 1);
- connection.commit();
+ connection.rollback();
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
index f6103b89fdc..63d4c25b24b 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
@@ -66,7 +66,6 @@ public final class ExceptionInTransactionTestCase extends
BaseTransactionTestCas
}
try (Connection connection2 = getDataSource().getConnection()) {
assertAccountRowCount(connection2, 0);
- } catch (final SQLException ignored) {
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/AutoDataSource.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/AutoDataSource.java
deleted file mode 100644
index 95ac386ae94..00000000000
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/AutoDataSource.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.transaction.engine.base;
-
-import lombok.Getter;
-
-import javax.sql.DataSource;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- * Datasource for caching connections.
- */
-@Getter
-public abstract class AutoDataSource implements DataSource {
-
- private final Set<Connection> connectionCache = new HashSet<>();
-
- /**
- * Close all connections.
- *
- * @throws SQLException SQL exception
- */
- public synchronized void close() throws SQLException {
- for (Connection each : connectionCache) {
- if (!each.isClosed()) {
- each.close();
- }
- }
- connectionCache.clear();
- }
-
- @Override
- public <T> T unwrap(final Class<T> iface) {
- return null;
- }
-
- @Override
- public boolean isWrapperFor(final Class<?> iface) {
- return false;
- }
-
- @Override
- public PrintWriter getLogWriter() {
- return null;
- }
-
- @Override
- public void setLogWriter(final PrintWriter out) {
-
- }
-
- @Override
- public void setLoginTimeout(final int seconds) {
-
- }
-
- @Override
- public int getLoginTimeout() {
- return 0;
- }
-
- @Override
- public Logger getParentLogger() {
- return null;
- }
-}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/JdbcDataSource.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/JdbcDataSource.java
deleted file mode 100644
index 7ea36d44d6f..00000000000
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/JdbcDataSource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.transaction.engine.base;
-
-import
org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.DockerContainerComposer;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * JDBC data source.
- */
-public final class JdbcDataSource extends AutoDataSource {
-
- private final DockerContainerComposer containerComposer;
-
- public JdbcDataSource(final DockerContainerComposer containerComposer) {
- this.containerComposer = containerComposer;
- }
-
- @Override
- public Connection getConnection() throws SQLException {
- Connection result = createConnection();
- synchronized (this) {
- getConnectionCache().add(result);
- }
- return result;
- }
-
- @Override
- public Connection getConnection(final String username, final String
password) throws SQLException {
- Connection result =
containerComposer.getJdbcContainer().getTargetDataSource().getConnection();
- synchronized (this) {
- getConnectionCache().add(result);
- }
- return result;
- }
-
- private Connection createConnection() throws SQLException {
- return
containerComposer.getJdbcContainer().getTargetDataSource().getConnection();
- }
-}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/ProxyDataSource.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/ProxyDataSource.java
deleted file mode 100644
index 94ead556bd9..00000000000
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/ProxyDataSource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.transaction.engine.base;
-
-import
org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.BaseContainerComposer;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/**
- * Proxy datasource.
- */
-public final class ProxyDataSource extends AutoDataSource {
-
- private final BaseContainerComposer containerComposer;
-
- private final String databaseName;
-
- private final String userName;
-
- private final String password;
-
- public ProxyDataSource(final BaseContainerComposer containerComposer,
final String databaseName, final String userName, final String password) {
- this.containerComposer = containerComposer;
- this.databaseName = databaseName;
- this.userName = userName;
- this.password = password;
- }
-
- @Override
- public Connection getConnection() throws SQLException {
- Connection result = createConnection();
- synchronized (this) {
- getConnectionCache().add(result);
- }
- return result;
- }
-
- @Override
- public Connection getConnection(final String username, final String
password) throws SQLException {
- String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseName);
- Connection result = DriverManager.getConnection(jdbcUrl, username,
password);
- synchronized (this) {
- getConnectionCache().add(result);
- }
- return result;
- }
-
- private Connection createConnection() throws SQLException {
- String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseName);
- return DriverManager.getConnection(jdbcUrl, userName, password);
- }
-}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index b38ddac8491..2e924c3b924 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.test.e2e.transaction.engine.base;
import com.google.common.base.Preconditions;
import lombok.Getter;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -44,6 +45,7 @@ import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.testcontainers.shaded.org.awaitility.Awaitility;
+import javax.sql.DataSource;
import javax.xml.bind.JAXB;
import java.io.File;
import java.sql.Connection;
@@ -99,7 +101,7 @@ public abstract class TransactionBaseE2EIT {
try {
callTestCases(testParam, containerComposer);
} finally {
- containerComposer.getDataSource().close();
+ closeDataSource(containerComposer);
}
}
}
@@ -124,6 +126,14 @@ public abstract class TransactionBaseE2EIT {
}
}
+ @SneakyThrows(Exception.class)
+ private static void closeDataSource(final TransactionContainerComposer
containerComposer) {
+ DataSource dataSource = containerComposer.getDataSource();
+ if (dataSource instanceof AutoCloseable) {
+ ((AutoCloseable) dataSource).close();
+ }
+ }
+
private void alterTransactionRule(final TransactionType transactionType,
final String providerType, final TransactionContainerComposer
containerComposer) throws SQLException {
if (Objects.equals(transactionType, TransactionType.LOCAL)) {
alterLocalTransactionRule(containerComposer);
@@ -145,10 +155,6 @@ public abstract class TransactionBaseE2EIT {
throw new RuntimeException(ex);
}
log.info("Transaction IT {} -> {} test end.", testParam,
each.getSimpleName());
- try {
- containerComposer.getDataSource().close();
- } catch (final SQLException ignored) {
- }
}
}
@@ -168,10 +174,6 @@ public abstract class TransactionBaseE2EIT {
throw new RuntimeException(ex);
}
log.info("Call transaction IT {} -> {} -> {} -> {} test end.",
testParam, transactionType, provider, each.getSimpleName());
- try {
- containerComposer.getDataSource().close();
- } catch (final SQLException ignored) {
- }
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
index 03c0b6388e8..acec2e09a8c 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
@@ -20,9 +20,6 @@ package
org.apache.shardingsphere.test.e2e.transaction.engine.base;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
-import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.transaction.framework.container.compose.BaseContainerComposer;
@@ -44,7 +41,7 @@ public final class TransactionContainerComposer implements
AutoCloseable {
private final BaseContainerComposer containerComposer;
- private final AutoDataSource dataSource;
+ private final DataSource dataSource;
public TransactionContainerComposer(final TransactionTestParameter
testParam) {
databaseType = testParam.getDatabaseType();
@@ -53,7 +50,7 @@ public final class TransactionContainerComposer implements
AutoCloseable {
}
private BaseContainerComposer initContainerComposer(final
TransactionTestParameter testParam) {
- BaseContainerComposer result = ENV.getItEnvType() ==
TransactionE2EEnvTypeEnum.DOCKER ? new DockerContainerComposer(testParam) : new
NativeContainerComposer(testParam.getDatabaseType());
+ BaseContainerComposer result = ENV.getItEnvType() ==
TransactionE2EEnvTypeEnum.DOCKER ? new DockerContainerComposer(testParam) : new
NativeContainerComposer();
result.start();
return result;
}
@@ -62,18 +59,14 @@ public final class TransactionContainerComposer implements
AutoCloseable {
return
AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
}
- private ProxyDataSource createProxyDataSource() {
- return new ProxyDataSource(containerComposer, "sharding_db",
ENV.getProxyUserName(), ENV.getProxyPassword());
- }
-
- private JdbcDataSource createJdbcDataSource() {
+ private DataSource createProxyDataSource() {
DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
- return new JdbcDataSource(dockerContainerComposer);
+ return
dockerContainerComposer.getProxyContainer().getTargetDataSource(null);
}
- private DataSource createDataSource(final DockerStorageContainer
storageContainer, final String dataSourceName) {
- return
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
storageContainer.getHost(), storageContainer.getMappedPort(), dataSourceName),
- storageContainer.getUsername(),
storageContainer.getPassword(), 50);
+ private DataSource createJdbcDataSource() {
+ DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
+ return
dockerContainerComposer.getJdbcContainer().getTargetDataSource();
}
@Override
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/BaseContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/BaseContainerComposer.java
index c23efe6b4f6..b98eac6adfc 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/BaseContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/BaseContainerComposer.java
@@ -30,14 +30,6 @@ public abstract class BaseContainerComposer implements
Startable {
this.containers = new ITContainers(scenario);
}
- /**
- * Get proxy jdbc url.
- *
- * @param databaseName database name
- * @return proxy jdbc url
- */
- public abstract String getProxyJdbcUrl(String databaseName);
-
@Override
public void start() {
getContainers().start();
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 9351b1739c3..683e9759acf 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
@@ -29,7 +29,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
-import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.transaction.framework.container.config.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.transaction.framework.container.config.proxy.ProxyClusterContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.transaction.framework.container.jdbc.ShardingSphereJDBCContainer;
@@ -111,9 +110,4 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
jdbcContainer.stop();
}
}
-
- @Override
- public String getProxyJdbcUrl(final String databaseName) {
- return DataSourceEnvironment.getURL(databaseType,
proxyContainer.getHost(), proxyContainer.getFirstMappedPort(), databaseName);
- }
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/NativeContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/NativeContainerComposer.java
index c9037a90bb2..ff9a7dc3a6a 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/NativeContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/NativeContainerComposer.java
@@ -17,28 +17,16 @@
package
org.apache.shardingsphere.test.e2e.transaction.framework.container.compose;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
-
/**
* Native composed container, you need start ShardingSphere-Proxy at firstly.
*/
public final class NativeContainerComposer extends BaseContainerComposer {
- private final DatabaseType databaseType;
-
- public NativeContainerComposer(final DatabaseType databaseType) {
+ public NativeContainerComposer() {
super("");
- this.databaseType = databaseType;
}
@Override
public void start() {
-
- }
-
- @Override
- public String getProxyJdbcUrl(final String databaseName) {
- return DataSourceEnvironment.getURL(databaseType, "localhost", 3307,
databaseName);
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index 6ad2b95a3e8..7aa177eb38a 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -20,8 +20,6 @@ package
org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType;
-import
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
@@ -44,11 +42,11 @@ public final class
ProxyClusterContainerConfigurationFactory {
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
String containerCommand = "readwrite-splitting".equals(scenario) ?
"-f" : "";
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), containerCommand);
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(scenario),
getMountedResource(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage(), containerCommand);
}
- private static String getProxyDatasourceName(final DatabaseType
databaseType) {
- return (databaseType instanceof PostgreSQLDatabaseType || databaseType
instanceof OpenGaussDatabaseType) ? "postgres" : "";
+ private static String getProxyDatasourceName(final String scenario) {
+ return "default".equals(scenario) ? "sharding_db" : scenario;
}
private static Map<String, String> getMountedResource(final String
scenario, final DatabaseType databaseType) {
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/database-sharding.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/database-sharding.yaml
index 424a1cdda23..880bec7c6d4 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/database-sharding.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/database-sharding.yaml
@@ -21,7 +21,7 @@
#
######################################################################################################
-databaseName: sharding_db
+databaseName: cursor
dataSources:
ds_0:
url: jdbc:opengauss://opengauss.cursor.host:5432/ds_0
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/database-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/database-readwrite-splitting.yaml
index e1c20158ac6..89449314eec 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/database-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/mysql/database-readwrite-splitting.yaml
@@ -21,7 +21,7 @@
#
######################################################################################################
-databaseName: sharding_db
+databaseName: readwrite-splitting
dataSources:
write_ds:
url:
jdbc:mysql://mysql.readwrite-splitting.host:3306/write_ds?useSSL=false&characterEncoding=utf-8
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/database-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/database-readwrite-splitting.yaml
index dec0bbecb77..a4b50071d86 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/database-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/opengauss/database-readwrite-splitting.yaml
@@ -21,7 +21,7 @@
#
######################################################################################################
-databaseName: sharding_db
+databaseName: readwrite-splitting
dataSources:
write_ds:
url: jdbc:opengauss://opengauss.default.host:5432/write_ds
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/database-readwrite-splitting.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/database-readwrite-splitting.yaml
index d9bb42aabcb..ae2e4822e6d 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/database-readwrite-splitting.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/readwrite-splitting/proxy/conf/postgresql/database-readwrite-splitting.yaml
@@ -21,7 +21,7 @@
#
######################################################################################################
-databaseName: sharding_db
+databaseName: readwrite-splitting
dataSources:
write_ds:
url: jdbc:postgresql://postgresql.default.host:5432/write_ds
