Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small optimization to avoid unnecessary Extents merge when growing cache entry #4026

Merged
merged 7 commits into from
Apr 8, 2021
Merged

Small optimization to avoid unnecessary Extents merge when growing cache entry #4026

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b95f1e
Small optimization to avoid unnecessary Extents merge when growing ca…
alvinlin123 Mar 30, 2021
cc1aa40
Update CHANGELOG.md
alvinlin123 Mar 30, 2021
63b785a
Merge from main bracnh to resolve CHANGELOG.md conflict
alvinlin123 Mar 30, 2021
0b6d8a9
Remove unintended whitespace modification
alvinlin123 Mar 30, 2021
67a714c
Add test to indirectly test the existence of the optimization
alvinlin123 Mar 31, 2021
6732365
Resolve changelog conflict
alvinlin123 Apr 8, 2021
316007b
Update CHANGELOG.md
pracucci Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* [ENHANCEMENT] Ingester: reduce CPU and memory when an high number of errors are returned by the ingester on the write path with the blocks storage. #3969 #3971 #3973
* [ENHANCEMENT] Distributor: reduce CPU and memory when an high number of errors are returned by the distributor on the write path. #3990
* [ENHANCEMENT] Put metric before label value in the "label value too long" error message. #4018
* [ENHANCEMENT] Query-frontend: Small optimization on top of PR #3968 to avoid unnecessary Extents merging. #4026
* [BUGFIX] Ruler-API: fix bug where `/api/v1/rules/<namespace>/<group_name>` endpoint return `400` instead of `404`. #4013
* [BUGFIX] Distributor: reverted changes done to rate limiting in #3825. #3948
* [BUGFIX] Ingester: Fix race condition when opening and closing tsdb concurrently. #3959
Expand Down
7 changes: 7 additions & 0 deletions pkg/querier/queryrange/results_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,13 @@ func (s resultsCache) handleHit(ctx context.Context, r Request, extents []Extent
extents = append(extents, extent)
}
sort.Slice(extents, func(i, j int) bool {
if extents[i].Start == extents[j].Start {
// as an optimization, for two extents starts at the same time, we
// put bigger extent at the front of the slice, which helps
// to reduce the amount of merge we have to do later.
return extents[i].End > extents[j].End
}

return extents[i].Start < extents[j].Start
})

Expand Down