You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2021/05/28 09:21:15 UTC
[shardingsphere] branch master updated: Fixes #10519,
update proxy-example config (#10521)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4f2c6bb Fixes #10519, update proxy-example config (#10521)
4f2c6bb is described below
commit 4f2c6bb6c1efb76ff630ff5d9042ae6a811fee4c
Author: Raigor <ra...@gmail.com>
AuthorDate: Fri May 28 17:20:48 2021 +0800
Fixes #10519, update proxy-example config (#10521)
* Fixes #10519, update proxy-example config
* fix DDL
---
.../resources/conf/config-readwrite-splitting.yaml | 6 +-
.../resources/conf/config-databases-tables.yaml | 6 +-
.../src/main/resources/conf/config-write-only.yaml | 2 +-
examples/src/resources/manual_schema.sql | 88 +++++++++++-----------
4 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
index 9e03f0a..ab26785 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/config-readwrite-splitting.yaml
@@ -26,7 +26,7 @@ schemaName: readwrite-splitting_db
dataSources:
write_ds:
- url: jdbc:mysql://127.0.0.1:3306/write_ds?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/demo_write_ds?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -36,7 +36,7 @@ dataSources:
minPoolSize: 1
maintenanceIntervalMilliseconds: 30000
read_ds_0:
- url: jdbc:mysql://127.0.0.1:3306/read_ds_0?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/demo_read_ds_0?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
@@ -46,7 +46,7 @@ dataSources:
minPoolSize: 1
maintenanceIntervalMilliseconds: 30000
read_ds_1:
- url: jdbc:mysql://127.0.0.1:3306/read_ds_1?serverTimezone=UTC&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/demo_read_ds_1?serverTimezone=UTC&useSSL=false
username: root
password:
connectionTimeoutMilliseconds: 30000
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
index ffb9e14..1e259a7 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-databases-tables.yaml
@@ -45,9 +45,11 @@ rules:
t_order:
actualDataNodes: ds_${0..1}.t_order_${0..1}
databaseStrategy:
- shardingAlgorithmName: hint_test
+ hint:
+ shardingAlgorithmName: hint_test
tableStrategy:
- shardingAlgorithmName: hint_test
+ hint:
+ shardingAlgorithmName: hint_test
keyGenerateStrategy:
column: order_id
keyGeneratorName: snowflake
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
index 39f0e08..66b2a3d 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-write-only.yaml
@@ -50,7 +50,7 @@ dataSources:
maintenanceIntervalMilliseconds: 30000
rules:
-- !read_QUERY
+- !READWRITE_SPLITTING
dataSources:
pr_ds:
writeDataSourceName: write_ds
diff --git a/examples/src/resources/manual_schema.sql b/examples/src/resources/manual_schema.sql
index b972e35..1d16b6a 100644
--- a/examples/src/resources/manual_schema.sql
+++ b/examples/src/resources/manual_schema.sql
@@ -19,64 +19,64 @@ DROP SCHEMA IF EXISTS demo_ds;
DROP SCHEMA IF EXISTS demo_ds_0;
DROP SCHEMA IF EXISTS demo_ds_1;
-DROP SCHEMA IF EXISTS demo_primary_ds;
-DROP SCHEMA IF EXISTS demo_replica_ds_0;
-DROP SCHEMA IF EXISTS demo_replica_ds_1;
+DROP SCHEMA IF EXISTS demo_write_ds;
+DROP SCHEMA IF EXISTS demo_read_ds_0;
+DROP SCHEMA IF EXISTS demo_read_ds_1;
-DROP SCHEMA IF EXISTS demo_primary_ds_0;
-DROP SCHEMA IF EXISTS demo_primary_ds_0_replica_0;
-DROP SCHEMA IF EXISTS demo_primary_ds_0_replica_1;
-DROP SCHEMA IF EXISTS demo_primary_ds_1;
-DROP SCHEMA IF EXISTS demo_primary_ds_1_replica_0;
-DROP SCHEMA IF EXISTS demo_primary_ds_1_replica_1;
+DROP SCHEMA IF EXISTS demo_write_ds_0;
+DROP SCHEMA IF EXISTS demo_write_ds_0_read_0;
+DROP SCHEMA IF EXISTS demo_write_ds_0_read_1;
+DROP SCHEMA IF EXISTS demo_write_ds_1;
+DROP SCHEMA IF EXISTS demo_write_ds_1_read_0;
+DROP SCHEMA IF EXISTS demo_write_ds_1_read_1;
DROP SCHEMA IF EXISTS shadow_demo_ds;
-DROP SCHEMA IF EXISTS demo_shadow_replica_ds;
-DROP SCHEMA IF EXISTS demo_replica_ds;
+DROP SCHEMA IF EXISTS demo_shadow_read_ds;
+DROP SCHEMA IF EXISTS demo_read_ds;
CREATE SCHEMA IF NOT EXISTS demo_ds;
CREATE SCHEMA IF NOT EXISTS demo_ds_0;
CREATE SCHEMA IF NOT EXISTS demo_ds_1;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds;
-CREATE SCHEMA IF NOT EXISTS demo_replica_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_replica_ds_1;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds;
+CREATE SCHEMA IF NOT EXISTS demo_read_ds_0;
+CREATE SCHEMA IF NOT EXISTS demo_read_ds_1;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_0;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_0_replica_0;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_0_replica_1;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_1;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_1_replica_0;
-CREATE SCHEMA IF NOT EXISTS demo_primary_ds_1_replica_1;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_0;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_0;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_0_read_1;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_1;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_0;
+CREATE SCHEMA IF NOT EXISTS demo_write_ds_1_read_1;
CREATE SCHEMA IF NOT EXISTS shadow_demo_ds;
-CREATE SCHEMA IF NOT EXISTS demo_shadow_replica_ds;
-CREATE SCHEMA IF NOT EXISTS demo_replica_ds;
+CREATE SCHEMA IF NOT EXISTS demo_shadow_read_ds;
+CREATE SCHEMA IF NOT EXISTS demo_read_ds;
-- Should sync from master-salve automatically
--- CREATE TABLE IF NOT EXISTS demo_replica_ds_0.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_replica_ds_1.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_replica_ds_0.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_replica_ds_1.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds_0.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds_1.t_order_item (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_0_replica_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_primary_ds_1_replica_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_0 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_1 (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_0_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_0.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_0 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
+-- CREATE TABLE IF NOT EXISTS demo_write_ds_1_read_1.t_order_item_1 (order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), write KEY (order_item_id));
--- CREATE TABLE IF NOT EXISTS demo_shadow_replica_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
--- CREATE TABLE IF NOT EXISTS demo_replica_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), PRIMARY KEY (user_id));
+-- CREATE TABLE IF NOT EXISTS demo_shadow_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), write KEY (user_id));
+-- CREATE TABLE IF NOT EXISTS demo_read_ds.t_user (user_id INT NOT NULL AUTO_INCREMENT, user_name VARCHAR(200), user_name_plain VARCHAR(200), pwd VARCHAR(200), assisted_query_pwd VARCHAR(200), write KEY (user_id));