query-frontend: correctly replace @ modifier for split queries
#8162
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
The existing code would only evaluate the at modifier for vector selectors, but subquery expressions also can have it. Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
dimitarvdimitrov
force-pushed
the
dimitar/query-frontend/at-modifier-with-subqueries
branch
from
d791d8a
to
c2ed965
Compare
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Comment on lines
+670
to
687
| switch exprAt := n.(type) { | ||
| case *parser.VectorSelector: | ||
| switch exprAt.StartOrEnd { | ||
| case parser.START: | ||
| selector.Timestamp = &start | ||
| exprAt.Timestamp = &start | ||
| case parser.END: | ||
| selector.Timestamp = &end | ||
| exprAt.Timestamp = &end | ||
| } | ||
| selector.StartOrEnd = 0 | ||
| exprAt.StartOrEnd = 0 | ||
| case *parser.SubqueryExpr: | ||
| switch exprAt.StartOrEnd { | ||
| case parser.START: | ||
| exprAt.Timestamp = &start | ||
| case parser.END: | ||
| exprAt.Timestamp = &end | ||
| } | ||
| exprAt.StartOrEnd = 0 | ||
| } |
There was a problem hiding this comment.
I couldn't find a brief generic way to write this, so the 7 lines are completely duplicated
dimitarvdimitrov
deleted the
dimitar/query-frontend/at-modifier-with-subqueries
branch
narqo
pushed a commit
to narqo/grafana-mimir
that referenced
this pull request
Jun 6, 2024
…fana#8162) * query-frontend: correctly replace `@` modifier for split queries The existing code would only evaluate the at modifier for vector selectors, but subquery expressions also can have it. Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Add CHANGELOG.md entry Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Rename variable Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
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.
What this PR does
The existing code would only evaluate the at modifier for vector selectors, but subquery expressions also can have it. There are no other expression types in promQL which can take the
@modifiers.Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.