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 6fd0957a480 Rename RuleRepositoryTuple's key and value to path and
content (#34838)
6fd0957a480 is described below
commit 6fd0957a48088b2457cd3a2f382ed89e223cf36d
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 2 11:31:30 2025 +0800
Rename RuleRepositoryTuple's key and value to path and content (#34838)
---
...tionYamlRuleRepositoryTupleSwapperEngineIT.java | 2 +-
.../database/DatabaseRulePersistService.java | 6 +--
.../config/global/GlobalRulePersistService.java | 2 +-
.../mode/node/rule/tuple/RuleRepositoryTuple.java | 4 +-
.../YamlRuleRepositoryTupleSwapperEngine.java | 22 +++++------
.../YamlRuleRepositoryTupleSwapperEngineTest.java | 44 +++++++++++-----------
.../YamlRuleRepositoryTupleSwapperEngineIT.java | 6 +--
7 files changed, 43 insertions(+), 43 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRuleRepositoryTupleSwapperEngineIT.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRuleRepositoryTupleSwapperEngineIT.java
index ce58ff31b8e..249a53fbc1c 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRuleRepositoryTupleSwapperEngineIT.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/yaml/ShardingConfigurationYamlRuleRepositoryTupleSwapperEngineIT.java
@@ -55,7 +55,7 @@ class
ShardingConfigurationYamlRuleRepositoryTupleSwapperEngineIT extends YamlRu
assertRepositoryTuple(actualTuples.get(12), "tables/t_stock",
((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getTables().get("t_stock"));
assertRepositoryTuple(actualTuples.get(13), "tables/t_order",
((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getTables().get("t_order"));
assertRepositoryTuple(actualTuples.get(14), "tables/t_order_item",
((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getTables().get("t_order_item"));
- assertRepositoryTuple(actualTuples.get(15), "binding_tables" +
actualTuples.get(15).getKey().substring(actualTuples.get(15).getKey().lastIndexOf("/")),
+ assertRepositoryTuple(actualTuples.get(15), "binding_tables" +
actualTuples.get(15).getPath().substring(actualTuples.get(15).getPath().lastIndexOf("/")),
new ArrayList<>(((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getBindingTables()).get(0));
assertRepositoryTuple(actualTuples.get(16), "binding_tables/foo", new
ArrayList<>(((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getBindingTables()).get(1));
assertRepositoryTuple(actualTuples.get(17), "default_sharding_column",
((YamlShardingRuleConfiguration)
expectedYamlRuleConfig).getDefaultShardingColumn());
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index b240e93b78e..88f56363c93 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -109,7 +109,7 @@ public final class DatabaseRulePersistService {
private Collection<MetaDataVersion> persistTuples(final
Collection<RuleRepositoryTuple> tuples) {
return tuples.stream().map(each -> new MetaDataVersion(
- each.getKey(), Math.max(MetaDataVersion.INIT_VERSION,
versionPersistService.persist(new VersionNodePath(each.getKey()),
each.getValue()) - 1))).collect(Collectors.toList());
+ each.getPath(), Math.max(MetaDataVersion.INIT_VERSION,
versionPersistService.persist(new VersionNodePath(each.getPath()),
each.getContent()) - 1))).collect(Collectors.toList());
}
/**
@@ -146,8 +146,8 @@ public final class DatabaseRulePersistService {
private Collection<MetaDataVersion> deleteTuples(final
Collection<RuleRepositoryTuple> tuples) {
Collection<MetaDataVersion> result = new LinkedList<>();
for (RuleRepositoryTuple each : tuples) {
- repository.delete(each.getKey());
- result.add(new MetaDataVersion(each.getKey()));
+ repository.delete(each.getPath());
+ result.add(new MetaDataVersion(each.getPath()));
}
return result;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index 8d43546b103..33a7653f662 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -83,6 +83,6 @@ public final class GlobalRulePersistService {
}
private void persistTuples(final Collection<RuleRepositoryTuple> tuples) {
- tuples.forEach(each -> versionPersistService.persist(new
VersionNodePath(each.getKey()), each.getValue()));
+ tuples.forEach(each -> versionPersistService.persist(new
VersionNodePath(each.getPath()), each.getContent()));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/RuleRepositoryTuple.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/RuleRepositoryTuple.java
index 9e30daa0998..741dedf1219 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/RuleRepositoryTuple.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/RuleRepositoryTuple.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
@Getter
public final class RuleRepositoryTuple {
- private final String key;
+ private final String path;
- private final String value;
+ private final String content;
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
index fcaeca54952..bd85a17a747 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
@@ -173,7 +173,7 @@ public final class YamlRuleRepositoryTupleSwapperEngine {
YamlRuleConfiguration yamlRuleConfig =
toBeSwappedType.getConstructor().newInstance();
DatabaseRuleNode databaseRuleNode =
DatabaseRuleNodeGenerator.generate(toBeSwappedType);
for (RuleRepositoryTuple each : tuples) {
- if (!Strings.isNullOrEmpty(each.getValue())) {
+ if (!Strings.isNullOrEmpty(each.getContent())) {
setFieldValue(yamlRuleConfig, fields,
databaseRuleNode.getRuleType(), each);
}
}
@@ -206,7 +206,7 @@ public final class YamlRuleRepositoryTupleSwapperEngine {
@SuppressWarnings({"unchecked", "rawtypes"})
private void setNamedItemFieldValue(final YamlRuleConfiguration
yamlRuleConfig, final String ruleType, final RuleRepositoryTuple tuple, final
String itemType, final Field field) {
DatabaseRuleNodePath databaseRuleNodePath = new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(itemType,
NodePathPattern.QUALIFIED_IDENTIFIER));
- Optional<String> itemValue = NodePathSearcher.find(tuple.getKey(), new
NodePathSearchCriteria(databaseRuleNodePath, false, true, 1));
+ Optional<String> itemValue = NodePathSearcher.find(tuple.getPath(),
new NodePathSearchCriteria(databaseRuleNodePath, false, true, 1));
if (!itemValue.isPresent()) {
return;
}
@@ -217,34 +217,34 @@ public final class YamlRuleRepositoryTupleSwapperEngine {
}
fieldValue = field.get(yamlRuleConfig);
Class<?> valueClass = (Class) ((ParameterizedType)
field.getGenericType()).getActualTypeArguments()[1];
- ((Map) fieldValue).put(itemValue.get(),
YamlEngine.unmarshal(tuple.getValue(), valueClass));
+ ((Map) fieldValue).put(itemValue.get(),
YamlEngine.unmarshal(tuple.getContent(), valueClass));
} else {
if (null == fieldValue) {
field.set(yamlRuleConfig, new LinkedList<>());
}
fieldValue = field.get(yamlRuleConfig);
- ((Collection) fieldValue).add(tuple.getValue());
+ ((Collection) fieldValue).add(tuple.getContent());
}
}
@SneakyThrows(ReflectiveOperationException.class)
private void setUniqueItemFieldValue(final YamlRuleConfiguration
yamlRuleConfig, final String ruleType, final RuleRepositoryTuple tuple, final
String itemType, final Field field) {
DatabaseRuleNodePath databaseRuleNodePath = new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(itemType));
- if (!NodePathSearcher.isMatchedPath(tuple.getKey(), new
NodePathSearchCriteria(databaseRuleNodePath, false, true, 1))) {
+ if (!NodePathSearcher.isMatchedPath(tuple.getPath(), new
NodePathSearchCriteria(databaseRuleNodePath, false, true, 1))) {
return;
}
if (field.getType().equals(Collection.class)) {
- field.set(yamlRuleConfig, YamlEngine.unmarshal(tuple.getValue(),
List.class));
+ field.set(yamlRuleConfig, YamlEngine.unmarshal(tuple.getContent(),
List.class));
} else if (field.getType().equals(String.class)) {
- field.set(yamlRuleConfig, tuple.getValue());
+ field.set(yamlRuleConfig, tuple.getContent());
} else if (field.getType().equals(boolean.class) ||
field.getType().equals(Boolean.class)) {
- field.set(yamlRuleConfig, Boolean.parseBoolean(tuple.getValue()));
+ field.set(yamlRuleConfig,
Boolean.parseBoolean(tuple.getContent()));
} else if (field.getType().equals(int.class) ||
field.getType().equals(Integer.class)) {
- field.set(yamlRuleConfig, Integer.parseInt(tuple.getValue()));
+ field.set(yamlRuleConfig, Integer.parseInt(tuple.getContent()));
} else if (field.getType().equals(long.class) ||
field.getType().equals(Long.class)) {
- field.set(yamlRuleConfig, Long.parseLong(tuple.getValue()));
+ field.set(yamlRuleConfig, Long.parseLong(tuple.getContent()));
} else {
- field.set(yamlRuleConfig, YamlEngine.unmarshal(tuple.getValue(),
field.getType()));
+ field.set(yamlRuleConfig, YamlEngine.unmarshal(tuple.getContent(),
field.getType()));
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngineTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngineTest.java
index 9475442e2e1..1b118d97836 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngineTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngineTest.java
@@ -47,8 +47,8 @@ class YamlRuleRepositoryTupleSwapperEngineTest {
Collection<RuleRepositoryTuple> actual = new
YamlRuleRepositoryTupleSwapperEngine().swapToTuples(new
LeafYamlRuleConfiguration("foo"));
assertThat(actual.size(), is(1));
RuleRepositoryTuple actualTuple = actual.iterator().next();
- assertThat(actualTuple.getKey(), is("/rules/leaf"));
- assertThat(actualTuple.getValue(), is("value: foo" +
System.lineSeparator()));
+ assertThat(actualTuple.getPath(), is("/rules/leaf"));
+ assertThat(actualTuple.getContent(), is("value: foo" +
System.lineSeparator()));
}
@Test
@@ -73,26 +73,26 @@ class YamlRuleRepositoryTupleSwapperEngineTest {
yamlRuleConfig.setGen("single_gen");
List<RuleRepositoryTuple> actual = new ArrayList<>(new
YamlRuleRepositoryTupleSwapperEngine("foo_db").swapToTuples(yamlRuleConfig));
assertThat(actual.size(), is(10));
- assertThat(actual.get(0).getKey(),
is("/metadata/foo_db/rules/node/map_value/k"));
- assertThat(actual.get(0).getValue(), is("value: v" +
System.lineSeparator()));
- assertThat(actual.get(1).getKey(),
is("/metadata/foo_db/rules/node/collection_value"));
- assertThat(actual.get(1).getValue(), is("- !LEAF" +
System.lineSeparator() + " value: foo" + System.lineSeparator()));
- assertThat(actual.get(2).getKey(),
is("/metadata/foo_db/rules/node/string_value"));
- assertThat(actual.get(2).getValue(), is("str"));
- assertThat(actual.get(3).getKey(),
is("/metadata/foo_db/rules/node/boolean_value"));
- assertThat(actual.get(3).getValue(), is("true"));
- assertThat(actual.get(4).getKey(),
is("/metadata/foo_db/rules/node/integer_value"));
- assertThat(actual.get(4).getValue(), is("1"));
- assertThat(actual.get(5).getKey(),
is("/metadata/foo_db/rules/node/long_value"));
- assertThat(actual.get(5).getValue(), is("10"));
- assertThat(actual.get(6).getKey(),
is("/metadata/foo_db/rules/node/enum_value"));
- assertThat(actual.get(6).getValue(), is("FOO"));
- assertThat(actual.get(7).getKey(),
is("/metadata/foo_db/rules/node/leaf"));
- assertThat(actual.get(7).getValue(), is("value: leaf" +
System.lineSeparator()));
- assertThat(actual.get(8).getKey(),
is("/metadata/foo_db/rules/node/gens/gen: value"));
- assertThat(actual.get(8).getValue(), is("value"));
- assertThat(actual.get(9).getKey(),
is("/metadata/foo_db/rules/node/gen"));
- assertThat(actual.get(9).getValue(), is("single_gen"));
+ assertThat(actual.get(0).getPath(),
is("/metadata/foo_db/rules/node/map_value/k"));
+ assertThat(actual.get(0).getContent(), is("value: v" +
System.lineSeparator()));
+ assertThat(actual.get(1).getPath(),
is("/metadata/foo_db/rules/node/collection_value"));
+ assertThat(actual.get(1).getContent(), is("- !LEAF" +
System.lineSeparator() + " value: foo" + System.lineSeparator()));
+ assertThat(actual.get(2).getPath(),
is("/metadata/foo_db/rules/node/string_value"));
+ assertThat(actual.get(2).getContent(), is("str"));
+ assertThat(actual.get(3).getPath(),
is("/metadata/foo_db/rules/node/boolean_value"));
+ assertThat(actual.get(3).getContent(), is("true"));
+ assertThat(actual.get(4).getPath(),
is("/metadata/foo_db/rules/node/integer_value"));
+ assertThat(actual.get(4).getContent(), is("1"));
+ assertThat(actual.get(5).getPath(),
is("/metadata/foo_db/rules/node/long_value"));
+ assertThat(actual.get(5).getContent(), is("10"));
+ assertThat(actual.get(6).getPath(),
is("/metadata/foo_db/rules/node/enum_value"));
+ assertThat(actual.get(6).getContent(), is("FOO"));
+ assertThat(actual.get(7).getPath(),
is("/metadata/foo_db/rules/node/leaf"));
+ assertThat(actual.get(7).getContent(), is("value: leaf" +
System.lineSeparator()));
+ assertThat(actual.get(8).getPath(),
is("/metadata/foo_db/rules/node/gens/gen: value"));
+ assertThat(actual.get(8).getContent(), is("value"));
+ assertThat(actual.get(9).getPath(),
is("/metadata/foo_db/rules/node/gen"));
+ assertThat(actual.get(9).getContent(), is("single_gen"));
}
@Test
diff --git
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRuleRepositoryTupleSwapperEngineIT.java
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRuleRepositoryTupleSwapperEngineIT.java
index 3e0bbcac8ef..fc5c884e1d1 100644
---
a/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRuleRepositoryTupleSwapperEngineIT.java
+++
b/test/it/yaml/src/main/java/org/apache/shardingsphere/test/it/yaml/YamlRuleRepositoryTupleSwapperEngineIT.java
@@ -73,8 +73,8 @@ public abstract class YamlRuleRepositoryTupleSwapperEngineIT {
protected abstract void assertRepositoryTuples(List<RuleRepositoryTuple>
actualTuples, YamlRuleConfiguration expectedYamlRuleConfig);
protected void assertRepositoryTuple(final RuleRepositoryTuple actual,
final String expectedKey, final Object expectedValue) {
- assertThat(actual.getKey(), containsString(expectedKey));
- assertThat(actual.getValue(), is(isSimpleObject(expectedValue) ?
expectedValue : YamlEngine.marshal(expectedValue)));
+ assertThat(actual.getPath(), containsString(expectedKey));
+ assertThat(actual.getContent(), is(isSimpleObject(expectedValue) ?
expectedValue : YamlEngine.marshal(expectedValue)));
}
private boolean isSimpleObject(final Object expectedValue) {
@@ -96,7 +96,7 @@ public abstract class YamlRuleRepositoryTupleSwapperEngineIT {
String ruleType = Objects.requireNonNull(entity).value();
Collection<RuleRepositoryTuple> tuples =
engine.swapToTuples(yamlRuleConfig);
YamlRuleConfiguration actualYamlRuleConfig = entity.leaf()
- ? engine.swapToYamlGlobalRuleConfiguration(ruleType,
tuples.iterator().next().getValue())
+ ? engine.swapToYamlGlobalRuleConfiguration(ruleType,
tuples.iterator().next().getContent())
: engine.swapToYamlDatabaseRuleConfiguration(ruleType, tuples);
YamlRootConfiguration yamlRootConfig = new YamlRootConfiguration();
yamlRootConfig.setRules(Collections.singletonList(actualYamlRuleConfig));
