From b58e9cdee2d1e02c57cddab9b2ffccb5907a3d40 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Mon, 19 Jul 2021 03:20:38 -0400 Subject: [PATCH] fixes a badly referenced variable name in StepEvaluator code (#3996) --- pkg/logql/sharding.go | 6 +++--- pkg/logql/step_evaluator.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/logql/sharding.go b/pkg/logql/sharding.go index f59ceb9a5f..6638e7125b 100644 --- a/pkg/logql/sharding.go +++ b/pkg/logql/sharding.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 { diff --git a/pkg/logql/step_evaluator.go b/pkg/logql/step_evaluator.go index 4cc1a37765..f49ec86af1 100644 --- a/pkg/logql/step_evaluator.go +++ b/pkg/logql/step_evaluator.go @@ -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