Skip to content

Commit 6bdaf39

Browse files
mdlayhermdlayher
committed
go/vt/vttablet: fix nilness issues
Signed-off-by: Matt Layher <mdlayher@planetscale.com>
1 parent 7312b05 commit 6bdaf39

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

‎go/vt/vttablet/grpctabletconn/conn.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func (conn *gRPCQueryClient) StreamExecute(ctx context.Context, target *querypb.
188188
fields = ser.Result.Fields
189189
}
190190
if err := callback(sqltypes.CustomProto3ToResult(fields, ser.Result)); err != nil {
191-
if err == nil || err == io.EOF {
191+
if err == io.EOF {
192192
return nil
193193
}
194194
return err
@@ -537,7 +537,7 @@ func (conn *gRPCQueryClient) BeginStreamExecute(ctx context.Context, target *que
537537
fields = ser.Result.Fields
538538
}
539539
if err := callback(sqltypes.CustomProto3ToResult(fields, ser.Result)); err != nil {
540-
if err == nil || err == io.EOF {
540+
if err == io.EOF {
541541
return state, nil
542542
}
543543
return state, err
@@ -583,7 +583,7 @@ func (conn *gRPCQueryClient) MessageStream(ctx context.Context, target *querypb.
583583
fields = msr.Result.Fields
584584
}
585585
if err := callback(sqltypes.CustomProto3ToResult(fields, msr.Result)); err != nil {
586-
if err == nil || err == io.EOF {
586+
if err == io.EOF {
587587
return nil
588588
}
589589
return err
@@ -640,7 +640,7 @@ func (conn *gRPCQueryClient) StreamHealth(ctx context.Context, callback func(*qu
640640
return tabletconn.ErrorFromGRPC(err)
641641
}
642642
if err := callback(shr); err != nil {
643-
if err == nil || err == io.EOF {
643+
if err == io.EOF {
644644
return nil
645645
}
646646
return err
@@ -924,7 +924,7 @@ func (conn *gRPCQueryClient) ReserveBeginStreamExecute(ctx context.Context, targ
924924
fields = ser.Result.Fields
925925
}
926926
if err := callback(sqltypes.CustomProto3ToResult(fields, ser.Result)); err != nil {
927-
if err == nil || err == io.EOF {
927+
if err == io.EOF {
928928
return state, nil
929929
}
930930
return state, err
@@ -1029,7 +1029,7 @@ func (conn *gRPCQueryClient) ReserveStreamExecute(ctx context.Context, target *q
10291029
fields = ser.Result.Fields
10301030
}
10311031
if err := callback(sqltypes.CustomProto3ToResult(fields, ser.Result)); err != nil {
1032-
if err == nil || err == io.EOF {
1032+
if err == io.EOF {
10331033
return state, nil
10341034
}
10351035
return state, err
@@ -1092,7 +1092,7 @@ func (conn *gRPCQueryClient) GetSchema(ctx context.Context, target *querypb.Targ
10921092
return tabletconn.ErrorFromGRPC(err)
10931093
}
10941094
if err := callback(shr); err != nil {
1095-
if err == nil || err == io.EOF {
1095+
if err == io.EOF {
10961096
return nil
10971097
}
10981098
return err

‎go/vt/vttablet/onlineddl/executor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ func (e *Executor) cutOverVReplMigration(ctx context.Context, s *VReplStream) er
778778
defer tmClient.Close()
779779

780780
// sanity checks:
781-
vreplTable, err := getVreplTable(ctx, s)
781+
vreplTable, err := getVreplTable(s)
782782
if err != nil {
783783
return err
784784
}
@@ -1422,7 +1422,7 @@ func (e *Executor) initVreplicationRevertMigration(ctx context.Context, onlineDD
14221422
return nil, err
14231423
}
14241424

1425-
vreplTableName, err := getVreplTable(ctx, revertStream)
1425+
vreplTableName, err := getVreplTable(revertStream)
14261426
if err != nil {
14271427
return nil, err
14281428
}

‎go/vt/vttablet/onlineddl/vrepl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,16 +659,16 @@ func (v *VRepl) generateStartStatement(ctx context.Context) (string, error) {
659659
)
660660
}
661661

662-
func getVreplTable(ctx context.Context, s *VReplStream) (string, error) {
662+
func getVreplTable(s *VReplStream) (string, error) {
663663
// sanity checks:
664664
if s == nil {
665-
return "", vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "No vreplication stream migration %s", s.workflow)
665+
return "", vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "No vreplication stream migration")
666666
}
667667
if s.bls.Filter == nil {
668668
return "", vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "No binlog source filter for migration %s", s.workflow)
669669
}
670670
if len(s.bls.Filter.Rules) != 1 {
671-
return "", vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "Cannot detect filter rules for migration/vreplication %+v", s.workflow)
671+
return "", vterrors.Errorf(vtrpcpb.Code_UNKNOWN, "Cannot detect filter rules for migration/vreplication %s", s.workflow)
672672
}
673673
vreplTable := s.bls.Filter.Rules[0].Match
674674
return vreplTable, nil

‎go/vt/vttablet/tabletmanager/vdiff/action.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ func (vde *Engine) handleCreateResumeAction(ctx context.Context, dbClient binlog
232232
if qr.RowsAffected == 0 {
233233
msg := fmt.Sprintf("no completed or stopped vdiff found for UUID %s on tablet %v",
234234
req.VdiffUuid, vde.thisTablet.Alias)
235-
if err != nil {
236-
msg = fmt.Sprintf("%s (%v)", msg, err)
237-
}
238235
return fmt.Errorf(msg)
239236
}
240237
}

‎go/vt/vttablet/tabletmanager/vreplication/queryhistory/sequenced_expectation_set.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type sequencedExpectationSet map[SequencedExpectation]any
1212

1313
func (ses *sequencedExpectationSet) Add(expectation SequencedExpectation) {
1414
if ses == nil {
15-
*ses = make(sequencedExpectationSet)
15+
ses = new(sequencedExpectationSet)
1616
}
1717
(*ses)[expectation] = true
1818
}
@@ -27,7 +27,7 @@ func (ses *sequencedExpectationSet) Contains(expectation SequencedExpectation) b
2727

2828
func (ses *sequencedExpectationSet) Slice() []SequencedExpectation {
2929
s := make([]SequencedExpectation, 0)
30-
if len(*ses) == 0 {
30+
if ses == nil || len(*ses) == 0 {
3131
return s
3232
}
3333
for se := range *ses {

0 commit comments

Comments
 (0)