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 20c974e7d62 Refactor GlobalRuleRDLUpdater (#29770)
20c974e7d62 is described below
commit 20c974e7d6225d0215c1ea0cea52f49685177241
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 19 09:36:52 2024 +0800
Refactor GlobalRuleRDLUpdater (#29770)
* Refactor GlobalRuleRDLUpdater
* Refactor GlobalRuleRDLUpdater
---
.../GlobalRuleRDLUpdater.java} | 11 +++++------
.../update/AlterGlobalClockRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updatable/AlterGlobalClockRuleStatement.java | 4 ++--
.../AlterSQLFederationRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updatable/AlterSQLFederationRuleStatement.java | 4 ++--
.../update/AlterSQLParserRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updatable/AlterSQLParserRuleStatement.java | 4 ++--
.../AlterSQLTranslatorRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updateable/AlterSQLTranslatorRuleStatement.java | 4 ++--
.../update/AlterTrafficRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updatable/AlterTrafficRuleStatement.java | 4 ++--
.../update/AlterTransactionRuleStatementUpdater.java | 4 ++--
...ere.distsql.handler.type.rdl.GlobalRuleRDLUpdater} | 0
.../updatable/AlterTransactionRuleStatement.java | 4 ++--
...dHandler.java => GlobalRuleRDLBackendHandler.java} | 17 ++++++++---------
...ndler.java => NewGlobalRuleRDLBackendHandler.java} | 15 +++++++--------
.../handler/distsql/ral/RALBackendHandlerFactory.java | 16 +++-------------
.../rdl/rule/NewRuleDefinitionBackendHandler.java | 17 ++++++++++++++---
.../ral/impl/UpdatableRALStatementAssert.java | 19 -------------------
.../asserts/statement/rdl/RDLStatementAssert.java | 19 +++++++++++++++++++
25 files changed, 80 insertions(+), 82 deletions(-)
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/update/GlobalRuleRALUpdater.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/GlobalRuleRDLUpdater.java
similarity index 80%
rename from
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/update/GlobalRuleRALUpdater.java
rename to
infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/GlobalRuleRDLUpdater.java
index 2c3179d1337..2c97f1a7ec2 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/ral/update/GlobalRuleRALUpdater.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/type/rdl/GlobalRuleRDLUpdater.java
@@ -15,22 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.distsql.handler.type.ral.update;
+package org.apache.shardingsphere.distsql.handler.type.rdl;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * RAL updater for global rule.
+ * RDL updater for global rule.
*
* @param <T> type of SQL statement
* @param <R> type of rule configuration
*/
@SingletonSPI
-public interface GlobalRuleRALUpdater<T extends SQLStatement, R extends
RuleConfiguration> extends TypedSPI {
+public interface GlobalRuleRDLUpdater<T extends RuleDefinitionStatement, R
extends RuleConfiguration> extends TypedSPI {
/**
* Check SQL statement.
@@ -57,5 +56,5 @@ public interface GlobalRuleRALUpdater<T extends SQLStatement,
R extends RuleConf
Class<R> getRuleConfigurationClass();
@Override
- Class<? extends UpdatableGlobalRuleRALStatement> getType();
+ Class<T> getType();
}
diff --git
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
index be59b240d03..10c00c55790 100644
---
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
+++
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.globalclock.distsql.handler.update;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import
org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
import
org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
/**
* Alter global clock rule statement updater.
*/
-public final class AlterGlobalClockRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterGlobalClockRuleStatement,
GlobalClockRuleConfiguration> {
+public final class AlterGlobalClockRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterGlobalClockRuleStatement,
GlobalClockRuleConfiguration> {
@Override
public void checkSQLStatement(final GlobalClockRuleConfiguration
currentRuleConfig, final AlterGlobalClockRuleStatement sqlStatement) {
diff --git
a/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/global-clock/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
index bfd405ae471..05233d1892a 100644
---
a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
+++
b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.globalclock.distsql.statement.updatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import java.util.Properties;
@@ -28,7 +28,7 @@ import java.util.Properties;
*/
@RequiredArgsConstructor
@Getter
-public final class AlterGlobalClockRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterGlobalClockRuleStatement extends
RuleDefinitionStatement {
private final String type;
diff --git
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
index 15095abf1ce..13a1795bb7d 100644
---
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
+++
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/update/AlterSQLFederationRuleStatementUpdater.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sqlfederation.distsql.handler.update;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import
org.apache.shardingsphere.sqlfederation.api.config.SQLFederationRuleConfiguration;
import
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment;
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.sqlfederation.distsql.statement.updatable.Alter
/**
* Alter SQL federation rule statement updater.
*/
-public final class AlterSQLFederationRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterSQLFederationRuleStatement,
SQLFederationRuleConfiguration> {
+public final class AlterSQLFederationRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterSQLFederationRuleStatement,
SQLFederationRuleConfiguration> {
@Override
public void checkSQLStatement(final SQLFederationRuleConfiguration
currentRuleConfig, final AlterSQLFederationRuleStatement sqlStatement) {
diff --git
a/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/sql-federation/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
index 2cb743a5bd8..847ac630c37 100644
---
a/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
+++
b/kernel/sql-federation/distsql/statement/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/statement/updatable/AlterSQLFederationRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sqlfederation.distsql.statement.updatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegment;
/**
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.sqlfederation.distsql.segment.CacheOptionSegmen
*/
@RequiredArgsConstructor
@Getter
-public final class AlterSQLFederationRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterSQLFederationRuleStatement extends
RuleDefinitionStatement {
private final Boolean sqlFederationEnabled;
diff --git
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
index 64fc374bfb5..5f25db71f32 100644
---
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
+++
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.parser.distsql.handler.update;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
import
org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement;
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
/**
* Alter SQL parser rule statement updater.
*/
-public final class AlterSQLParserRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterSQLParserRuleStatement, SQLParserRuleConfiguration> {
+public final class AlterSQLParserRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterSQLParserRuleStatement, SQLParserRuleConfiguration> {
@Override
public void checkSQLStatement(final SQLParserRuleConfiguration
currentRuleConfig, final AlterSQLParserRuleStatement sqlStatement) {
diff --git
a/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/sql-parser/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
index 74a451d1321..f5aca5b0959 100644
---
a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
+++
b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.parser.distsql.statement.updatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
/**
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment;
*/
@RequiredArgsConstructor
@Getter
-public final class AlterSQLParserRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterSQLParserRuleStatement extends RuleDefinitionStatement
{
private final CacheOptionSegment parseTreeCache;
diff --git
a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleStatementUpdater.java
b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleStatementUpdater.java
index c5fc00a31d9..97c4fc9f9e6 100644
---
a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleStatementUpdater.java
+++
b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/update/AlterSQLTranslatorRuleStatementUpdater.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sqltranslator.distsql.handler.update;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration;
import
org.apache.shardingsphere.sqltranslator.distsql.statement.updateable.AlterSQLTranslatorRuleStatement;
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.sqltranslator.spi.SQLTranslator;
/**
* Alter SQL translator rule statement updater.
*/
-public final class AlterSQLTranslatorRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterSQLTranslatorRuleStatement,
SQLTranslatorRuleConfiguration> {
+public final class AlterSQLTranslatorRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterSQLTranslatorRuleStatement,
SQLTranslatorRuleConfiguration> {
@Override
public void checkSQLStatement(final SQLTranslatorRuleConfiguration
currentRuleConfig, final AlterSQLTranslatorRuleStatement sqlStatement) {
diff --git
a/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/sql-translator/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
index d345e82f40b..3a56511b9d0 100644
---
a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
+++
b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/updateable/AlterSQLTranslatorRuleStatement.java
@@ -20,14 +20,14 @@ package
org.apache.shardingsphere.sqltranslator.distsql.statement.updateable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
/**
* Alter SQL translator rule statement.
*/
@RequiredArgsConstructor
@Getter
-public final class AlterSQLTranslatorRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterSQLTranslatorRuleStatement extends
RuleDefinitionStatement {
private final AlgorithmSegment provider;
diff --git
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
index 2e1eeca112d..21e6a8a0529 100644
---
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
+++
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.traffic.distsql.handler.update;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
/**
* Alter traffic rule statement updater.
*/
-public final class AlterTrafficRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterTrafficRuleStatement, TrafficRuleConfiguration> {
+public final class AlterTrafficRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterTrafficRuleStatement, TrafficRuleConfiguration> {
@Override
public void checkSQLStatement(final TrafficRuleConfiguration
currentRuleConfig, final AlterTrafficRuleStatement sqlStatement) {
diff --git
a/kernel/traffic/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/traffic/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/traffic/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/traffic/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
index 29ee30acb67..d967123c8d0 100644
---
a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
+++
b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.traffic.distsql.statement.updatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment;
import java.util.Collection;
@@ -29,7 +29,7 @@ import java.util.Collection;
*/
@RequiredArgsConstructor
@Getter
-public final class AlterTrafficRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterTrafficRuleStatement extends RuleDefinitionStatement {
private final Collection<TrafficRuleSegment> segments;
}
diff --git
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
index 66a5aff38ca..d86ef467a72 100644
---
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
+++
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.distsql.handler.update;
import
org.apache.shardingsphere.distsql.handler.exception.rule.InvalidRuleConfigurationException;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.transaction.api.TransactionType;
@@ -32,7 +32,7 @@ import java.util.Optional;
/**
* Alter transaction rule statement updater.
*/
-public final class AlterTransactionRuleStatementUpdater implements
GlobalRuleRALUpdater<AlterTransactionRuleStatement,
TransactionRuleConfiguration> {
+public final class AlterTransactionRuleStatementUpdater implements
GlobalRuleRDLUpdater<AlterTransactionRuleStatement,
TransactionRuleConfiguration> {
@Override
public void checkSQLStatement(final TransactionRuleConfiguration
currentRuleConfig, final AlterTransactionRuleStatement sqlStatement) {
diff --git
a/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
b/kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
similarity index 100%
rename from
kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater
rename to
kernel/transaction/distsql/handler/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater
diff --git
a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
index 4ec90696935..1711b923341 100644
---
a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
+++
b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.transaction.distsql.statement.updatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import
org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment;
/**
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.transaction.distsql.segment.TransactionProvider
*/
@RequiredArgsConstructor
@Getter
-public final class AlterTransactionRuleStatement extends
UpdatableGlobalRuleRALStatement {
+public final class AlterTransactionRuleStatement extends
RuleDefinitionStatement {
private final String defaultType;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/GlobalRuleRDLBackendHandler.java
similarity index 82%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/GlobalRuleRDLBackendHandler.java
index aa2407cf0b7..c813726d590 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/UpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/GlobalRuleRDLBackendHandler.java
@@ -19,9 +19,8 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
-import org.apache.shardingsphere.distsql.statement.ral.RALStatement;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -34,17 +33,17 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Updatable RAL backend handler for global rule.
+ * RDL backend handler for global rule.
*/
@RequiredArgsConstructor
-public final class UpdatableGlobalRuleRALBackendHandler implements
DistSQLBackendHandler {
+public final class GlobalRuleRDLBackendHandler implements
DistSQLBackendHandler {
- private final UpdatableGlobalRuleRALStatement sqlStatement;
+ private final RuleDefinitionStatement sqlStatement;
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public ResponseHeader execute() {
- GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
+ GlobalRuleRDLUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRDLUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
Collection<RuleConfiguration> ruleConfigs =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
@@ -64,8 +63,8 @@ public final class UpdatableGlobalRuleRALBackendHandler
implements DistSQLBacken
}
@SuppressWarnings({"rawtypes", "unchecked"})
- private Collection<RuleConfiguration> processUpdate(final
Collection<RuleConfiguration> ruleConfigurations, final RALStatement
sqlStatement, final GlobalRuleRALUpdater globalRuleUpdater,
- final
RuleConfiguration currentRuleConfig) {
+ private Collection<RuleConfiguration> processUpdate(final
Collection<RuleConfiguration> ruleConfigurations,
+ final
RuleDefinitionStatement sqlStatement, final GlobalRuleRDLUpdater
globalRuleUpdater, final RuleConfiguration currentRuleConfig) {
Collection<RuleConfiguration> result = new
LinkedList<>(ruleConfigurations);
result.remove(currentRuleConfig);
result.add(globalRuleUpdater.buildAlteredRuleConfiguration(currentRuleConfig,
sqlStatement));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewGlobalRuleRDLBackendHandler.java
similarity index 82%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewGlobalRuleRDLBackendHandler.java
index b0fccb10e33..ab61671c107 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewUpdatableGlobalRuleRALBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/NewGlobalRuleRDLBackendHandler.java
@@ -19,9 +19,8 @@ package
org.apache.shardingsphere.proxy.backend.handler.distsql.ral;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException;
-import
org.apache.shardingsphere.distsql.handler.type.ral.update.GlobalRuleRALUpdater;
-import org.apache.shardingsphere.distsql.statement.ral.RALStatement;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
+import org.apache.shardingsphere.distsql.handler.type.rdl.GlobalRuleRDLUpdater;
+import org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -33,17 +32,17 @@ import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResp
import java.util.Collection;
/**
- * New updatable RAL backend handler for global rule.
+ * New RDL backend handler for global rule.
*/
@RequiredArgsConstructor
-public final class NewUpdatableGlobalRuleRALBackendHandler implements
DistSQLBackendHandler {
+public final class NewGlobalRuleRDLBackendHandler implements
DistSQLBackendHandler {
- private final UpdatableGlobalRuleRALStatement sqlStatement;
+ private final RuleDefinitionStatement sqlStatement;
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public ResponseHeader execute() {
- GlobalRuleRALUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRALUpdater.class, sqlStatement.getClass());
+ GlobalRuleRDLUpdater globalRuleUpdater =
TypedSPILoader.getService(GlobalRuleRDLUpdater.class, sqlStatement.getClass());
Class<? extends RuleConfiguration> ruleConfigClass =
globalRuleUpdater.getRuleConfigurationClass();
ContextManager contextManager =
ProxyContext.getInstance().getContextManager();
Collection<RuleConfiguration> ruleConfigs =
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations();
@@ -63,7 +62,7 @@ public final class NewUpdatableGlobalRuleRALBackendHandler
implements DistSQLBac
}
@SuppressWarnings({"rawtypes", "unchecked"})
- private RuleConfiguration processUpdate(final
Collection<RuleConfiguration> ruleConfigurations, final RALStatement
sqlStatement, final GlobalRuleRALUpdater globalRuleUpdater,
+ private RuleConfiguration processUpdate(final
Collection<RuleConfiguration> ruleConfigurations, final RuleDefinitionStatement
sqlStatement, final GlobalRuleRDLUpdater globalRuleUpdater,
final RuleConfiguration
currentRuleConfig) {
RuleConfiguration result =
globalRuleUpdater.buildAlteredRuleConfiguration(currentRuleConfig,
sqlStatement);
ruleConfigurations.remove(currentRuleConfig);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
index 1453fa1e2c6..228b02754b2 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
@@ -21,9 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.statement.ral.QueryableRALStatement;
import org.apache.shardingsphere.distsql.statement.ral.RALStatement;
-import
org.apache.shardingsphere.distsql.statement.ral.UpdatableGlobalRuleRALStatement;
import org.apache.shardingsphere.distsql.statement.ral.UpdatableRALStatement;
-import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -41,16 +39,8 @@ public final class RALBackendHandlerFactory {
* @return created instance
*/
public static ProxyBackendHandler newInstance(final RALStatement
sqlStatement, final ConnectionSession connectionSession) {
- if (sqlStatement instanceof QueryableRALStatement) {
- return new QueryableRALBackendHandler<>((QueryableRALStatement)
sqlStatement, connectionSession);
- }
- if (sqlStatement instanceof UpdatableGlobalRuleRALStatement) {
- String modeType =
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType();
- if ("Cluster".equals(modeType) || "Standalone".equals(modeType)) {
- return new
NewUpdatableGlobalRuleRALBackendHandler((UpdatableGlobalRuleRALStatement)
sqlStatement);
- }
- return new
UpdatableGlobalRuleRALBackendHandler((UpdatableGlobalRuleRALStatement)
sqlStatement);
- }
- return new UpdatableRALBackendHandler<>((UpdatableRALStatement)
sqlStatement, connectionSession);
+ return sqlStatement instanceof QueryableRALStatement
+ ? new QueryableRALBackendHandler<>((QueryableRALStatement)
sqlStatement, connectionSession)
+ : new UpdatableRALBackendHandler<>((UpdatableRALStatement)
sqlStatement, connectionSession);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
index d70b8a6fb4b..8f6345031fb 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
@@ -33,6 +33,8 @@ import
org.apache.shardingsphere.infra.rule.identifier.type.StaticDataSourceCont
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.NewYamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.NewGlobalRuleRDLBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.GlobalRuleRDLBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.RDLBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
@@ -63,10 +65,20 @@ public final class NewRuleDefinitionBackendHandler<T
extends RuleDefinitionState
super(sqlStatement, connectionSession);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings("rawtypes")
@Override
protected ResponseHeader execute(final String databaseName, final T
sqlStatement) {
- RuleDefinitionUpdater ruleDefinitionUpdater =
TypedSPILoader.getService(RuleDefinitionUpdater.class, sqlStatement.getClass());
+ Optional<RuleDefinitionUpdater> ruleDefinitionUpdater =
TypedSPILoader.findService(RuleDefinitionUpdater.class,
sqlStatement.getClass());
+ if (ruleDefinitionUpdater.isPresent()) {
+ execute(databaseName, sqlStatement, ruleDefinitionUpdater.get());
+ return new UpdateResponseHeader(sqlStatement);
+ }
+ String modeType =
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType();
+ return "Cluster".equals(modeType) || "Standalone".equals(modeType) ?
new NewGlobalRuleRDLBackendHandler(sqlStatement).execute() : new
GlobalRuleRDLBackendHandler(sqlStatement).execute();
+ }
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private void execute(final String databaseName, final T sqlStatement,
final RuleDefinitionUpdater ruleDefinitionUpdater) {
Class<? extends RuleConfiguration> ruleConfigClass =
ruleDefinitionUpdater.getRuleConfigurationClass();
ShardingSphereDatabase database =
ProxyContext.getInstance().getDatabase(databaseName);
RuleConfiguration currentRuleConfig =
findCurrentRuleConfiguration(database, ruleConfigClass).orElse(null);
@@ -75,7 +87,6 @@ public final class NewRuleDefinitionBackendHandler<T extends
RuleDefinitionState
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(
processSQLStatement(database, sqlStatement,
ruleDefinitionUpdater, currentRuleConfig));
}
- return new UpdateResponseHeader(sqlStatement);
}
private Optional<RuleConfiguration> findCurrentRuleConfiguration(final
ShardingSphereDatabase database, final Class<? extends RuleConfiguration>
ruleConfigClass) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
index 1edd4983480..e7811efd190 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java
@@ -28,16 +28,10 @@ import
org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStat
import
org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshTableMetaDataStatement;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.SetDistVariableStatement;
import
org.apache.shardingsphere.distsql.statement.ral.updatable.UnlabelComputeNodeStatement;
-import
org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
-import
org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement;
import
org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterComputeNodeStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterGlobalClockRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterReadwriteSplittingStorageUnitStatusStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterSQLParserRuleStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterTrafficRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.ImportDatabaseConfigurationStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.ImportMetaDataStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.LabelComputeNodeStatementAssert;
@@ -47,10 +41,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.UnlabelComputeNodeStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterComputeNodeStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterGlobalClockRuleStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterReadwriteSplittingStorageUnitStatusStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterSQLParserRuleStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterTrafficRuleStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportDatabaseConfigurationStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ImportMetaDataStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.LabelComputeNodeStatementTestCase;
@@ -58,8 +49,6 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase;
-import
org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement;
-import
org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement;
/**
* Updatable RAL statement assert.
@@ -85,23 +74,15 @@ public final class UpdatableRALStatementAssert {
SetDistVariableStatementAssert.assertIs(assertContext,
(SetDistVariableStatement) actual, (SetDistVariableStatementTestCase) expected);
} else if (actual instanceof RefreshTableMetaDataStatement) {
RefreshTableMetaDataStatementAssert.assertIs(assertContext,
(RefreshTableMetaDataStatement) actual, (RefreshTableMetaDataStatementTestCase)
expected);
- } else if (actual instanceof AlterSQLParserRuleStatement) {
- AlterSQLParserRuleStatementAssert.assertIs(assertContext,
(AlterSQLParserRuleStatement) actual, (AlterSQLParserRuleStatementTestCase)
expected);
- } else if (actual instanceof AlterTrafficRuleStatement) {
- AlterTrafficRuleStatementAssert.assertIs(assertContext,
(AlterTrafficRuleStatement) actual, (AlterTrafficRuleStatementTestCase)
expected);
} else if (actual instanceof ImportDatabaseConfigurationStatement) {
ImportDatabaseConfigurationStatementAssert.assertIs(assertContext,
(ImportDatabaseConfigurationStatement) actual,
(ImportDatabaseConfigurationStatementTestCase) expected);
} else if (actual instanceof ImportMetaDataStatement) {
ImportMetaDataStatementAssert.assertIs(assertContext,
(ImportMetaDataStatement) actual, (ImportMetaDataStatementTestCase) expected);
- } else if (actual instanceof AlterTransactionRuleStatement) {
- ExistingAssert.assertIs(assertContext, actual, expected);
} else if (actual instanceof
AlterReadwriteSplittingStorageUnitStatusStatement) {
AlterReadwriteSplittingStorageUnitStatusStatementAssert.assertIs(assertContext,
(AlterReadwriteSplittingStorageUnitStatusStatement)
actual, (AlterReadwriteSplittingStorageUnitStatusStatementTestCase) expected);
} else if (actual instanceof LockClusterStatement) {
LockClusterStatementAssert.assertIs(assertContext,
(LockClusterStatement) actual, (LockClusterStatementTestCase) expected);
- } else if (actual instanceof AlterGlobalClockRuleStatement) {
- AlterGlobalClockRuleStatementAssert.assertIs(assertContext,
(AlterGlobalClockRuleStatement) actual, (AlterGlobalClockRuleStatementTestCase)
expected);
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
index 5472ae93418..51dd6c4c550 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/RDLStatementAssert.java
@@ -26,7 +26,13 @@ import
org.apache.shardingsphere.distsql.statement.rdl.create.CreateRuleStatemen
import
org.apache.shardingsphere.distsql.statement.rdl.create.RegisterStorageUnitStatement;
import org.apache.shardingsphere.distsql.statement.rdl.drop.DropRuleStatement;
import
org.apache.shardingsphere.distsql.statement.rdl.drop.UnregisterStorageUnitStatement;
+import
org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
+import
org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterGlobalClockRuleStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterSQLParserRuleStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterTrafficRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.AlterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.create.CreateRuleStatementAssert;
@@ -34,9 +40,14 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.r
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.DropRuleStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.UnregisterStorageUnitStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterGlobalClockRuleStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterSQLParserRuleStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterTrafficRuleStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.AlterStorageUnitStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.RegisterStorageUnitStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.resource.UnregisterStorageUnitStatementTestCase;
+import
org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement;
+import
org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement;
/**
* RDL statement assert.
@@ -64,6 +75,14 @@ public final class RDLStatementAssert {
AlterStorageUnitStatementAssert.assertIs(assertContext,
(AlterStorageUnitStatement) actual, (AlterStorageUnitStatementTestCase)
expected);
} else if (actual instanceof UnregisterStorageUnitStatement) {
UnregisterStorageUnitStatementAssert.assertIs(assertContext,
(UnregisterStorageUnitStatement) actual,
(UnregisterStorageUnitStatementTestCase) expected);
+ } else if (actual instanceof AlterSQLParserRuleStatement) {
+ AlterSQLParserRuleStatementAssert.assertIs(assertContext,
(AlterSQLParserRuleStatement) actual, (AlterSQLParserRuleStatementTestCase)
expected);
+ } else if (actual instanceof AlterTrafficRuleStatement) {
+ AlterTrafficRuleStatementAssert.assertIs(assertContext,
(AlterTrafficRuleStatement) actual, (AlterTrafficRuleStatementTestCase)
expected);
+ } else if (actual instanceof AlterTransactionRuleStatement) {
+ ExistingAssert.assertIs(assertContext, actual, expected);
+ } else if (actual instanceof AlterGlobalClockRuleStatement) {
+ AlterGlobalClockRuleStatementAssert.assertIs(assertContext,
(AlterGlobalClockRuleStatement) actual, (AlterGlobalClockRuleStatementTestCase)
expected);
}
}
}
