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

zhangliang 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 11104c4af03 Fix code format for minor changes (#28110)
11104c4af03 is described below

commit 11104c4af03ac80552f639fe55a83e1d3eb5068b
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Aug 16 13:31:25 2023 +0800

    Fix code format for minor changes (#28110)
    
    * Refactor JDBCStandardShardingAlgorithmFixture
    
    * Refactor InventoryIncrementalJobAPI
    
    * Refactor ShowComputeNodeModeExecutor
    
    * Fix code format for minor changes
---
 .../pipeline/core/job/service/InventoryIncrementalJobAPI.java  |  3 ++-
 .../distsql/ral/queryable/ShowComputeNodeModeExecutor.java     |  2 +-
 .../handler/admin/executor/ShowCurrentUserExecutorTest.java    |  4 ++--
 .../fixture/sharding/JDBCStandardShardingAlgorithmFixture.java | 10 ----------
 .../config/impl/mysql/MySQLContainerConfigurationFactory.java  |  8 +++++---
 .../impl/opengauss/OpenGaussContainerConfigurationFactory.java |  8 +++++---
 .../postgresql/PostgreSQLContainerConfigurationFactory.java    |  7 ++++---
 .../config/mysql/MySQLContainerConfigurationFactory.java       |  8 +++++---
 .../opengauss/OpenGaussContainerConfigurationFactory.java      |  7 ++++---
 .../postgresql/PostgreSQLContainerConfigurationFactory.java    |  7 ++++---
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobAPI.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobAPI.java
index 0388fd4dbac..80e0d3818bc 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobAPI.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobAPI.java
@@ -131,8 +131,9 @@ public interface InventoryIncrementalJobAPI extends 
PipelineJobAPI {
      * Commit pipeline job.
      *
      * @param jobId job ID
+     * @throws SQLException sql exception
      */
-    void commit(String jobId);
+    void commit(String jobId) throws SQLException;
     
     /**
      * Rollback pipeline job.
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
index dca08d1afda..eb8521c9e90 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
@@ -43,7 +43,7 @@ public final class ShowComputeNodeModeExecutor implements 
InstanceContextRequire
         PersistRepositoryConfiguration repositoryConfig = 
instanceContext.getModeConfiguration().getRepository();
         String modeType = instanceContext.getModeConfiguration().getType();
         String repositoryType = null == repositoryConfig ? "" : 
repositoryConfig.getType();
-        String props = null == repositoryConfig || null == 
repositoryConfig.getProps() ? "" : new 
Gson().toJson(repositoryConfig.getProps());
+        String props = null == repositoryConfig || null == 
repositoryConfig.getProps() || repositoryConfig.getProps().isEmpty() ? "" : new 
Gson().toJson(repositoryConfig.getProps());
         return Collections.singleton(new LocalDataQueryResultRow(modeType, 
repositoryType, props));
     }
     
diff --git 
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
 
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
index 083a113b98e..b313a9b566d 100644
--- 
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
+++ 
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
@@ -67,12 +67,12 @@ class ShowCurrentUserExecutorTest {
     private ContextManager mockContextManager() {
         ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
         MetaDataContexts metaDataContexts = new 
MetaDataContexts(mock(MetaDataPersistService.class),
-                new ShardingSphereMetaData(new HashMap<>(), 
mock(ResourceMetaData.class), mockShardingSphereRuleMetaData(), new 
ConfigurationProperties(new Properties())));
+                new ShardingSphereMetaData(new HashMap<>(), 
mock(ResourceMetaData.class), mockRuleMetaData(), new 
ConfigurationProperties(new Properties())));
         when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
         return result;
     }
     
-    private RuleMetaData mockShardingSphereRuleMetaData() {
+    private RuleMetaData mockRuleMetaData() {
         AuthorityRule authorityRule = mock(AuthorityRule.class);
         ShardingSphereUser shardingSphereUser = mock(ShardingSphereUser.class);
         when(shardingSphereUser.getGrantee()).thenReturn(new Grantee("root", 
"%"));
diff --git 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/sharding/JDBCStandardShardingAlgorithmFixture.java
 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/sharding/JDBCStandardShardingAlgorithmFixture.java
index 18fa50db852..2f093265a11 100644
--- 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/sharding/JDBCStandardShardingAlgorithmFixture.java
+++ 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/sharding/JDBCStandardShardingAlgorithmFixture.java
@@ -17,25 +17,15 @@
 
 package org.apache.shardingsphere.test.e2e.driver.fixture.sharding;
 
-import lombok.Getter;
 import 
org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
 import 
org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
 import 
org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Properties;
 
-@Getter
 public final class JDBCStandardShardingAlgorithmFixture implements 
StandardShardingAlgorithm<Integer> {
     
-    private Properties props;
-    
-    @Override
-    public void init(final Properties props) {
-        this.props = props;
-    }
-    
     @Override
     public String doSharding(final Collection<String> availableTargetNames, 
final PreciseShardingValue<Integer> shardingValue) {
         for (String each : availableTargetNames) {
diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
index cde84baa837..275426e939b 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.i
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
@@ -81,8 +82,9 @@ public final class MySQLContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>(3, 1F);
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
MySQLDatabaseType()) + "/01-actual-init.sql", 
"/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
MySQLDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "MySQL")) + "/01-actual-init.sql",
+                "/docker-entrypoint-initdb.d/01-actual-init.sql");
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "MySQL")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/mysql/my.cnf", 
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
         return result;
diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/opengauss/OpenGaussContainerConfigurationFactory.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/opengauss/OpenGaussContainerConfigurationFactory.java
index eec9284b10b..c7424696683 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/opengauss/OpenGaussContainerConfigurationFactory.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/opengauss/OpenGaussContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.i
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import 
org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.OpenGaussContainer;
@@ -76,8 +77,9 @@ public final class OpenGaussContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>(4, 1F);
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
OpenGaussDatabaseType()) + "/01-actual-init.sql", 
"/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
OpenGaussDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "openGauss")) + 
"/01-actual-init.sql",
+                "/docker-entrypoint-initdb.d/01-actual-init.sql");
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "openGauss")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/postgresql/postgresql.conf", 
OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
         result.put("/env/opengauss/pg_hba.conf", 
OpenGaussContainer.OPENGAUSS_HBA_IN_CONF_CONTAINER);
diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/postgresql/PostgreSQLContainerConfigurationFactory.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/postgresql/PostgreSQLContainerConfigurationFactory.java
index a7158913535..576ef875066 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/postgresql/PostgreSQLContainerConfigurationFactory.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/postgresql/PostgreSQLContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.i
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.PostgreSQLContainer;
@@ -75,9 +76,9 @@ public final class PostgreSQLContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>(3, 1F);
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
PostgreSQLDatabaseType()) + "/01-actual-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL")) + 
"/01-actual-init.sql",
                 "/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
PostgreSQLDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/postgresql/postgresql.conf", 
PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
         return result;
diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/mysql/MySQLContainerConfigurationFactory.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/mysql/MySQLContainerConfigurationFactory.java
index c61f0d2aa2c..fe5aa4ce2a9 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/mysql/MySQLContainerConfigurationFactory.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/mysql/MySQLContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
 import 
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
@@ -60,8 +61,9 @@ public final class MySQLContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>();
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
MySQLDatabaseType()) + "/01-actual-init.sql", 
"/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
MySQLDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "MySQL")) + "/01-actual-init.sql",
+                "/docker-entrypoint-initdb.d/01-actual-init.sql");
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "MySQL")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/mysql/my.cnf", 
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
         return result;
diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/opengauss/OpenGaussContainerConfigurationFactory.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/opengauss/OpenGaussContainerConfigurationFactory.java
index 7b76af4ca94..46d856ef165 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/opengauss/OpenGaussContainerConfigurationFactory.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/opengauss/OpenGaussContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import 
org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.OpenGaussContainer;
@@ -58,9 +59,9 @@ public final class OpenGaussContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>(3, 1F);
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
OpenGaussDatabaseType()) + "/01-actual-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "openGauss")) + 
"/01-actual-init.sql",
                 "/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
OpenGaussDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "openGauss")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/postgresql/postgresql.conf", 
OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
         return result;
diff --git 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/postgresql/PostgreSQLContainerConfigurationFactory.java
 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/postgresql/PostgreSQLContainerConfigurationFactory.java
index d1996da4803..ee9964f3e44 100644
--- 
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/postgresql/PostgreSQLContainerConfigurationFactory.java
+++ 
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/postgresql/PostgreSQLContainerConfigurationFactory.java
@@ -19,7 +19,8 @@ package 
org.apache.shardingsphere.test.e2e.transaction.framework.container.confi
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.OpenGaussContainer;
@@ -60,9 +61,9 @@ public final class PostgreSQLContainerConfigurationFactory {
     
     private static Map<String, String> getMountedResources(final String 
scenario) {
         Map<String, String> result = new HashMap<>(3, 1F);
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, new 
PostgreSQLDatabaseType()) + "/01-actual-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, 
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL")) + 
"/01-actual-init.sql",
                 "/docker-entrypoint-initdb.d/01-actual-init.sql");
-        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, new 
PostgreSQLDatabaseType()) + "/01-expected-init.sql",
+        result.put(new 
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, 
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL")) + 
"/01-expected-init.sql",
                 "/docker-entrypoint-initdb.d/01-expected-init.sql");
         result.put("/env/postgresql/postgresql.conf", 
OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
         return result;

Reply via email to