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

chore: minor refactor suggested by go lint

pull/21610/head
davidby-influx 2021-06-04 11:22:30 -07:00
parent 8be1b13a39
commit 7d10228e19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tsdb/shard.go
View File

@ -1651,7 +1651,7 @@ func NewMeasurementFieldSet(path string) (*MeasurementFieldSet, error) {
fields: make(map[string]*MeasurementFields),
path: path,
}
fs.SetMeasurementFieldSetWriter(100)
fs.SetMeasurementFieldSetWriter(MaxCombinedWrites)
// If there is a load error, return the error and an empty set so
// it can be rebuild manually.
return fs, fs.load()
@ -1855,7 +1855,7 @@ func (fs *MeasurementFieldSet) writeToFile(first writeRequest) {
if err != nil || isEmpty {
return
}
err = fs.renameFile(path, err)
err = fs.renameFile(path)
}
// marshalMeasurementFieldSet: remove the fields.idx file if no fields
@ -1875,7 +1875,7 @@ func (fs *MeasurementFieldSet) marshalMeasurementFieldSet() ([]byte, error) {
return fs.marshalMeasurementFieldSetNoLock()
}
func (fs *MeasurementFieldSet) renameFile(path string, err error) error {
func (fs *MeasurementFieldSet) renameFile(path string) error {
fs.mu.Lock()
defer fs.mu.Unlock()
@ -1883,7 +1883,7 @@ func (fs *MeasurementFieldSet) renameFile(path string, err error) error {
return err
}
if err = file.SyncDir(filepath.Dir(fs.path)); err != nil {
if err := file.SyncDir(filepath.Dir(fs.path)); err != nil {
return err
}