Skip to content

Clone only needed KademliaPeers when yielding closest nodes #326

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

Merged
merged 3 commits into from
Feb 27, 2025
Merged

Clone only needed KademliaPeers when yielding closest nodes #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2d465a
Clone only needed KademliaPeers when yielding closest nodes
dharjeezy Feb 17, 2025
5e60bf9
use flat map instead
dharjeezy Feb 22, 2025
e754d8e
Merge branch 'master' into dami/clone-needed-kamlia-peers
dmitry-markin Feb 27, 2025
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
4 changes: 2 additions & 2 deletions src/protocol/libp2p/kademlia/bucket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ impl KBucket {

/// Get iterator over the k-bucket, sorting the k-bucket entries in increasing order
/// by distance.
pub fn closest_iter<K: Clone>(&self, target: &Key<K>) -> impl Iterator<Item = KademliaPeer> {
let mut nodes = self.nodes.clone();
pub fn closest_iter<K: Clone>(&self, target: &Key<K>) -> impl Iterator<Item = &KademliaPeer> {
let mut nodes: Vec<_> = self.nodes.iter().collect();
nodes.sort_by(|a, b| target.distance(&a.key).cmp(&target.distance(&b.key)));
nodes.into_iter().filter(|peer| !peer.addresses.is_empty())
}
Expand Down
5 changes: 3 additions & 2 deletions src/protocol/libp2p/kademlia/routing_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,10 @@ impl RoutingTable {

/// Get `limit` closest peers to `target` from the k-buckets.
pub fn closest<K: Clone>(&mut self, target: &Key<K>, limit: usize) -> Vec<KademliaPeer> {
ClosestBucketsIter::new(self.local_key.distance(target))
.flat_map(|index| self.buckets[index.get()].closest_iter(target))
ClosestBucketsIter::new(self.local_key.distance(&target))
.flat_map(|index| self.buckets[index.get()].closest_iter(&target))
.take(limit)
.cloned()
.collect()
}
}
Expand Down
Loading