YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #147 from greatest-ape/work-2023-08-30

Browse source 
common: make extract_response_peers code more idiomatic
This commit is contained in:
Joakim Frostegård 2023-08-31 14:11:16 +02:00 • committed by GitHub
commit bf6e686ef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

89
aquatic_common/src/lib.rs
View file

@ -159,89 +159,62 @@ where
F: Fn(&V) -> R, F: Fn(&V) -> R,
{ {
if peer_map.len() <= max_num_peers_to_take + 1 { if peer_map.len() <= max_num_peers_to_take + 1 {
// First case: number of peers in map (minus sender peer) is less than // This branch: number of peers in map (minus sender peer) is less than
// or equal to number of peers to take, so return all except sender // or equal to number of peers to take, so return all except sender
// peer. // peer.
let mut peers = Vec::with_capacity(peer_map.len()); let mut peers = Vec::with_capacity(peer_map.len());
let mut opt_sender_peer_index = None; peers.extend(peer_map.iter().filter_map(|(k, v)| {
(*k != sender_peer_map_key).then_some(peer_conversion_function(v))
for (i, (k, v)) in peer_map.iter().enumerate() { }));
opt_sender_peer_index =
opt_sender_peer_index.or((*k == sender_peer_map_key).then_some(i));
peers.push(peer_conversion_function(v));
}
if let Some(index) = opt_sender_peer_index {
peers.swap_remove(index);
}
// Handle the case when sender peer is not in peer list. Typically, // Handle the case when sender peer is not in peer list. Typically,
// this function will not be called when this is the case. // this function will not be called when this is the case.
if peers.len() > max_num_peers_to_take { if peers.len() > max_num_peers_to_take {
peers.swap_remove(0); peers.pop();
} }
peers peers
} else { } else {
// If this branch is taken, the peer map contains at least two more // Note: if this branch is taken, the peer map contains at least two
// peers than max_num_peers_to_take // more peers than max_num_peers_to_take
let middle_index = peer_map.len() / 2; let middle_index = peer_map.len() / 2;
// Add one to take two extra peers in case sender peer is among // Add one to take two extra peers in case sender peer is among
// selected peers and will need to be filtered out // selected peers and will need to be filtered out
let half_num_to_take = (max_num_peers_to_take / 2) + 1; let num_to_take_per_half = (max_num_peers_to_take / 2) + 1;
let offset_half_one = rng.gen_range(0..(middle_index - half_num_to_take).max(1)); let offset_half_one = {
let offset_half_two = let from = 0;
rng.gen_range(middle_index..(peer_map.len() - half_num_to_take).max(middle_index + 1)); let to = usize::max(1, middle_index - num_to_take_per_half);
let end_half_one = offset_half_one + half_num_to_take; rng.gen_range(from..to)
let end_half_two = offset_half_two + half_num_to_take; };
let offset_half_two = {
let from = middle_index;
let to = usize::max(middle_index + 1, peer_map.len() - num_to_take_per_half);
rng.gen_range(from..to)
};
let end_half_one = offset_half_one + num_to_take_per_half;
let end_half_two = offset_half_two + num_to_take_per_half;
let mut peers = Vec::with_capacity(max_num_peers_to_take + 2); let mut peers = Vec::with_capacity(max_num_peers_to_take + 2);
// Extract first range if let Some(slice) = peer_map.get_range(offset_half_one..end_half_one) {
{ peers.extend(slice.iter().filter_map(|(k, v)| {
let mut opt_sender_peer_index = None; (*k != sender_peer_map_key).then_some(peer_conversion_function(v))
}));
if let Some(slice) = peer_map.get_range(offset_half_one..end_half_one) {
for (i, (k, v)) in slice.into_iter().enumerate() {
opt_sender_peer_index =
opt_sender_peer_index.or((*k == sender_peer_map_key).then_some(i));
peers.push(peer_conversion_function(v));
}
}
if let Some(index) = opt_sender_peer_index {
peers.swap_remove(index);
}
} }
if let Some(slice) = peer_map.get_range(offset_half_two..end_half_two) {
// Extract second range peers.extend(slice.iter().filter_map(|(k, v)| {
{ (*k != sender_peer_map_key).then_some(peer_conversion_function(v))
let initial_peers_len = peers.len(); }));
let mut opt_sender_peer_index = None;
if let Some(slice) = peer_map.get_range(offset_half_two..end_half_two) {
for (i, (k, v)) in slice.into_iter().enumerate() {
opt_sender_peer_index =
opt_sender_peer_index.or((*k == sender_peer_map_key).then_some(i));
peers.push(peer_conversion_function(v));
}
}
if let Some(index) = opt_sender_peer_index {
peers.swap_remove(initial_peers_len + index);
}
} }
while peers.len() > max_num_peers_to_take { while peers.len() > max_num_peers_to_take {
peers.swap_remove(0); peers.pop();
} }
peers peers