This is an automated email from the ASF dual-hosted git repository.
zichaowang 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 b6886cce9cb Refactor g4 of alter transmission rule (#30260)
b6886cce9cb is described below
commit b6886cce9cb183df5f71cfc697d3ee2997e5eb34
Author: Raigor <[email protected]>
AuthorDate: Fri Feb 23 20:12:11 2024 +0800
Refactor g4 of alter transmission rule (#30260)
---
.../distsql/parser/src/main/antlr4/imports/cdc/RALStatement.g4 | 10 +++++-----
.../parser/src/main/antlr4/imports/migration/RALStatement.g4 | 2 +-
.../cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java | 4 +---
.../distsql/parser/core/MigrationDistSQLStatementVisitor.java | 4 +---
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/cdc/RALStatement.g4
b/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/cdc/RALStatement.g4
index 81b46358a3e..213747d09d7 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/cdc/RALStatement.g4
+++
b/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/cdc/RALStatement.g4
@@ -24,7 +24,7 @@ showStreamingRule
;
alterStreamingRule
- : ALTER STREAMING RULE transmissionRule?
+ : ALTER STREAMING RULE transmissionRule
;
transmissionRule
@@ -35,6 +35,10 @@ readDefinition
: READ LP_ workerThread? (COMMA_? batchSize)? (COMMA_? shardingSize)?
(COMMA_? rateLimiter)? RP_
;
+writeDefinition
+ : WRITE LP_ workerThread? (COMMA_? batchSize)? (COMMA_? rateLimiter)? RP_
+ ;
+
workerThread
: WORKER_THREAD EQ_ intValue
;
@@ -51,10 +55,6 @@ rateLimiter
: RATE_LIMITER LP_ algorithmDefinition RP_
;
-writeDefinition
- : WRITE LP_ workerThread? (COMMA_? batchSize)? (COMMA_? rateLimiter)? RP_
- ;
-
streamChannel
: STREAM_CHANNEL LP_ algorithmDefinition RP_
;
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/migration/RALStatement.g4
b/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/migration/RALStatement.g4
index 4330340b7f8..9f4b3a653fe 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/migration/RALStatement.g4
+++
b/kernel/data-pipeline/distsql/parser/src/main/antlr4/imports/migration/RALStatement.g4
@@ -24,7 +24,7 @@ showMigrationRule
;
alterMigrationRule
- : ALTER MIGRATION RULE transmissionRule?
+ : ALTER MIGRATION RULE transmissionRule
;
transmissionRule
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
index 3e5356105d0..b498f0aa0fe 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
+++
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
@@ -80,9 +80,7 @@ public final class CDCDistSQLStatementVisitor extends
CDCDistSQLStatementBaseVis
@Override
public ASTNode visitAlterStreamingRule(final AlterStreamingRuleContext
ctx) {
- TransmissionRuleSegment segment = null == ctx.transmissionRule() ? null
- : (TransmissionRuleSegment) visit(ctx.transmissionRule());
- return new AlterTransmissionRuleStatement("STREAMING", segment);
+ return new AlterTransmissionRuleStatement("STREAMING",
(TransmissionRuleSegment) visit(ctx.transmissionRule()));
}
@Override
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
index 4baa6269f93..bfcf8ff27cf 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
+++
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
@@ -103,9 +103,7 @@ public final class MigrationDistSQLStatementVisitor extends
MigrationDistSQLStat
@Override
public ASTNode visitAlterMigrationRule(final AlterMigrationRuleContext
ctx) {
- TransmissionRuleSegment segment = null == ctx.transmissionRule() ? null
- : (TransmissionRuleSegment) visit(ctx.transmissionRule());
- return new AlterTransmissionRuleStatement("MIGRATION", segment);
+ return new AlterTransmissionRuleStatement("MIGRATION",
(TransmissionRuleSegment) visit(ctx.transmissionRule()));
}
@Override
