simplify some error returns

removes unnecessary if statements
This commit is contained in:
Matt Jaffee 2018-05-14 17:50:15 -05:00
parent 0c06549a5b
commit 1550279ebc
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
3 changed files with 4 additions and 13 deletions

View file

@ -1299,10 +1299,8 @@ func (c *Cluster) FollowResizeInstruction(instr *internal.ResizeInstruction) err
// Write to local frame and always close reader.
if err := func() error {
defer rd.Close()
if _, err := frag.ReadFrom(rd); err != nil {
return err
}
return nil
_, err := frag.ReadFrom(rd)
return err
}(); err != nil {
return errors.Wrap(err, "copying remote slice")
}

View file

@ -417,9 +417,5 @@ func (t *ClusterCluster) FollowResizeInstruction(instr *internal.ResizeInstructi
}
node := DecodeNode(instr.Coordinator)
if err := t.SendTo(node, complete); err != nil {
return err
}
return nil
return t.SendTo(node, complete)
}

View file

@ -69,10 +69,7 @@ func (v *View) Reopen() error {
v.View = pilosa.NewView(path, v.Index(), v.Frame(), v.Name(), pilosa.DefaultCacheSize)
v.View.RowAttrStore = v.RowAttrStore
if err := v.Open(); err != nil {
return err
}
return nil
return v.Open()
}
// MustSetBits sets bits on a row. Panic on error.