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

fix: repair bad port dropping return value names (#22307) 

Named returns were not cherry-picked correctly from
commit a989f8f8b6 in
master-1.x branch.

closes https://github.com/influxdata/influxdb/issues/22303
pull/22357/head
davidby-influx 2021-08-31 09:24:15 -07:00 committed by GitHub
parent acc8d2e5c3
commit 99cfbfe8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tsdb/index.go
View File

@ -1343,15 +1343,15 @@ func (is IndexSet) HasField(measurement []byte, field string) bool {
// MeasurementNamesByExpr returns a slice of measurement names matching the // MeasurementNamesByExpr returns a slice of measurement names matching the
// provided condition. If no condition is provided then all names are returned. // provided condition. If no condition is provided then all names are returned.
func (is IndexSet) MeasurementNamesByExpr(auth query.Authorizer, expr influxql.Expr) ([][]byte, error) { func (is IndexSet) MeasurementNamesByExpr(auth query.Authorizer, expr influxql.Expr) (_ [][]byte, err error) {
release := is.SeriesFile.Retain() release := is.SeriesFile.Retain()
defer release() defer release()
// Return filtered list if expression exists. // Return filtered list if expression exists.
if expr != nil { if expr != nil {
itr, err := is.measurementNamesByExpr(auth, expr) itr, returnErr := is.measurementNamesByExpr(auth, expr)
if err != nil { if returnErr != nil {
return nil, err return nil, returnErr
} else if itr == nil { } else if itr == nil {
return nil, nil return nil, nil
} }
@ -1505,15 +1505,15 @@ func (is IndexSet) measurementNamesByNameFilter(auth query.Authorizer, op influx
// provided condition. If no condition is provided then all names are returned. // provided condition. If no condition is provided then all names are returned.
// This behaves differently from MeasurementNamesByExpr because it will // This behaves differently from MeasurementNamesByExpr because it will
// return measurements using flux predicates. // return measurements using flux predicates.
func (is IndexSet) MeasurementNamesByPredicate(auth query.Authorizer, expr influxql.Expr) ([][]byte, error) { func (is IndexSet) MeasurementNamesByPredicate(auth query.Authorizer, expr influxql.Expr) (_ [][]byte, err error) {
release := is.SeriesFile.Retain() release := is.SeriesFile.Retain()
defer release() defer release()
// Return filtered list if expression exists. // Return filtered list if expression exists.
if expr != nil { if expr != nil {
itr, err := is.measurementNamesByPredicate(auth, expr) itr, returnErr := is.measurementNamesByPredicate(auth, expr)
if err != nil { if returnErr != nil {
return nil, err return nil, returnErr
} }
if itr != nil { if itr != nil {
defer func() { defer func() {