Improve TestQueryStatistics and fix bugs exposed by it #13667
Merged
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
beorn7
force-pushed
the
beorn7/promql
branch
from
72016c4
to
14b42e8
Compare
Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: beorn7 <beorn@grafana.com>
Also, fix the bugs exposed by the tests. Signed-off-by: beorn7 <beorn@grafana.com>
beorn7
force-pushed
the
beorn7/promql
branch
from
14b42e8
to
f48c7a5
Compare
beorn7
commented
Mar 5, 2024
| @@ -1221,7 +1224,6 @@ func (ev *evaluator) rangeEval(prepSeries func(labels.Labels, *EvalSeriesHelper) | |||
| if ev.currentSamples > ev.maxSamples { | |||
| ev.error(ErrTooManySamples(env)) | |||
| } | |||
| ev.samplesStats.UpdatePeak(ev.currentSamples) | |||
There was a problem hiding this comment.
This has already been done in line 1219.
|
The third commit makes major changes to PromQL engine, which is not described by the PR title or description. |
beorn7
changed the title
|
I mean, "major changes" == fixing how we determine if the max-sample-threshold was crossed. But your point is correct, the PR should mention that this fixes bugs. I have updated the title. (The commit description already mentioned that it fixes the bugs exposed by the improved tests.) |
|
@marctc this fixes your code, so you would be a suitable reviewer for this. Thank you very much. |
marctc
approved these changes
Mar 12, 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.
These are follow-ups that arose from the review of #9626.
The improvements to TestQueryStatistics are only possible now that native histograms have been integrated into the PromQL testing framework. The improved test exposed a number of smaller bugs when counting histogram samples, mostly where the code originally assumed that the sample count would only get incremented by one and wrote conditions in a more concise style based on that. However, even a single histogram sample can increment the count by more than one, so the
ifstatements had to be rearranged.