Skip to content
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

Jump to bottom

*: fix slow query nil pointer panic when get session for TTL #39865

Merged
merged 5 commits into from
Dec 13, 2022
Merged

*: fix slow query nil pointer panic when get session for TTL #39865

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4af3f45
*: fix slow query nil pointer panic when get session for TTL
lcwangchao Dec 13, 2022
e3ec9bf
update
lcwangchao Dec 13, 2022
796c96f
update
lcwangchao Dec 13, 2022
e8416ba
Merge branch 'master' into slow_query_ttl_nil
lcwangchao Dec 13, 2022
ad5aa34
Merge branch 'master' into slow_query_ttl_nil
lcwangchao Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion executor/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ func (a *ExecStmt) LogSlowQuery(txnTS uint64, succ bool, hasMoreResults bool) {
if a.retryCount > 0 {
slowItems.ExecRetryTime = costTime - sessVars.DurationParse - sessVars.DurationCompile - time.Since(a.retryStartTime)
}
if _, ok := a.StmtNode.(*ast.CommitStmt); ok {
if _, ok := a.StmtNode.(*ast.CommitStmt); ok && sessVars.PrevStmt != nil {
slowItems.PrevStmt = sessVars.PrevStmt.String()
}
slowLog := sessVars.SlowLogFormat(slowItems)
Expand Down
3 changes: 2 additions & 1 deletion ttl/ttlworker/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func getSession(pool sessionPool) (session.Session, error) {
pool.Put(resource)
})

if _, err = se.ExecuteSQL(context.Background(), "commit"); err != nil {
// Force rollback the session to guarantee the session is not in any explicit transaction
if _, err = se.ExecuteSQL(context.Background(), "ROLLBACK"); err != nil {
se.Close()
return nil, err
}
Expand Down