You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/02/20 12:17:11 UTC
[shardingsphere] branch master updated: simplify dataset.xml (#9458)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 4ee1832 simplify dataset.xml (#9458)
4ee1832 is described below
commit 4ee1832feac8c2924a79dc554cd84d014488426d
Author: Jieker <ji...@163.com>
AuthorDate: Sat Feb 20 20:16:53 2021 +0800
simplify dataset.xml (#9458)
---
.../src/test/resources/env/dbtbl_with_replica_query/dataset.xml | 6 ------
.../src/test/resources/env/replica_query/dataset.xml | 7 -------
2 files changed, 13 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/dataset.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/dataset.xml
index dfdfcea..b72d2c8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/dataset.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_replica_query/dataset.xml
@@ -32,10 +32,6 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
- <metadata data-nodes="primary_ds_0.t_global,replica_ds_0.t_global">
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
<row data-node="primary_ds_0.t_order_0" values="1000, 10, init" />
<row data-node="primary_ds_0.t_order_1" values="1001, 10, init" />
<row data-node="primary_ds_0.t_order_2" values="1002, 10, init" />
@@ -346,7 +342,6 @@
<row data-node="primary_ds_7.t_broadcast_table" values="1, init" />
<row data-node="primary_ds_8.t_broadcast_table" values="1, init" />
<row data-node="primary_ds_9.t_broadcast_table" values="1, init" />
- <row data-node="primary_ds_0.t_global" values="1, global_primary" />
<row data-node="replica_ds_0.t_order_0" values="1000, 10, init_replica" />
<row data-node="replica_ds_0.t_order_1" values="1001, 10, init_replica" />
<row data-node="replica_ds_0.t_order_2" values="1002, 10, init_replica" />
@@ -657,5 +652,4 @@
<row data-node="replica_ds_7.t_broadcast_table" values="1, init_replica" />
<row data-node="replica_ds_8.t_broadcast_table" values="1, init_replica" />
<row data-node="replica_ds_9.t_broadcast_table" values="1, init_replica" />
- <row data-node="replica_ds_0.t_global" values="1, global_replica" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/dataset.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/dataset.xml
index e5646e5..109a0da 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/dataset.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/replica_query/dataset.xml
@@ -32,10 +32,6 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
- <metadata data-nodes="primary_ds.t_global,replica_${0..1}.t_global">
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
<row data-node="primary_ds.t_order" values="1000, 10, init" />
<row data-node="primary_ds.t_order" values="1001, 10, init" />
<row data-node="primary_ds.t_order" values="1100, 11, init" />
@@ -157,7 +153,6 @@
<row data-node="primary_ds.t_order_item" values="290101, 2901, 29, init, 2017-08-08" />
<row data-node="primary_ds.t_order_item" values="290102, 2901, 29, init, 2017-08-08" />
<row data-node="primary_ds.t_broadcast_table" values="1, init" />
- <row data-node="primary_ds.t_global" values="1, global_primary" />
<row data-node="replica_0.t_order" values="1000, 10, init_replica" />
<row data-node="replica_0.t_order" values="1001, 10, init_replica" />
<row data-node="replica_0.t_order" values="1100, 11, init_replica" />
@@ -279,7 +274,6 @@
<row data-node="replica_0.t_order_item" values="290101, 2901, 29, init_replica, 2017-08-08" />
<row data-node="replica_0.t_order_item" values="290102, 2901, 29, init_replica, 2017-08-08" />
<row data-node="replica_0.t_broadcast_table" values="1, init_replica" />
- <row data-node="replica_0.t_global" values="1, global_replica_0" />
<row data-node="replica_1.t_order" values="1000, 10, init_replica" />
<row data-node="replica_1.t_order" values="1001, 10, init_replica" />
<row data-node="replica_1.t_order" values="1100, 11, init_replica" />
@@ -401,5 +395,4 @@
<row data-node="replica_1.t_order_item" values="290101, 2901, 29, init_replica, 2017-08-08" />
<row data-node="replica_1.t_order_item" values="290102, 2901, 29, init_replica, 2017-08-08" />
<row data-node="replica_1.t_broadcast_table" values="1, init_replica" />
- <row data-node="replica_1.t_global" values="1, global_replica_1" />
</dataset>