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 59389727b51 Rename NodePathPattern.IDENTIFIER (#34672)
59389727b51 is described below
commit 59389727b51d01d81b70a5bd0de94bc6356fb3b4
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Feb 14 23:13:52 2025 +0800
Rename NodePathPattern.IDENTIFIER (#34672)
---
.../apache/shardingsphere/mode/node/path/NodePathPattern.java | 4 ++--
.../config/database/item/NamedDatabaseRuleItemNodePath.java | 2 +-
.../path/config/database/root/DatabaseRuleRootNodePath.java | 2 +-
.../mode/node/path/config/global/GlobalRuleNodePath.java | 2 +-
.../mode/node/path/metadata/DataSourceMetaDataNodePath.java | 10 +++++-----
.../mode/node/path/metadata/DatabaseMetaDataNodePath.java | 4 ++--
.../mode/node/path/metadata/StatisticsNodePath.java | 10 ++++------
.../mode/node/path/metadata/TableMetaDataNodePath.java | 5 ++---
.../mode/node/path/metadata/ViewMetaDataNodePath.java | 5 ++---
9 files changed, 20 insertions(+), 24 deletions(-)
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathPattern.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathPattern.java
index a95152649f6..2eb0686d35a 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathPattern.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/NodePathPattern.java
@@ -27,7 +27,7 @@ import lombok.NoArgsConstructor;
public final class NodePathPattern {
/**
- * Grouped identifier pattern.
+ * Identifier pattern.
*/
- public static final String GROUPED_IDENTIFIER = "([\\w\\-]+)";
+ public static final String IDENTIFIER = "([\\w\\-]+)";
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
index 64106a6a87e..02624dcde1a 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedDatabaseRuleItemNodePath.java
@@ -40,7 +40,7 @@ public final class NamedDatabaseRuleItemNodePath {
public NamedDatabaseRuleItemNodePath(final DatabaseRuleRootNodePath
rootNodePath, final String type) {
this.type = type;
- String pattern = String.join("/", rootNodePath.getNodePrefix() + type,
NodePathPattern.GROUPED_IDENTIFIER);
+ String pattern = String.join("/", rootNodePath.getNodePrefix() + type,
NodePathPattern.IDENTIFIER);
itemPathPattern = Pattern.compile(pattern + "$");
versionNodePathParser = new VersionNodePathParser(pattern);
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/root/DatabaseRuleRootNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/root/DatabaseRuleRootNodePath.java
index f9fe923222f..daf3cb24dc6 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/root/DatabaseRuleRootNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/root/DatabaseRuleRootNodePath.java
@@ -41,7 +41,7 @@ public final class DatabaseRuleRootNodePath {
public DatabaseRuleRootNodePath(final String ruleType) {
this.ruleType = ruleType;
- nodePrefix = String.join("/", ROOT_NODE,
NodePathPattern.GROUPED_IDENTIFIER, RULE_NODE, ruleType, "");
+ nodePrefix = String.join("/", ROOT_NODE, NodePathPattern.IDENTIFIER,
RULE_NODE, ruleType, "");
pathPattern = Pattern.compile(nodePrefix + ".*");
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
index dee36692ffe..23cbdc7885d 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/global/GlobalRuleNodePath.java
@@ -31,7 +31,7 @@ public final class GlobalRuleNodePath {
private static final String ROOT_NODE = "/rules";
- private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getRootPath() + "/" + NodePathPattern.GROUPED_IDENTIFIER);
+ private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getRootPath() + "/" + NodePathPattern.IDENTIFIER);
/**
* Get global rule root path.
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePath.java
index be3b99ed0ae..1e0ce14ab38 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DataSourceMetaDataNodePath.java
@@ -42,10 +42,10 @@ public final class DataSourceMetaDataNodePath {
private static final String UNITS_NODE = "units";
private static final VersionNodePathParser STORAGE_UNITS_PARSER =
- new VersionNodePathParser(String.join("/",
getStorageUnitsPath(NodePathPattern.GROUPED_IDENTIFIER),
NodePathPattern.GROUPED_IDENTIFIER));
+ new VersionNodePathParser(String.join("/",
getStorageUnitsPath(NodePathPattern.IDENTIFIER), NodePathPattern.IDENTIFIER));
private static final VersionNodePathParser STORAGE_NODES_PARSER =
- new VersionNodePathParser(String.join("/",
getStorageNodesPath(NodePathPattern.GROUPED_IDENTIFIER),
NodePathPattern.GROUPED_IDENTIFIER));
+ new VersionNodePathParser(String.join("/",
getStorageNodesPath(NodePathPattern.IDENTIFIER), NodePathPattern.IDENTIFIER));
/**
* Get data source root path.
@@ -146,7 +146,7 @@ public final class DataSourceMetaDataNodePath {
* @return found storage unit name
*/
public static Optional<String> findStorageUnitNameByStorageUnitPath(final
String path) {
- Pattern pattern =
Pattern.compile(getStorageUnitPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getStorageUnitPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -158,7 +158,7 @@ public final class DataSourceMetaDataNodePath {
* @return found storage unit name
*/
public static Optional<String> findStorageNodeNameByStorageNodePath(final
String path) {
- Pattern pattern =
Pattern.compile(getStorageNodePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getStorageNodePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -170,6 +170,6 @@ public final class DataSourceMetaDataNodePath {
* @return is data source root path or not
*/
public static boolean isDataSourceRootPath(final String path) {
- return
Pattern.compile(getDataSourceRootPath(NodePathPattern.GROUPED_IDENTIFIER) +
"?", Pattern.CASE_INSENSITIVE).matcher(path).find();
+ return
Pattern.compile(getDataSourceRootPath(NodePathPattern.IDENTIFIER) + "?",
Pattern.CASE_INSENSITIVE).matcher(path).find();
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java
index 660afe47973..080f19817e9 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/DatabaseMetaDataNodePath.java
@@ -84,7 +84,7 @@ public final class DatabaseMetaDataNodePath {
*/
public static Optional<String> findDatabaseName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.GROUPED_IDENTIFIER) +
endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
}
@@ -98,7 +98,7 @@ public final class DatabaseMetaDataNodePath {
*/
public static Optional<String> findSchemaName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatisticsNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatisticsNodePath.java
index 194f26c590c..4377117eedf 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatisticsNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatisticsNodePath.java
@@ -128,7 +128,7 @@ public final class StatisticsNodePath {
*/
public static Optional<String> findDatabaseName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.GROUPED_IDENTIFIER) +
endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
}
@@ -142,7 +142,7 @@ public final class StatisticsNodePath {
*/
public static Optional<String> findSchemaName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -156,8 +156,7 @@ public final class StatisticsNodePath {
*/
public static Optional<String> findTableName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
-
Pattern.compile(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER) +
endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -169,8 +168,7 @@ public final class StatisticsNodePath {
* @return found row unique key
*/
public static Optional<String> findRowUniqueKey(final String path) {
- Pattern pattern = Pattern.compile(
- getTableRowPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER,
UNIQUE_KEY_PATTERN) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getTableRowPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, UNIQUE_KEY_PATTERN) +
"$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(4)) :
Optional.empty();
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePath.java
index 6bfd957d7e9..aef80faa425 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/TableMetaDataNodePath.java
@@ -35,8 +35,7 @@ public final class TableMetaDataNodePath {
private static final String TABLES_NODE = "tables";
- private static final VersionNodePathParser PARSER =
- new
VersionNodePathParser(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER));
+ private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
* Get table root path.
@@ -80,7 +79,7 @@ public final class TableMetaDataNodePath {
* @return found table name
*/
public static Optional<String> findTableName(final String path) {
- Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePath.java
index c5e7126a03e..6565763410b 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ViewMetaDataNodePath.java
@@ -35,8 +35,7 @@ public final class ViewMetaDataNodePath {
private static final String VIEWS_NODE = "views";
- private static final VersionNodePathParser PARSER =
- new
VersionNodePathParser(getViewPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER));
+ private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
/**
* Get view root path.
@@ -80,7 +79,7 @@ public final class ViewMetaDataNodePath {
* @return view name
*/
public static Optional<String> findViewName(final String path) {
- Pattern pattern =
Pattern.compile(getViewPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
