Adding a couple missing targets.

riseofthetigers · Aug 5, 2015 · e58395c · e58395c
1 parent 7855514
commit e58395c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/go/vt/tabletserver/gorpcqueryservice/sqlquery.go b/go/vt/tabletserver/gorpcqueryservice/sqlquery.go
@@ -157,7 +157,7 @@ func (sq *SqlQuery) Execute2(ctx context.Context, executeRequest *proto.ExecuteR
 		callerid.GoRPCEffectiveCallerID(executeRequest.EffectiveCallerID),
 		callerid.GoRPCImmediateCallerID(executeRequest.ImmediateCallerID),
 	)
-	tErr := sq.server.Execute(callinfo.RPCWrapCallInfo(ctx), nil, &executeRequest.QueryRequest, reply)
+	tErr := sq.server.Execute(callinfo.RPCWrapCallInfo(ctx), proto.TargetToProto3(executeRequest.Target), &executeRequest.QueryRequest, reply)
 	tabletserver.AddTabletErrorToQueryResult(tErr, reply)
 	if *tabletserver.RPCErrorOnlyInReply {
 		return nil
@@ -228,7 +228,7 @@ func (sq *SqlQuery) ExecuteBatch2(ctx context.Context, req *proto.ExecuteBatchRe
 		callerid.GoRPCEffectiveCallerID(req.EffectiveCallerID),
 		callerid.GoRPCImmediateCallerID(req.ImmediateCallerID),
 	)
-	tErr := sq.server.ExecuteBatch(callinfo.RPCWrapCallInfo(ctx), nil, &req.QueryBatch, reply)
+	tErr := sq.server.ExecuteBatch(callinfo.RPCWrapCallInfo(ctx), proto.TargetToProto3(req.Target), &req.QueryBatch, reply)
 	tabletserver.AddTabletErrorToQueryResultList(tErr, reply)
 	if *tabletserver.RPCErrorOnlyInReply {
 		return nil
@@ -243,7 +243,7 @@ func (sq *SqlQuery) SplitQuery(ctx context.Context, req *proto.SplitQueryRequest
 		callerid.GoRPCEffectiveCallerID(req.EffectiveCallerID),
 		callerid.GoRPCImmediateCallerID(req.ImmediateCallerID),
 	)
-	tErr := sq.server.SplitQuery(callinfo.RPCWrapCallInfo(ctx), nil, req, reply)
+	tErr := sq.server.SplitQuery(callinfo.RPCWrapCallInfo(ctx), proto.TargetToProto3(req.Target), req, reply)
 	tabletserver.AddTabletErrorToSplitQueryResult(tErr, reply)
 	if *tabletserver.RPCErrorOnlyInReply {
 		return nil

diff --git a/go/vt/tabletserver/proto/structs.go b/go/vt/tabletserver/proto/structs.go
@@ -50,6 +50,7 @@ type ExecuteRequest struct {
 	QueryRequest      Query
 	EffectiveCallerID *CallerID
 	ImmediateCallerID *VTGateCallerID
+	Target            *Target
 }
 
 //go:generate bsongen -file $GOFILE -type Query -o query_bson.go
@@ -103,6 +104,7 @@ type ExecuteBatchRequest struct {
 	QueryBatch        QueryList
 	EffectiveCallerID *CallerID
 	ImmediateCallerID *VTGateCallerID
+	Target            *Target
 }
 
 //go:generate bsongen -file $GOFILE -type QueryList -o query_list_bson.go
@@ -145,6 +147,7 @@ type SplitQueryRequest struct {
 	SessionID         int64
 	EffectiveCallerID *CallerID
 	ImmediateCallerID *VTGateCallerID
+	Target            *Target
 }
 
 // QuerySplit represents a split of SplitQueryRequest.Query. RowCount is only