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 78711708d24 Remove NodePathSearchCriteria.trimEmptyNode (#34969)
78711708d24 is described below
commit 78711708d24de2d0b8518c6335969849a62e9a5c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 13 11:27:51 2025 +0800
Remove NodePathSearchCriteria.trimEmptyNode (#34969)
---
.../mode/node/path/engine/searcher/NodePathSearchCriteria.java | 2 --
.../mode/node/path/engine/searcher/NodePathSearcher.java | 8 ++++----
.../path/type/database/metadata/DatabaseMetaDataNodePath.java | 2 +-
.../type/database/metadata/datasource/StorageNodeNodePath.java | 2 +-
.../type/database/metadata/datasource/StorageUnitNodePath.java | 2 +-
.../path/type/database/metadata/rule/DatabaseRuleNodePath.java | 4 ++--
.../type/database/metadata/schema/SchemaMetaDataNodePath.java | 2 +-
.../path/type/database/metadata/schema/TableMetaDataNodePath.java | 2 +-
.../path/type/database/metadata/schema/ViewMetaDataNodePath.java | 2 +-
.../path/type/database/statistics/StatisticsDataNodePath.java | 2 +-
.../path/type/database/statistics/StatisticsDatabaseNodePath.java | 2 +-
.../path/type/database/statistics/StatisticsSchemaNodePath.java | 2 +-
.../path/type/database/statistics/StatisticsTableNodePath.java | 2 +-
.../mode/node/path/type/global/config/GlobalRuleNodePath.java | 2 +-
.../node/path/type/global/node/compute/label/LabelNodePath.java | 2 +-
.../global/node/compute/process/KillProcessTriggerNodePath.java | 4 ++--
.../node/compute/process/ShowProcessListTriggerNodePath.java | 4 ++--
.../node/path/type/global/node/compute/status/OnlineNodePath.java | 4 ++--
.../node/path/type/global/node/compute/status/StatusNodePath.java | 2 +-
.../global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java | 2 +-
.../type/global/node/storage/QualifiedDataSourceNodePath.java | 2 +-
.../type/global/state/DatabaseListenerCoordinatorNodePath.java | 2 +-
.../mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java | 4 ++--
.../dispatch/listener/type/DatabaseMetaDataChangedListener.java | 2 +-
24 files changed, 31 insertions(+), 33 deletions(-)
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java
index efb31ca9e50..b1b14b4d525 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearchCriteria.java
@@ -30,8 +30,6 @@ public final class NodePathSearchCriteria {
private final NodePath searchExample;
- private final boolean trimEmptyNode;
-
private final boolean containsChildPath;
private final int searchSegmentIndex;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java
index 8758c167c94..00c3847bd82 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/engine/searcher/NodePathSearcher.java
@@ -42,7 +42,7 @@ public final class NodePathSearcher {
* @return found node segment
*/
public static Optional<String> find(final String path, final
NodePathSearchCriteria criteria) {
- Matcher matcher = createPattern(criteria.getSearchExample(),
criteria.isTrimEmptyNode(), criteria.isContainsChildPath()).matcher(path);
+ Matcher matcher = createPattern(criteria.getSearchExample(),
criteria.isContainsChildPath()).matcher(path);
return matcher.find() ?
Optional.of(matcher.group(criteria.getSearchSegmentIndex())) : Optional.empty();
}
@@ -65,11 +65,11 @@ public final class NodePathSearcher {
* @return is matched path or not
*/
public static boolean isMatchedPath(final String path, final
NodePathSearchCriteria criteria) {
- return createPattern(criteria.getSearchExample(),
criteria.isTrimEmptyNode(),
criteria.isContainsChildPath()).matcher(path).find();
+ return createPattern(criteria.getSearchExample(),
criteria.isContainsChildPath()).matcher(path).find();
}
- private static Pattern createPattern(final NodePath searchExample, final
boolean trimEmptyNode, final boolean containsChildPath) {
+ private static Pattern createPattern(final NodePath searchExample, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- return Pattern.compile(START_PATTERN +
NodePathGenerator.toPath(searchExample, trimEmptyNode) + endPattern,
Pattern.CASE_INSENSITIVE);
+ return Pattern.compile(START_PATTERN +
NodePathGenerator.toPath(searchExample, false) + endPattern,
Pattern.CASE_INSENSITIVE);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java
index 360c0dfe6be..7823ce05a5d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/DatabaseMetaDataNodePath.java
@@ -40,6 +40,6 @@ public final class DatabaseMetaDataNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createDatabaseSearchCriteria() {
- return new NodePathSearchCriteria(new
DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), false, true, 1);
+ return new NodePathSearchCriteria(new
DatabaseMetaDataNodePath(NodePathPattern.IDENTIFIER), true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
index 584765a6376..9f6608f8e9f 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageNodeNodePath.java
@@ -47,6 +47,6 @@ public final class StorageNodeNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createStorageNodeSearchCriteria(final
String databaseName) {
- return new NodePathSearchCriteria(new
StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);
+ return new NodePathSearchCriteria(new
StorageNodeNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
index 72c4bce8675..3ffa86f2a33 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/datasource/StorageUnitNodePath.java
@@ -47,6 +47,6 @@ public final class StorageUnitNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createStorageUnitSearchCriteria(final
String databaseName) {
- return new NodePathSearchCriteria(new
StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), false, true, 1);
+ return new NodePathSearchCriteria(new
StorageUnitNodePath(databaseName, NodePathPattern.IDENTIFIER), true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
index d509e597aff..365034f8f1d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/rule/DatabaseRuleNodePath.java
@@ -50,7 +50,7 @@ public final class DatabaseRuleNodePath implements NodePath {
* @return create search criteria
*/
public static NodePathSearchCriteria createRuleTypeSearchCriteria(final
String databaseName) {
- return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), false,
true, 1);
+ return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, NodePathPattern.IDENTIFIER, null), true, 1);
}
/**
@@ -62,6 +62,6 @@ public final class DatabaseRuleNodePath implements NodePath {
* @return create search criteria
*/
public static NodePathSearchCriteria
createRuleItemNameSearchCriteria(final String databaseName, final String
ruleType, final String ruleItemType) {
- return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType,
NodePathPattern.QUALIFIED_IDENTIFIER)), false, true, 1);
+ return new NodePathSearchCriteria(new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(ruleItemType,
NodePathPattern.QUALIFIED_IDENTIFIER)), true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
index 9478a85bac3..30965a97663 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/SchemaMetaDataNodePath.java
@@ -48,6 +48,6 @@ public final class SchemaMetaDataNodePath implements NodePath
{
* @return created search criteria
*/
public static NodePathSearchCriteria createSchemaSearchCriteria(final
String databaseName, final boolean containsChildPath) {
- return new NodePathSearchCriteria(new
SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER), false,
containsChildPath, 1);
+ return new NodePathSearchCriteria(new
SchemaMetaDataNodePath(databaseName, NodePathPattern.IDENTIFIER),
containsChildPath, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
index 61453c6141c..c3d74b0bd7d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/TableMetaDataNodePath.java
@@ -47,6 +47,6 @@ public final class TableMetaDataNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createTableSearchCriteria(final
String databaseName, final String schemaName) {
- return new NodePathSearchCriteria(new
TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
+ return new NodePathSearchCriteria(new
TableMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
index deb06d04626..7aa5e5cc302 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/metadata/schema/ViewMetaDataNodePath.java
@@ -49,6 +49,6 @@ public final class ViewMetaDataNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createViewSearchCriteria(final String
databaseName, final String schemaName) {
- return new NodePathSearchCriteria(new
ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
false, true, 1);
+ return new NodePathSearchCriteria(new
ViewMetaDataNodePath(databaseName, schemaName, NodePathPattern.IDENTIFIER),
true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
index b22d34d7d6b..0e7f7a94c0e 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDataNodePath.java
@@ -47,6 +47,6 @@ public final class StatisticsDataNodePath implements NodePath
{
* @return created search criteria
*/
public static NodePathSearchCriteria createRowUniqueKeySearchCriteria() {
- return new NodePathSearchCriteria(new
StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, false, 4);
+ return new NodePathSearchCriteria(new
StatisticsDataNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER), false, 4);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java
index d29996ef711..e75c7de6e7e 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsDatabaseNodePath.java
@@ -41,6 +41,6 @@ public final class StatisticsDatabaseNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createDatabaseSearchCriteria(final
boolean containsChildPath) {
- return new NodePathSearchCriteria(new
StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), false,
containsChildPath, 1);
+ return new NodePathSearchCriteria(new
StatisticsDatabaseNodePath(NodePathPattern.IDENTIFIER), containsChildPath, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java
index ab2bf9c0d41..29ca99fd92f 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsSchemaNodePath.java
@@ -46,6 +46,6 @@ public final class StatisticsSchemaNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createSchemaSearchCriteria(final
boolean containsChildPath) {
- return new NodePathSearchCriteria(new
StatisticsSchemaNodePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER), false, containsChildPath, 2);
+ return new NodePathSearchCriteria(new
StatisticsSchemaNodePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER), containsChildPath, 2);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java
index e7e93f3c23c..aaaf5233fed 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/database/statistics/StatisticsTableNodePath.java
@@ -48,6 +48,6 @@ public final class StatisticsTableNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createTableSearchCriteria(final
boolean containsChildPath) {
- return new NodePathSearchCriteria(new
StatisticsTableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER), false, containsChildPath, 3);
+ return new NodePathSearchCriteria(new
StatisticsTableNodePath(NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER), containsChildPath, 3);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java
index d9850b2e230..ad0ccdc093d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/config/GlobalRuleNodePath.java
@@ -40,6 +40,6 @@ public final class GlobalRuleNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createRuleTypeSearchCriteria() {
- return new NodePathSearchCriteria(new
GlobalRuleNodePath(NodePathPattern.IDENTIFIER), false, true, 1);
+ return new NodePathSearchCriteria(new
GlobalRuleNodePath(NodePathPattern.IDENTIFIER), true, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
index 0c95039d7b2..7a278d06438 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/label/LabelNodePath.java
@@ -40,6 +40,6 @@ public final class LabelNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new
LabelNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+ return new NodePathSearchCriteria(new
LabelNodePath(NodePathPattern.IDENTIFIER), false, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java
index 144cf5bd004..d9f4a103e09 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/KillProcessTriggerNodePath.java
@@ -44,7 +44,7 @@ public final class KillProcessTriggerNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new KillProcessTriggerNodePath(),
false, false, 1);
+ return new NodePathSearchCriteria(new KillProcessTriggerNodePath(),
false, 1);
}
/**
@@ -53,6 +53,6 @@ public final class KillProcessTriggerNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createProcessIdSearchCriteria() {
- return new NodePathSearchCriteria(new KillProcessTriggerNodePath(),
false, false, 2);
+ return new NodePathSearchCriteria(new KillProcessTriggerNodePath(),
false, 2);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java
index 952a460d671..e45a0dc015f 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/process/ShowProcessListTriggerNodePath.java
@@ -44,7 +44,7 @@ public final class ShowProcessListTriggerNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new
ShowProcessListTriggerNodePath(), false, false, 1);
+ return new NodePathSearchCriteria(new
ShowProcessListTriggerNodePath(), false, 1);
}
/**
@@ -53,6 +53,6 @@ public final class ShowProcessListTriggerNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createProcessIdSearchCriteria() {
- return new NodePathSearchCriteria(new
ShowProcessListTriggerNodePath(), false, false, 2);
+ return new NodePathSearchCriteria(new
ShowProcessListTriggerNodePath(), false, 2);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java
index 1085412d2d3..fc3915d288b 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/OnlineNodePath.java
@@ -51,7 +51,7 @@ public final class OnlineNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceTypeSearchCriteria() {
- return new NodePathSearchCriteria(new OnlineNodePath(), false, false,
1);
+ return new NodePathSearchCriteria(new OnlineNodePath(), false, 1);
}
/**
@@ -60,6 +60,6 @@ public final class OnlineNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new OnlineNodePath(), false, false,
2);
+ return new NodePathSearchCriteria(new OnlineNodePath(), false, 2);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java
index a0f2e72b275..e8fe355e900 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/status/StatusNodePath.java
@@ -40,6 +40,6 @@ public final class StatusNodePath implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new
StatusNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+ return new NodePathSearchCriteria(new
StatusNodePath(NodePathPattern.IDENTIFIER), false, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java
index 34b5c9ef1d0..9e112e996ad 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/compute/workerid/ComputeNodeWorkerIDNodePath.java
@@ -40,6 +40,6 @@ public final class ComputeNodeWorkerIDNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createInstanceIdSearchCriteria() {
- return new NodePathSearchCriteria(new
ComputeNodeWorkerIDNodePath(NodePathPattern.IDENTIFIER), false, false, 1);
+ return new NodePathSearchCriteria(new
ComputeNodeWorkerIDNodePath(NodePathPattern.IDENTIFIER), false, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java
index 080ffc7f277..41009921d1c 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/node/storage/QualifiedDataSourceNodePath.java
@@ -45,6 +45,6 @@ public final class QualifiedDataSourceNodePath implements
NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria
createQualifiedDataSourceSearchCriteria() {
- return new NodePathSearchCriteria(new
QualifiedDataSourceNodePath(NodePathPattern.QUALIFIED_IDENTIFIER), false,
false, 1);
+ return new NodePathSearchCriteria(new
QualifiedDataSourceNodePath(NodePathPattern.QUALIFIED_IDENTIFIER), false, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java
index b80610c0fb5..42b3bdecf3b 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/DatabaseListenerCoordinatorNodePath.java
@@ -40,6 +40,6 @@ public final class DatabaseListenerCoordinatorNodePath
implements NodePath {
* @return created search criteria
*/
public static NodePathSearchCriteria createDatabaseSearchCriteria() {
- return new NodePathSearchCriteria(new
DatabaseListenerCoordinatorNodePath(NodePathPattern.IDENTIFIER), false, false,
1);
+ return new NodePathSearchCriteria(new
DatabaseListenerCoordinatorNodePath(NodePathPattern.IDENTIFIER), false, 1);
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
index d07d3c7b437..fd2cd0da2cb 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleNodeTupleSwapperEngine.java
@@ -193,7 +193,7 @@ public final class YamlRuleNodeTupleSwapperEngine {
private void setNamedItemFieldValue(final String databaseName, final
YamlRuleConfiguration yamlRuleConfig,
final String ruleType, final
RuleNodeTuple 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.getPath(),
new NodePathSearchCriteria(databaseRuleNodePath, false, true, 1));
+ Optional<String> itemValue = NodePathSearcher.find(tuple.getPath(),
new NodePathSearchCriteria(databaseRuleNodePath, true, 1));
if (!itemValue.isPresent()) {
return;
}
@@ -218,7 +218,7 @@ public final class YamlRuleNodeTupleSwapperEngine {
private void setUniqueItemFieldValue(final String databaseName, final
YamlRuleConfiguration yamlRuleConfig,
final String ruleType, final
RuleNodeTuple tuple, final String itemType, final Field field) {
DatabaseRuleNodePath databaseRuleNodePath = new
DatabaseRuleNodePath(databaseName, ruleType, new DatabaseRuleItem(itemType));
- if (!NodePathSearcher.isMatchedPath(tuple.getPath(), new
NodePathSearchCriteria(databaseRuleNodePath, false, true, 1))) {
+ if (!NodePathSearcher.isMatchedPath(tuple.getPath(), new
NodePathSearchCriteria(databaseRuleNodePath, true, 1))) {
return;
}
if (field.getType().equals(Collection.class)) {
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
index 2fe21df3487..952238a995e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/listener/type/DatabaseMetaDataChangedListener.java
@@ -89,7 +89,7 @@ public final class DatabaseMetaDataChangedListener implements
DataChangedEventLi
return new
VersionNodePath(handler.getSubscribedNodePath(databaseName)).isActiveVersionPath(event.getKey());
}
if (handler instanceof DatabaseNodeValueChangedHandler) {
- return NodePathSearcher.isMatchedPath(event.getKey(), new
NodePathSearchCriteria(handler.getSubscribedNodePath(databaseName), false,
false, 1));
+ return NodePathSearcher.isMatchedPath(event.getKey(), new
NodePathSearchCriteria(handler.getSubscribedNodePath(databaseName), false, 1));
}
return false;
}
