MQE: avoid using statement in Query where possible
#11001
Merged
Conversation
This file contains hidden or 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
jhesketh
approved these changes
Mar 26, 2025
pkg/streamingpromql/query.go
Outdated
| @@ -37,6 +37,7 @@ import ( | |||
| var errQueryCancelled = cancellation.NewErrorf("query execution cancelled") | |||
| var errQueryClosed = cancellation.NewErrorf("Query.Close() called") | |||
| var errQueryFinished = cancellation.NewErrorf("query execution finished") | |||
| var errStringForRangeQuery = errors.New("query expression produces a string, but expression for range queries must produce an instant vector or scalar") | |||
There was a problem hiding this comment.
(nit) could make this generic to use in newQuery too
Suggested change
| var errStringForRangeQuery = errors.New("query expression produces a string, but expression for range queries must produce an instant vector or scalar") | |
| var strStringForRangeQuery = "query expression produces a %s but expression for range queries must produce an instant vector or scalar" |
There was a problem hiding this comment.
I've tackled this in a slightly different way in f178f97: I've changed Exec to not check if it's an instant query if we get a StringOperator. This makes the behaviour consistent with how we handle RangeVectorOperators, which are also not supported as the root operator for instant queries.
6799a1a to
f178f97
Compare
jhesketh
approved these changes
Mar 26, 2025
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
This PR refactors the
Querytype to avoid using theEvalStmtwhere possible.This will make it easier to introduce queries based on query plans, as query plans may not have an equivalent PromQL statement.
Which issue(s) this PR fixes or relates to
(none)
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.