Merge branch 'master' of github.com:youtube/vitess

go/vt/topo/srvshard.go

@@ -18,7 +18,8 @@ const SHARD_ZERO = "0"
 // SrvShard contains a roll-up of the shard in the local namespace.
 // In zk, it is under /zk/<cell>/vt/ns/<keyspace>/<shard>
 type SrvShard struct {
-	// Copied from Shard
+	// Copied / infered from Shard
+	Name        string
 	KeyRange    key.KeyRange
 	ServedTypes []TabletType
 
@@ -57,6 +58,9 @@ func NewSrvShard(version int64) *SrvShard {
 
 // ShardName returns the name of a shard.
 func (ss *SrvShard) ShardName() string {
+	if ss.Name != "" {
+		return ss.Name
+	}
 	if !ss.KeyRange.IsPartial() {
 		return SHARD_ZERO
 	}

go/vt/topo/srvshard_bson.go

@@ -19,6 +19,7 @@ func (srvShard *SrvShard) MarshalBson(buf *bytes2.ChunkedWriter, key string) {
 	bson.EncodeOptionalPrefix(buf, bson.Object, key)
 	lenWriter := bson.NewLenWriter(buf)
 
+	bson.EncodeString(buf, "Name", srvShard.Name)
 	srvShard.KeyRange.MarshalBson(buf, "KeyRange")
 	// []TabletType
 	{
@@ -56,6 +57,8 @@ func (srvShard *SrvShard) UnmarshalBson(buf *bytes.Buffer, kind byte) {
 
 	for kind := bson.NextByte(buf); kind != bson.EOO; kind = bson.NextByte(buf) {
 		switch bson.ReadCString(buf) {
+		case "Name":
+			srvShard.Name = bson.DecodeString(buf, kind)
 		case "KeyRange":
 			srvShard.KeyRange.UnmarshalBson(buf, kind)
 		case "ServedTypes":

go/vt/topo/srvshard_test.go

@@ -39,6 +39,7 @@ func TestSrvKeySpace(t *testing.T) {
 			string(TYPE_MASTER): &KeyspacePartition{
 				Shards: []SrvShard{
 					SrvShard{
+						Name:        "test_shard",
 						ServedTypes: []TabletType{TYPE_MASTER},
 					},
 				},
@@ -61,6 +62,7 @@ func TestSrvKeySpace(t *testing.T) {
 			TYPE_MASTER: &KeyspacePartition{
 				Shards: []SrvShard{
 					SrvShard{
+						Name:        "test_shard",
 						ServedTypes: []TabletType{TYPE_MASTER},
 						TabletTypes: []TabletType{},
 					},

go/vt/topotools/rebuild.go

@@ -204,6 +204,7 @@ func rebuildCellSrvShard(ts topo.Server, shardInfo *topo.ShardInfo, cell string,
 	go func() {
 		log.Infof("updating shard serving graph in cell %v for %v/%v", cell, shardInfo.Keyspace(), shardInfo.ShardName())
 		srvShard := &topo.SrvShard{
+			Name:        shardInfo.ShardName(),
 			KeyRange:    shardInfo.KeyRange,
 			ServedTypes: shardInfo.ServedTypes,
 			TabletTypes: make([]topo.TabletType, 0, len(locationAddrsMap)),

go/vt/vtgate/resolver.go

@@ -20,6 +20,15 @@ import (
 	"github.com/youtube/vitess/go/vt/vtgate/proto"
 )
 
+var (
+	separator        = []byte(", ")
+	sqlVarIdentifier = []byte(":")
+	openBracket      = []byte(" in (")
+	closeBracket     = []byte(")")
+	kwAnd            = []byte(" and ")
+	kwWhere          = []byte(" where ")
+)
+
 // Resolver is the layer to resolve KeyspaceIds and KeyRanges
 // to shards. It will try to re-resolve shards if ScatterConn
 // returns retryable error, which may imply horizontal or vertical
@@ -334,13 +343,14 @@ func StrsEquals(a, b []string) bool {
 }
 
 func buildEntityIds(shardIDMap map[string][]interface{}, qSql, entityColName string, qBindVars map[string]interface{}) ([]string, map[string]string, map[string]map[string]interface{}) {
-	shards := make([]string, 0, 1)
+	shards := make([]string, len(shardIDMap))
+	shardsIdx := 0
 	sqls := make(map[string]string)
 	bindVars := make(map[string]map[string]interface{})
 	for shard, ids := range shardIDMap {
 		var b bytes.Buffer
 		b.Write([]byte(entityColName))
-		b.Write([]byte(" in ("))
+		b.Write(openBracket)
 		bindVar := make(map[string]interface{})
 		for k, v := range qBindVars {
 			bindVar[k] = v
@@ -349,14 +359,16 @@ func buildEntityIds(shardIDMap map[string][]interface{}, qSql, entityColName str
 			bvName := fmt.Sprintf("%v%v", entityColName, i)
 			bindVar[bvName] = id
 			if i > 0 {
-				b.Write([]byte(", "))
+				b.Write(separator)
 			}
-			b.Write([]byte(fmt.Sprintf(":%v", bvName)))
+			b.Write(sqlVarIdentifier)
+			b.Write([]byte(bvName))
 		}
-		b.Write([]byte(")"))
-		shards = append(shards, shard)
+		b.Write(closeBracket)
 		sqls[shard] = insertSqlClause(qSql, b.String())
 		bindVars[shard] = bindVar
+		shards[shardsIdx] = shard
+		shardsIdx++
 	}
 	return shards, sqls, bindVars
 }
@@ -381,9 +393,9 @@ func insertSqlClause(querySql, clause string) string {
 	var b bytes.Buffer
 	b.Write([]byte(querySql[:idxExtra]))
 	if strings.Contains(sql, "where") {
-		b.Write([]byte(" and "))
+		b.Write(kwAnd)
 	} else {
-		b.Write([]byte(" where "))
+		b.Write(kwWhere)
 	}
 	b.Write([]byte(clause))
 	if idxExtra < len(sql) {

go/vt/vtgate/scatter_conn.go

@@ -103,7 +103,6 @@ func (stc *ScatterConn) ExecuteEntityIds(
 	tabletType topo.TabletType,
 	session *SafeSession,
 ) (*mproto.QueryResult, error) {
-	var lock sync.Mutex
 	results, allErrors := stc.multiGo(
 		context,
 		"ExecuteEntityIds",
@@ -113,10 +112,8 @@ func (stc *ScatterConn) ExecuteEntityIds(
 		session,
 		func(sdc *ShardConn, transactionId int64, sResults chan<- interface{}) error {
 			shard := sdc.shard
-			lock.Lock()
 			sql := sqls[shard]
 			bindVar := bindVars[shard]
-			lock.Unlock()
 			innerqr, err := sdc.Execute(context, sql, bindVar, transactionId)
 			if err != nil {
 				return err