Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor PR feedback refactor

pull/6502/head
Cory LaNou 2016-05-02 12:47:31 -05:00
parent a3bf3e2ef1
commit 4d30ea1eb3
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tsdb/engine/tsm1/engine.go
View File

@ -370,11 +370,8 @@ func (e *Engine) readFileFromBackup(tr *tar.Reader, shardRelativePath string) er
// Sync to disk & close. // Sync to disk & close.
if err := f.Sync(); err != nil { if err := f.Sync(); err != nil {
return err return err
} else if err := f.Close(); err != nil {
return err
} }
return f.Close()
return nil
} }
// addToIndexFromKey will pull the measurement name, series key, and field name from a composite key and add it to the // addToIndexFromKey will pull the measurement name, series key, and field name from a composite key and add it to the

6
tsdb/shard.go
View File

@ -558,11 +558,7 @@ func (s *Shard) Restore(r io.Reader, basePath string) error {
} }
// Reopen engine. // Reopen engine.
if err := s.Open(); err != nil { return s.Open()
return err
}
return nil
} }
// Shards represents a sortable list of shards. // Shards represents a sortable list of shards.