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/02/20 07:28:21 UTC
[shardingsphere] branch master updated: update the config in proxy
(#9450)
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 fa04423 update the config in proxy (#9450)
fa04423 is described below
commit fa044232497bbf759f682c2b6ad079d7763e2a7c
Author: Jieker <ji...@163.com>
AuthorDate: Sat Feb 20 15:27:51 2021 +0800
update the config in proxy (#9450)
---
.../resources/docker/db/proxy/conf/config-db.yaml | 10 +++++++--
.../conf/config-dbtbl-with-replica-query.yaml | 4 ++--
.../proxy/conf/config-replica-query.yaml | 26 ++++++++++++++++++++++
.../docker/tbl/proxy/conf/config-tbl.yaml | 5 +++--
4 files changed, 39 insertions(+), 6 deletions(-)
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 5c013a6..4f9c14c 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
@@ -137,11 +137,17 @@ rules:
keyGenerateStrategy:
column: item_id
keyGeneratorName: constant
+ t_order_details:
+ actualDataNodes: ds_${0..9}.t_order_details
+ databaseStrategy:
+ standard:
+ shardingColumn: user_id
+ shardingAlgorithmName: standard_test
bindingTables:
- - t_order,t_order_item
+ - t_order,t_order_item,t_order_details
broadcastTables:
- t_broadcast_table
-
+ - t_broadcast_table_for_ddl
shardingAlgorithms:
standard_test:
type: STANDARD_TEST
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 6e69113..139f789 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
@@ -258,10 +258,10 @@ rules:
shardingColumn: order_id
shardingAlgorithmName: standard_test
bindingTables:
- - t_order,t_order_item
+ - t_order,t_order_item,t_order_details
broadcastTables:
- t_broadcast_table
-
+ - t_broadcast_table_for_ddl
shardingAlgorithms:
standard_test:
type: STANDARD_TEST
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 9f57bba..b16264a 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
@@ -50,6 +50,32 @@ dataSources:
maintenanceIntervalMilliseconds: 30000
rules:
+- !SHARDING
+ tables:
+ t_order:
+ actualDataNodes: primary-replica-ds.t_order
+ tableStrategy:
+ none:
+ databaseStrategy:
+ none:
+ t_order_item:
+ actualDataNodes: primary-replica-ds.t_order_item
+ tableStrategy:
+ none:
+ databaseStrategy:
+ none:
+ t_order_details:
+ actualDataNodes: primary-replica-ds.t_order_details
+ tableStrategy:
+ none:
+ databaseStrategy:
+ none:
+ bindingTables:
+ - t_order,t_order_item,t_order_details
+ broadcastTables:
+ - t_broadcast_table
+ - t_broadcast_table_for_ddl
+
- !REPLICA_QUERY
dataSources:
primary-replica-ds:
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 79f31b4..12c9198 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
@@ -54,10 +54,11 @@ rules:
shardingColumn: order_id
shardingAlgorithmName: standard_test
bindingTables:
- - t_order,t_order_item
+ - t_order,t_order_item,t_order_details
broadcastTables:
- t_broadcast_table
-
+ - t_broadcast_table_for_ddl
+
shardingAlgorithms:
standard_test:
type: STANDARD_TEST