Deduplicate identical series labels and track their memory consumption in QueryLimiter.AddSeries #13806
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
charleskorn
reviewed
Dec 11, 2025
Comment on lines
+1020
to
1034
| duplicated, limitErr := queryLimiter.AddSeries(ls) | ||
| if limitErr != nil { | ||
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, limitErr | ||
| } | ||
|
|
||
| if duplicated { | ||
| continue | ||
| } | ||
|
|
||
| // TODO move this inside AddSeries | ||
| if err := memoryTracker.IncreaseMemoryConsumptionForLabels(ls); err != nil { | ||
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, err | ||
| } | ||
|
|
||
| myStreamingSeriesLabels = append(myStreamingSeriesLabels, ls) |
Contributor
There was a problem hiding this comment.
Suggested change
| duplicated, limitErr := queryLimiter.AddSeries(ls) | |
| if limitErr != nil { | |
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, limitErr | |
| } | |
| if duplicated { | |
| continue | |
| } | |
| // TODO move this inside AddSeries | |
| if err := memoryTracker.IncreaseMemoryConsumptionForLabels(ls); err != nil { | |
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, err | |
| } | |
| myStreamingSeriesLabels = append(myStreamingSeriesLabels, ls) | |
| ls, limitErr := queryLimiter.AddSeries(ls) | |
| if limitErr != nil { | |
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, limitErr | |
| } | |
| // TODO move this inside AddSeries | |
| if err := memoryTracker.IncreaseMemoryConsumptionForLabels(ls); err != nil { | |
| return myWarnings, myQueriedBlocks, myStreamingSeriesLabels, indexBytesFetched, false, false, err | |
| } | |
| myStreamingSeriesLabels = append(myStreamingSeriesLabels, ls) |
charleskorn
reviewed
Dec 11, 2025
| defer ql.uniqueSeriesMx.Unlock() | ||
|
|
||
| uniqueSeriesBefore := len(ql.uniqueSeries) | ||
| _, duplicated := ql.uniqueSeries[fingerprint] |
Contributor
There was a problem hiding this comment.
Suggested change
| _, duplicated := ql.uniqueSeries[fingerprint] | |
| seriesLabels, duplicated := ql.uniqueSeries[fingerprint] |
Contributor
There was a problem hiding this comment.
One other thing we should do here: we'll need to handle hash collisions.
charleskorn
reviewed
Dec 11, 2025
| } | ||
|
|
||
| return NewMaxSeriesHitLimitError(uint64(ql.maxSeriesPerQuery)) | ||
| return duplicated, NewMaxSeriesHitLimitError(uint64(ql.maxSeriesPerQuery)) |
Contributor
There was a problem hiding this comment.
Suggested change
| return duplicated, NewMaxSeriesHitLimitError(uint64(ql.maxSeriesPerQuery)) | |
| return seriesLabels, NewMaxSeriesHitLimitError(uint64(ql.maxSeriesPerQuery)) |
charleskorn
reviewed
Dec 11, 2025
| return duplicated, NewMaxSeriesHitLimitError(uint64(ql.maxSeriesPerQuery)) | ||
| } | ||
| return nil | ||
| return duplicated, nil |
Contributor
There was a problem hiding this comment.
Suggested change
| return duplicated, nil | |
| return seriesLabels, nil |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
https://github.com/grafana/mimir-squad/issues/3280
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]. If changelog entry is not needed, please add thechangelog-not-neededlabel to the PR.about-versioning.mdupdated with experimental features.