fixes a badly referenced variable name in StepEvaluator code (#3996)

pull/4016/head
Owen Diehl 5 years ago committed by GitHub
parent fef99775ea
commit b58e9cdee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkg/logql/sharding.go
  2. 2
      pkg/logql/step_evaluator.go

@ -326,13 +326,13 @@ func (ev *DownstreamEvaluator) Iterator(
// Contract: They must be of identical start, end, and step values.
func ConcatEvaluator(evaluators []StepEvaluator) (StepEvaluator, error) {
return newStepEvaluator(
func() (done bool, ts int64, vec promql.Vector) {
func() (ok bool, ts int64, vec promql.Vector) {
var cur promql.Vector
for _, eval := range evaluators {
done, ts, cur = eval.Next()
ok, ts, cur = eval.Next()
vec = append(vec, cur...)
}
return done, ts, vec
return ok, ts, vec
},
func() (lastErr error) {
for _, eval := range evaluators {

@ -9,7 +9,7 @@ import (
// StepEvaluator evaluate a single step of a query.
type StepEvaluator interface {
// while Next returns a promql.Value, the only acceptable types are Scalar and Vector.
Next() (bool, int64, promql.Vector)
Next() (ok bool, ts int64, vec promql.Vector)
// Close all resources used.
Close() error
// Reports any error

Loading…
Cancel
Save