fix(iroh-store): put_many bug
#507
Merged
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
ramfox
force-pushed
the
ramfox/put_many_bug_fix
branch
2 times, most recently
from
e562342 to
05ead87
Compare
- `continue` instead of `return`, when we find that a CID already exists in the store - ensure we aren't double-adding CIDs from the same batch, by tracking the batched CIDs in a HashSet
ramfox
force-pushed
the
ramfox/put_many_bug_fix
branch
from
05ead87 to
18748ed
Compare
rklaehn
previously approved these changes
Nov 17, 2022
rklaehn
approved these changes
Nov 17, 2022
| @@ -367,9 +367,9 @@ impl<'a> WriteStore<'a> { | |||
| let mut total_blob_size = 0; | |||
|
|
|||
| let mut batch = WriteBatch::default(); | |||
| let mut cid_tracker: HashSet<Cid> = std::collections::HashSet::default(); | |||
| let mut cid_tracker: AHashSet<Cid> = AHashSet::default(); | |||
There was a problem hiding this comment.
If we had a vec we could use https://docs.rs/ahash/latest/ahash/struct.AHashSet.html#method.with_capacity here to make sure the hashset does not need to rehash.
But with the iterator we could just use the size hint, which is probably not worth it.
There was a problem hiding this comment.
HashSets have with_capacity: https://docs.rs/ahash/latest/ahash/struct.AHashSet.html#method.with_capacity
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.
Fixes the following scenario: if you attempt to add a folder with some files, it adds fine. But if you add a new file to that folder and add it again, the store won't add the new file.
closes n0-computer/beetle#114