You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/01/09 14:15:19 UTC
[shardingsphere] branch master updated: Move init sql to env folder
(#8963)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 96a58d8 Move init sql to env folder (#8963)
96a58d8 is described below
commit 96a58d80ec14b9ad0c6404dfb05c024f1a76aa7a
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jan 9 22:14:48 2021 +0800
Move init sql to env folder (#8963)
* Simplify db/init.sql
* Simplify other init.sql
* Refactor container's internal mysql host name
* Move init sql to env folder
---
.../test/resources/docker/db/docker-compose.yml | 4 +--
.../resources/docker/db/proxy/conf/config-db.yaml | 20 +++++------
.../dbtbl_with_replica_query/docker-compose.yml | 4 +--
.../conf/config-dbtbl-with-replica-query.yaml | 40 +++++++++++-----------
.../docker/replica_query/docker-compose.yml | 4 +--
.../proxy/conf/config-replica-query.yaml | 6 ++--
.../test/resources/docker/tbl/docker-compose.yml | 4 +--
.../docker/tbl/proxy/conf/config-tbl.yaml | 2 +-
.../resources/{docker/db/mysql => env/db}/init.sql | 35 +++++--------------
.../dbtbl_with_replica_query}/init.sql | 0
.../mysql => env/replica_query}/init.sql | 2 ++
.../{docker/tbl/mysql => env/tbl}/init.sql | 9 +++++
12 files changed, 62 insertions(+), 68 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
index b242a9b..c0bc552 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/docker-compose.yml
@@ -23,7 +23,7 @@ services:
container_name: db-mysql
command: --default-authentication-plugin=mysql_native_password
volumes:
- - ./mysql:/docker-entrypoint-initdb.d/
+ - ../../env/db:/docker-entrypoint-initdb.d/
ports:
- "33060:3306"
@@ -39,7 +39,7 @@ services:
ports:
- "33070:3307"
links:
- - "mysql:db.mysql"
+ - "mysql:mysql.db.host"
# - "zookeeper:zk"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/proxy/conf/config-db.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/proxy/conf/config-db.yaml
index ff0e573..7d9ba2c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/proxy/conf/config-db.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/proxy/conf/config-db.yaml
@@ -19,7 +19,7 @@ schemaName: db
dataSources:
ds_0:
- url: jdbc:mysql://db.mysql:3306/db_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_0?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -29,7 +29,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_1:
- url: jdbc:mysql://db.mysql:3306/db_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_1?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -39,7 +39,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_2:
- url: jdbc:mysql://db.mysql:3306/db_2?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_2?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -49,7 +49,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_3:
- url: jdbc:mysql://db.mysql:3306/db_3?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_3?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -59,7 +59,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_4:
- url: jdbc:mysql://db.mysql:3306/db_4?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_4?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -69,7 +69,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_5:
- url: jdbc:mysql://db.mysql:3306/db_5?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_5?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -79,7 +79,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_6:
- url: jdbc:mysql://db.mysql:3306/db_6?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_6?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -89,7 +89,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_7:
- url: jdbc:mysql://db.mysql:3306/db_7?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_7?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -99,7 +99,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_8:
- url: jdbc:mysql://db.mysql:3306/db_8?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_8?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -109,7 +109,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
ds_9:
- url: jdbc:mysql://db.mysql:3306/db_9?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.db.host:3306/db_9?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
index 957a5a0..61bb8a2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/docker-compose.yml
@@ -23,7 +23,7 @@ services:
container_name: dbtbl-with-replica-query-mysql
command: --default-authentication-plugin=mysql_native_password
volumes:
- - ./mysql:/docker-entrypoint-initdb.d/
+ - ../../env/dbtbl_with_replica_query:/docker-entrypoint-initdb.d/
ports:
- "33360:3306"
@@ -39,7 +39,7 @@ services:
ports:
- "33110:3307"
links:
- - "mysql:dbtbl-with-replica-query.mysql"
+ - "mysql:mysql.dbtbl-with-replica-query.host"
# - "zookeeper:zk"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/proxy/conf/config-dbtbl-with-replica-query.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/proxy/conf/config-dbtbl-with-replica-query.yaml
index aac865b..55d7a41 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/proxy/conf/config-dbtbl-with-replica-query.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/proxy/conf/config-dbtbl-with-replica-query.yaml
@@ -19,7 +19,7 @@ schemaName: dbtbl_with_replica_query
dataSources:
primary_ds_0:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_0?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -29,7 +29,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_1:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_1?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -39,7 +39,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_2:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_2?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_2?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -49,7 +49,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_3:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_3?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_3?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -59,7 +59,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_4:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_4?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_4?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -69,7 +69,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_5:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_5?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_5?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -79,7 +79,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_6:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_6?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_6?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -89,7 +89,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_7:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_7?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_7?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -99,7 +99,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_8:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_8?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_8?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -109,7 +109,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
primary_ds_9:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/primary_ds_8?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/primary_ds_8?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -119,7 +119,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_0:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_0?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -129,7 +129,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_1:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_1?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -139,7 +139,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_2:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_2?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_2?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -149,7 +149,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_3:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_3?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_3?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -159,7 +159,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_4:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_4?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_4?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -169,7 +169,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_5:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_5?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_5?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -179,7 +179,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_6:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_6?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_6?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -189,7 +189,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_7:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_7?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_7?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -199,7 +199,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_8:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_8?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_8?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -209,7 +209,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_ds_9:
- url: jdbc:mysql://dbtbl-with-replica-query.mysql:3306/replica_ds_8?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.dbtbl-with-replica-query.host:3306/replica_ds_8?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
index 5d85c6e..f476969 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/docker-compose.yml
@@ -23,7 +23,7 @@ services:
container_name: replica-query-mysql
command: --default-authentication-plugin=mysql_native_password
volumes:
- - ./mysql:/docker-entrypoint-initdb.d/
+ - ../../env/replica_query:/docker-entrypoint-initdb.d/
ports:
- "33260:3306"
@@ -39,7 +39,7 @@ services:
ports:
- "33090:3307"
links:
- - "mysql:replica-query.mysql"
+ - "mysql:mysql.replica-query.host"
# - "zookeeper:zk"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/proxy/conf/config-replica-query.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/proxy/conf/config-replica-query.yaml
index 4509b5b..a24ec59 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/proxy/conf/config-replica-query.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/proxy/conf/config-replica-query.yaml
@@ -19,7 +19,7 @@ schemaName: replica_query
dataSources:
primary_ds:
- url: jdbc:mysql://replica-query.mysql:3306/primary_ds?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.replica-query.host:3306/primary_ds?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -29,7 +29,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_0:
- url: jdbc:mysql://replica-query.mysql:3306/replica_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.replica-query.host:3306/replica_0?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -39,7 +39,7 @@ dataSources:
minPoolSize: 2
maintenanceIntervalMilliseconds: 30000
replica_1:
- url: jdbc:mysql://replica-query.mysql:3306/replica_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.replica-query.host:3306/replica_1?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
index 3365839..d257900 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/docker-compose.yml
@@ -23,7 +23,7 @@ services:
container_name: tbl-mysql
command: --default-authentication-plugin=mysql_native_password
volumes:
- - ./mysql:/docker-entrypoint-initdb.d/
+ - ../../env/tbl:/docker-entrypoint-initdb.d/
ports:
- "33160:3306"
@@ -39,7 +39,7 @@ services:
ports:
- "33080:3307"
links:
- - "mysql:tbl.mysql"
+ - "mysql:mysql.tbl.host"
# - "zookeeper:zk"
volumes:
- ./proxy/conf:/opt/shardingsphere-proxy/conf
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/proxy/conf/config-tbl.yaml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/proxy/conf/config-tbl.yaml
index 655ed02..ed8a7fa 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/proxy/conf/config-tbl.yaml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/proxy/conf/config-tbl.yaml
@@ -19,7 +19,7 @@ schemaName: tbl
dataSources:
tbl:
- url: jdbc:mysql://tbl.mysql:3306/tbl?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://mysql.tbl.host:3306/tbl?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/init.sql
similarity index 86%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/init.sql
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/init.sql
index 7a99a38..ff342ea 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/db/mysql/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/db/init.sql
@@ -28,60 +28,43 @@ CREATE DATABASE db_6;
CREATE DATABASE db_7;
CREATE DATABASE db_8;
CREATE DATABASE db_9;
-CREATE DATABASE primary_ds_0;
-CREATE DATABASE primary_ds_1;
-CREATE DATABASE primary_ds_2;
-CREATE DATABASE primary_ds_3;
-CREATE DATABASE primary_ds_4;
-CREATE DATABASE primary_ds_5;
-CREATE DATABASE primary_ds_6;
-CREATE DATABASE primary_ds_7;
-CREATE DATABASE primary_ds_8;
-CREATE DATABASE primary_ds_9;
-CREATE DATABASE replica_ds_0;
-CREATE DATABASE replica_ds_1;
-CREATE DATABASE replica_ds_2;
-CREATE DATABASE replica_ds_3;
-CREATE DATABASE replica_ds_4;
-CREATE DATABASE replica_ds_5;
-CREATE DATABASE replica_ds_6;
-CREATE DATABASE replica_ds_7;
-CREATE DATABASE replica_ds_8;
-CREATE DATABASE replica_ds_9;
-CREATE DATABASE primary_ds;
-CREATE DATABASE replica_0;
-CREATE DATABASE replica_1;
-CREATE DATABASE tbl;
-CREATE DATABASE db;
-CREATE DATABASE shadow_db;
CREATE TABLE db_0.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_0.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_0.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_1.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_1.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_1.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_2.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_2.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_2.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_3.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_3.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_3.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_4.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_4.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_4.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_5.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_5.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_5.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_6.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_6.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_6.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_7.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_7.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_7.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_8.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_8.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_8.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
+
CREATE TABLE db_9.t_order (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE db_9.t_order_item (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE db_9.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (id));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/init.sql
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/dbtbl_with_replica_query/mysql/init.sql
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/init.sql
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/init.sql
similarity index 99%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/mysql/init.sql
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/init.sql
index 19a2ecb..fcf6962 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/replica_query/mysql/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/init.sql
@@ -24,7 +24,9 @@ CREATE DATABASE replica_1;
CREATE TABLE primary_ds.t_order_ (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE primary_ds.t_order_item_ (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE replica_0.t_order_ (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE replica_0.t_order_item_ (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE replica_1.t_order_ (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE replica_1.t_order_item_ (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/mysql/init.sql b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/init.sql
similarity index 99%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/mysql/init.sql
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/init.sql
index de8f640..0aaf2e1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/docker/tbl/mysql/init.sql
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/tbl/init.sql
@@ -22,21 +22,30 @@ CREATE DATABASE tbl;
CREATE TABLE tbl.t_order_0 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_0 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_1 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_1 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_2 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_2 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_3 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_3 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_4 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_4 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_5 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_5 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_6 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_6 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_7 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_7 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_8 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_8 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
+
CREATE TABLE tbl.t_order_9 (order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (order_id));
CREATE TABLE tbl.t_order_item_9 (item_id INT NOT NULL, order_id INT NOT NULL, user_id INT NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));