mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
Expand series set just once
Signed-off-by: Charles Korn <charles.korn@grafana.com>
This commit is contained in:
parent
17b1486964
commit
90ac889e1f
|
@ -1792,16 +1792,17 @@ func (ev *evaluator) eval(expr parser.Expr) (parser.Value, storage.Warnings) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ev *evaluator) evalTimestampFunctionOverVectorSelector(vs *parser.VectorSelector, call FunctionCall, e *parser.Call) (parser.Value, storage.Warnings) {
|
func (ev *evaluator) evalTimestampFunctionOverVectorSelector(vs *parser.VectorSelector, call FunctionCall, e *parser.Call) (parser.Value, storage.Warnings) {
|
||||||
|
ws, err := checkAndExpandSeriesSet(ev.ctx, vs)
|
||||||
|
if err != nil {
|
||||||
|
ev.error(errWithWarnings{fmt.Errorf("expanding series: %w", err), ws})
|
||||||
|
}
|
||||||
|
|
||||||
return ev.rangeEval(nil, func(v []parser.Value, _ [][]EvalSeriesHelper, enh *EvalNodeHelper) (Vector, storage.Warnings) {
|
return ev.rangeEval(nil, func(v []parser.Value, _ [][]EvalSeriesHelper, enh *EvalNodeHelper) (Vector, storage.Warnings) {
|
||||||
if vs.Timestamp != nil {
|
if vs.Timestamp != nil {
|
||||||
// This is a special case only for "timestamp" since the offset
|
// This is a special case only for "timestamp" since the offset
|
||||||
// needs to be adjusted for every point.
|
// needs to be adjusted for every point.
|
||||||
vs.Offset = time.Duration(enh.Ts-*vs.Timestamp) * time.Millisecond
|
vs.Offset = time.Duration(enh.Ts-*vs.Timestamp) * time.Millisecond
|
||||||
}
|
}
|
||||||
ws, err := checkAndExpandSeriesSet(ev.ctx, vs)
|
|
||||||
if err != nil {
|
|
||||||
ev.error(errWithWarnings{fmt.Errorf("expanding series: %w", err), ws})
|
|
||||||
}
|
|
||||||
vec := make(Vector, 0, len(vs.Series))
|
vec := make(Vector, 0, len(vs.Series))
|
||||||
it := storage.NewMemoizedEmptyIterator(durationMilliseconds(ev.lookbackDelta))
|
it := storage.NewMemoizedEmptyIterator(durationMilliseconds(ev.lookbackDelta))
|
||||||
var chkIter chunkenc.Iterator
|
var chkIter chunkenc.Iterator
|
||||||
|
|
Loading…
Reference in a new issue