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 30170099b2b [DistSQL] support 'alter sharding auditor' (#18899)
30170099b2b is described below
commit 30170099b2ba8e7071ab7783f7351887cd7887e2
Author: natehuang <[email protected]>
AuthorDate: Wed Jul 6 23:27:06 2022 +0800
[DistSQL] support 'alter sharding auditor' (#18899)
---
.../AlterShardingAuditorStatementUpdater.java | 94 ++++++++++++++++++++
...here.infra.distsql.update.RuleDefinitionUpdater | 1 +
.../AlterShardingAuditorStatementUpdaterTest.java | 99 ++++++++++++++++++++++
.../main/antlr4/imports/sharding/RDLStatement.g4 | 4 +
.../parser/autogen/ShardingDistSQLStatement.g4 | 1 +
.../core/ShardingDistSQLStatementVisitor.java | 7 ++
.../statement/AlterShardingAuditorStatement.java | 19 ++---
.../rdl/alter/AlterRuleStatementAssert.java | 5 ++
.../impl/AlterShardingAuditorStatementAssert.java | 69 +++++++++++++++
.../jaxb/cases/domain/SQLParserTestCases.java | 5 ++
.../AlterShardingAuditorStatementTestCase.java | 4 +-
.../src/main/resources/case/rdl/alter.xml | 6 ++
.../src/main/resources/sql/supported/rdl/alter.xml | 1 +
13 files changed, 303 insertions(+), 12 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAuditorStatementUpdater.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAuditorStatementUpdater.java
new file mode 100644
index 00000000000..644ee60ff58
--- /dev/null
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingAuditorStatementUpdater.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sharding.distsql.handler.update;
+
+import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
+import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
+import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.DuplicateRuleException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.RequiredAlgorithmMissedException;
+import
org.apache.shardingsphere.infra.distsql.update.RuleDefinitionAlterUpdater;
+import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import
org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter;
+import
org.apache.shardingsphere.sharding.distsql.parser.segment.ShardingAuditorSegment;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAuditorStatement;
+import org.apache.shardingsphere.sharding.factory.KeyGenerateAlgorithmFactory;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Alter sharding auditor statement updater.
+ */
+public final class AlterShardingAuditorStatementUpdater implements
RuleDefinitionAlterUpdater<AlterShardingAuditorStatement,
ShardingRuleConfiguration> {
+
+ @Override
+ public void checkSQLStatement(final ShardingSphereDatabase database,
+ final AlterShardingAuditorStatement
sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws
DistSQLException {
+ String databaseName = database.getName();
+ Collection<String> requireNames =
sqlStatement.getAuditorSegments().stream().map(ShardingAuditorSegment::getAuditorName).collect(Collectors.toList());
+ checkDuplicate(databaseName, requireNames);
+ checkExist(requireNames, currentRuleConfig);
+ checkAlgorithmType(sqlStatement);
+ }
+
+ private void checkDuplicate(final String databaseName, final
Collection<String> requireNames) throws DistSQLException {
+ Collection<String> duplicateRequire =
requireNames.stream().collect(Collectors.groupingBy(each -> each,
Collectors.counting())).entrySet().stream()
+ .filter(each -> each.getValue() >
1).map(Map.Entry::getKey).collect(Collectors.toSet());
+ DistSQLException.predictionThrow(duplicateRequire.isEmpty(), () -> new
DuplicateRuleException("sharding", databaseName, duplicateRequire));
+ }
+
+ private void checkExist(final Collection<String> requireNames, final
ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
+ Collection<String> notExistAlgorithms =
requireNames.stream().filter(each ->
!currentRuleConfig.getAuditors().containsKey(each)).collect(Collectors.toList());
+ DistSQLException.predictionThrow(notExistAlgorithms.isEmpty(), () ->
new RequiredAlgorithmMissedException("sharding", notExistAlgorithms));
+ }
+
+ private void checkAlgorithmType(final AlterShardingAuditorStatement
sqlStatement) throws DistSQLException {
+ Collection<String> requireNames =
sqlStatement.getAuditorSegments().stream()
+
.map(ShardingAuditorSegment::getAlgorithmSegment).map(AlgorithmSegment::getName).collect(Collectors.toList());
+ Collection<String> invalidAlgorithmNames =
requireNames.stream().filter(each ->
!KeyGenerateAlgorithmFactory.contains(each)).collect(Collectors.toList());
+ DistSQLException.predictionThrow(invalidAlgorithmNames.isEmpty(), ()
-> new InvalidAlgorithmConfigurationException("sharding",
invalidAlgorithmNames));
+ }
+
+ @Override
+ public ShardingRuleConfiguration buildToBeAlteredRuleConfiguration(final
AlterShardingAuditorStatement sqlStatement) {
+ ShardingRuleConfiguration result = new ShardingRuleConfiguration();
+ Map<String, ShardingSphereAlgorithmConfiguration> algorithmConfigMap =
sqlStatement.getAuditorSegments().stream()
+
.collect(Collectors.toMap(ShardingAuditorSegment::getAuditorName, each ->
ShardingTableRuleStatementConverter.createAlgorithmConfiguration(each.getAlgorithmSegment())));
+ result.setAuditors(algorithmConfigMap);
+ return result;
+ }
+
+ @Override
+ public void updateCurrentRuleConfiguration(final ShardingRuleConfiguration
currentRuleConfig, final ShardingRuleConfiguration toBeAlteredRuleConfig) {
+
currentRuleConfig.getAuditors().putAll(toBeAlteredRuleConfig.getShardingAlgorithms());
+ }
+
+ @Override
+ public Class<ShardingRuleConfiguration> getRuleConfigurationClass() {
+ return ShardingRuleConfiguration.class;
+ }
+
+ @Override
+ public String getType() {
+ return AlterShardingAuditorStatement.class.getName();
+ }
+}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater
index c626188c691..46efafefefb 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.distsql.update.RuleDefinitionUpdater
@@ -32,6 +32,7 @@
org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingKeyGener
org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingKeyGeneratorStatementUpdater
org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingKeyGeneratorStatementUpdater
org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingAuditorStatementUpdater
+org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingAuditorStatementUpdater
org.apache.shardingsphere.sharding.distsql.handler.update.AlterDefaultShardingStrategyStatementUpdater
org.apache.shardingsphere.sharding.distsql.handler.update.DropDefaultStrategyStatementUpdater
org.apache.shardingsphere.scaling.distsql.handler.update.CreateShardingScalingRuleStatementUpdater
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
new file mode 100644
index 00000000000..8b7f157edf8
--- /dev/null
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingAuditorStatementUpdaterTest.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sharding.distsql.update;
+
+import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
+import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
+import org.apache.shardingsphere.infra.distsql.exception.DistSQLException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.DuplicateRuleException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmConfigurationException;
+import
org.apache.shardingsphere.infra.distsql.exception.rule.RequiredAlgorithmMissedException;
+import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import
org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingAuditorStatementUpdater;
+import
org.apache.shardingsphere.sharding.distsql.parser.segment.ShardingAuditorSegment;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAuditorStatement;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class AlterShardingAuditorStatementUpdaterTest {
+
+ private final AlterShardingAuditorStatementUpdater updater = new
AlterShardingAuditorStatementUpdater();
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private ShardingSphereDatabase database;
+
+ @Before
+ public void before() {
+ when(database.getName()).thenReturn("test");
+ }
+
+ @Test(expected = DuplicateRuleException.class)
+ public void assertExecuteWithDuplicate() throws DistSQLException {
+ ShardingAuditorSegment auditorSegment = new
ShardingAuditorSegment("input_auditor_name", new
AlgorithmSegment("DML_SHARDING_CONDITIONS", createProperties()));
+ updater.checkSQLStatement(database, new
AlterShardingAuditorStatement(Arrays.asList(auditorSegment, auditorSegment)),
null);
+ }
+
+ @Test(expected = RequiredAlgorithmMissedException.class)
+ public void assertExecuteWithNotExist() throws DistSQLException {
+ Properties props = createProperties();
+ ShardingAuditorSegment auditorSegment = new
ShardingAuditorSegment("not_exist_auditor_name", new
AlgorithmSegment("DML_SHARDING_CONDITIONS", props));
+ ShardingRuleConfiguration ruleConfig = new ShardingRuleConfiguration();
+ ruleConfig.getAuditors().put("exist_auditor_name", new
ShardingSphereAlgorithmConfiguration("DML_SHARDING_CONDITIONS", props));
+ updater.checkSQLStatement(database, new
AlterShardingAuditorStatement(Collections.singletonList(auditorSegment)),
ruleConfig);
+ }
+
+ @Test(expected = InvalidAlgorithmConfigurationException.class)
+ public void assertExecuteWithInvalidAlgorithm() throws DistSQLException {
+ Properties props = createProperties();
+ ShardingAuditorSegment auditorSegment = new
ShardingAuditorSegment("exist_auditor_name", new
AlgorithmSegment("INVALID_TYPE", props));
+ ShardingRuleConfiguration ruleConfig = new ShardingRuleConfiguration();
+ ruleConfig.getAuditors().put("exist_auditor_name", new
ShardingSphereAlgorithmConfiguration("DML_SHARDING_CONDITIONS", props));
+ updater.checkSQLStatement(database, new
AlterShardingAuditorStatement(Collections.singletonList(auditorSegment)),
ruleConfig);
+ }
+
+ @Test
+ public void assertUpdate() {
+ ShardingAuditorSegment auditorSegment = new
ShardingAuditorSegment("exist_auditor_name", new
AlgorithmSegment("DML_SHARDING_CONDITIONS", createProperties()));
+ ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
+ currentRuleConfig.getAuditors().put("exist_auditor_name", new
ShardingSphereAlgorithmConfiguration("DML_SHARDING_CONDITIONS",
createProperties()));
+ AlterShardingAuditorStatement statement = new
AlterShardingAuditorStatement(Collections.singletonList(auditorSegment));
+ ShardingRuleConfiguration toBeAlteredRuleConfiguration =
updater.buildToBeAlteredRuleConfiguration(statement);
+ updater.updateCurrentRuleConfiguration(currentRuleConfig,
toBeAlteredRuleConfiguration);
+
assertThat(currentRuleConfig.getAuditors().get("exist_auditor_name").getType(),
is("DML_SHARDING_CONDITIONS"));
+ }
+
+ private Properties createProperties() {
+ Properties result = new Properties();
+ result.put("key", "value");
+ return result;
+ }
+}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RDLStatement.g4
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RDLStatement.g4
index 8669722c998..8df58a06682 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RDLStatement.g4
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/imports/sharding/RDLStatement.g4
@@ -75,6 +75,10 @@ alterShardingKeyGenerator
: ALTER SHARDING KEY GENERATOR keyGeneratorDefinition (COMMA
keyGeneratorDefinition)*
;
+alterShardingAuditor
+ : ALTER SHARDING AUDITOR auditorDefinition (COMMA auditorDefinition)*
+ ;
+
dropShardingTableRule
: DROP SHARDING TABLE RULE ifExists? tableName (COMMA tableName)*
withUnusedAlgorithmsClause?
;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/sharding/org/apache/shardingsphere/distsql/parser/autogen/ShardingDistSQLStatement.g4
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/sharding/org/apache/shardingsphere/distsql/parser/autogen/ShardingDistSQLStatement.g4
index 918401aa3bd..9e52b15a774 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/sharding/org/apache/shardingsphere/distsql/parser/autogen/ShardingDistSQLStatement.g4
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/antlr4/sharding/org/apache/shardingsphere/distsql/parser/autogen/ShardingDistSQLStatement.g4
@@ -51,6 +51,7 @@ execute
| dropShardingKeyGenerator
| showShardingAuditors
| createShardingAuditor
+ | alterShardingAuditor
| showShardingDefaultShardingStrategy
| alterDefaultShardingStrategy
| dropDefaultShardingStrategy
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index 4b5aea34ae5..c3d2b250976 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatement
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlgorithmPropertyContext;
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterDefaultShardingStrategyContext;
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterShardingAlgorithmContext;
+import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterShardingAuditorContext;
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterShardingBindingTableRulesContext;
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterShardingBroadcastTableRulesContext;
import
org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.AlterShardingKeyGeneratorContext;
@@ -86,6 +87,7 @@ import
org.apache.shardingsphere.sharding.distsql.parser.segment.ShardingStrateg
import
org.apache.shardingsphere.sharding.distsql.parser.segment.TableRuleSegment;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAlgorithmStatement;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAuditorStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBindingTableRulesStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBroadcastTableRulesStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingKeyGeneratorStatement;
@@ -462,6 +464,11 @@ public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatem
return new
CreateShardingAuditorStatement(ctx.auditorDefinition().stream().map(this::buildShardingAuditorSegment).collect(Collectors.toCollection(LinkedList::new)));
}
+ @Override
+ public ASTNode visitAlterShardingAuditor(final AlterShardingAuditorContext
ctx) {
+ return new
AlterShardingAuditorStatement(ctx.auditorDefinition().stream().map(this::buildShardingAuditorSegment).collect(Collectors.toList()));
+ }
+
private ShardingAuditorSegment buildShardingAuditorSegment(final
AuditorDefinitionContext ctx) {
return new
ShardingAuditorSegment(getIdentifierValue(ctx.auditorName()),
(AlgorithmSegment) visitAlgorithmDefinition(ctx.algorithmDefinition()));
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingAuditorStatement.java
similarity index 54%
copy from
shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
copy to
shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingAuditorStatement.java
index ae9675f3924..981fc819dcc 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingAuditorStatement.java
@@ -15,22 +15,21 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter;
+package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.rdl.ExpectedShardingAlgorithm;
-import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement;
+import
org.apache.shardingsphere.sharding.distsql.parser.segment.ShardingAuditorSegment;
-import java.util.LinkedList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
+import java.util.Collection;
/**
- * Alter sharding auditor statement test case.
+ * Alter sharding auditor statement.
*/
+@RequiredArgsConstructor
@Getter
-public final class AlterShardingAuditorStatementTestCase extends
SQLParserTestCase {
+public final class AlterShardingAuditorStatement extends AlterRuleStatement {
- @XmlElement(name = "shardingAuditor")
- private final List<ExpectedShardingAlgorithm> shardingAuditors = new
LinkedList<>();
+ private final Collection<ShardingAuditorSegment> auditorSegments;
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/AlterRuleStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/AlterRuleStatementAssert.java
index b543c4bed9b..264156af846 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/AlterRuleStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/AlterRuleStatementAssert.java
@@ -29,6 +29,7 @@ import
org.apache.shardingsphere.scaling.distsql.statement.EnableShardingScaling
import
org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowAlgorithmStatement;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAuditorStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBindingTableRulesStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingBroadcastTableRulesStatement;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingKeyGeneratorStatement;
@@ -43,6 +44,7 @@ import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterReadwriteSplittingRuleStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShadowAlgorithmStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShadowRuleStatementAssert;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShardingAuditorStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShardingBindingTableRulesStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShardingBroadcastTableRulesStatementAssert;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl.AlterShardingKeyGeneratorStatementAssert;
@@ -58,6 +60,7 @@ import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterReadwriteSplittingRuleStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShadowAlgorithmStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShadowRuleStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingAuditorStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingBindingTableRulesStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingBroadcastTableRulesStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingKeyGeneratorStatementTestCase;
@@ -105,6 +108,8 @@ public final class AlterRuleStatementAssert {
(AlterDefaultSingleTableRuleStatementTestCase) expected);
} else if (actual instanceof AlterShardingKeyGeneratorStatement) {
AlterShardingKeyGeneratorStatementAssert.assertIs(assertContext,
(AlterShardingKeyGeneratorStatement) actual,
(AlterShardingKeyGeneratorStatementTestCase) expected);
+ } else if (actual instanceof AlterShardingAuditorStatement) {
+ AlterShardingAuditorStatementAssert.assertIs(assertContext,
(AlterShardingAuditorStatement) actual, (AlterShardingAuditorStatementTestCase)
expected);
} else if (actual instanceof EnableShardingScalingRuleStatement) {
EnableShardingScalingRuleStatementAssert.assertIs(assertContext,
(EnableShardingScalingRuleStatement) actual,
(EnableShardingScalingRuleStatementTestCase) expected);
} else if (actual instanceof DisableShardingScalingRuleStatement) {
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingAuditorStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingAuditorStatementAssert.java
new file mode 100644
index 00000000000..5cb51bfbd57
--- /dev/null
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/alter/impl/AlterShardingAuditorStatementAssert.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.rdl.alter.impl;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.sharding.distsql.parser.segment.ShardingAuditorSegment;
+import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingAuditorStatement;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.distsql.rdl.ShardingAuditorAssert;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.rdl.ExpectedShardingAuditor;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingAuditorStatementTestCase;
+
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Alter sharding auditor statement assert.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class AlterShardingAuditorStatementAssert {
+
+ /**
+ * Assert alter sharding auditor statement is correct with expected parser
result.
+ *
+ * @param assertContext assert context
+ * @param actual actual alter sharding auditor statement
+ * @param expected expected create sharding auditor statement test case
+ */
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final AlterShardingAuditorStatement actual, final
AlterShardingAuditorStatementTestCase expected) {
+ if (null == expected) {
+ assertNull(assertContext.getText("Actual sharding auditor
statement should not exist."), actual);
+ } else {
+ assertNotNull(assertContext.getText("Actual sharding auditor
statement should exist."), actual);
+ assertShardingAuditor(assertContext, actual.getAuditorSegments(),
expected.getShardingAuditors());
+ }
+ }
+
+ private static void assertShardingAuditor(final SQLCaseAssertContext
assertContext, final Collection<ShardingAuditorSegment> actual, final
List<ExpectedShardingAuditor> expected) {
+ if (null == expected) {
+ assertNull(assertContext.getText("Actual sharding auditor segments
should not exist."), actual);
+ } else {
+ assertNotNull(assertContext.getText("Actual sharding auditor
segments should exist."), actual);
+ int count = 0;
+ for (ShardingAuditorSegment each : actual) {
+ ShardingAuditorAssert.assertIs(assertContext, each,
expected.get(count));
+ count++;
+ }
+ }
+ }
+}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
index 95f3cb6aee9..0f4a640821b 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/SQLParserTestCases.java
@@ -305,6 +305,7 @@ import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShadowAlgorithmStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShadowRuleStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingAlgorithmStatementTestCase;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingAuditorStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingAutoTableRuleStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingBindingTableRulesStatementTestCase;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter.AlterShardingBroadcastTableRulesStatementTestCase;
@@ -1159,6 +1160,9 @@ public final class SQLParserTestCases {
@XmlElement(name = "alter-sharding-key-generator")
private final List<AlterShardingKeyGeneratorStatementTestCase>
alterShardingKeyGeneratorTestCases = new LinkedList<>();
+ @XmlElement(name = "alter-sharding-auditor")
+ private final List<AlterShardingAuditorStatementTestCase>
alterShardingAuditorTestCases = new LinkedList<>();
+
@XmlElement(name = "drop-sharding-key-generator")
private final List<DropShardingKeyGeneratorStatementTestCase>
dropShardingKeyGeneratorTestCases = new LinkedList<>();
@@ -1776,6 +1780,7 @@ public final class SQLParserTestCases {
putAll(showSlaveStatusTestCases, result);
putAll(alterShardingAlgorithmTestCases, result);
putAll(alterShardingKeyGeneratorTestCases, result);
+ putAll(alterShardingAuditorTestCases, result);
putAll(killTestCases, result);
putAll(createDefaultShadowAlgorithmTestCases, result);
putAll(cacheIndexTestCases, result);
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
index ae9675f3924..a38ff31350c 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/rdl/alter/AlterShardingAuditorStatementTestCase.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.rdl.alter;
import lombok.Getter;
-import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.rdl.ExpectedShardingAlgorithm;
+import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.rdl.ExpectedShardingAuditor;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
import java.util.LinkedList;
@@ -32,5 +32,5 @@ import javax.xml.bind.annotation.XmlElement;
public final class AlterShardingAuditorStatementTestCase extends
SQLParserTestCase {
@XmlElement(name = "shardingAuditor")
- private final List<ExpectedShardingAlgorithm> shardingAuditors = new
LinkedList<>();
+ private final List<ExpectedShardingAuditor> shardingAuditors = new
LinkedList<>();
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/alter.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/alter.xml
index e8b9e3a3195..94c91de6af7 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/alter.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/rdl/alter.xml
@@ -280,6 +280,12 @@
</shardingKeyGenerator>
</alter-sharding-key-generator>
+ <alter-sharding-auditor sql-case-id="alter-sharding-auditor">
+ <shardingAuditor auditor-name="sharding_key_required_auditor">
+ <algorithm algorithm-name="DML_SHARDING_CONDITIONS" />
+ </shardingAuditor>
+ </alter-sharding-auditor>
+
<alter-default-single-table sql-case-id="alter-default-single-table"
default-data-source="ds_0" />
<alter-default-sharding-strategy
sql-case-id="alter-default-sharding-strategy">
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rdl/alter.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rdl/alter.xml
index b0fdec5b63d..a65947e84d9 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rdl/alter.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/rdl/alter.xml
@@ -45,6 +45,7 @@
<distsql-case id="alter-sharding-algorithm" value="ALTER SHARDING
ALGORITHM algorithm_name(TYPE(NAME=inline,PROPERTIES('algorithm-expression' =
't_order_${order_id % 2}')))" />
<distsql-case id="alter-default-single-table" value="ALTER DEFAULT SINGLE
TABLE RULE RESOURCE = ds_0" />
<distsql-case id="alter-sharding-key-generator" value="ALTER SHARDING KEY
GENERATOR uuid_key_generator(TYPE(NAME=uuid))" />
+ <distsql-case id="alter-sharding-auditor" value="ALTER SHARDING AUDITOR
sharding_key_required_auditor(TYPE(NAME=DML_SHARDING_CONDITIONS))" />
<distsql-case id="alter-default-sharding-strategy" value="ALTER DEFAULT
SHARDING TABLE STRATEGY(TYPE=standard, SHARDING_COLUMN=order_id,
SHARDING_ALGORITHM=algorithms_name)" />
<distsql-case id="alter-default-sharding-strategy-complex" value="ALTER
DEFAULT SHARDING TABLE STRATEGY(TYPE=complex,
SHARDING_COLUMNS=order_id,user_id, SHARDING_ALGORITHM=algorithms_name)" />
<distsql-case id="enable-sharding-scaling-rule" value="ENABLE SHARDING
SCALING RULE scalingName" />
