Fix: use id's to sort persisted diffs instead of file paths#907
Open
tertsdiepraam wants to merge 1 commit into
Open
Fix: use id's to sort persisted diffs instead of file paths#907tertsdiepraam wants to merge 1 commit into
tertsdiepraam wants to merge 1 commit into
Conversation
ximon18
reviewed
Jul 15, 2026
| /// Information about a single persisted zone data file. | ||
| #[derive(Clone, Debug)] | ||
| pub struct PersistedDiffFileInfo { | ||
| id: usize, |
Member
There was a problem hiding this comment.
Suggested change
| id: usize, | |
| /// Field to order by so that entries in the tree can be iterated over in insertion order. | |
| id: usize, |
ximon18
approved these changes
Jul 15, 2026
ximon18
left a comment
ximon18
left a comment
Member
There was a problem hiding this comment.
During review of PR #657 I was actually against adding an id field to this type, ironically, as it added no value, but now it is being added as a work around for a huge oversight on my part... very appreciated @tertsdiepraam.
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
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.
This was something I missed during the purging review. I think this is the simplest fix for it. I'm intentionally keeping this very small and self-contained to get the fix in as quickly as possible.
The issue is that the paths get sorted lexicographically so the path
se.loaded.10is sorted beforese.loaded.2. To fix this, we store the id as ausizeseparately and implementOrdby comparing just that field.Closes #908