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

fix: unhandled errors returned by Sketch.Merge (#22858)

pull/22859/head
CasMc 2021-11-10 22:26:24 +08:00 committed by GitHub
parent 6b56af3c3f
commit 2bace7767d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/index/tsi1/index.go
View File

@ -397,9 +397,9 @@ func (i *Index) updateMeasurementSketches() error {
for j := 0; j < int(i.PartitionN); j++ { for j := 0; j < int(i.PartitionN); j++ {
if s, t, err := i.partitions[j].MeasurementsSketches(); err != nil { if s, t, err := i.partitions[j].MeasurementsSketches(); err != nil {
return err return err
} else if i.mSketch.Merge(s); err != nil { } else if err := i.mSketch.Merge(s); err != nil {
return err return err
} else if i.mTSketch.Merge(t); err != nil { } else if err := i.mTSketch.Merge(t); err != nil {
return err return err
} }
} }
@ -411,9 +411,9 @@ func (i *Index) updateSeriesSketches() error {
for j := 0; j < int(i.PartitionN); j++ { for j := 0; j < int(i.PartitionN); j++ {
if s, t, err := i.partitions[j].SeriesSketches(); err != nil { if s, t, err := i.partitions[j].SeriesSketches(); err != nil {
return err return err
} else if i.sSketch.Merge(s); err != nil { } else if err := i.sSketch.Merge(s); err != nil {
return err return err
} else if i.sTSketch.Merge(t); err != nil { } else if err := i.sTSketch.Merge(t); err != nil {
return err return err
} }
} }