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

zhaojinchao 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 c329e65f3b8 Add queryProperties to the query result of storage units. 
(#28208)
c329e65f3b8 is described below

commit c329e65f3b8a3e18f227190e9389830d1fb3d924
Author: Raigor <[email protected]>
AuthorDate: Tue Aug 22 12:22:23 2023 +0800

    Add queryProperties to the query result of storage units. (#28208)
    
    * Add queryProperties to the query result of storage units.
    
    * Fix test xml
    
    * Fix RAL test xml
---
 .../rql/storage/unit/ShowStorageUnitExecutor.java  | 45 ++++++++++------------
 .../empty_rules/mysql/show_storage_units.xml       | 42 ++++++++++----------
 .../rql/dataset/db/mysql/show_storage_units.xml    | 20 +++++-----
 .../mysql/show_storage_units.xml                   | 40 +++++++++----------
 .../mysql/show_storage_units.xml                   | 40 +++++++++----------
 .../dataset/encrypt/mysql/show_storage_units.xml   |  2 +-
 .../mysql/show_storage_units.xml                   |  4 +-
 .../mysql/show_storage_units.xml                   |  6 +--
 .../mysql/show_storage_units.xml                   | 20 +++++-----
 .../rql/dataset/tbl/mysql/show_storage_units.xml   |  2 +-
 10 files changed, 109 insertions(+), 112 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
index 256febd2fc2..9a88ef900fa 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/storage/unit/ShowStorageUnitExecutor.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.storage.unit;
 
-import com.google.gson.Gson;
 import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
 import 
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement;
 import 
org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties;
@@ -31,6 +30,7 @@ import 
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryRes
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
 import 
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageUnit;
+import org.apache.shardingsphere.infra.util.json.JsonUtils;
 import org.apache.shardingsphere.proxy.backend.util.StorageUnitUtils;
 
 import javax.sql.DataSource;
@@ -41,6 +41,7 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
@@ -48,18 +49,6 @@ import java.util.stream.Collectors;
  */
 public final class ShowStorageUnitExecutor implements 
RQLExecutor<ShowStorageUnitsStatement> {
     
-    private static final String CONNECTION_TIMEOUT_MILLISECONDS = 
"connectionTimeoutMilliseconds";
-    
-    private static final String IDLE_TIMEOUT_MILLISECONDS = 
"idleTimeoutMilliseconds";
-    
-    private static final String MAX_LIFETIME_MILLISECONDS = 
"maxLifetimeMilliseconds";
-    
-    private static final String MAX_POOL_SIZE = "maxPoolSize";
-    
-    private static final String MIN_POOL_SIZE = "minPoolSize";
-    
-    private static final String READ_ONLY = "readOnly";
-    
     @Override
     public Collection<String> getColumnNames() {
         return Arrays.asList("name", "type", "host", "port", "db", 
"connection_timeout_milliseconds", "idle_timeout_milliseconds",
@@ -72,22 +61,30 @@ public final class ShowStorageUnitExecutor implements 
RQLExecutor<ShowStorageUni
         Collection<LocalDataQueryResultRow> result = new LinkedList<>();
         for (Entry<String, DataSourcePoolProperties> entry : 
getDataSourcePoolPropertiesMap(database, sqlStatement).entrySet()) {
             String key = entry.getKey();
-            DataSourcePoolProperties props = entry.getValue();
             ConnectionProperties connectionProps = 
resourceMetaData.getConnectionProperties(key);
-            Map<String, Object> standardProps = 
props.getPoolPropertySynonyms().getStandardProperties();
-            Map<String, Object> otherProps = 
props.getCustomProperties().getProperties();
+            Map<String, Object> poolProps = 
entry.getValue().getPoolPropertySynonyms().getStandardProperties();
+            Map<String, Object> customProps = 
getCustomProps(entry.getValue().getCustomProperties().getProperties(), 
connectionProps.getQueryProperties());
             result.add(new LocalDataQueryResultRow(key,
                     resourceMetaData.getStorageType(key).getType(),
                     connectionProps.getHostname(),
                     connectionProps.getPort(),
                     connectionProps.getCatalog(),
-                    getStandardProperty(standardProps, 
CONNECTION_TIMEOUT_MILLISECONDS),
-                    getStandardProperty(standardProps, 
IDLE_TIMEOUT_MILLISECONDS),
-                    getStandardProperty(standardProps, 
MAX_LIFETIME_MILLISECONDS),
-                    getStandardProperty(standardProps, MAX_POOL_SIZE),
-                    getStandardProperty(standardProps, MIN_POOL_SIZE),
-                    getStandardProperty(standardProps, READ_ONLY),
-                    otherProps.isEmpty() ? "" : new 
Gson().toJson(otherProps)));
+                    getStandardProperty(poolProps, 
"connectionTimeoutMilliseconds"),
+                    getStandardProperty(poolProps, "idleTimeoutMilliseconds"),
+                    getStandardProperty(poolProps, "maxLifetimeMilliseconds"),
+                    getStandardProperty(poolProps, "maxPoolSize"),
+                    getStandardProperty(poolProps, "minPoolSize"),
+                    getStandardProperty(poolProps, "readOnly"),
+                    customProps.isEmpty() ? "" : 
JsonUtils.toJsonString(customProps)));
+        }
+        return result;
+    }
+    
+    private Map<String, Object> getCustomProps(final Map<String, Object> 
customProperties, final Properties queryProperties) {
+        Map<String, Object> result = new 
LinkedHashMap<>(customProperties.size() + 1, 1F);
+        result.putAll(customProperties);
+        if (!queryProperties.isEmpty()) {
+            result.put("queryProperties", queryProperties);
         }
         return result;
     }
@@ -108,7 +105,7 @@ public final class ShowStorageUnitExecutor implements 
RQLExecutor<ShowStorageUni
                 }
             }
         } else {
-            for (Entry<String, StorageUnit> entry : 
database.getResourceMetaData().getStorageUnitMetaData().getStorageUnits().entrySet())
 {
+            for (Entry<String, StorageUnit> entry : storageUnits.entrySet()) {
                 result.put(entry.getKey(), 
getDataSourcePoolProperties(propsMap, entry.getKey(), 
storageUnits.get(entry.getKey()).getStorageType(), 
entry.getValue().getDataSource()));
             }
         }
diff --git 
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/mysql/show_storage_units.xml
index ad817841422..1726532a2f0 100644
--- 
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/mysql/show_storage_units.xml
@@ -30,25 +30,25 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="write_ds_0| MySQL| mysql.empty_rules.host| 3306| write_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_1| MySQL| mysql.empty_rules.host| 3306| write_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_2| MySQL| mysql.empty_rules.host| 3306| write_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_3| MySQL| mysql.empty_rules.host| 3306| write_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_4| MySQL| mysql.empty_rules.host| 3306| write_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_5| MySQL| mysql.empty_rules.host| 3306| write_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_6| MySQL| mysql.empty_rules.host| 3306| write_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_7| MySQL| mysql.empty_rules.host| 3306| write_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_8| MySQL| mysql.empty_rules.host| 3306| write_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="write_ds_9| MySQL| mysql.empty_rules.host| 3306| write_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="read_ds_0| MySQL| mysql.empty_rules.host| 3306| read_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_1| MySQL| mysql.empty_rules.host| 3306| read_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_2| MySQL| mysql.empty_rules.host| 3306| read_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_3| MySQL| mysql.empty_rules.host| 3306| read_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_4| MySQL| mysql.empty_rules.host| 3306| read_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_5| MySQL| mysql.empty_rules.host| 3306| read_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_6| MySQL| mysql.empty_rules.host| 3306| read_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_7| MySQL| mysql.empty_rules.host| 3306| read_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_8| MySQL| mysql.empty_rules.host| 3306| read_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="read_ds_9| MySQL| mysql.empty_rules.host| 3306| read_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
-    <row values="rdl_test_0| MySQL| mysql.empty_rules.host| 3306| rdl_test_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_0| MySQL| mysql.empty_rules.host| 3306| write_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_1| MySQL| mysql.empty_rules.host| 3306| write_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_2| MySQL| mysql.empty_rules.host| 3306| write_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_3| MySQL| mysql.empty_rules.host| 3306| write_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_4| MySQL| mysql.empty_rules.host| 3306| write_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_5| MySQL| mysql.empty_rules.host| 3306| write_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_6| MySQL| mysql.empty_rules.host| 3306| write_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_7| MySQL| mysql.empty_rules.host| 3306| write_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_8| MySQL| mysql.empty_rules.host| 3306| write_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="write_ds_9| MySQL| mysql.empty_rules.host| 3306| write_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="read_ds_0| MySQL| mysql.empty_rules.host| 3306| read_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_1| MySQL| mysql.empty_rules.host| 3306| read_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_2| MySQL| mysql.empty_rules.host| 3306| read_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_3| MySQL| mysql.empty_rules.host| 3306| read_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_4| MySQL| mysql.empty_rules.host| 3306| read_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_5| MySQL| mysql.empty_rules.host| 3306| read_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_6| MySQL| mysql.empty_rules.host| 3306| read_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_7| MySQL| mysql.empty_rules.host| 3306| read_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_8| MySQL| mysql.empty_rules.host| 3306| read_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="read_ds_9| MySQL| mysql.empty_rules.host| 3306| read_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&qu
 [...]
+    <row values="rdl_test_0| MySQL| mysql.empty_rules.host| 3306| rdl_test_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/mysql/show_storage_units.xml
index d671a1f2e51..a288cf4bf6d 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/db/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/db/mysql/show_storage_units.xml
@@ -30,14 +30,14 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="ds_0| MySQL| mysql.db.host| 3306| db_0| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_1| MySQL| mysql.db.host| 3306| db_1| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_2| MySQL| mysql.db.host| 3306| db_2| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_3| MySQL| mysql.db.host| 3306| db_3| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_4| MySQL| mysql.db.host| 3306| db_4| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_5| MySQL| mysql.db.host| 3306| db_5| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_6| MySQL| mysql.db.host| 3306| db_6| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_7| MySQL| mysql.db.host| 3306| db_7| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_8| MySQL| mysql.db.host| 3306| db_8| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
-    <row values="ds_9| MySQL| mysql.db.host| 3306| db_9| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_0| MySQL| mysql.db.host| 3306| db_0| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_1| MySQL| mysql.db.host| 3306| db_1| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_2| MySQL| mysql.db.host| 3306| db_2| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_3| MySQL| mysql.db.host| 3306| db_3| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_4| MySQL| mysql.db.host| 3306| db_4| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_5| MySQL| mysql.db.host| 3306| db_5| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_6| MySQL| mysql.db.host| 3306| db_6| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_7| MySQL| mysql.db.host| 3306| db_7| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_8| MySQL| mysql.db.host| 3306| db_8| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
+    <row values="ds_9| MySQL| mysql.db.host| 3306| db_9| 30000| 60000| 
1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_storage_units.xml
index 007441d6e7a..9dd4e5f876d 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/mysql/show_storage_units.xml
@@ -30,24 +30,24 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="write_ds_0| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_0| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_1| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_2| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_3| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_4| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_5| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_6| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_7| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_8| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="write_ds_9| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
-    <row values="read_ds_0| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_0| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_1| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_2| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_3| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_4| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_5| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_6| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_7| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_8| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
-    <row values="read_ds_9| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="write_ds_0| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_0| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_1| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_2| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_3| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_4| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_5| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_6| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_7| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_8| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="write_ds_9| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| write_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetM
 [...]
+    <row values="read_ds_0| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_0| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_1| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_2| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_3| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_4| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_5| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_6| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_7| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_8| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
+    <row values="read_ds_9| MySQL| mysql.dbtbl_with_readwrite_splitting.host| 
3306| read_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMet
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_storage_units.xml
index 4da3fb386da..aed4c1331a3 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_storage_units.xml
@@ -30,24 +30,24 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="encrypt_write_ds_0| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_0| 30000| 60000| 1800000| 20| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&qu
 [...]
-    <row values="encrypt_write_ds_1| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_2| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_3| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_4| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_5| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_6| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_7| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_8| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_write_ds_9| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
-    <row values="encrypt_read_ds_0| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_1| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_2| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_3| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_4| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_5| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_6| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_7| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_8| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
-    <row values="encrypt_read_ds_9| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_write_ds_0| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_0| 30000| 60000| 1800000| 20| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&qu
 [...]
+    <row values="encrypt_write_ds_1| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_2| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_3| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_4| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_5| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_6| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_7| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_8| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_write_ds_9| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| 
encrypt_write_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quo
 [...]
+    <row values="encrypt_read_ds_0| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_1| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_1| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_2| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_2| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_3| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_3| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_4| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_4| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_5| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_5| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_6| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_6| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_7| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_7| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_8| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_8| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
+    <row values="encrypt_read_ds_9| MySQL| 
mysql.dbtbl_with_readwrite_splitting_and_encrypt.host| 3306| encrypt_read_ds_9| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/mysql/show_storage_units.xml
index 5bd321913fe..4d0a8d294d9 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/mysql/show_storage_units.xml
@@ -30,5 +30,5 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="encrypt| MySQL| mysql.encrypt.host| 3306| encrypt| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false
 [...]
+    <row values="encrypt| MySQL| mysql.encrypt.host| 3306| encrypt| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_storage_units.xml
index 17a72dba45d..358d937e1b5 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/mysql/show_storage_units.xml
@@ -30,6 +30,6 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="encrypt_write_ds| MySQL| 
mysql.encrypt_and_readwrite_splitting.host| 3306| encrypt_write_ds| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;ca
 [...]
-    <row values="encrypt_read_ds| MySQL| 
mysql.encrypt_and_readwrite_splitting.host| 3306| encrypt_read_ds| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cach
 [...]
+    <row values="encrypt_write_ds| MySQL| 
mysql.encrypt_and_readwrite_splitting.host| 3306| encrypt_write_ds| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;ca
 [...]
+    <row values="encrypt_read_ds| MySQL| 
mysql.encrypt_and_readwrite_splitting.host| 3306| encrypt_read_ds| 30000| 
60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cach
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_storage_units.xml
index 144bae9a311..7f3e41dbffc 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/readwrite_splitting/mysql/show_storage_units.xml
@@ -30,7 +30,7 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="write_ds| MySQL| mysql.readwrite_splitting.host| 3306| 
write_ds| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#
 [...]
-    <row values="read_0| MySQL| mysql.readwrite_splitting.host| 3306| read_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
-    <row values="read_1| MySQL| mysql.readwrite_splitting.host| 3306| read_1| 
30000| 60000| 1800000| 2| 2| 
false|&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&q
 [...]
+    <row values="write_ds| MySQL| mysql.readwrite_splitting.host| 3306| 
write_ds| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#
 [...]
+    <row values="read_0| MySQL| mysql.readwrite_splitting.host| 3306| read_0| 
30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&
 [...]
+    <row values="read_1| MySQL| mysql.readwrite_splitting.host| 3306| read_1| 
30000| 60000| 1800000| 2| 2| 
false|&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&q
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_storage_units.xml
index 311508a5540..44aa27da856 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/sharding_and_encrypt/mysql/show_storage_units.xml
@@ -30,14 +30,14 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="encrypt_ds_0| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_0| 30000| 60000| 1800000| 20| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetada
 [...]
-    <row values="encrypt_ds_1| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_2| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_3| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_4| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_5| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_6| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_7| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_8| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
-    <row values="encrypt_ds_9| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_0| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_0| 30000| 60000| 1800000| 20| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetada
 [...]
+    <row values="encrypt_ds_1| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_1| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_2| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_2| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_3| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_3| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_4| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_4| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_5| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_5| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_6| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_6| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_7| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_7| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_8| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_8| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
+    <row values="encrypt_ds_9| MySQL| mysql.sharding_and_encrypt.host| 3306| 
encrypt_ds_9| 30000| 60000| 1800000| 2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadat
 [...]
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/mysql/show_storage_units.xml
 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/mysql/show_storage_units.xml
index ae81c8e0936..9d3a10e7baa 100644
--- 
a/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/mysql/show_storage_units.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/rql/dataset/tbl/mysql/show_storage_units.xml
@@ -30,5 +30,5 @@
         <column name="read_only" />
         <column name="other_attributes" />
     </metadata>
-    <row values="tbl| MySQL| mysql.tbl.host| 3306| tbl| 30000| 60000| 1800000| 
2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&
 [...]
+    <row values="tbl| MySQL| mysql.tbl.host| 3306| tbl| 30000| 60000| 1800000| 
2| 2| false| 
&#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&
 [...]
 </dataset>

Reply via email to