-
Notifications
You must be signed in to change notification settings - Fork 835
perf: skip snapshot rebuild in mergeDuplicates when names are unique #2441
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.
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
Open
david-mollitor-db
wants to merge
1
commit into
prometheus:main
Choose a base branch
from
david-mollitor-db:merge-duplicates-fast-path
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
overall this change and associated benchmarks look good. I'd like to see a few extra tests added though.
All four of the existing mergeDuplicates tests either exercise the merge path or pass any empty snapshots list. An inverted condition or
i=0start would not be caught by the existing tests. Can we add cases for:assertThat(TextFormatUtil.mergeDuplicates(s)).isSameAs(s)a,m,z,z) → still merged, which pins the loop range.Also, the sorted invariant is cross-module and nothing pins the sort key, and the fast path is only correct while
MetricSnapshotssorts bygetPrometheusName().MetricSnapshotsTest.testSortasserts order viagetMetadata().getName()using names wherename,prometheusNameandexpositionBaseNameall coincide so it would keep passing if the sort key moved tonameorexpositionBaseName. If that happens,mergeDuplicatessilently stops merging and the writers emit repeated# HELP/# TYPEblocks for one family.we could add some tests around this:
MetricSnapshotsTestthat pins ordering bygetPrometheusName()with names where the three differ (e.g.my.metricvsmy_metric_b, or a_total-suffixed counter);MetricSnapshotsnamingTextFormatUtil.mergeDuplicatesas adependant, so the next person to touch the comparator sees it.