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

server: avoid reusing cached stmt ctx on cursor read #40023

Merged
merged 10 commits into from
Dec 22, 2022
Merged

server: avoid reusing cached stmt ctx on cursor read #40023

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be682f2
server: avoid reusing cached stmt ctx on cursor read
zyguan Dec 19, 2022
20acf1b
Merge branch 'master' into fix-39998
hawkingrei Dec 19, 2022
fe579aa
do not reuse stmt ctx if has cursor-exists flag
zyguan Dec 20, 2022
1eaa6f1
Merge remote-tracking branch 'zyguan/fix-39998' into fix-39998
zyguan Dec 20, 2022
156e6b2
Merge branch 'master' into fix-39998
zyguan Dec 20, 2022
920f00a
fixup
zyguan Dec 21, 2022
068c6fc
Merge branch 'master' into fix-39998
zyguan Dec 21, 2022
8f5ebfd
fix build
zyguan Dec 21, 2022
ce5006e
Merge branch 'master' into fix-39998
ti-chi-bot Dec 22, 2022
ea12fa2
Merge branch 'master' into fix-39998
ti-chi-bot Dec 22, 2022
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
2 changes: 1 addition & 1 deletion executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ func (e *UnionExec) Close() error {
func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
vars := ctx.GetSessionVars()
var sc *stmtctx.StatementContext
if vars.TxnCtx.CouldRetry {
if vars.TxnCtx.CouldRetry || mysql.HasCursorExistsFlag(vars.Status) {
// Must construct new statement context object, the retry history need context for every statement.
// TODO: Maybe one day we can get rid of transaction retry, then this logic can be deleted.
sc = &stmtctx.StatementContext{}
Expand Down
6 changes: 5 additions & 1 deletion server/conn_stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,18 @@ func (cc *clientConn) executePlanCacheStmt(ctx context.Context, stmt interface{}
// The first return value indicates whether the call of executePreparedStmtAndWriteResult has no side effect and can be retried.
// Currently the first return value is used to fallback to TiKV when TiFlash is down.
func (cc *clientConn) executePreparedStmtAndWriteResult(ctx context.Context, stmt PreparedStatement, args []expression.Expression, useCursor bool) (bool, error) {
prepStmt, err := (&cc.ctx).GetSessionVars().GetPreparedStmtByID(uint32(stmt.ID()))
vars := (&cc.ctx).GetSessionVars()
prepStmt, err := vars.GetPreparedStmtByID(uint32(stmt.ID()))
if err != nil {
return true, errors.Annotate(err, cc.preparedStmt2String(uint32(stmt.ID())))
}
execStmt := &ast.ExecuteStmt{
BinaryArgs: args,
PrepStmt: prepStmt,
}
if useCursor {
vars.SetStatusFlag(mysql.ServerStatusCursorExists, true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not taking a close look to make sure the status is reset properly after the query.
Do you check it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}
rs, err := (&cc.ctx).ExecuteStmt(ctx, execStmt)
if err != nil {
return true, errors.Annotate(err, cc.preparedStmt2String(uint32(stmt.ID())))
Expand Down