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: update session when query failed. #103

Merged
merged 1 commit into from
Mar 4, 2024
Merged

fix: update session when query failed. #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions restful.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func (c *APIClient) doRequest(ctx context.Context, method, path string, req inte
}

func (c *APIClient) trackStats(resp *QueryResponse) {
if c.statsTracker == nil {
if c.statsTracker == nil || resp == nil {
return
}
c.statsTracker(resp.ID, &resp.Stats)
Expand Down Expand Up @@ -314,21 +314,23 @@ func (c *APIClient) DoQuery(ctx context.Context, query string, args []driver.Val
}

path := "/v1/query"
var result QueryResponse
err = c.doRequest(ctx, "POST", path, request, &result)
var resp QueryResponse
err = c.doRequest(ctx, "POST", path, request, &resp)
if err != nil {
return nil, errors.Wrap(err, "failed to do query request")
}
if result.Error != nil {
return nil, errors.Wrap(result.Error, "query error")
// try update session as long as resp is not nil, even if query failed (resp.Error != nil)
// e.g. transaction state need to be updated if commit fail
c.applySessionState(&resp)
c.trackStats(&resp)
if resp.Error != nil {
return nil, errors.Wrap(resp.Error, "query error")
}
c.applySessionState(&result)
c.trackStats(&result)
return &result, nil
return &resp, nil
}

func (c *APIClient) applySessionState(response *QueryResponse) {
if response.Session == nil {
if response == nil || response.Session == nil {
return
}
c.sessionState = response.Session
Expand All @@ -346,7 +348,6 @@ func (c *APIClient) WaitForQuery(ctx context.Context, result *QueryResponse) (*Q
if err != nil {
return nil, errors.Wrap(err, "failed to query page")
}
c.trackStats(result)
if result.Error != nil {
return nil, errors.Wrap(result.Error, "query page failed")
}
Expand Down Expand Up @@ -444,11 +445,13 @@ func (c *APIClient) QueryPage(ctx context.Context, nextURI string) (*QueryRespon
retry.Attempts(3),
retry.DelayType(retry.FixedDelay),
)
// try update session as long as resp is not nil, even if query failed (resp.Error != nil)
// e.g. transaction state need to be updated if commit fail
c.applySessionState(&result)
c.trackStats(&result)
if err != nil {
return nil, errors.Wrap(err, "failed to query page")
}
c.trackStats(&result)
c.applySessionState(&result)
return &result, nil
}

Expand Down