Skip to content

Commit 6364199

Browse files
authored
add bats test for kill query <pid> (#8493)
1 parent 0257cc9 commit 6364199

File tree

4 files changed

+35
-4
lines changed

4 files changed

+35
-4
lines changed

go/cmd/dolt/commands/sqlserver/queryist_utils.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ func BuildConnectionStringQueryist(ctx context.Context, cwdFS filesys.Filesys, c
6868
var lateBind cli.LateBindQueryist = func(ctx context.Context) (cli.Queryist, *sql.Context, func(), error) {
6969
sqlCtx := sql.NewContext(ctx)
7070
sqlCtx.SetCurrentDatabase(dbRev)
71-
return queryist, sqlCtx, func() { conn.Conn(ctx) }, nil
71+
return queryist, sqlCtx, func() {
72+
conn.Conn(ctx)
73+
}, nil
7274
}
7375

7476
return lateBind, nil

go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/cespare/xxhash/v2 v2.2.0
5858
github.com/creasty/defaults v1.6.0
5959
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
60-
github.com/dolthub/go-mysql-server v0.18.2-0.20241024235854-afe619562da2
60+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6
6161
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
6262
github.com/dolthub/swiss v0.1.0
6363
github.com/goccy/go-json v0.10.2

go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
183183
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
184184
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
185185
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
186-
github.com/dolthub/go-mysql-server v0.18.2-0.20241024235854-afe619562da2 h1:qqg+Nqjel7xcfT1lzC/2tk1rm+U+LsFkgI3R7dJRiG0=
187-
github.com/dolthub/go-mysql-server v0.18.2-0.20241024235854-afe619562da2/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
186+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6 h1:+RYghO025hK+Q2y9rPXv3mLOSnWOKllVjfg3vEJ4lfM=
187+
github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
188188
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
189189
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
190190
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bats
2+
load $BATS_TEST_DIRNAME/helper/common.bash
3+
4+
setup() {
5+
setup_common
6+
}
7+
8+
teardown() {
9+
teardown_common
10+
}
11+
12+
@test "processlist: kill query" {
13+
if [ "$SQL_ENGINE" != "remote-engine" ]; then
14+
skip "processlist is remote-engine specific"
15+
fi
16+
17+
dolt sql -q "select sleep(1000)" &
18+
sleep 1
19+
20+
run dolt sql -q "SHOW PROCESSLIST"
21+
[[ "$output" =~ "select sleep(1000)" ]] || false
22+
23+
qpid=$(dolt sql -q "show processlist" | grep --text "select sleep(1000)" | cut -d"|" -f2)
24+
run dolt sql -q "kill query $qpid"
25+
sleep 1
26+
27+
run dolt sql -q "SHOW PROCESSLIST"
28+
[[ ! "$output" =~ "select sleep(1000)" ]] || false
29+
}

0 commit comments

Comments
 (0)