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

server: fix prepared cursor select #30285

Merged
merged 5 commits into from
Dec 9, 2021
Merged

server: fix prepared cursor select #30285

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1cbdb1
server: fix prepared cursor select
xhebox Nov 30, 2021
7855935
server: address comment
xhebox Dec 8, 2021
b43d96b
Merge branch 'master' into fix_1
ti-chi-bot Dec 9, 2021
68f2475
Merge branch 'master' into fix_1
ti-chi-bot Dec 9, 2021
00c6d88
Merge branch 'master' into fix_1
ti-chi-bot Dec 9, 2021
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
10 changes: 7 additions & 3 deletions server/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,10 +2190,15 @@ func (cc *clientConn) writeChunks(ctx context.Context, rs ResultSet, binary bool
// fetchSize, the desired number of rows to be fetched each time when client uses cursor.
func (cc *clientConn) writeChunksWithFetchSize(ctx context.Context, rs ResultSet, serverStatus uint16, fetchSize int) error {
fetchedRows := rs.GetFetchedRows()
// if fetchedRows is not enough, getting data from recordSet.
req := rs.NewChunk(nil)
for len(fetchedRows) < fetchSize {
// if fetchedRows is not enough, getting data from recordSet.
req := rs.NewChunk(cc.chunkAlloc)
// NOTE: chunk should not be allocated from the allocator
// the allocator will reset every statement
// but it maybe stored in the result set among statements
// ref https://github.com/pingcap/tidb/blob/7fc6ebbda4ddf84c0ba801ca7ebb636b934168cf/server/conn_stmt.go#L233-L239
// Here server.tidbResultSet implements Next method.
req.Reset()
if err := rs.Next(ctx, req); err != nil {
return err
}
Expand All @@ -2205,7 +2210,6 @@ func (cc *clientConn) writeChunksWithFetchSize(ctx context.Context, rs ResultSet
for i := 0; i < rowCount; i++ {
fetchedRows = append(fetchedRows, req.GetRow(i))
}
req = chunk.Renew(req, cc.ctx.GetSessionVars().MaxChunkSize)
}

// tell the client COM_STMT_FETCH has finished by setting proper serverStatus,
Expand Down