You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/09 16:23:26 UTC
(shardingsphere) branch master updated: Rename DialectSQLStatementExtractor (#35655)
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 8e0bcdb983a Rename DialectSQLStatementExtractor (#35655)
8e0bcdb983a is described below
commit 8e0bcdb983a94999c6fb1fab00ec200c23666bbc
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Jun 10 00:23:20 2025 +0800
Rename DialectSQLStatementExtractor (#35655)
---
...ntContextExtractor.java => DialectSQLStatementExtractor.java} | 4 ++--
.../binder/context/statement/SQLStatementContextFactory.java | 9 ++++-----
...mentContextExtractor.java => MySQLSQLStatementExtractor.java} | 6 +++---
....infra.binder.context.extractor.DialectSQLStatementExtractor} | 2 +-
...ContextExtractor.java => SQLServerSQLStatementExtractor.java} | 6 +++---
....infra.binder.context.extractor.DialectSQLStatementExtractor} | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementContextExtractor.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementExtractor.java
similarity index 92%
rename from infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementContextExtractor.java
rename to infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementExtractor.java
index 65dfb973d9d..79dbe8cc3cf 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementContextExtractor.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/extractor/DialectSQLStatementExtractor.java
@@ -25,10 +25,10 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatemen
import java.util.Collection;
/**
- * Dialect SQL statement context extractor.
+ * Dialect SQL statement extractor.
*/
@SingletonSPI
-public interface DialectSQLStatementContextExtractor extends DatabaseTypedSPI {
+public interface DialectSQLStatementExtractor extends DatabaseTypedSPI {
/**
* Extract table segments.
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
index 775620ddd58..241d7f640d6 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.binder.context.statement;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor;
+import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor;
import org.apache.shardingsphere.infra.binder.context.statement.type.dal.ExplainStatementContext;
import org.apache.shardingsphere.infra.binder.context.statement.type.dal.ShowColumnsStatementContext;
import org.apache.shardingsphere.infra.binder.context.statement.type.dal.ShowIndexStatementContext;
@@ -123,10 +123,9 @@ public final class SQLStatementContextFactory {
*/
public static SQLStatementContext newInstance(final ShardingSphereMetaData metaData,
final DatabaseType databaseType, final SQLStatement sqlStatement, final List<Object> params, final String currentDatabaseName) {
- Optional<DialectSQLStatementContextExtractor> dialectTableAvailableSQLStatementContextExtractor = DatabaseTypedSPILoader.findService(
- DialectSQLStatementContextExtractor.class, databaseType);
- if (dialectTableAvailableSQLStatementContextExtractor.isPresent()) {
- Collection<SimpleTableSegment> tableSegments = dialectTableAvailableSQLStatementContextExtractor.get().extractTables(sqlStatement);
+ Optional<DialectSQLStatementExtractor> dialectSQLStatementExtractor = DatabaseTypedSPILoader.findService(DialectSQLStatementExtractor.class, databaseType);
+ if (dialectSQLStatementExtractor.isPresent()) {
+ Collection<SimpleTableSegment> tableSegments = dialectSQLStatementExtractor.get().extractTables(sqlStatement);
if (!tableSegments.isEmpty()) {
return new TableAvailableSQLStatementContext(databaseType, sqlStatement, tableSegments);
}
diff --git a/infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementContextExtractor.java b/infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementExtractor.java
similarity index 92%
rename from infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementContextExtractor.java
rename to infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementExtractor.java
index 8d01a8e9ba1..011a495f99e 100644
--- a/infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementContextExtractor.java
+++ b/infra/binder/dialect/mysql/src/main/java/org/apache/shardingsphere/infra/binder/mysql/MySQLSQLStatementExtractor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.binder.mysql;
-import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor;
+import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dal.MySQLFlushStatement;
@@ -28,9 +28,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * SQL statement context extractor for MySQL.
+ * SQL statement extractor for MySQL.
*/
-public final class MySQLSQLStatementContextExtractor implements DialectSQLStatementContextExtractor {
+public final class MySQLSQLStatementExtractor implements DialectSQLStatementExtractor {
@Override
public Collection<SimpleTableSegment> extractTables(final SQLStatement sqlStatement) {
diff --git a/infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor b/infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
similarity index 90%
rename from infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor
rename to infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
index eb59c7477d9..5fb95dca9bf 100644
--- a/infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor
+++ b/infra/binder/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.binder.mysql.MySQLSQLStatementContextExtractor
+org.apache.shardingsphere.infra.binder.mysql.MySQLSQLStatementExtractor
diff --git a/infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementContextExtractor.java b/infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementExtractor.java
similarity index 89%
rename from infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementContextExtractor.java
rename to infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementExtractor.java
index b74dee0f698..23a4f126163 100644
--- a/infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementContextExtractor.java
+++ b/infra/binder/dialect/sqlserver/src/main/java/org/apache/shardingsphere/infra/binder/sqlserver/SQLServerSQLStatementExtractor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.binder.sqlserver;
-import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor;
+import org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DenyUserStatement;
@@ -26,9 +26,9 @@ import java.util.Collection;
import java.util.Collections;
/**
- * SQL statement context extractor for SQLServer.
+ * SQL statement extractor for SQLServer.
*/
-public final class SQLServerSQLStatementContextExtractor implements DialectSQLStatementContextExtractor {
+public final class SQLServerSQLStatementExtractor implements DialectSQLStatementExtractor {
@Override
public Collection<SimpleTableSegment> extractTables(final SQLStatement sqlStatement) {
diff --git a/infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor b/infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
similarity index 97%
rename from infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor
rename to infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
index b6f08266329..9ce98be5e77 100644
--- a/infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementContextExtractor
+++ b/infra/binder/dialect/sqlserver/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.binder.context.extractor.DialectSQLStatementExtractor
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.binder.sqlserver.SQLServerSQLStatementContextExtractor
+org.apache.shardingsphere.infra.binder.sqlserver.SQLServerSQLStatementExtractor