From f6bf3b7a0d32ff5fd46b581d7634909199c1abd8 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Fri, 13 Sep 2024 10:28:54 +0200 Subject: [PATCH] Rename to generateMatrix Rename evaluator.expandSeriesToMatrix into generateMatrix, while also dropping the start, end, interval arguments since they are evaluator fields. Write more extensive method documentation. Signed-off-by: Arve Knudsen --- promql/engine.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/promql/engine.go b/promql/engine.go index f73eaf968..10c7310ba 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -1457,9 +1457,12 @@ func (ev *evaluator) rangeEvalAgg(ctx context.Context, aggExpr *parser.Aggregate return result, warnings } -// expandSeriesToMatrix expands vs.Series into a Matrix. -func (ev *evaluator) expandSeriesToMatrix(ctx context.Context, vs *parser.VectorSelector, start, end, interval int64) Matrix { - numSteps := int((end-start)/interval) + 1 +// generateMatrix generates a Matrix between ev.startTimestamp and ev.endTimestamp (inclusive), each point spaced ev.interval apart, from vs. +// For every series iterator in vs.Series, the method iterates in ev.interval sized steps from ev.startTimestamp until and including ev.endTimestamp, +// collecting every corresponding sample (obtained via ev.vectorSelectorSingle) into a Series. +// All of the generated Series are collected into a Matrix, that gets returned. +func (ev *evaluator) generateMatrix(ctx context.Context, vs *parser.VectorSelector) Matrix { + numSteps := int((ev.endTimestamp-ev.startTimestamp)/ev.interval) + 1 mat := make(Matrix, 0, len(vs.Series)) var prevSS *Series @@ -1476,7 +1479,7 @@ func (ev *evaluator) expandSeriesToMatrix(ctx context.Context, vs *parser.Vector Metric: s.Labels(), } - for ts, step := start, -1; ts <= end; ts += interval { + for ts, step := ev.startTimestamp, -1; ts <= ev.endTimestamp; ts += ev.interval { step++ _, f, h, ok := ev.vectorSelectorSingle(it, vs, ts) if !ok { @@ -1955,7 +1958,7 @@ func (ev *evaluator) eval(ctx context.Context, expr parser.Expr) (parser.Value, if err != nil { ev.error(errWithWarnings{fmt.Errorf("expanding series: %w", err), ws}) } - mat := ev.expandSeriesToMatrix(ctx, e, ev.startTimestamp, ev.endTimestamp, ev.interval) + mat := ev.generateMatrix(ctx, e) return mat, ws case *parser.MatrixSelector: