Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@morgo
morgo committed Jun 20, 2022
1 parent 9a77892 commit 7981304
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 1 deletion.
1 change: 1 addition & 0 deletions executor/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ type CancelDDLJobsExec struct {
func (e *CancelDDLJobsExec) Open(ctx context.Context) error {
// We want to use a global transaction to execute the admin command, so we don't use e.ctx here.
errInTxn := kv.RunInNewTxn(context.Background(), e.ctx.GetStore(), true, func(ctx context.Context, txn kv.Transaction) (err error) {
fmt.Printf("@@@@ cancelling ddl job!\n")
e.errs, err = ddl.CancelJobs(txn, e.jobIDs)
return
})
Expand Down
2 changes: 1 addition & 1 deletion executor/simple.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@ func (e *SimpleExec) executeKillStmt(ctx context.Context, s *ast.KillStmt) error
}
return nil
}

// executing kill command
sm := e.ctx.GetSessionManager()
if sm == nil {
return nil
Expand Down
11 changes: 11 additions & 0 deletions server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,17 @@ func killConn(conn *clientConn) {
conn.mu.RLock()
cancelFunc := conn.mu.cancelFunc
conn.mu.RUnlock()
// killing connection...
// killing conn
fmt.Printf("#### kill level 2\n")

/*
errInTxn := kv.RunInNewTxn(context.Background(), e.ctx.GetStore(), true, func(ctx context.Context, txn kv.Transaction) (err error) {
e.errs, err = ddl.CancelJobs(txn, e.jobIDs)
return
})
*/

if cancelFunc != nil {
cancelFunc()
}
Expand Down
104 changes: 104 additions & 0 deletions testcase.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
use test;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int not null primary key auto_increment, b varbinary(1024));
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM dual;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;
INSERT INTO t1 SELECT NULL, RANDOM_BYTES(1024) FROM t1 a, t1 b, t1 c LIMIT 50000;

0 comments on commit 7981304

Please sign in to comment.