Skip to content

Commit 566314b

Browse files
committed
querier: Actually use select mint,maxt params during select.
This will definitely helps with offset queries. Same was done on cortexproject/cortex#1012 Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
1 parent 5bfe54e commit 566314b

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pkg/query/api/v1.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,19 +503,20 @@ func (api *API) series(r *http.Request) (interface{}, []error, *ApiError) {
503503
}
504504

505505
// TODO(bwplotka): Support downsampling?
506-
q, err := api.queryableCreate(enableDedup, replicaLabels, 0, enablePartialResponse).Querier(r.Context(), timestamp.FromTime(start), timestamp.FromTime(end))
506+
q, err := api.queryableCreate(enableDedup, replicaLabels, 0, enablePartialResponse).
507+
Querier(r.Context(), timestamp.FromTime(start), timestamp.FromTime(end))
507508
if err != nil {
508509
return nil, nil, &ApiError{errorExec, err}
509510
}
510511
defer runutil.CloseWithLogOnErr(api.logger, q, "queryable series")
511512

512513
var (
513514
warnings []error
514-
metrics = []labels.Labels{}
515+
metrics []labels.Labels
515516
sets []storage.SeriesSet
516517
)
517518
for _, mset := range matcherSets {
518-
s, warns, err := q.Select(&storage.SelectParams{}, mset...)
519+
s, warns, err := q.Select(nil, mset...)
519520
if err != nil {
520521
return nil, nil, &ApiError{errorExec, err}
521522
}

pkg/query/querier.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,18 @@ func (q *querier) Select(params *storage.SelectParams, ms ...*labels.Matcher) (s
169169
return nil, nil, errors.Wrap(err, "convert matchers")
170170
}
171171

172+
if params == nil {
173+
params = &storage.SelectParams{
174+
Start: q.mint,
175+
End: q.maxt,
176+
}
177+
}
172178
queryAggrs, resAggr := aggrsFromFunc(params.Func)
173179

174180
resp := &seriesServer{ctx: ctx}
175181
if err := q.proxy.Series(&storepb.SeriesRequest{
176-
MinTime: q.mint,
177-
MaxTime: q.maxt,
182+
MinTime: params.Start,
183+
MaxTime: params.End,
178184
Matchers: sms,
179185
MaxResolutionWindow: q.maxResolutionMillis,
180186
Aggregates: queryAggrs,

0 commit comments

Comments
 (0)