MQE time related functions #10486
Open
MQE time related functions #10486
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: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
lamida
force-pushed
the
lamida/mqe-time-functions
branch
from
2cf7ef4 to
5ebc1ff
Compare
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
charleskorn
reviewed
Jan 23, 2025
Co-authored-by: Charles Korn <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
charleskorn
reviewed
Jan 28, 2025
pkg/streamingpromql/functions.go
Outdated
| @@ -61,6 +61,37 @@ func SingleInputVectorFunctionOperatorFactory(name string, f functions.FunctionO | |||
| } | |||
| } | |||
|
|
|||
| func TimeFunctionOperatorFactory(name string, f functions.FunctionOverInstantVectorDefinition) InstantVectorFunctionOperatorFactory { | |||
There was a problem hiding this comment.
Given this is only used by TimeTransformationFunctionOperatorFactory, I would move this inside that function - I don't think the separation is useful, and they're always used together.
There was a problem hiding this comment.
Should be inlined in 16843e7
Co-authored-by: Charles Korn <[email protected]>
Co-authored-by: Charles Korn <[email protected]>
Co-authored-by: Charles Korn <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
Signed-off-by: Jon Kartago Lamida <[email protected]>
charleskorn
approved these changes
Jan 29, 2025
| samples = samples[:s.TimeRange.StepCount] | ||
|
|
||
| for step := 0; step < s.TimeRange.StepCount; step++ { | ||
| t := s.TimeRange.StartT + int64(step)*s.TimeRange.IntervalMilliseconds |
There was a problem hiding this comment.
[nit] This could be simplified to:
Suggested change
| t := s.TimeRange.StartT + int64(step)*s.TimeRange.IntervalMilliseconds | |
| t := s.TimeRange.IndexTime(step) |
|
|
||
| samples = samples[:s.TimeRange.StepCount] | ||
|
|
||
| for step := 0; step < s.TimeRange.StepCount; step++ { |
There was a problem hiding this comment.
[nit] This could be simplified to:
Suggested change
| for step := 0; step < s.TimeRange.StepCount; step++ { | |
| for step := range s.TimeRange.StepCount { |
Comment on lines
+86
to
+104
| if len(args) > 1 { | ||
| // Should be caught by the PromQL parser, but we check here for safety. | ||
| return nil, fmt.Errorf("expected 0 or 1 argument for %s, got %v", name, len(args)) | ||
| } | ||
|
|
||
| var inner types.InstantVectorOperator | ||
| if len(args) > 0 { | ||
| var ok bool | ||
| // time based function expect instant vector argument | ||
| inner, ok = args[0].(types.InstantVectorOperator) | ||
| if !ok { | ||
| // Should be caught by the PromQL parser, but we check here for safety. | ||
| return nil, fmt.Errorf("expected an instant vector argument for %s, got %T", name, args[0]) | ||
| } | ||
|
|
||
| } else { | ||
| // if the argument is not provided, it will default to vector(time()) | ||
| inner = scalars.NewScalarToInstantVector(operators.NewTime(timeRange, memoryConsumptionTracker, expressionPosition), expressionPosition) | ||
| } |
There was a problem hiding this comment.
[nit] This could be simplified to a structure like:
if len(args) == 0 {
...
} else if len(args) == 1 {
...
} else {
return nil, fmt.Errorf("expected 0 or 1 argument for %s, got %v", name, len(args))
}
charleskorn
reviewed
Jan 29, 2025
There was a problem hiding this comment.
Also just noticed there are a bunch of test cases in pkg/streamingpromql/testdata/upstream/at_modifier.test that can now be enabled (eg. those starting around line 200) - could you please enable these?
(tools/check-for-disabled-but-supported-mqe-test-cases should find them all for you)
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
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.