This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 780db86966a Optimize the way to obtain like pattern in
ShowTablesExecutor (#32709)
780db86966a is described below
commit 780db86966aafa339a94a8d372ed03fa057894b2
Author: Raigor <[email protected]>
AuthorDate: Wed Aug 28 16:14:57 2024 +0800
Optimize the way to obtain like pattern in ShowTablesExecutor (#32709)
---
.../handler/executor/rql/resource/ShowLogicalTableExecutor.java | 6 +-----
.../backend/mysql/handler/admin/executor/ShowTablesExecutor.java | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
index 954b0c549dc..4cac299f3f4 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
@@ -78,11 +78,7 @@ public final class ShowLogicalTableExecutor implements
DistSQLQueryExecutor<Show
}
private Optional<Pattern> getLikePattern(final ShowLogicalTablesStatement
sqlStatement) {
- if (!sqlStatement.getLikePattern().isPresent()) {
- return Optional.empty();
- }
- Optional<String> pattern =
sqlStatement.getLikePattern().map(RegexUtils::convertLikePatternToRegex);
- return pattern.map(optional ->
Pattern.compile(RegexUtils.convertLikePatternToRegex(optional),
Pattern.CASE_INSENSITIVE));
+ return sqlStatement.getLikePattern().map(optional ->
Pattern.compile(RegexUtils.convertLikePatternToRegex(optional),
Pattern.CASE_INSENSITIVE));
}
@Override
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
index b13f55f674e..ac28c0643b6 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowTablesExecutor.java
@@ -110,7 +110,7 @@ public final class ShowTablesExecutor implements
DatabaseAdminQueryExecutor {
if (!sqlStatement.getFilter().isPresent()) {
return Optional.empty();
}
- Optional<String> pattern =
sqlStatement.getFilter().get().getLike().map(optional ->
RegexUtils.convertLikePatternToRegex(optional.getPattern()));
- return pattern.map(optional ->
Pattern.compile(RegexUtils.convertLikePatternToRegex(optional),
Pattern.CASE_INSENSITIVE));
+ Optional<String> regex =
sqlStatement.getFilter().get().getLike().map(optional ->
RegexUtils.convertLikePatternToRegex(optional.getPattern()));
+ return regex.map(optional -> Pattern.compile(optional,
Pattern.CASE_INSENSITIVE));
}
}