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 a2c58e7a55a Simplify DatabaseTypeUtils (#26855)
a2c58e7a55a is described below
commit a2c58e7a55ae6b8c468682e75ba8ba89bacf7604
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 9 15:48:38 2023 +0800
Simplify DatabaseTypeUtils (#26855)
---
.../container/atomic/util/DatabaseTypeUtils.java | 34 ----------------------
.../pipeline/cases/PipelineContainerComposer.java | 20 +++++++------
.../createtable/CreateTableSQLGeneratorIT.java | 3 +-
.../cases/migration/AbstractMigrationE2EIT.java | 7 +++--
.../primarykey/TextPrimaryKeyMigrationE2EIT.java | 5 ++--
.../container/compose/DockerContainerComposer.java | 4 +--
...eProxyClusterContainerConfigurationFactory.java | 7 +++--
.../ProxyClusterContainerConfigurationFactory.java | 5 ++--
8 files changed, 28 insertions(+), 57 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
index 87f533682f8..b782ebd80ae 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
@@ -20,10 +20,6 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang.StringUtils;
-import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
-import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
-import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
/**
* Database type utility class.
@@ -31,36 +27,6 @@ import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseT
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class DatabaseTypeUtils {
- /**
- * Check MySQL database type.
- *
- * @param databaseType database type
- * @return true if database type is MySQL, false otherwise
- */
- public static boolean isMySQL(final DatabaseType databaseType) {
- return databaseType instanceof MySQLDatabaseType;
- }
-
- /**
- * Check PostgreSQL database type.
- *
- * @param databaseType database type
- * @return true if database type is PostgreSQL, false otherwise
- */
- public static boolean isPostgreSQL(final DatabaseType databaseType) {
- return databaseType instanceof PostgreSQLDatabaseType;
- }
-
- /**
- * Check openGauss database type.
- *
- * @param databaseType database type
- * @return true if database type is openGauss, false otherwise
- */
- public static boolean isOpenGauss(final DatabaseType databaseType) {
- return databaseType instanceof OpenGaussDatabaseType;
- }
-
/**
* Get storage container image major version.
*
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
index 6c50af1aaa7..90b406e1a81 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
@@ -28,6 +28,9 @@ import
org.apache.shardingsphere.data.pipeline.common.job.JobStatus;
import org.apache.shardingsphere.data.pipeline.common.job.type.JobType;
import org.apache.shardingsphere.infra.database.metadata.url.JdbcUrlAppender;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
@@ -42,7 +45,6 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.comp
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
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.util.PropertiesBuilder;
@@ -135,7 +137,7 @@ public final class PipelineContainerComposer implements
AutoCloseable {
@SneakyThrows(SQLException.class)
private void init(final JobType jobType) {
- String jdbcUrl =
containerComposer.getProxyJdbcUrl(DatabaseTypeUtils.isPostgreSQL(databaseType)
|| DatabaseTypeUtils.isOpenGauss(databaseType) ? "postgres" : "");
+ String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseType
instanceof PostgreSQLDatabaseType || databaseType instanceof
OpenGaussDatabaseType ? "postgres" : "");
try (Connection connection = DriverManager.getConnection(jdbcUrl,
ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)) {
cleanUpPipelineJobs(connection, jobType);
cleanUpProxyDatabase(connection);
@@ -205,10 +207,10 @@ public final class PipelineContainerComposer implements
AutoCloseable {
* @return appended JDBC URL
*/
public String appendExtraParameter(final String jdbcUrl) {
- if (DatabaseTypeUtils.isMySQL(databaseType)) {
+ if (databaseType instanceof MySQLDatabaseType) {
return new JdbcUrlAppender().appendQueryProperties(jdbcUrl,
PropertiesBuilder.build(new Property("rewriteBatchedStatements",
Boolean.TRUE.toString())));
}
- if (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) {
+ if (databaseType instanceof PostgreSQLDatabaseType || databaseType
instanceof OpenGaussDatabaseType) {
return new JdbcUrlAppender().appendQueryProperties(jdbcUrl,
PropertiesBuilder.build(new Property("stringtype", "unspecified"),
new Property("bitToString", Boolean.TRUE.toString()), new
Property("TimeZone", "UTC")));
}
@@ -262,10 +264,10 @@ public final class PipelineContainerComposer implements
AutoCloseable {
if (PipelineEnvTypeEnum.DOCKER ==
PipelineE2EEnvironment.getInstance().getItEnvType()) {
DockerStorageContainer storageContainer =
((DockerContainerComposer)
containerComposer).getStorageContainers().get(storageContainerIndex);
return isInContainer
- ? DataSourceEnvironment.getURL(getDatabaseType(),
storageContainer.getNetworkAliases().get(0), storageContainer.getExposedPort(),
databaseName)
+ ? DataSourceEnvironment.getURL(databaseType,
storageContainer.getNetworkAliases().get(0), storageContainer.getExposedPort(),
databaseName)
: storageContainer.getJdbcUrl(databaseName);
}
- return DataSourceEnvironment.getURL(getDatabaseType(), "127.0.0.1",
PipelineE2EEnvironment.getInstance().getActualDataSourceDefaultPort(databaseType),
databaseName);
+ return DataSourceEnvironment.getURL(databaseType, "127.0.0.1",
PipelineE2EEnvironment.getInstance().getActualDataSourceDefaultPort(databaseType),
databaseName);
}
/**
@@ -287,7 +289,7 @@ public final class PipelineContainerComposer implements
AutoCloseable {
* @throws SQLException SQL exception
*/
public void createSchema(final Connection connection, final int
sleepSeconds) throws SQLException {
- if (!getDatabaseType().isSchemaAvailable()) {
+ if (!databaseType.isSchemaAvailable()) {
return;
}
connection.createStatement().execute(String.format("CREATE SCHEMA %s",
SCHEMA_NAME));
@@ -314,9 +316,9 @@ public final class PipelineContainerComposer implements
AutoCloseable {
* @throws SQLException SQL exception
*/
public void createSourceTableIndexList(final String schema, final String
sourceTableName) throws SQLException {
- if (DatabaseTypeUtils.isPostgreSQL(getDatabaseType())) {
+ if (databaseType instanceof PostgreSQLDatabaseType) {
sourceExecuteWithLog(String.format("CREATE INDEX IF NOT EXISTS
idx_user_id ON %s.%s ( user_id )", schema, sourceTableName));
- } else if (DatabaseTypeUtils.isOpenGauss(getDatabaseType())) {
+ } else if (databaseType instanceof OpenGaussDatabaseType) {
sourceExecuteWithLog(String.format("CREATE INDEX idx_user_id ON
%s.%s ( user_id )", schema, sourceTableName));
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index a68f9061593..efd58f2e287 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -38,7 +38,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.mysql.MySQLContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
@@ -107,7 +106,7 @@ class CreateTableSQLGeneratorIT {
}
private StorageContainerConfiguration
createStorageContainerConfiguration(final DatabaseType databaseType, final
String storageContainerImage) {
- if (DatabaseTypeUtils.isMySQL(databaseType)) {
+ if (databaseType instanceof MySQLDatabaseType) {
int majorVersion = new
DockerImageVersion(storageContainerImage).getMajorVersion();
Map<String, String> mountedResources =
Collections.singletonMap(String.format("/env/mysql/mysql%s/my.cnf",
majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
return MySQLContainerConfigurationFactory.newInstance(null, null,
mountedResources);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
index 2e63a8ca13c..7d0c6f4a1da 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
@@ -20,11 +20,12 @@ package
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration;
import com.google.common.base.Strings;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
import
org.apache.shardingsphere.test.e2e.data.pipeline.command.MigrationDistSQLCommand;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.PipelineE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.enums.PipelineEnvTypeEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.awaitility.Awaitility;
import org.opengauss.util.PSQLException;
@@ -78,11 +79,11 @@ public abstract class AbstractMigrationE2EIT {
}
protected void createSourceSchema(final PipelineContainerComposer
containerComposer, final String schemaName) throws SQLException {
- if
(DatabaseTypeUtils.isPostgreSQL(containerComposer.getDatabaseType())) {
+ if (containerComposer.getDatabaseType() instanceof
PostgreSQLDatabaseType) {
containerComposer.sourceExecuteWithLog(String.format("CREATE
SCHEMA IF NOT EXISTS %s", schemaName));
return;
}
- if
(DatabaseTypeUtils.isOpenGauss(containerComposer.getDatabaseType())) {
+ if (containerComposer.getDatabaseType() instanceof
OpenGaussDatabaseType) {
try {
containerComposer.sourceExecuteWithLog(String.format("CREATE
SCHEMA %s", schemaName));
} catch (final SQLException ex) {
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
index 871e5f530c5..3558b751d44 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
@@ -30,7 +30,6 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -52,7 +51,7 @@ class TextPrimaryKeyMigrationE2EIT extends
AbstractMigrationE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(PipelineE2ETestCaseArgumentsProvider.class)
- void assertTextPrimaryMigrationSuccess(final PipelineTestParameter
testParam) throws SQLException, InterruptedException {
+ void assertTextPrimaryMigrationSuccess(final PipelineTestParameter
testParam) throws SQLException {
try (PipelineContainerComposer containerComposer = new
PipelineContainerComposer(testParam, new MigrationJobType())) {
containerComposer.createSourceOrderTable(getSourceTableName(containerComposer));
try (Connection connection =
containerComposer.getSourceDataSource().getConnection()) {
@@ -76,7 +75,7 @@ class TextPrimaryKeyMigrationE2EIT extends
AbstractMigrationE2EIT {
}
private String getSourceTableName(final PipelineContainerComposer
containerComposer) {
- return DatabaseTypeUtils.isMySQL(containerComposer.getDatabaseType())
? "T_ORDER" : "t_order";
+ return containerComposer.getDatabaseType() instanceof
MySQLDatabaseType ? "T_ORDER" : "t_order";
}
private static boolean isEnabled() {
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 97f64ac5aae..e258cf13c99 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
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.com
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
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;
@@ -34,7 +35,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.mysql.MySQLContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import java.security.InvalidParameterException;
@@ -67,7 +67,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
}
for (int i = 0; i < storageContainerCount; i++) {
StorageContainerConfiguration storageContainerConfig;
- if (DatabaseTypeUtils.isMySQL(databaseType)) {
+ if (databaseType instanceof MySQLDatabaseType) {
int majorVersion = new
DockerImageVersion(storageContainerImage).getMajorVersion();
Map<String, String> mountedResources = new HashMap<>();
mountedResources.put(String.format("/env/mysql/mysql%s/my.cnf", majorVersion),
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
index 36c34bca563..96daf03d2d3 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
@@ -20,6 +20,9 @@ package
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.con
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
@@ -47,13 +50,13 @@ public final class
PipelineProxyClusterContainerConfigurationFactory {
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
- return (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) ? "postgres" : "";
+ return (databaseType instanceof PostgreSQLDatabaseType || databaseType
instanceof OpenGaussDatabaseType) ? "postgres" : "";
}
private static Map<String, String> getMountedResource(final DatabaseType
databaseType, final String storageContainerImage) {
Map<String, String> result = new HashMap<>(2, 1F);
result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
- if (DatabaseTypeUtils.isMySQL(databaseType)) {
+ if (databaseType instanceof MySQLDatabaseType) {
String majorVersion =
DatabaseTypeUtils.parseMajorVersion(storageContainerImage);
result.put(String.format("/env/%s/server-%s.yaml",
databaseType.getType().toLowerCase(), majorVersion),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
} else {
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 9bf237a3c6f..99ca92dbd5a 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,10 +20,11 @@ package
org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
+import
org.apache.shardingsphere.infra.database.type.dialect.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;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import java.util.HashMap;
import java.util.Map;
@@ -46,7 +47,7 @@ public final class ProxyClusterContainerConfigurationFactory {
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
- return (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) ? "postgres" : "";
+ return (databaseType instanceof PostgreSQLDatabaseType || databaseType
instanceof OpenGaussDatabaseType) ? "postgres" : "";
}
private static Map<String, String> getMountedResource(final String
scenario, final DatabaseType databaseType) {
