(shardingsphere) branch master updated: Minor refactor for BatchDMLE2EIT (#30364)

[tuichenchuxin]

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

tuichenchuxin 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 e1c89433f65 Minor refactor for BatchDMLE2EIT (#30364)
e1c89433f65 is described below

commit e1c89433f656392ee87f3702c6f250a1d63efe37
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Fri Mar 1 18:09:51 2024 +0800

    Minor refactor for BatchDMLE2EIT (#30364)
---
 .../shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java    | 9 ++++++---
 .../shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
index 0483ba149af..c41b386e13f 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
@@ -34,6 +34,7 @@ import 
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioData
 import 
org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMetaData;
 import 
org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMetaDataFactory;
 import 
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
+import 
org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
 import org.junit.jupiter.api.AfterEach;
 
 import javax.sql.DataSource;
@@ -112,16 +113,18 @@ public abstract class BaseDMLE2EIT {
         }
     }
     
-    protected final void assertDataSet(final BatchE2EContainerComposer 
containerComposer, final int[] actualUpdateCounts, final DatabaseType 
databaseType) throws SQLException {
+    protected final void assertDataSet(final BatchE2EContainerComposer 
containerComposer, final int[] actualUpdateCounts, final CaseTestParameter 
testParam) throws SQLException {
         for (DataSetMetaData each : 
containerComposer.getDataSet(actualUpdateCounts).getMetaDataList()) {
-            assertDataSet(containerComposer, actualUpdateCounts, each, 
databaseType);
+            assertDataSet(containerComposer, actualUpdateCounts, each, 
testParam);
         }
     }
     
     private void assertDataSet(final BatchE2EContainerComposer 
containerComposer, final int[] actualUpdateCounts, final DataSetMetaData 
expectedDataSetMetaData,
-                               final DatabaseType databaseType) throws 
SQLException {
+                               final CaseTestParameter testParam) throws 
SQLException {
+        Map<String, DatabaseType> databaseTypes = 
DatabaseEnvironmentManager.getDatabaseTypes(testParam.getScenario(), 
testParam.getDatabaseType());
         for (String each : 
InlineExpressionParserFactory.newInstance(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate())
 {
             DataNode dataNode = new DataNode(each);
+            DatabaseType databaseType = 
databaseTypes.get(dataNode.getDataSourceName());
             DataSource dataSource = 
containerComposer.getActualDataSourceMap().get(dataNode.getDataSourceName());
             try (
                     Connection connection = dataSource.getConnection();
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
index a6fe37e3807..9e2974da0eb 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BatchDMLE2EIT.java
@@ -54,7 +54,7 @@ class BatchDMLE2EIT extends BaseDMLE2EIT {
             try (Connection connection = 
containerComposer.getTargetDataSource().getConnection()) {
                 actualUpdateCounts = 
executeBatchForPreparedStatement(testParam, connection);
             }
-            assertDataSet(containerComposer, actualUpdateCounts, 
testParam.getDatabaseType());
+            assertDataSet(containerComposer, actualUpdateCounts, testParam);
         }
     }