This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 5d17bfbc6ca Fix feature tuple swapper engine it (#31633)
5d17bfbc6ca is described below
commit 5d17bfbc6ca42e9a429738e616d296e60da6939c
Author: zhaojinchao <[email protected]>
AuthorDate: Sat Jun 8 10:52:20 2024 +0800
Fix feature tuple swapper engine it (#31633)
* Fix ShardingConfigurationRepositoryTupleSwapperEngineIT unit test
* Fix other swapper engine it
---
...teSplittingConfigurationRepositoryTupleSwapperEngineIT.java | 4 ++--
.../ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
index 7e62e5e2c17..062db935016 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/it/ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT.java
@@ -38,7 +38,7 @@ class
ReadwriteSplittingConfigurationRepositoryTupleSwapperEngineIT extends Repo
assertThat(actualRepositoryTuples.size(), is(4));
assertRepositoryTuple(actualRepositoryTuples.get(0),
"load_balancers/random", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getLoadBalancers().get("random"));
assertRepositoryTuple(actualRepositoryTuples.get(1),
"load_balancers/roundRobin", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getLoadBalancers().get("roundRobin"));
- assertRepositoryTuple(actualRepositoryTuples.get(2),
"data_sources/ds_0", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getDataSourceGroups().get("ds_0"));
- assertRepositoryTuple(actualRepositoryTuples.get(3),
"data_sources/ds_1", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getDataSourceGroups().get("ds_1"));
+ assertRepositoryTuple(actualRepositoryTuples.get(2),
"data_source_groups/ds_0", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getDataSourceGroups().get("ds_0"));
+ assertRepositoryTuple(actualRepositoryTuples.get(3),
"data_source_groups/ds_1", ((YamlReadwriteSplittingRuleConfiguration)
expectedYamlRuleConfig).getDataSourceGroups().get("ds_1"));
}
}
diff --git
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
index 9eebdaa01ee..738e98b75c0 100644
---
a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
+++
b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/it/ShadowRuleConfigurationRepositoryTupleSwapperEngineIT.java
@@ -39,13 +39,13 @@ class ShadowRuleConfigurationRepositoryTupleSwapperEngineIT
extends RepositoryTu
assertThat(actualRepositoryTuples.size(), is(9));
List<RepositoryTuple> actual = new ArrayList<>(actualRepositoryTuples);
assertRepositoryTuple(actual.get(0),
- "algorithms/user-id-insert-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-insert-match-algorithm"));
+ "shadow_algorithms/user-id-insert-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-insert-match-algorithm"));
assertRepositoryTuple(actual.get(1),
- "algorithms/user-id-update-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-update-match-algorithm"));
+ "shadow_algorithms/user-id-update-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-update-match-algorithm"));
assertRepositoryTuple(actual.get(2),
- "algorithms/user-id-select-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-select-match-algorithm"));
- assertRepositoryTuple(actual.get(3), "algorithms/sql-hint-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("sql-hint-algorithm"));
- assertRepositoryTuple(actual.get(4), "default_algorithm_name",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getDefaultShadowAlgorithmName());
+ "shadow_algorithms/user-id-select-match-algorithm",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("user-id-select-match-algorithm"));
+ assertRepositoryTuple(actual.get(3),
"shadow_algorithms/sql-hint-algorithm", ((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getShadowAlgorithms().get("sql-hint-algorithm"));
+ assertRepositoryTuple(actual.get(4), "default_shadow_algorithm_name",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getDefaultShadowAlgorithmName());
assertRepositoryTuple(actual.get(5), "data_sources/shadowDataSource",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getDataSources().get("shadowDataSource"));
assertRepositoryTuple(actual.get(6), "tables/t_order",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getTables().get("t_order"));
assertRepositoryTuple(actual.get(7), "tables/t_order_item",
((YamlShadowRuleConfiguration)
expectedYamlRuleConfig).getTables().get("t_order_item"));
