Merge pull request vitessio#1467 from alainjobart/resharding

Renaming xid_{type,value} to {type,value} in the proto3
wlx5575 · Jan 29, 2016 · 014ff36 · 014ff36
2 parents 86a1644 + 963e0f7
commit 014ff36
Show file tree

Hide file tree

Showing 16 changed files with 218 additions and 222 deletions.
diff --git a/go/cmd/vtgateclienttest/goclienttest/echo.go b/go/cmd/vtgateclienttest/goclienttest/echo.go
@@ -42,21 +42,21 @@ var (
 	entityKeyspaceIDs = []*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 		{
 			KeyspaceId: []byte{1, 2, 3},
-			XidType:    sqltypes.Int64,
-			XidValue:   []byte("123"),
+			Type:       sqltypes.Int64,
+			Value:      []byte("123"),
 		},
 		{
 			KeyspaceId: []byte{4, 5, 6},
-			XidType:    sqltypes.Float64,
-			XidValue:   []byte("2"),
+			Type:       sqltypes.Float64,
+			Value:      []byte("2"),
 		},
 		{
 			KeyspaceId: []byte{7, 8, 9},
-			XidType:    sqltypes.VarBinary,
-			XidValue:   []byte{1, 2, 3},
+			Type:       sqltypes.VarBinary,
+			Value:      []byte{1, 2, 3},
 		},
 	}
-	entityKeyspaceIDsEcho = "[xid_type:INT64 xid_value:\"123\" keyspace_id:\"\\001\\002\\003\"  xid_type:FLOAT64 xid_value:\"2\" keyspace_id:\"\\004\\005\\006\"  xid_type:VARBINARY xid_value:\"\\001\\002\\003\" keyspace_id:\"\\007\\010\\t\" ]"
+	entityKeyspaceIDsEcho = "[type:INT64 value:\"123\" keyspace_id:\"\\001\\002\\003\"  type:FLOAT64 value:\"2\" keyspace_id:\"\\004\\005\\006\"  type:VARBINARY value:\"\\001\\002\\003\" keyspace_id:\"\\007\\010\\t\" ]"
 
 	tabletType     = topodatapb.TabletType_REPLICA
 	tabletTypeEcho = topodatapb.TabletType_name[int32(tabletType)]

diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go
diff --git a/go/vt/vtgate/gorpcvtgatecommon/proto3.go b/go/vt/vtgate/gorpcvtgatecommon/proto3.go
@@ -28,8 +28,8 @@ func EntityIdsToProto(l []EntityId) []*vtgatepb.ExecuteEntityIdsRequest_EntityId
 		if err != nil {
 			panic(err)
 		}
-		result[i].XidType = v.Type
-		result[i].XidValue = v.Value
+		result[i].Type = v.Type
+		result[i].Value = v.Value
 	}
 	return result
 }
@@ -41,7 +41,7 @@ func ProtoToEntityIds(l []*vtgatepb.ExecuteEntityIdsRequest_EntityId) []EntityId
 	}
 	result := make([]EntityId, len(l))
 	for i, e := range l {
-		v, err := sqltypes.ValueFromBytes(e.XidType, e.XidValue)
+		v, err := sqltypes.ValueFromBytes(e.Type, e.Value)
 		if err != nil {
 			panic(err)
 		}

diff --git a/go/vt/vtgate/resolver_test.go b/go/vt/vtgate/resolver_test.go
@@ -63,13 +63,13 @@ func TestResolverExecuteEntityIds(t *testing.T) {
 			"col",
 			[]*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 				{
-					XidType:    sqltypes.Int64,
-					XidValue:   []byte("0"),
+					Type:       sqltypes.Int64,
+					Value:      []byte("0"),
 					KeyspaceId: []byte{0x10},
 				},
 				{
-					XidType:    sqltypes.VarBinary,
-					XidValue:   []byte("1"),
+					Type:       sqltypes.VarBinary,
+					Value:      []byte("1"),
 					KeyspaceId: []byte{0x25},
 				},
 			},

diff --git a/go/vt/vtgate/topo_utils.go b/go/vt/vtgate/topo_utils.go
@@ -104,7 +104,7 @@ func mapEntityIdsToShards(ctx context.Context, topoServ topo.SrvTopoServer, cell
 		if err != nil {
 			return "", nil, err
 		}
-		v, err := sqltypes.ValueFromBytes(eid.XidType, eid.XidValue)
+		v, err := sqltypes.ValueFromBytes(eid.Type, eid.Value)
 		if err != nil {
 			return "", nil, err
 		}

diff --git a/go/vt/vtgate/vtgate_test.go b/go/vt/vtgate/vtgate_test.go
@@ -323,8 +323,8 @@ func TestVTGateExecuteEntityIds(t *testing.T) {
 		"kid",
 		[]*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 			{
-				XidType:    sqltypes.VarBinary,
-				XidValue:   []byte("id1"),
+				Type:       sqltypes.VarBinary,
+				Value:      []byte("id1"),
 				KeyspaceId: []byte{0x10},
 			},
 		},
@@ -352,8 +352,8 @@ func TestVTGateExecuteEntityIds(t *testing.T) {
 		"kid",
 		[]*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 			{
-				XidType:    sqltypes.VarBinary,
-				XidValue:   []byte("id1"),
+				Type:       sqltypes.VarBinary,
+				Value:      []byte("id1"),
 				KeyspaceId: []byte{0x10},
 			},
 		},
@@ -386,13 +386,13 @@ func TestVTGateExecuteEntityIds(t *testing.T) {
 		"kid",
 		[]*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 			{
-				XidType:    sqltypes.VarBinary,
-				XidValue:   []byte("id1"),
+				Type:       sqltypes.VarBinary,
+				Value:      []byte("id1"),
 				KeyspaceId: []byte{0x10},
 			},
 			{
-				XidType:    sqltypes.VarBinary,
-				XidValue:   []byte("id2"),
+				Type:       sqltypes.VarBinary,
+				Value:      []byte("id2"),
 				KeyspaceId: []byte{0x30},
 			},
 		},
@@ -845,13 +845,13 @@ func TestAnnotatingExecuteEntityIds(t *testing.T) {
 		"entity_column_name",
 		[]*vtgatepb.ExecuteEntityIdsRequest_EntityId{
 			{
-				XidType:    sqltypes.Int64,
-				XidValue:   []byte("0"),
+				Type:       sqltypes.Int64,
+				Value:      []byte("0"),
 				KeyspaceId: []byte{0x10}, // First shard.
 			},
 			{
-				XidType:    sqltypes.Int64,
-				XidValue:   []byte("1"),
+				Type:       sqltypes.Int64,
+				Value:      []byte("1"),
 				KeyspaceId: []byte{0x25}, // Second shard.
 			},
 		},