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 48b7b55  Refactor SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES 
statement with shardingsphere-integration-test  (#11540)
48b7b55 is described below

commit 48b7b55daa9f06b994f512e4c113b45d6e9e56a1
Author: liguoping <[email protected]>
AuthorDate: Fri Aug 20 17:53:47 2021 +0800

    Refactor SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES statement with 
shardingsphere-integration-test  (#11540)
    
    * Refactor SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES statement 
with shardingsphere-integration-test
    
    * update init.sql
    
    * I know why test not passed, add more init.sql under folder tbl.
    
    * bindingTables t_order_item_federate_sharding
    
    * docker t_order_item_federate_sharding
    
    * remove t_order_item_federate_sharding from bindingTables in 
config-tbl.yaml
    
    * move table t_order_federate to h2/init-db_0.sql
    
    * undo table t_order_federate to h2/init-db_0.sql
    
    * env 
db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt
    
    * remove tbl dataset.xml, add dataset to other folder
    
    * update test-case's scenario-types
    
    * adjust CaseParallelRunnerExecutor executors thread count 2
    
    * update config-db.yaml
    
    * config-db.yaml use ds, not db
    
    * remove scenario-types db
    
    * consider increase db max_pool_size to 5
    
    * 2 consider increase db max_pool_size to 5
    
    * resolve conflict of init.sql
    
    * resolve conflict of init.sql
    
    * config maxPoolSize 4
---
 .../statement/FederatePrepareStatementTest.java    | 33 +--------------------
 .../jdbc/core/statement/FederateStatementTest.java | 34 ----------------------
 .../storage/ShardingSphereStorageContainer.java    |  2 +-
 .../parallel/impl/CaseParallelRunnerExecutor.java  |  2 +-
 ...sql_by_id_across_single_and_sharding_tables.xml | 31 ++++++++++++++++++++
 ..._across_single_and_sharding_tables_order_id.xml | 30 +++++++++++++++++++
 ...sql_by_id_across_single_and_sharding_tables.xml | 31 ++++++++++++++++++++
 ..._across_single_and_sharding_tables_order_id.xml | 30 +++++++++++++++++++
 .../cases/dql/dql-integration-test-cases.xml       |  9 ++++++
 .../docker/db/h2/proxy/conf/config-db.yaml         |  2 +-
 .../docker/db/mysql/proxy/conf/config-db.yaml      |  2 +-
 .../docker/db/postgresql/proxy/conf/config-db.yaml |  2 +-
 .../config-dbtbl-with-readwrite-splitting.yaml     |  2 +-
 .../config-dbtbl-with-readwrite-splitting.yaml     |  2 +-
 .../config-dbtbl-with-readwrite-splitting.yaml     |  2 +-
 .../src/test/resources/env/db/rules.yaml           |  2 +-
 .../env/dbtbl_with_readwrite_splitting/rules.yaml  |  2 +-
 .../rules.yaml                                     |  2 +-
 18 files changed, 143 insertions(+), 77 deletions(-)

diff --git 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederatePrepareStatementTest.java
 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederatePrepareStatementTest.java
index 7e8bfc6..bc863fe 100644
--- 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederatePrepareStatementTest.java
+++ 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederatePrepareStatementTest.java
@@ -32,12 +32,6 @@ import static org.junit.Assert.assertTrue;
 
 public final class FederatePrepareStatementTest extends 
AbstractShardingSphereDataSourceForFederateTest {
 
-    private static final String 
SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES =
-            "select t_order_federate.*, t_order_item_federate_sharding.* "
-                    + "from t_order_federate, t_order_item_federate_sharding "
-                    + "where t_order_federate.order_id = 
t_order_item_federate_sharding.item_id "
-                    + "AND t_order_item_federate_sharding.order_id = ?";
-
     private static final String 
SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ALIAS =
             "select o.*, i.* from t_order_federate o, 
t_order_item_federate_sharding i "
                     + "where o.order_id = i.item_id AND i.order_id = ?";
@@ -69,32 +63,7 @@ public final class FederatePrepareStatementTest extends 
AbstractShardingSphereDa
     
     private static final String 
SELECT_PARTIAL_DISTINCT_AGGREGATION_SQL_FOR_SHARDING_TABLE =
             "SELECT SUM(DISTINCT user_id), SUM(order_id_sharding) FROM 
t_order_federate_sharding WHERE order_id_sharding > ?";
-    
-    @Test
-    public void 
assertQueryWithFederateInSingleAndShardingTableByExecuteQuery() throws 
SQLException {
-        assertQueryWithFederateInSingleAndShardingTable(true);
-    }
-    
-    @Test
-    public void assertQueryWithFederateInSingleAndShardingTableByExecute() 
throws SQLException {
-        assertQueryWithFederateInSingleAndShardingTable(false);
-    }
-    
-    private void assertQueryWithFederateInSingleAndShardingTable(final boolean 
executeQuery) throws SQLException {
-        ShardingSpherePreparedStatement preparedStatement = 
(ShardingSpherePreparedStatement) getShardingSphereDataSource()
-                
.getConnection().prepareStatement(SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES);
-        preparedStatement.setInt(1, 10001);
-        ResultSet resultSet = getResultSet(preparedStatement, executeQuery);
-        assertNotNull(resultSet);
-        assertTrue(resultSet.next());
-        assertThat(resultSet.getInt(1), is(1001));
-        assertThat(resultSet.getInt(2), is(11));
-        assertThat(resultSet.getString(3), is("init"));
-        assertThat(resultSet.getInt(4), is(1001));
-        assertThat(resultSet.getInt(5), is(10001));
-        assertFalse(resultSet.next());
-    }
-    
+
     @Test
     public void 
assertQueryWithFederateInSingleAndShardingTableWithAliasByExecuteQuery() throws 
SQLException {
         assertQueryWithFederateInSingleAndShardingTableWithAlias(true);
diff --git 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederateStatementTest.java
 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederateStatementTest.java
index 709bc03..fc40ffa 100644
--- 
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederateStatementTest.java
+++ 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/FederateStatementTest.java
@@ -32,11 +32,6 @@ import static org.junit.Assert.assertTrue;
 
 public final class FederateStatementTest extends 
AbstractShardingSphereDataSourceForFederateTest {
 
-    private static final String 
SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES =
-            "select t_order_federate.*, t_order_item_federate_sharding.* from 
t_order_federate, "
-                    + "t_order_item_federate_sharding where 
t_order_federate.order_id = "
-                    + "t_order_item_federate_sharding.item_id";
-
     private static final String 
SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES_ALIAS = "select o.*, i.* 
from"
             + " t_order_federate o, t_order_item_federate_sharding i where 
o.order_id = i.item_id";
 
@@ -73,35 +68,6 @@ public final class FederateStatementTest extends 
AbstractShardingSphereDataSourc
             "SELECT SUM(DISTINCT user_id), SUM(order_id_sharding) FROM 
t_order_federate_sharding WHERE order_id_sharding > 1000";
     
     @Test
-    public void 
assertQueryWithFederateInSingleAndShardingTableByExecuteQuery() throws 
SQLException {
-        assertQueryWithFederateInSingleAndShardingTable(true);
-    }
-    
-    @Test
-    public void assertQueryWithFederateInSingleAndShardingTableByExecute() 
throws SQLException {
-        assertQueryWithFederateInSingleAndShardingTable(false);
-    }
-    
-    private void assertQueryWithFederateInSingleAndShardingTable(final boolean 
executeQuery) throws SQLException {
-        ShardingSphereStatement statement = (ShardingSphereStatement) 
getShardingSphereDataSource().getConnection().createStatement();
-        ResultSet resultSet = getResultSet(statement, 
SELECT_SQL_BY_ID_ACROSS_SINGLE_AND_SHARDING_TABLES, executeQuery);
-        assertNotNull(resultSet);
-        assertTrue(resultSet.next());
-        assertThat(resultSet.getInt(1), is(1000));
-        assertThat(resultSet.getInt(2), is(10));
-        assertThat(resultSet.getString(3), is("init"));
-        assertThat(resultSet.getInt(4), is(1000));
-        assertThat(resultSet.getInt(5), is(10000));
-        assertTrue(resultSet.next());
-        assertThat(resultSet.getInt(1), is(1001));
-        assertThat(resultSet.getInt(2), is(11));
-        assertThat(resultSet.getString(3), is("init"));
-        assertThat(resultSet.getInt(4), is(1001));
-        assertThat(resultSet.getInt(5), is(10001));
-        assertFalse(resultSet.next());
-    }
-    
-    @Test
     public void 
assertQueryWithFederateInSingleAndShardingTableWithAliasByExecuteQuery() throws 
SQLException {
         assertQueryWithFederateInSingleAndShardingTableWithAlias(true);
     }
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
index c390227..bcd014a 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/container/storage/ShardingSphereStorageContainer.java
@@ -74,7 +74,7 @@ public abstract class ShardingSphereStorageContainer extends 
ShardingSphereConta
         config.setPassword(getPassword());
         config.setDriverClassName(getDriverClassName());
         config.setJdbcUrl(getUrl(dataSourceName));
-        config.setMaximumPoolSize(2);
+        config.setMaximumPoolSize(4);
         config.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
         getConnectionInitSQL().ifPresent(config::setConnectionInitSql);
         return new HikariDataSource(config);
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/runner/parallel/impl/CaseParallelRunnerExecutor.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/runner/parallel/impl/CaseParallelRunnerExecutor.java
index e52afed..1184079 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/runner/parallel/impl/CaseParallelRunnerExecutor.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/src/test/java/org/apache/shardingsphere/test/integration/junit/runner/parallel/impl/CaseParallelRunnerExecutor.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Future;
  * Parallel runner executor with case.
  */
 public final class CaseParallelRunnerExecutor implements 
ParallelRunnerExecutor {
-    
+
     private final ExecutorServiceManager executorServiceManager = new 
ExecutorServiceManager(Runtime.getRuntime().availableProcessors() * 2 - 1);
     
     private final Collection<Future<?>> taskFeatures = new LinkedList<>();
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables.xml
new file mode 100644
index 0000000..86101fa
--- /dev/null
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ 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.
+  -->
+
+<dataset>
+    <metadata>
+        <column name="order_id" />
+        <column name="user_id" />
+        <column name="status" />
+        <column name="item_id" />
+        <column name="order_id0" />
+        <column name="user_id0" />
+        <column name="status0"/>
+        <column name="remarks"/>
+    </metadata>
+    <row values="1000, 10, init, 1000, 10000, 10, init, 
t_order_item_federate_sharding" />
+    <row values="1001, 11, init, 1001, 10001, 11, init, 
t_order_item_federate_sharding" />
+</dataset>
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
new file mode 100644
index 0000000..e2c99a9
--- /dev/null
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ 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.
+  -->
+
+<dataset>
+    <metadata>
+        <column name="order_id" />
+        <column name="user_id" />
+        <column name="status" />
+        <column name="item_id" />
+        <column name="order_id0" />
+        <column name="user_id0" />
+        <column name="status0"/>
+        <column name="remarks"/>
+    </metadata>
+    <row values="1001, 11, init, 1001, 10001, 11, init, 
t_order_item_federate_sharding" />
+</dataset>
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables.xml
new file mode 100644
index 0000000..86101fa
--- /dev/null
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ 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.
+  -->
+
+<dataset>
+    <metadata>
+        <column name="order_id" />
+        <column name="user_id" />
+        <column name="status" />
+        <column name="item_id" />
+        <column name="order_id0" />
+        <column name="user_id0" />
+        <column name="status0"/>
+        <column name="remarks"/>
+    </metadata>
+    <row values="1000, 10, init, 1000, 10000, 10, init, 
t_order_item_federate_sharding" />
+    <row values="1001, 11, init, 1001, 10001, 11, init, 
t_order_item_federate_sharding" />
+</dataset>
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
new file mode 100644
index 0000000..e2c99a9
--- /dev/null
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/select_sql_by_id_across_single_and_sharding_tables_order_id.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ 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.
+  -->
+
+<dataset>
+    <metadata>
+        <column name="order_id" />
+        <column name="user_id" />
+        <column name="status" />
+        <column name="item_id" />
+        <column name="order_id0" />
+        <column name="user_id0" />
+        <column name="status0"/>
+        <column name="remarks"/>
+    </metadata>
+    <row values="1001, 11, init, 1001, 10001, 11, init, 
t_order_item_federate_sharding" />
+</dataset>
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
index 1eae0a4..b623494 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
@@ -543,4 +543,13 @@
     <test-case sql="SELECT GROUP_CONCAT(i.item_id SEPARATOR ';') AS item_ids 
FROM t_order_federate o INNER JOIN t_order_item_federate_sharding i ON 
o.order_id = i.item_id WHERE i.order_id >= ?" db-types="MySQL" 
scenario-types="dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
         <assertion parameters="10000:int" 
expected-data-file="select_group_concat_function_with_federate.xml" />
     </test-case>
+
+    <test-case sql="select t_order_federate.*, 
t_order_item_federate_sharding.* from 
t_order_federate,t_order_item_federate_sharding where t_order_federate.order_id 
= t_order_item_federate_sharding.item_id" 
scenario-types="dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+        <assertion 
expected-data-file="select_sql_by_id_across_single_and_sharding_tables.xml" />
+    </test-case>
+
+    <test-case sql="select t_order_federate.*, 
t_order_item_federate_sharding.* from t_order_federate, 
t_order_item_federate_sharding where t_order_federate.order_id = 
t_order_item_federate_sharding.item_id AND 
t_order_item_federate_sharding.order_id = ?" 
scenario-types="dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
+        <assertion parameters="10001:int" 
expected-data-file="select_sql_by_id_across_single_and_sharding_tables_order_id.xml"
 />
+    </test-case>
+
 </integration-test-cases>
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/h2/proxy/conf/config-db.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/h2/proxy/conf/config-db.yaml
index f5f4830..fcf38f4 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/h2/proxy/conf/config-db.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/h2/proxy/conf/config-db.yaml
@@ -141,7 +141,7 @@ rules:
   shardingAlgorithms:
     standard_test:
       type: STANDARD_TEST
-  
+
   keyGenerators:
       constant:
         type: CONSTANT
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/proxy/conf/config-db.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/proxy/conf/config-db.yaml
index 510a074..7c33a8d 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/proxy/conf/config-db.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/proxy/conf/config-db.yaml
@@ -141,7 +141,7 @@ rules:
   shardingAlgorithms:
     standard_test:
       type: STANDARD_TEST
-  
+
   keyGenerators:
       constant:
         type: CONSTANT
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/proxy/conf/config-db.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/proxy/conf/config-db.yaml
index f7f5c9c..69d3c56 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/proxy/conf/config-db.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/postgresql/proxy/conf/config-db.yaml
@@ -141,7 +141,7 @@ rules:
   shardingAlgorithms:
     standard_test:
       type: STANDARD_TEST
-  
+
   keyGenerators:
       constant:
         type: CONSTANT
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/h2/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/h2/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
index 8f7e24b..f1847e5 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/h2/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/h2/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
@@ -253,7 +253,7 @@ rules:
       type: INLINE
       props:
         algorithm-expression: t_order_item_federate_sharding_${item_id % 2}
-  
+
   keyGenerators:
     constant:
       type: Constant
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/mysql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/mysql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
index 8f7e24b..f1847e5 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/mysql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/mysql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
@@ -253,7 +253,7 @@ rules:
       type: INLINE
       props:
         algorithm-expression: t_order_item_federate_sharding_${item_id % 2}
-  
+
   keyGenerators:
     constant:
       type: Constant
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
index 80de964..035d21c 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_readwrite_splitting/postgresql/proxy/conf/config-dbtbl-with-readwrite-splitting.yaml
@@ -253,7 +253,7 @@ rules:
       type: INLINE
       props:
         algorithm-expression: t_order_item_federate_sharding_${item_id % 2}
-  
+
   keyGenerators:
     constant:
       type: Constant
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/rules.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/rules.yaml
index d8b5a09..90162f1 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/rules.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/rules.yaml
@@ -48,7 +48,7 @@ rules:
   shardingAlgorithms:
     standard_test:
       type: STANDARD_TEST
-  
+
   keyGenerators:
     constant:
       type: Constant
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting/rules.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting/rules.yaml
index 845f7f8..0035e87 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting/rules.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting/rules.yaml
@@ -70,7 +70,7 @@ rules:
       type: INLINE
       props:
         algorithm-expression: t_order_item_federate_sharding_${item_id % 2}
-  
+
   keyGenerators:
     constant:
       type: Constant
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
index 37e9fa6..04e32b7 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/rules.yaml
@@ -70,7 +70,7 @@ rules:
       type: INLINE
       props:
         algorithm-expression: t_order_item_federate_sharding_${item_id % 2}
-  
+
   keyGenerators:
     constant:
       type: Constant

Reply via email to