Skip to content

IGNITE-29285 Add kill lock SQL command #13822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-plekhanov merged 4 commits into from
Nov 13, 2026
+11,918 −11,280
Merged

IGNITE-29285 Add kill lock SQL command #13822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da24f30
IGNITE-29285 Add kill lock SQL command
alex-plekhanov Nov 12, 2026
257de08
IGNITE-29285 Add kill lock SQL command
alex-plekhanov Nov 12, 2026
b5ea916
IGNITE-29285 Add kill lock SQL command
alex-plekhanov Nov 12, 2026
51da6d9
Merge remote-tracking branch 'apache/master' into ignite-29285
alex-plekhanov Nov 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/calcite/src/main/codegen/config.fmpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ data: {
"COMPUTE"
"ASYNC"
"QUERY",
"LOCK"
"STATISTICS",
"REFRESH",
"ANALYZE",
Expand Down Expand Up @@ -107,6 +108,7 @@ data: {
"COMPUTE"
"ASYNC"
"QUERY"
"LOCK"
"STATISTICS"
"REFRESH"
"ANALYZE"
Expand Down Expand Up @@ -450,6 +452,7 @@ data: {
"SqlKillTransaction()",
"SqlKillComputeTask()",
"SqlKillQuery()",
"SqlKillLock()",
"SqlSavepoint()",
"SqlRollbackToSavepoint()",
"SqlCommitTransaction()",
Expand Down
12 changes: 12 additions & 0 deletions modules/calcite/src/main/codegen/includes/parserImpls.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,18 @@ SqlNode SqlKillQuery():
}
}

SqlNode SqlKillLock():
{
final Span s;
final SqlCharStringLiteral xid;
}
{
<KILL> { s = span(); } <LOCK>
xid = IgniteUuidLiteral() {
return IgniteSqlKill.createLockKill(s.end(this), xid);
}
}

SqlNode SqlCommitTransaction():
{
final Span s;
Expand Down
7 changes: 7 additions & 0 deletions ...che/ignite/internal/processors/query/calcite/prepare/ddl/SqlToNativeCommandConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.ignite.internal.processors.query.calcite.sql.IgniteSqlKill;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillComputeTask;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillContinuousQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillLock;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillScanQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillService;
Expand All @@ -66,6 +67,7 @@
import org.apache.ignite.internal.sql.command.SqlIndexColumn;
import org.apache.ignite.internal.sql.command.SqlKillComputeTaskCommand;
import org.apache.ignite.internal.sql.command.SqlKillContinuousQueryCommand;
import org.apache.ignite.internal.sql.command.SqlKillLockCommand;
import org.apache.ignite.internal.sql.command.SqlKillQueryCommand;
import org.apache.ignite.internal.sql.command.SqlKillScanQueryCommand;
import org.apache.ignite.internal.sql.command.SqlKillServiceCommand;
Expand Down Expand Up @@ -267,6 +269,11 @@ else if (cmd instanceof IgniteSqlKillQuery) {
IgniteSqlKillQuery cmd0 = (IgniteSqlKillQuery)cmd;
return new SqlKillQueryCommand(cmd0.nodeId(), cmd0.queryId(), cmd0.isAsync());
}
else if (cmd instanceof IgniteSqlKillLock) {
IgniteSqlKillLock cmd0 = (IgniteSqlKillLock)cmd;
IgniteUuid xid = IgniteUuid.fromString(cmd0.xid().getValueAs(String.class));
return new SqlKillLockCommand(xid);
}
else {
throw new IgniteSQLException("Unsupported native operation [" +
"cmdName=" + (cmd == null ? null : cmd.getClass().getSimpleName()) + "; " +
Expand Down
9 changes: 9 additions & 0 deletions .../src/main/java/org/apache/ignite/internal/processors/query/calcite/sql/IgniteSqlKill.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.calcite.util.Pair;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillComputeTask;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillContinuousQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillLock;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillScanQuery;
import org.apache.ignite.internal.processors.query.calcite.sql.kill.IgniteSqlKillService;
Expand Down Expand Up @@ -93,6 +94,14 @@ public static IgniteSqlKill createQueryKill(
return new IgniteSqlKillQuery(pos, globalQueryId, nodeId, queryId, isAsync);
}

/** */
public static IgniteSqlKill createLockKill(
SqlParserPos pos,
SqlCharStringLiteral xid
) {
return new IgniteSqlKillLock(pos, xid);
}

/** */
public static Pair<UUID, Long> parseGlobalQueryId(String globalQryId) {
String[] ids = globalQryId.split("_");
Expand Down
Loading
Loading