Use MarshalVT/UnmarshalVT instead of proto.Marshal/`proto.Unmar…

…shal`. (vitessio#12525) * Use `MarshalVT` instead of `proto.Marshal`. Signed-off-by: Arthur Schreiber <[email protected]> * Use `UnmarshalVT` instead of `proto.Unmarshal`. Signed-off-by: Arthur Schreiber <[email protected]> --------- Signed-off-by: Arthur Schreiber <[email protected]>
github · Apr 11, 2024 · ccc22b1 · ccc22b1
1 parent a8bc7c0
commit ccc22b1
Show file tree

Hide file tree

Showing 20 changed files with 63 additions and 82 deletions.
diff --git a/go/vt/tableacl/tableacl.go b/go/vt/tableacl/tableacl.go
@@ -113,7 +113,7 @@ func (tacl *tableACL) init(configFile string, aclCB func()) error {
 		return err
 	}
 	config := &tableaclpb.Config{}
-	if err := proto.Unmarshal(data, config); err != nil {
+	if err := config.UnmarshalVT(data); err != nil {
 		// try to parse tableacl as json file
 		if jsonErr := json2.Unmarshal(data, config); jsonErr != nil {
 			log.Infof("unable to parse tableACL config file as a protobuf or json file.  protobuf err: %v  json err: %v", err, jsonErr)

diff --git a/go/vt/topo/cell_info.go b/go/vt/topo/cell_info.go
@@ -21,7 +21,6 @@ import (
 	"path"
 	"strings"
 
-	"google.golang.org/protobuf/proto"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"vitess.io/vitess/go/vt/vterrors"
@@ -74,7 +73,7 @@ func (ts *Server) GetCellInfo(ctx context.Context, cell string, strongRead bool)
 
 	// Unpack the contents.
 	ci := &topodatapb.CellInfo{}
-	if err := proto.Unmarshal(contents, ci); err != nil {
+	if err := ci.UnmarshalVT(contents); err != nil {
 		return nil, err
 	}
 	return ci, nil
@@ -83,7 +82,7 @@ func (ts *Server) GetCellInfo(ctx context.Context, cell string, strongRead bool)
 // CreateCellInfo creates a new CellInfo with the provided content.
 func (ts *Server) CreateCellInfo(ctx context.Context, cell string, ci *topodatapb.CellInfo) error {
 	// Pack the content.
-	contents, err := proto.Marshal(ci)
+	contents, err := ci.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -108,7 +107,7 @@ func (ts *Server) UpdateCellInfoFields(ctx context.Context, cell string, update
 		contents, version, err := ts.globalCell.Get(ctx, filePath)
 		switch {
 		case err == nil:
-			if err := proto.Unmarshal(contents, ci); err != nil {
+			if err := ci.UnmarshalVT(contents); err != nil {
 				return err
 			}
 		case IsErrType(err, NoNode):
@@ -126,7 +125,7 @@ func (ts *Server) UpdateCellInfoFields(ctx context.Context, cell string, update
 		}
 
 		// Pack and save.
-		contents, err = proto.Marshal(ci)
+		contents, err = ci.MarshalVT()
 		if err != nil {
 			return err
 		}

diff --git a/go/vt/topo/cells_aliases.go b/go/vt/topo/cells_aliases.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"path"
 
-	"google.golang.org/protobuf/proto"
-
 	"context"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
@@ -63,7 +61,7 @@ func (ts *Server) GetCellsAliases(ctx context.Context, strongRead bool) (ret map
 
 			// Unpack the contents.
 			cellsAlias := &topodatapb.CellsAlias{}
-			if err := proto.Unmarshal(contents, cellsAlias); err != nil {
+			if err := cellsAlias.UnmarshalVT(contents); err != nil {
 				return nil, err
 			}
 
@@ -90,7 +88,7 @@ func (ts *Server) GetCellsAlias(ctx context.Context, name string, strongRead boo
 
 	// Unpack the contents.
 	cellsAlias := &topodatapb.CellsAlias{}
-	if err := proto.Unmarshal(contents, cellsAlias); err != nil {
+	if err := cellsAlias.UnmarshalVT(contents); err != nil {
 		return nil, err
 	}
 
@@ -119,7 +117,7 @@ func (ts *Server) CreateCellsAlias(ctx context.Context, alias string, cellsAlias
 	ts.clearCellAliasesCache()
 
 	// Pack the content.
-	contents, err := proto.Marshal(cellsAlias)
+	contents, err := cellsAlias.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -142,7 +140,7 @@ func (ts *Server) UpdateCellsAlias(ctx context.Context, alias string, update fun
 		contents, version, err := ts.globalCell.Get(ctx, filePath)
 		switch {
 		case err == nil:
-			if err := proto.Unmarshal(contents, cellsAlias); err != nil {
+			if err := cellsAlias.UnmarshalVT(contents); err != nil {
 				return err
 			}
 		case IsErrType(err, NoNode):
@@ -169,7 +167,7 @@ func (ts *Server) UpdateCellsAlias(ctx context.Context, alias string, update fun
 		}
 
 		// Pack and save.
-		contents, err = proto.Marshal(cellsAlias)
+		contents, err = cellsAlias.MarshalVT()
 		if err != nil {
 			return err
 		}

diff --git a/go/vt/topo/external_vitess_cluster.go b/go/vt/topo/external_vitess_cluster.go
@@ -20,8 +20,6 @@ import (
 	"context"
 	"path"
 
-	"google.golang.org/protobuf/proto"
-
 	"vitess.io/vitess/go/event"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/topo/events"
@@ -49,7 +47,7 @@ func GetExternalVitessClusterPath(clusterName string) string {
 
 // CreateExternalVitessCluster creates a topo record for the passed vitess cluster
 func (ts *Server) CreateExternalVitessCluster(ctx context.Context, clusterName string, value *topodatapb.ExternalVitessCluster) error {
-	data, err := proto.Marshal(value)
+	data, err := value.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -77,7 +75,7 @@ func (ts *Server) GetExternalVitessCluster(ctx context.Context, clusterName stri
 		return nil, err
 	}
 	vc := &topodatapb.ExternalVitessCluster{}
-	if err = proto.Unmarshal(data, vc); err != nil {
+	if err = vc.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrap(err, "bad vitess cluster data")
 	}
 
@@ -91,7 +89,7 @@ func (ts *Server) GetExternalVitessCluster(ctx context.Context, clusterName stri
 // UpdateExternalVitessCluster updates the topo record for the named vitess cluster
 func (ts *Server) UpdateExternalVitessCluster(ctx context.Context, vc *ExternalVitessClusterInfo) error {
 	//FIXME: check for cluster lock
-	data, err := proto.Marshal(vc.ExternalVitessCluster)
+	data, err := vc.ExternalVitessCluster.MarshalVT()
 	if err != nil {
 		return err
 	}

diff --git a/go/vt/topo/keyspace.go b/go/vt/topo/keyspace.go
@@ -20,8 +20,6 @@ import (
 	"path"
 	"strings"
 
-	"google.golang.org/protobuf/proto"
-
 	"context"
 
 	"vitess.io/vitess/go/vt/vterrors"
@@ -180,7 +178,7 @@ func (ts *Server) CreateKeyspace(ctx context.Context, keyspace string, value *to
 		return vterrors.Wrapf(err, "CreateKeyspace: %s", err)
 	}
 
-	data, err := proto.Marshal(value)
+	data, err := value.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -211,7 +209,7 @@ func (ts *Server) GetKeyspace(ctx context.Context, keyspace string) (*KeyspaceIn
 	}
 
 	k := &topodatapb.Keyspace{}
-	if err = proto.Unmarshal(data, k); err != nil {
+	if err = k.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrap(err, "bad keyspace data")
 	}
 
@@ -251,7 +249,7 @@ func (ts *Server) UpdateKeyspace(ctx context.Context, ki *KeyspaceInfo) error {
 		return err
 	}
 
-	data, err := proto.Marshal(ki.Keyspace)
+	data, err := ki.Keyspace.MarshalVT()
 	if err != nil {
 		return err
 	}

diff --git a/go/vt/topo/replication.go b/go/vt/topo/replication.go
@@ -186,7 +186,7 @@ func (ts *Server) UpdateShardReplicationFields(ctx context.Context, cell, keyspa
 			// Empty node, version is nil
 		case err == nil:
 			// Use any data we got.
-			if err = proto.Unmarshal(data, sr); err != nil {
+			if err = sr.UnmarshalVT(data); err != nil {
 				return vterrors.Wrap(err, "bad ShardReplication data")
 			}
 		default:
@@ -204,7 +204,7 @@ func (ts *Server) UpdateShardReplicationFields(ctx context.Context, cell, keyspa
 		}
 
 		// marshall and save
-		data, err = proto.Marshal(sr)
+		data, err = sr.MarshalVT()
 		if err != nil {
 			return err
 		}
@@ -243,7 +243,7 @@ func (ts *Server) GetShardReplication(ctx context.Context, cell, keyspace, shard
 	}
 
 	sr := &topodatapb.ShardReplication{}
-	if err = proto.Unmarshal(data, sr); err != nil {
+	if err = sr.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrap(err, "bad ShardReplication data")
 	}
 

diff --git a/go/vt/topo/shard.go b/go/vt/topo/shard.go
@@ -213,7 +213,7 @@ func (ts *Server) GetShard(ctx context.Context, keyspace, shard string) (*ShardI
 	}
 
 	value := &topodatapb.Shard{}
-	if err = proto.Unmarshal(data, value); err != nil {
+	if err = value.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrapf(err, "GetShard(%v,%v): bad shard data", keyspace, shard)
 	}
 	return &ShardInfo{
@@ -232,7 +232,7 @@ func (ts *Server) updateShard(ctx context.Context, si *ShardInfo) error {
 	span.Annotate("shard", si.shardName)
 	defer span.Finish()
 
-	data, err := proto.Marshal(si.Shard)
+	data, err := si.Shard.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -315,7 +315,7 @@ func (ts *Server) CreateShard(ctx context.Context, keyspace, shard string) (err
 	}
 
 	// Marshal and save.
-	data, err := proto.Marshal(value)
+	data, err := value.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -670,7 +670,7 @@ func (ts *Server) WatchShard(ctx context.Context, keyspace, shard string) (*Watc
 		return nil, nil, err
 	}
 	value := &topodatapb.Shard{}
-	if err := proto.Unmarshal(current.Contents, value); err != nil {
+	if err := value.UnmarshalVT(current.Contents); err != nil {
 		// Cancel the watch, drain channel.
 		cancel()
 		for range wdChannel {
@@ -698,7 +698,7 @@ func (ts *Server) WatchShard(ctx context.Context, keyspace, shard string) (*Watc
 			}
 
 			value := &topodatapb.Shard{}
-			if err := proto.Unmarshal(wd.Contents, value); err != nil {
+			if err := value.UnmarshalVT(wd.Contents); err != nil {
 				cancel()
 				for range wdChannel {
 				}

diff --git a/go/vt/topo/srv_keyspace.go b/go/vt/topo/srv_keyspace.go
@@ -23,8 +23,6 @@ import (
 	"path"
 	"sync"
 
-	"google.golang.org/protobuf/proto"
-
 	"vitess.io/vitess/go/vt/vterrors"
 
 	"vitess.io/vitess/go/vt/concurrency"
@@ -64,7 +62,7 @@ func (ts *Server) WatchSrvKeyspace(ctx context.Context, cell, keyspace string) (
 		return nil, nil, err
 	}
 	value := &topodatapb.SrvKeyspace{}
-	if err := proto.Unmarshal(current.Contents, value); err != nil {
+	if err := value.UnmarshalVT(current.Contents); err != nil {
 		// Cancel the watch, drain channel.
 		cancel()
 		for range wdChannel {
@@ -93,7 +91,7 @@ func (ts *Server) WatchSrvKeyspace(ctx context.Context, cell, keyspace string) (
 			}
 
 			value := &topodatapb.SrvKeyspace{}
-			if err := proto.Unmarshal(wd.Contents, value); err != nil {
+			if err := value.UnmarshalVT(wd.Contents); err != nil {
 				cancel()
 				for range wdChannel {
 				}
@@ -637,7 +635,7 @@ func (ts *Server) UpdateSrvKeyspace(ctx context.Context, cell, keyspace string,
 	}
 
 	nodePath := srvKeyspaceFileName(keyspace)
-	data, err := proto.Marshal(srvKeyspace)
+	data, err := srvKeyspace.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -691,7 +689,7 @@ func (ts *Server) GetSrvKeyspace(ctx context.Context, cell, keyspace string) (*t
 		return nil, err
 	}
 	srvKeyspace := &topodatapb.SrvKeyspace{}
-	if err := proto.Unmarshal(data, srvKeyspace); err != nil {
+	if err := srvKeyspace.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrapf(err, "SrvKeyspace unmarshal failed: %v", data)
 	}
 	return srvKeyspace, nil

diff --git a/go/vt/topo/srv_vschema.go b/go/vt/topo/srv_vschema.go
@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"sync"
 
-	"google.golang.org/protobuf/proto"
-
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/vterrors"
 
@@ -54,7 +52,7 @@ func (ts *Server) WatchSrvVSchema(ctx context.Context, cell string) (*WatchSrvVS
 		return nil, nil, err
 	}
 	value := &vschemapb.SrvVSchema{}
-	if err := proto.Unmarshal(current.Contents, value); err != nil {
+	if err := value.UnmarshalVT(current.Contents); err != nil {
 		// Cancel the watch, drain channel.
 		cancel()
 		for range wdChannel {
@@ -83,7 +81,7 @@ func (ts *Server) WatchSrvVSchema(ctx context.Context, cell string) (*WatchSrvVS
 			}
 
 			value := &vschemapb.SrvVSchema{}
-			if err := proto.Unmarshal(wd.Contents, value); err != nil {
+			if err := value.UnmarshalVT(wd.Contents); err != nil {
 				cancel()
 				for range wdChannel {
 				}
@@ -105,7 +103,7 @@ func (ts *Server) UpdateSrvVSchema(ctx context.Context, cell string, srvVSchema
 	}
 
 	nodePath := SrvVSchemaFile
-	data, err := proto.Marshal(srvVSchema)
+	data, err := srvVSchema.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -126,7 +124,7 @@ func (ts *Server) GetSrvVSchema(ctx context.Context, cell string) (*vschemapb.Sr
 		return nil, err
 	}
 	srvVSchema := &vschemapb.SrvVSchema{}
-	if err := proto.Unmarshal(data, srvVSchema); err != nil {
+	if err := srvVSchema.UnmarshalVT(data); err != nil {
 		return nil, vterrors.Wrapf(err, "SrvVSchema unmarshal failed: %v", data)
 	}
 	return srvVSchema, nil

diff --git a/go/vt/topo/tablet.go b/go/vt/topo/tablet.go
@@ -245,7 +245,7 @@ func (ts *Server) GetTablet(ctx context.Context, alias *topodatapb.TabletAlias)
 		return nil, err
 	}
 	tablet := &topodatapb.Tablet{}
-	if err := proto.Unmarshal(data, tablet); err != nil {
+	if err := tablet.UnmarshalVT(data); err != nil {
 		return nil, err
 	}
 
@@ -310,7 +310,7 @@ func (ts *Server) GetTabletsByCell(ctx context.Context, cellAlias string) ([]*Ta
 	tablets := make([]*TabletInfo, len(listResults))
 	for n := range listResults {
 		tablet := &topodatapb.Tablet{}
-		if err := proto.Unmarshal(listResults[n].Value, tablet); err != nil {
+		if err := tablet.UnmarshalVT(listResults[n].Value); err != nil {
 			return nil, err
 		}
 		tablets[n] = &TabletInfo{Tablet: tablet, version: listResults[n].Version}
@@ -363,7 +363,7 @@ func (ts *Server) UpdateTablet(ctx context.Context, ti *TabletInfo) error {
 	span.Annotate("tablet", topoproto.TabletAliasString(ti.Alias))
 	defer span.Finish()
 
-	data, err := proto.Marshal(ti.Tablet)
+	data, err := ti.Tablet.MarshalVT()
 	if err != nil {
 		return err
 	}
@@ -441,7 +441,7 @@ func (ts *Server) CreateTablet(ctx context.Context, tablet *topodatapb.Tablet) e
 		return err
 	}
 
-	data, err := proto.Marshal(tablet)
+	data, err := tablet.MarshalVT()
 	if err != nil {
 		return err
 	}