This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 bf7dc281174 Rename SupportedSQLChecker (#32393)
bf7dc281174 is described below
commit bf7dc28117442adbc1bf694454913e31e2634cf4
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 4 20:15:08 2024 +0800
Rename SupportedSQLChecker (#32393)
* Rename SupportedSQLChecker
* Move package of EncryptRuleConfigurationChecker
---
.../{ => config}/EncryptRuleConfigurationChecker.java | 2 +-
.../checker/sql/EncryptOrderByItemSupportedChecker.java | 4 ++--
...sFactory.java => EncryptSupportedSQLCheckersBuilder.java} | 8 ++++----
...shardingsphere.infra.checker.SupportedSQLCheckersBuilder} | 2 +-
...sphere.infra.config.rule.checker.RuleConfigurationChecker | 2 +-
.../{ => config}/EncryptRuleConfigurationCheckerTest.java | 2 +-
...upportedCheckEngine.java => SupportedSQLCheckEngine.java} | 12 ++++++------
.../{SQLSupportedChecker.java => SupportedSQLChecker.java} | 4 ++--
...CheckersFactory.java => SupportedSQLCheckersBuilder.java} | 8 ++++----
.../infra/connection/kernel/KernelProcessor.java | 4 ++--
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationChecker.java
similarity index 99%
rename from
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
rename to
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationChecker.java
index 36ae98ba25e..598973bc788 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationChecker.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationChecker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.checker;
+package org.apache.shardingsphere.encrypt.checker.config;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedChecker.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedChecker.java
index 69a12b049fc..a0d3bef65c4 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedChecker.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptOrderByItemSupportedChecker.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import org.apache.shardingsphere.infra.checker.SQLSupportedChecker;
+import org.apache.shardingsphere.infra.checker.SupportedSQLChecker;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
@@ -40,7 +40,7 @@ import java.util.Optional;
* Order by item supported checker for encrypt.
*/
@HighFrequencyInvocation
-public final class EncryptOrderByItemSupportedChecker implements
SQLSupportedChecker<SelectStatementContext, EncryptRule> {
+public final class EncryptOrderByItemSupportedChecker implements
SupportedSQLChecker<SelectStatementContext, EncryptRule> {
@Override
public boolean isCheck(final SQLStatementContext sqlStatementContext) {
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSQLSupportedCheckersFactory.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSupportedSQLCheckersBuilder.java
similarity index 80%
rename from
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSQLSupportedCheckersFactory.java
rename to
features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSupportedSQLCheckersBuilder.java
index a37da7b3875..3f89b02ff42 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSQLSupportedCheckersFactory.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/checker/sql/EncryptSupportedSQLCheckersBuilder.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.encrypt.checker.sql;
import org.apache.shardingsphere.encrypt.constant.EncryptOrder;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
-import org.apache.shardingsphere.infra.checker.SQLSupportedChecker;
-import org.apache.shardingsphere.infra.checker.SQLSupportedCheckersFactory;
+import org.apache.shardingsphere.infra.checker.SupportedSQLChecker;
+import org.apache.shardingsphere.infra.checker.SupportedSQLCheckersBuilder;
import java.util.Collection;
import java.util.Collections;
@@ -28,10 +28,10 @@ import java.util.Collections;
/**
* Encrypt SQL supported checker factory.
*/
-public final class EncryptSQLSupportedCheckersFactory implements
SQLSupportedCheckersFactory<EncryptRule> {
+public final class EncryptSupportedSQLCheckersBuilder implements
SupportedSQLCheckersBuilder<EncryptRule> {
@Override
- public Collection<SQLSupportedChecker<?, EncryptRule>> getCheckers() {
+ public Collection<SupportedSQLChecker<?, EncryptRule>>
getSupportedSQLCheckers() {
return Collections.singleton(new EncryptOrderByItemSupportedChecker());
}
diff --git
a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SQLSupportedCheckersFactory
b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SupportedSQLCheckersBuilder
similarity index 90%
rename from
features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SQLSupportedCheckersFactory
rename to
features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SupportedSQLCheckersBuilder
index de9483a73a1..061c565b82e 100644
---
a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SQLSupportedCheckersFactory
+++
b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.checker.SupportedSQLCheckersBuilder
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.encrypt.checker.sql.EncryptSQLSupportedCheckersFactory
+org.apache.shardingsphere.encrypt.checker.sql.EncryptSupportedSQLCheckersBuilder
diff --git
a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker
b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker
index a1a310bce9e..c02e5b307d8 100644
---
a/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker
+++
b/features/encrypt/core/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.config.rule.checker.RuleConfigurationChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.encrypt.checker.EncryptRuleConfigurationChecker
+org.apache.shardingsphere.encrypt.checker.config.EncryptRuleConfigurationChecker
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationCheckerTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
similarity index 99%
rename from
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationCheckerTest.java
rename to
features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
index 40f720f8a15..533d668d9f9 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/EncryptRuleConfigurationCheckerTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/checker/config/EncryptRuleConfigurationCheckerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.encrypt.checker;
+package org.apache.shardingsphere.encrypt.checker.config;
import org.apache.shardingsphere.encrypt.config.EncryptRuleConfiguration;
import
org.apache.shardingsphere.encrypt.config.rule.EncryptColumnItemRuleConfiguration;
diff --git
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckEngine.java
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckEngine.java
similarity index 81%
rename from
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckEngine.java
rename to
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckEngine.java
index 4ed0433ef26..da53593db4e 100644
---
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckEngine.java
+++
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckEngine.java
@@ -29,9 +29,9 @@ import java.util.Map;
import java.util.Map.Entry;
/**
- * SQL supported check engine.
+ * Supported SQL check engine.
*/
-public final class SQLSupportedCheckEngine {
+public final class SupportedSQLCheckEngine {
/**
* Check SQL.
@@ -44,9 +44,9 @@ public final class SQLSupportedCheckEngine {
@SuppressWarnings({"rawtypes", "unchecked"})
public void checkSQL(final Collection<ShardingSphereRule> rules, final
SQLStatementContext sqlStatementContext, final Map<String,
ShardingSphereSchema> schemas, final String databaseName) {
ShardingSphereSchema schema = getSchema(sqlStatementContext, schemas,
databaseName);
- for (Entry<ShardingSphereRule, SQLSupportedCheckersFactory> entry :
OrderedSPILoader.getServices(SQLSupportedCheckersFactory.class,
rules).entrySet()) {
- Collection<SQLSupportedChecker> checkers =
entry.getValue().getCheckers();
- for (SQLSupportedChecker each : checkers) {
+ for (Entry<ShardingSphereRule, SupportedSQLCheckersBuilder> entry :
OrderedSPILoader.getServices(SupportedSQLCheckersBuilder.class,
rules).entrySet()) {
+ Collection<SupportedSQLChecker> checkers =
entry.getValue().getSupportedSQLCheckers();
+ for (SupportedSQLChecker each : checkers) {
if (each.isCheck(sqlStatementContext)) {
each.check(entry.getKey(), schema, sqlStatementContext);
}
@@ -54,7 +54,7 @@ public final class SQLSupportedCheckEngine {
}
}
- private static ShardingSphereSchema getSchema(final SQLStatementContext
sqlStatementContext, final Map<String, ShardingSphereSchema> schemas, final
String databaseName) {
+ private ShardingSphereSchema getSchema(final SQLStatementContext
sqlStatementContext, final Map<String, ShardingSphereSchema> schemas, final
String databaseName) {
ShardingSphereSchema defaultSchema = schemas.get(new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(databaseName));
return sqlStatementContext instanceof TableAvailable ?
((TableAvailable)
sqlStatementContext).getTablesContext().getSchemaName().map(schemas::get).orElse(defaultSchema)
: defaultSchema;
}
diff --git
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedChecker.java
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLChecker.java
similarity index 94%
rename from
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedChecker.java
rename to
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLChecker.java
index fbd17989ace..438d65c2801 100644
---
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedChecker.java
+++
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLChecker.java
@@ -22,12 +22,12 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
/**
- * SQL supported checker.
+ * Supported SQL checker.
*
* @param <T> type of SQL statement context
* @param <R> type of ShardingSphere rule
*/
-public interface SQLSupportedChecker<T extends SQLStatementContext, R extends
ShardingSphereRule> {
+public interface SupportedSQLChecker<T extends SQLStatementContext, R extends
ShardingSphereRule> {
/**
* Judge whether to need check SQL.
diff --git
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckersFactory.java
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckersBuilder.java
similarity index 85%
rename from
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckersFactory.java
rename to
infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckersBuilder.java
index db2c8c68130..45439634120 100644
---
a/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SQLSupportedCheckersFactory.java
+++
b/infra/checker/src/main/java/org/apache/shardingsphere/infra/checker/SupportedSQLCheckersBuilder.java
@@ -24,17 +24,17 @@ import
org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPI;
import java.util.Collection;
/**
- * SQL supported checkers factory.
+ * Supported SQL checkers builder.
*
* @param <T> type of rule
*/
@Singleton
-public interface SQLSupportedCheckersFactory<T extends ShardingSphereRule>
extends OrderedSPI<T> {
+public interface SupportedSQLCheckersBuilder<T extends ShardingSphereRule>
extends OrderedSPI<T> {
/**
- * Get SQL supported checkers.
+ * Get supported SQL checkers.
*
* @return got checkers
*/
- Collection<SQLSupportedChecker<?, T>> getCheckers();
+ Collection<SupportedSQLChecker<?, T>> getSupportedSQLCheckers();
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/kernel/KernelProcessor.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/kernel/KernelProcessor.java
index 5fb7a0f8b40..728be3cda81 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/kernel/KernelProcessor.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/kernel/KernelProcessor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.connection.kernel;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
-import org.apache.shardingsphere.infra.checker.SQLSupportedCheckEngine;
+import org.apache.shardingsphere.infra.checker.SupportedSQLCheckEngine;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionContext;
@@ -60,7 +60,7 @@ public final class KernelProcessor {
private void check(final QueryContext queryContext) {
ShardingSphereDatabase database = queryContext.getUsedDatabase();
- new
SQLSupportedCheckEngine().checkSQL(database.getRuleMetaData().getRules(),
queryContext.getSqlStatementContext(), database.getSchemas(),
database.getName());
+ new
SupportedSQLCheckEngine().checkSQL(database.getRuleMetaData().getRules(),
queryContext.getSqlStatementContext(), database.getSchemas(),
database.getName());
}
private RouteContext route(final QueryContext queryContext, final
RuleMetaData globalRuleMetaData, final ConfigurationProperties props, final
ConnectionContext connectionContext) {
