go/vt/wrangler: fix nilness issues and unused variable (vitessio#14710)

slackhq · Dec 13, 2023 · 7fc6a9a · 7fc6a9a
1 parent 529f300
commit 7fc6a9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/go/vt/wrangler/materializer.go b/go/vt/wrangler/materializer.go
@@ -318,13 +318,11 @@ func (wr *Wrangler) MoveTables(ctx context.Context, workflow, sourceKeyspace, ta
 				return err
 			}
 		}
-		if vschema != nil {
-			// We added to the vschema.
-			if err := wr.ts.SaveVSchema(ctx, targetKeyspace, vschema); err != nil {
-				return err
-			}
-		}
 
+		// We added to the vschema.
+		if err := wr.ts.SaveVSchema(ctx, targetKeyspace, vschema); err != nil {
+			return err
+		}
 	}
 	if err := wr.ts.RebuildSrvVSchema(ctx, nil); err != nil {
 		return err

diff --git a/go/vt/wrangler/traffic_switcher.go b/go/vt/wrangler/traffic_switcher.go
@@ -1920,9 +1920,6 @@ func (ts *trafficSwitcher) addParticipatingTablesToKeyspace(ctx context.Context,
 		if err := json2.Unmarshal([]byte(wrap), ks); err != nil {
 			return err
 		}
-		if err != nil {
-			return err
-		}
 		for table, vtab := range ks.Tables {
 			vschema.Tables[table] = vtab
 		}

diff --git a/go/vt/wrangler/vexec.go b/go/vt/wrangler/vexec.go
@@ -661,9 +661,6 @@ func (wr *Wrangler) getReplicationStatusFromRow(ctx context.Context, row sqltype
 	workflowSubType, _ = row.ToInt32("workflow_sub_type")
 	deferSecondaryKeys, _ = row.ToBool("defer_secondary_keys")
 	rowsCopied = row.AsInt64("rows_copied", 0)
-	if err != nil {
-		return nil, "", err
-	}
 
 	status := &ReplicationStatus{
 		Shard:                primary.Shard,
@@ -701,8 +698,8 @@ func (wr *Wrangler) getStreams(ctx context.Context, workflow, keyspace string) (
 	var rsr ReplicationStatusResult
 	rsr.ShardStatuses = make(map[string]*ShardReplicationStatus)
 	rsr.Workflow = workflow
-	var results map[*topo.TabletInfo]*querypb.QueryResult
-	query := `select 
+
+	const query = `select
 		id,
 		source,
 		pos,