Skip to content

Reset BytesBuffer after each rowBatch #2811

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

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Reset BytesBuffer after each rowBatch #2811

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb914a
Reset BytesBuffer after each rowBatch
Jan 10, 2025
f35b0ad
remove debug
Jan 10, 2025
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
8 changes: 7 additions & 1 deletion server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,12 @@ func (h *Handler) resultForDefaultIter(ctx *sql.Context, c *mysql.Conn, schema s
timer := time.NewTimer(waitTime)
defer timer.Stop()

// Wrap the callback to include a BytesBuffer.Reset() to clean out rows that have already been spooled
resetCallback := func(r *sqltypes.Result, more bool) error {
defer buf.Reset()
return callback(r, more)
}

// Reads rows from the channel, converts them to wire format,
// and calls |callback| to give them to vitess.
eg.Go(func() error {
Expand All @@ -645,7 +651,7 @@ func (h *Handler) resultForDefaultIter(ctx *sql.Context, c *mysql.Conn, schema s
r = &sqltypes.Result{Fields: resultFields}
}
if r.RowsAffected == rowsBatch {
if err := callback(r, more); err != nil {
if err := resetCallback(r, more); err != nil {
return err
}
r = nil
Expand Down
Loading