fix: special case the return values from a sharded first/last_over_time query #13578
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Callum Styan <callumstyan@gmail.com>
cstyan
changed the title
paul1r
reviewed
Jul 19, 2024
pkg/logql/engine.go
Outdated
| @@ -381,9 +385,36 @@ func (q *query) evalSample(ctx context.Context, expr syntax.SampleExpr) (promql_ | |||
| return nil, errors.New("unexpected empty result") | |||
| } | |||
|
|
|||
| func (q *query) JoinSampleVector(next bool, r StepResult, stepEvaluator StepEvaluator, maxSeries int) (promql_parser.Value, error) { | |||
| func vectorsToSeries(vec promql.Vector) ([]promql.Series, map[uint64]*promql.Series) { | |||
There was a problem hiding this comment.
Do we want a test function for this?
There was a problem hiding this comment.
this is tested via TestMappingEquivalence_Instant, we could add a test specifically for this but it didn't feel necessary
trevorwhitney
approved these changes
Jul 24, 2024
| @@ -395,6 +426,14 @@ func (q *query) JoinSampleVector(next bool, r StepResult, stepEvaluator StepEval | |||
| } | |||
|
|
|||
| if GetRangeType(q.params) == InstantType { | |||
| // an instant query sharded first/last_over_time can return a single vector | |||
| if mergeFirstLast { | |||
There was a problem hiding this comment.
does TestMappingEquivalence_Instant need a test for the false case (existing behavior) here? Or is that adequately covered elsewhere?
There was a problem hiding this comment.
the tests here execute both the sharded and unsharded (aka not mergeFirstLast) versions of the queries, and then compare the results
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
TestMappingEquivalence Signed-off-by: Callum Styan <callumstyan@gmail.com>
1 task
benclive
pushed a commit
to cyriltovena/loki
that referenced
this pull request
Jul 31, 2024
…me query (grafana#13578) Signed-off-by: Callum Styan <callumstyan@gmail.com>
This was referenced Aug 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We noticed during the rollout of
first/last_over_timesharding earlier this week that instant queries would return vectors only (as intended), and the code for handling merging of shardedfirst/last_over_timequeries expected to only receive matrices.With this PR we're special casing the return value from
JoinSampleVectorif the operation type is the shardedfirst/last_over_time.