Skip to content

removed resolver usage from StreamExecute #7281

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
systay merged 1 commit into from
Jan 11, 2021
Merged

removed resolver usage from StreamExecute #7281

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion go/test/endtoend/vtgate/misc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ func TestUseStmtInOLAP(t *testing.T) {
require.NoError(t, err)
defer conn.Close()

queries := []string{"set workload='olap'", "use `ks:80-`"}
queries := []string{"set workload='olap'", "use `ks:80-`", "use `ks:-80`"}
for i, q := range queries {
t.Run(fmt.Sprintf("%d-%s", i, q), func(t *testing.T) {
exec(t, conn, q)
Expand Down
25 changes: 2 additions & 23 deletions go/vt/vtgate/vtgate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import (
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/tb"
"vitess.io/vitess/go/vt/discovery"
"vitess.io/vitess/go/vt/key"
"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/logutil"
"vitess.io/vitess/go/vt/schema"
Expand Down Expand Up @@ -311,34 +310,15 @@ func (vtg *VTGate) ExecuteBatch(ctx context.Context, session *vtgatepb.Session,
// by multiple go routines.
func (vtg *VTGate) StreamExecute(ctx context.Context, session *vtgatepb.Session, sql string, bindVariables map[string]*querypb.BindVariable, callback func(*sqltypes.Result) error) error {
// In this context, we don't care if we can't fully parse destination
destKeyspace, destTabletType, dest, _ := vtg.executor.ParseDestinationTarget(session.TargetString)
destKeyspace, destTabletType, _, _ := vtg.executor.ParseDestinationTarget(session.TargetString)
statsKey := []string{"StreamExecute", destKeyspace, topoproto.TabletTypeLString(destTabletType)}

defer vtg.timings.Record(statsKey, time.Now())

var err error
if bvErr := sqltypes.ValidateBindVariables(bindVariables); bvErr != nil {
err = vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", bvErr)
goto handleError
}

// TODO: This could be simplified to have a StreamExecute that takes
// a destTarget without explicit destination.
switch dest.(type) {
case key.DestinationShard:
err = vtg.resolver.StreamExecute(
ctx,
sql,
bindVariables,
destKeyspace,
destTabletType,
dest,
session.Options,
func(reply *sqltypes.Result) error {
vtg.rowsReturned.Add(statsKey, int64(len(reply.Rows)))
return callback(reply)
})
default:
} else {
err = vtg.executor.StreamExecute(
ctx,
"StreamExecute",
Expand All @@ -354,7 +334,6 @@ func (vtg *VTGate) StreamExecute(ctx context.Context, session *vtgatepb.Session,
return callback(reply)
})
}
handleError:
if err != nil {
query := map[string]interface{}{
"Sql": sql,
Expand Down