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 1bad57c21f6 Rename NodePathPattern.GROUPED_IDENTIFIER (#34650)
1bad57c21f6 is described below
commit 1bad57c21f67d854fc9cbd437a12cd19604f7eb9
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Feb 12 23:42:59 2025 +0800
Rename NodePathPattern.GROUPED_IDENTIFIER (#34650)
* Rename NodePathPattern.GROUPED_IDENTIFIER
* Rename NodePathPattern.GROUPED_IDENTIFIER
---
.../shardingsphere/mode/node/path/NodePathPattern.java | 4 ++--
.../path/config/database/item/NamedRuleItemNodePath.java | 2 +-
.../mode/node/path/config/global/GlobalRuleNodePath.java | 2 +-
.../mode/node/path/metadata/DataSourceMetaDataNodePath.java | 12 +++++++-----
.../mode/node/path/metadata/DatabaseMetaDataNodePath.java | 4 ++--
.../mode/node/path/metadata/StatisticsNodePath.java | 9 +++++----
.../mode/node/path/metadata/TableMetaDataNodePath.java | 5 +++--
.../mode/node/path/metadata/ViewMetaDataNodePath.java | 5 +++--
8 files changed, 24 insertions(+), 19 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 2eb0686d35a..a95152649f6 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 {
/**
- * Identifier pattern.
+ * Grouped identifier pattern.
*/
- public static final String IDENTIFIER = "([\\w\\-]+)";
+ public static final String GROUPED_IDENTIFIER = "([\\w\\-]+)";
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
index 05f26ce1a6e..e3765608e44 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/config/database/item/NamedRuleItemNodePath.java
@@ -40,7 +40,7 @@ public final class NamedRuleItemNodePath {
public NamedRuleItemNodePath(final RuleRootNodePath rootNodePath, final
String type) {
this.type = type;
- String pattern = String.join("/", rootNodePath.getNodePrefix() + type,
NodePathPattern.IDENTIFIER);
+ String pattern = String.join("/", rootNodePath.getNodePrefix() + type,
NodePathPattern.GROUPED_IDENTIFIER);
versionNodePathParser = new VersionNodePathParser(pattern);
itemPathPattern = Pattern.compile(pattern + "$");
}
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 29af6b315ff..e003a626363 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.IDENTIFIER);
+ private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getRootPath() + "/" + NodePathPattern.GROUPED_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 308d98512a1..be3b99ed0ae 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
@@ -41,9 +41,11 @@ public final class DataSourceMetaDataNodePath {
private static final String UNITS_NODE = "units";
- private static final VersionNodePathParser STORAGE_UNITS_PARSER = new
VersionNodePathParser(String.join("/",
getStorageUnitsPath(NodePathPattern.IDENTIFIER), NodePathPattern.IDENTIFIER));
+ private static final VersionNodePathParser STORAGE_UNITS_PARSER =
+ new VersionNodePathParser(String.join("/",
getStorageUnitsPath(NodePathPattern.GROUPED_IDENTIFIER),
NodePathPattern.GROUPED_IDENTIFIER));
- private static final VersionNodePathParser STORAGE_NODES_PARSER = new
VersionNodePathParser(String.join("/",
getStorageNodesPath(NodePathPattern.IDENTIFIER), NodePathPattern.IDENTIFIER));
+ private static final VersionNodePathParser STORAGE_NODES_PARSER =
+ new VersionNodePathParser(String.join("/",
getStorageNodesPath(NodePathPattern.GROUPED_IDENTIFIER),
NodePathPattern.GROUPED_IDENTIFIER));
/**
* Get data source root path.
@@ -144,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.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getStorageUnitPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -156,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.IDENTIFIER,
NodePathPattern.IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getStorageNodePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + "$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -168,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.IDENTIFIER) + "?",
Pattern.CASE_INSENSITIVE).matcher(path).find();
+ return
Pattern.compile(getDataSourceRootPath(NodePathPattern.GROUPED_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 080f19817e9..660afe47973 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.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.GROUPED_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.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_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 f6598ea7cef..194f26c590c 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.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getDatabasePath(NodePathPattern.GROUPED_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.IDENTIFIER,
NodePathPattern.IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getSchemaPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER) + endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(2)) :
Optional.empty();
}
@@ -156,7 +156,8 @@ public final class StatisticsNodePath {
*/
public static Optional<String> findTableName(final String path, final
boolean containsChildPath) {
String endPattern = containsChildPath ? "?" : "$";
- Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + endPattern,
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
+
Pattern.compile(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER) +
endPattern, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -169,7 +170,7 @@ public final class StatisticsNodePath {
*/
public static Optional<String> findRowUniqueKey(final String path) {
Pattern pattern = Pattern.compile(
- getTableRowPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER, UNIQUE_KEY_PATTERN) +
"$", Pattern.CASE_INSENSITIVE);
+ getTableRowPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_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 aef80faa425..6bfd957d7e9 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,7 +35,8 @@ public final class TableMetaDataNodePath {
private static final String TABLES_NODE = "tables";
- private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
+ private static final VersionNodePathParser PARSER =
+ new
VersionNodePathParser(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER));
/**
* Get table root path.
@@ -79,7 +80,7 @@ public final class TableMetaDataNodePath {
* @return found table name
*/
public static Optional<String> findTableName(final String path) {
- Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getTablePath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_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 6565763410b..c5e7126a03e 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,7 +35,8 @@ public final class ViewMetaDataNodePath {
private static final String VIEWS_NODE = "views";
- private static final VersionNodePathParser PARSER = new
VersionNodePathParser(getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER));
+ private static final VersionNodePathParser PARSER =
+ new
VersionNodePathParser(getViewPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER));
/**
* Get view root path.
@@ -79,7 +80,7 @@ public final class ViewMetaDataNodePath {
* @return view name
*/
public static Optional<String> findViewName(final String path) {
- Pattern pattern =
Pattern.compile(getViewPath(NodePathPattern.IDENTIFIER,
NodePathPattern.IDENTIFIER, NodePathPattern.IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
+ Pattern pattern =
Pattern.compile(getViewPath(NodePathPattern.GROUPED_IDENTIFIER,
NodePathPattern.GROUPED_IDENTIFIER, NodePathPattern.GROUPED_IDENTIFIER) + "$",
Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(path);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
