You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/05/25 01:43:22 UTC
[shardingsphere] branch master updated: Improve MySQL kill statement (#25535) (#25842)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 be59c217769 Improve MySQL kill statement (#25535) (#25842)
be59c217769 is described below
commit be59c21776917e836521702e3ecdea0feafbac9e
Author: niu niu <zi...@aliyun.com>
AuthorDate: Thu May 25 09:43:05 2023 +0800
Improve MySQL kill statement (#25535) (#25842)
---
.../sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4 | 2 +-
.../mysql/visitor/statement/type/MySQLDALStatementVisitor.java | 6 +++++-
test/it/parser/src/main/resources/case/dal/kill.xml | 1 +
test/it/parser/src/main/resources/sql/supported/dal/kill.xml | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4 b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
index 06cf4b8d0e6..b1152e4d516 100644
--- a/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
+++ b/parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DALStatement.g4
@@ -380,7 +380,7 @@ tablesOption
;
kill
- : KILL (CONNECTION | QUERY)? IDENTIFIER_
+ : KILL (CONNECTION | QUERY)? AT_? IDENTIFIER_
;
loadIndexInfo
diff --git a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
index 0a5f337443d..a257485b302 100644
--- a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
+++ b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
@@ -470,7 +470,11 @@ public final class MySQLDALStatementVisitor extends MySQLStatementVisitor implem
@Override
public ASTNode visitKill(final KillContext ctx) {
MySQLKillStatement result = new MySQLKillStatement();
- result.setProcessId(ctx.IDENTIFIER_().getText());
+ if (null != ctx.AT_()) {
+ result.setProcessId(ctx.AT_().getText().concat(ctx.IDENTIFIER_().getText()));
+ } else {
+ result.setProcessId(ctx.IDENTIFIER_().getText());
+ }
return result;
}
diff --git a/test/it/parser/src/main/resources/case/dal/kill.xml b/test/it/parser/src/main/resources/case/dal/kill.xml
index 22ceff65141..0e5d050dc34 100644
--- a/test/it/parser/src/main/resources/case/dal/kill.xml
+++ b/test/it/parser/src/main/resources/case/dal/kill.xml
@@ -18,4 +18,5 @@
<sql-parser-test-cases>
<kill sql-case-id="kill_process_id" process-id="abc" />
+ <kill sql-case-id="kill_process_with_id" process-id="@id" />
</sql-parser-test-cases>
diff --git a/test/it/parser/src/main/resources/sql/supported/dal/kill.xml b/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
index 5869dd4d023..d3cc51b6776 100644
--- a/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dal/kill.xml
@@ -18,4 +18,5 @@
<sql-cases>
<sql-case id="kill_process_id" value="KILL abc" db-types="MySQL" />
+ <sql-case id="kill_process_with_id" value="KILL QUERY @id" db-types="MySQL" />
</sql-cases>