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

Prepare to handle streaming responses that contain session only rows #15

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Prepare to handle streaming responses that contain session only rows #15

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
41 changes: 31 additions & 10 deletions handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func (h *handler) ComQuery(c *mysql.Conn, query string, callback func(*sqltypes.
)

if data.IsOLAP() {
return h.streamExecute(data, query, emptyBindVars, callback)
return h.streamExecute(c, data, query, emptyBindVars, callback)
}

resp, err := h.client.Execute(context.Background(), connect.NewRequest(&psdbpb.ExecuteRequest{
Expand Down Expand Up @@ -181,7 +181,7 @@ func (h *handler) ComStmtExecute(c *mysql.Conn, prepare *mysql.PrepareData, call
data := h.clientData(c)

if data.IsOLAP() {
return h.streamExecute(data, prepare.PrepareStmt, castBindVars(prepare.BindVars), callback)
return h.streamExecute(c, data, prepare.PrepareStmt, castBindVars(prepare.BindVars), callback)
}

resp, err := h.client.Execute(context.Background(), connect.NewRequest(&psdbpb.ExecuteRequest{
Expand Down Expand Up @@ -226,7 +226,7 @@ func (h *handler) WarningCount(c *mysql.Conn) uint16 {
return uint16(len(session.GetVitessSession().GetWarnings()))
}

func (h *handler) streamExecute(data *clientData, query string, bindVars map[string]*querypb.BindVariable, callback func(*sqltypes.Result) error) error {
func (h *handler) streamExecute(c *mysql.Conn, data *clientData, query string, bindVars map[string]*querypb.BindVariable, callback func(*sqltypes.Result) error) error {
stream, err := h.client.StreamExecute(context.Background(), connect.NewRequest(&psdbpb.ExecuteRequest{
Session: data.Session,
Query: query,
Expand All @@ -241,18 +241,39 @@ func (h *handler) streamExecute(data *clientData, query string, bindVars map[str

for stream.Receive() {
resp = stream.Msg()
// NOTE: Some results do not have any Result. This is most likely
// the case when a Session is returned. While Vitess currently (as of v18)
// is implemented such that the last streaming response
// contains a Session, but not Result, I do not want to assume
// this is always the case, so this is implemented to handle
// both existing or none existing, or either existing to cover
// our bases.

// Some results may contain a Session, if so
// we need to bind it to the mysql.Conn like normal
if resp.Session != nil {
bindSession(c, data, resp.Session)
}

// If we have ane error, we just return the error
if resp.Error != nil {
return sqlerror.NewSQLErrorFromError(vterrors.FromVTRPC(
castRPCError(resp.Error)),
)
}
if fields == nil {
fields = resp.GetResult().GetFields()
}
if err := callback(sqltypes.CustomProto3ToResult(
castFields(fields), castQueryResult(resp.GetResult())),
); err != nil {
return err

// Lastly if there are results, we return them to the mysql client.
// messages without results get ignored at this point since they
// likely only contained session data.
if resp.Result != nil {
if fields == nil {
fields = resp.Result.GetFields()
}
if err := callback(sqltypes.CustomProto3ToResult(
castFields(fields), castQueryResult(resp.GetResult())),
); err != nil {
return err
}
}

// For each iteration, stream.Msg() is reused to the same struct,
Expand Down
Loading