Skip to content

use sqlCtx in handler #2718

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 11 commits into from
Oct 28, 2024
Merged

use sqlCtx in handler #2718

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bcc247d
actually use cancel context
Oct 25, 2024
87f96d5
[ga-format-pr] Run ./format_repo.sh to fix formatting
jycor Oct 25, 2024
a5265e9
remove todos
Oct 25, 2024
9572a0d
remove debug
Oct 25, 2024
34c470d
Merge branch 'main' into james/ctx
Oct 25, 2024
4e2eed2
handler test
Oct 25, 2024
3656821
[ga-format-pr] Run ./format_repo.sh to fix formatting
jycor Oct 25, 2024
5cb3346
add waits
Oct 25, 2024
68eae6b
fix flake and race
Oct 26, 2024
3ba9230
g
Oct 26, 2024
9fa6d1b
server/handle.go: doQuery cleanup of some error handling. (#2723)
reltuk Oct 28, 2024
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
7 changes: 1 addition & 6 deletions server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,9 @@ func (h *Handler) doQuery(

sqlCtx.GetLogger().Tracef("beginning execution")

oCtx := ctx

// TODO: it would be nice to put this logic in the engine, not the handler, but we don't want the process to be
// marked done until we're done spooling rows over the wire
ctx, err = sqlCtx.ProcessList.BeginQuery(sqlCtx, query)
sqlCtx, err = sqlCtx.ProcessList.BeginQuery(sqlCtx, query)
defer func() {
if err != nil && ctx != nil {
sqlCtx.ProcessList.EndQuery(sqlCtx)
Expand Down Expand Up @@ -455,9 +453,6 @@ func (h *Handler) doQuery(
return remainder, err
}

// errGroup context is now canceled
ctx = oCtx

if err = setConnStatusFlags(sqlCtx, c); err != nil {
return remainder, err
}
Expand Down