Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Matt Lord <[email protected]>
  • Loading branch information
@mattlord
mattlord committed Sep 19, 2023
1 parent 786d0df commit ebc117d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 25 deletions.
13 changes: 9 additions & 4 deletions go/cmd/vtctldclient/cli/json.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ import (
"google.golang.org/protobuf/proto"
)

const (
JSONindent = " "
JSONprefix = ""
)

// MarshalJSON marshals obj to a JSON string. It uses the jsonpb marshaler for
// proto.Message types, with some sensible defaults, and falls back to the
// standard Go marshaler otherwise. In both cases, the marshaled JSON is
Expand All @@ -39,14 +44,14 @@ func MarshalJSON(obj any) ([]byte, error) {
case proto.Message:
m := protojson.MarshalOptions{
Multiline: true,
Indent: " ",
Indent: JSONindent,
UseEnumNumbers: true,
UseProtoNames: true,
EmitUnpopulated: true,
}
return m.Marshal(obj)
default:
data, err := json.MarshalIndent(obj, "", " ")
data, err := json.MarshalIndent(obj, JSONprefix, JSONindent)
if err != nil {
return nil, fmt.Errorf("json.Marshal = %v", err)
}
Expand All @@ -61,14 +66,14 @@ func MarshalJSONCompact(obj any) ([]byte, error) {
case proto.Message:
m := protojson.MarshalOptions{
Multiline: true,
Indent: " ",
Indent: JSONindent,
UseEnumNumbers: true,
UseProtoNames: true,
EmitUnpopulated: false, // elide zero value elements
}
return m.Marshal(obj)
default:
data, err := json.MarshalIndent(obj, "", " ")
data, err := json.MarshalIndent(obj, JSONprefix, JSONindent)
if err != nil {
return nil, fmt.Errorf("json.Marshal = %v", err)
}
Expand Down
43 changes: 22 additions & 21 deletions go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,10 @@ See the --help output for each command for more details.`,

// vDiffCreate makes a VDiffCreate gRPC call to a vtctld.
vDiffCreate = &cobra.Command{
Use: "create",
Short: "Create and run a VDiff to compare the tables involved in a VReplication workflow between the source and target.",
Example: `vtctldclient --server localhost:15999 vdiff --workflow commerce2customer --target-keyspace customer create b3f59678-5241-11ee-be56-0242ac120002`,
Use: "create",
Short: "Create and run a VDiff to compare the tables involved in a VReplication workflow between the source and target.",
Example: `vtctldclient --server localhost:15999 vdiff --workflow commerce2customer --target-keyspace customer
vtctldclient --server localhost:15999 vdiff --workflow commerce2customer --target-keyspace customer create b3f59678-5241-11ee-be56-0242ac120002`,
SilenceUsage: true,
DisableFlagsInUseLine: true,
Aliases: []string{"Create"},
Expand Down Expand Up @@ -279,7 +280,7 @@ func commandVDiffCreate(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
if state, err = displayVDiff2ShowSingleSummary(format, common.BaseOptions.TargetKeyspace, common.BaseOptions.Workflow, uuidStr, resp, false); err != nil {
if state, err = displayShowSingleSummary(format, common.BaseOptions.TargetKeyspace, common.BaseOptions.Workflow, uuidStr, resp, false); err != nil {
return err
}
if state == vdiff.CompletedState {
Expand Down Expand Up @@ -464,14 +465,14 @@ func displayListings(listings []*VDiffListing) string {
return str
}

func displayVDiff2ShowResponse(format, keyspace, workflowName, actionArg string, res *vtctldatapb.VDiffShowResponse, verbose bool) error {
func displayShowResponse(format, keyspace, workflowName, actionArg string, resp *vtctldatapb.VDiffShowResponse, verbose bool) error {
var vdiffUUID uuid.UUID
var err error
switch actionArg {
case vdiff.AllActionArg:
return displayVDiff2ShowRecent(format, keyspace, workflowName, actionArg, res)
return displayShowRecent(format, keyspace, workflowName, actionArg, resp)
case vdiff.LastActionArg:
for _, resp := range res.TabletResponses {
for _, resp := range resp.TabletResponses {
vdiffUUID, err = uuid.Parse(resp.VdiffUuid)
if err != nil {
if format == "json" {
Expand All @@ -491,22 +492,22 @@ func displayVDiff2ShowResponse(format, keyspace, workflowName, actionArg string,
return err
}
}
if len(res.TabletResponses) == 0 {
return fmt.Errorf("no response received for vdiff show of %s.%s(%s)", keyspace, workflowName, vdiffUUID.String())
if len(resp.TabletResponses) == 0 {
return fmt.Errorf("no response received for vdiff show of %s.%s (%s)", keyspace, workflowName, vdiffUUID.String())
}
_, err := displayVDiff2ShowSingleSummary(format, keyspace, workflowName, vdiffUUID.String(), res, verbose)
_, err := displayShowSingleSummary(format, keyspace, workflowName, vdiffUUID.String(), resp, verbose)
return err
}
}

func displayVDiff2ShowRecent(format, keyspace, workflowName, subCommand string, res *vtctldatapb.VDiffShowResponse) error {
func displayShowRecent(format, keyspace, workflowName, subCommand string, resp *vtctldatapb.VDiffShowResponse) error {
str := ""
recent, err := buildVDiff2Recent(res)
recent, err := buildRecent(resp)
if err != nil {
return err
}
if format == "json" {
jsonText, err := json.MarshalIndent(recent, "", "\t")
jsonText, err := json.MarshalIndent(recent, cli.JSONprefix, cli.JSONindent)
if err != nil {
return err
}
Expand All @@ -524,9 +525,9 @@ func displayVDiff2ShowRecent(format, keyspace, workflowName, subCommand string,
return nil
}

func buildVDiff2Recent(res *vtctldatapb.VDiffShowResponse) ([]*VDiffListing, error) {
func buildRecent(resp *vtctldatapb.VDiffShowResponse) ([]*VDiffListing, error) {
var listings []*VDiffListing
for _, resp := range res.TabletResponses {
for _, resp := range resp.TabletResponses {
if resp != nil && resp.Output != nil {
qr := sqltypes.Proto3ToResult(resp.Output)
for _, row := range qr.Named().Rows {
Expand All @@ -543,16 +544,16 @@ func buildVDiff2Recent(res *vtctldatapb.VDiffShowResponse) ([]*VDiffListing, err
return listings, nil
}

func displayVDiff2ShowSingleSummary(format, keyspace, workflowName, uuid string, res *vtctldatapb.VDiffShowResponse, verbose bool) (vdiff.VDiffState, error) {
func displayShowSingleSummary(format, keyspace, workflowName, uuid string, resp *vtctldatapb.VDiffShowResponse, verbose bool) (vdiff.VDiffState, error) {
state := vdiff.UnknownState
str := ""
summary, err := buildVDiff2SingleSummary(keyspace, workflowName, uuid, res, verbose)
summary, err := buildSingleSummary(keyspace, workflowName, uuid, resp, verbose)
if err != nil {
return state, err
}
state = summary.State
if format == "json" {
jsonText, err := json.MarshalIndent(summary, "", " ")
jsonText, err := json.MarshalIndent(summary, cli.JSONprefix, cli.JSONindent)
if err != nil {
return state, err
}
Expand All @@ -579,7 +580,7 @@ func displayVDiff2ShowSingleSummary(format, keyspace, workflowName, uuid string,
fmt.Printf(str + "\n")
return state, nil
}
func buildVDiff2SingleSummary(keyspace, workflow, uuid string, res *vtctldatapb.VDiffShowResponse, verbose bool) (*vdiffSummary, error) {
func buildSingleSummary(keyspace, workflow, uuid string, resp *vtctldatapb.VDiffShowResponse, verbose bool) (*vdiffSummary, error) {
summary := &vdiffSummary{
Workflow: workflow,
Keyspace: keyspace,
Expand Down Expand Up @@ -619,7 +620,7 @@ func buildVDiff2SingleSummary(keyspace, workflow, uuid string, res *vtctldatapb.
// report.
totalRowsToCompare := int64(0)
var shards []string
for shard, resp := range res.TabletResponses {
for shard, resp := range resp.TabletResponses {
first := true
if resp != nil && resp.Output != nil {
shards = append(shards, shard)
Expand Down Expand Up @@ -812,7 +813,7 @@ func commandVDiffShow(cmd *cobra.Command, args []string) error {
return err
}

if err := displayVDiff2ShowResponse(format, common.BaseOptions.TargetKeyspace, common.BaseOptions.Workflow, vDiffShowOptions.Arg, resp, vDiffShowOptions.Verbose); err != nil {
if err := displayShowResponse(format, common.BaseOptions.TargetKeyspace, common.BaseOptions.Workflow, vDiffShowOptions.Arg, resp, vDiffShowOptions.Verbose); err != nil {
return err
}
return nil
Expand Down

0 comments on commit ebc117d

Please sign in to comment.