query routing: multi-table plan options

go/cmd/topo2topo/topo2topo.go

@@ -43,6 +43,7 @@ var (
 	doShards            = flag.Bool("do-shards", false, "copies the shard information")
 	doShardReplications = flag.Bool("do-shard-replications", false, "copies the shard replication information")
 	doTablets           = flag.Bool("do-tablets", false, "copies the tablet information")
+	doRoutingRules      = flag.Bool("do-routing-rules", false, "copies the routing rules")
 )
 
 func main() {
@@ -87,7 +88,9 @@ func copyTopos(ctx context.Context, fromTS, toTS *topo.Server) {
 	if *doTablets {
 		helpers.CopyTablets(ctx, fromTS, toTS)
 	}
-
+	if *doRoutingRules {
+		helpers.CopyRoutingRules(ctx, fromTS, toTS)
+	}
 }
 
 func compareTopos(ctx context.Context, fromTS, toTS *topo.Server) {

go/vt/sqlparser/ast.go

@@ -532,7 +532,7 @@ func (node *Stream) walkSubtree(visit Visit) error {
 // the row and re-inserts with new values. For that reason we keep it as an Insert struct.
 // Replaces are currently disallowed in sharded schemas because
 // of the implications the deletion part may have on vindexes.
-// If you add fields here, consider adding them to calls to validateSubquerySamePlan.
+// If you add fields here, consider adding them to calls to validateUnshardedRoute.
 type Insert struct {
 	Action     string
 	Comments   Comments
@@ -584,7 +584,7 @@ func (Values) iInsertRows()       {}
 func (*ParenSelect) iInsertRows() {}
 
 // Update represents an UPDATE statement.
-// If you add fields here, consider adding them to calls to validateSubquerySamePlan.
+// If you add fields here, consider adding them to calls to validateUnshardedRoute.
 type Update struct {
 	Comments   Comments
 	Ignore     string
@@ -618,7 +618,7 @@ func (node *Update) walkSubtree(visit Visit) error {
 }
 
 // Delete represents a DELETE statement.
-// If you add fields here, consider adding them to calls to validateSubquerySamePlan.
+// If you add fields here, consider adding them to calls to validateUnshardedRoute.
 type Delete struct {
 	Comments   Comments
 	Targets    TableNames

go/vt/topo/helpers/compare.go

@@ -21,6 +21,7 @@ package helpers
 import (
 	"reflect"
 
+	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/context"
 	"vitess.io/vitess/go/vt/proto/vtrpc"
 	"vitess.io/vitess/go/vt/topo"
@@ -179,3 +180,19 @@ func CompareShardReplications(ctx context.Context, fromTS, toTS *topo.Server) er
 	}
 	return nil
 }
+
+// CompareRoutingRules will compare the routing rules in the destination topo.
+func CompareRoutingRules(ctx context.Context, fromTS, toTS *topo.Server) error {
+	rrFrom, err := fromTS.GetRoutingRules(ctx)
+	if err != nil {
+		return vterrors.Wrapf(err, "GetKeyspace(from)")
+	}
+	rrTo, err := toTS.GetRoutingRules(ctx)
+	if err != nil {
+		return vterrors.Wrapf(err, "GetKeyspace(to)")
+	}
+	if !proto.Equal(rrFrom, rrTo) {
+		return vterrors.Errorf(vtrpc.Code_FAILED_PRECONDITION, "routing rules: %v does not match %v", rrFrom, rrTo)
+	}
+	return nil
+}

go/vt/topo/helpers/compare_test.go

@@ -77,4 +77,16 @@ func TestBasicCompare(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Compare tablets failed: %v", err)
 	}
+
+	err = CompareRoutingRules(ctx, fromTS, toTS)
+	if err == nil {
+		t.Fatalf("Compare routing rules is not failing when topos are not in sync")
+	}
+
+	CopyRoutingRules(ctx, fromTS, toTS)
+
+	err = CompareRoutingRules(ctx, fromTS, toTS)
+	if err != nil {
+		t.Fatalf("Compare routing rules failed: %v", err)
+	}
 }

go/vt/topo/helpers/copy.go

@@ -175,3 +175,14 @@ func CopyShardReplications(ctx context.Context, fromTS, toTS *topo.Server) {
 		}
 	}
 }
+
+// CopyRoutingRules will create the routing rules in the destination topo.
+func CopyRoutingRules(ctx context.Context, fromTS, toTS *topo.Server) {
+	rr, err := fromTS.GetRoutingRules(ctx)
+	if err != nil {
+		log.Fatalf("GetRoutingRules: %v", err)
+	}
+	if err := toTS.SaveRoutingRules(ctx, rr); err != nil {
+		log.Errorf("SaveRoutingRules(%v): %v", rr, err)
+	}
+}