Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

NLnet task 3 #667

Merged
lx merged 60 commits from nlnet-task3 into next-0.10 2024-01-11 10:58:08 +00:00
Conversation 1 Commits 60 Files changed 41 +12 -1
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f8df90b79b - Show all commits

13
src/table/table.rs
View file

@ -196,6 +196,8 @@ impl<F: TableSchema, R: TableReplication> Table<F, R> {
let hash = entry.partition_key().hash(); let hash = entry.partition_key().hash();
let mut write_sets = self.data.replication.write_sets(&hash); let mut write_sets = self.data.replication.write_sets(&hash);
for set in write_sets.as_mut().iter_mut() { for set in write_sets.as_mut().iter_mut() {
// Sort nodes in each write sets to merge write sets with same
// nodes but in possibly different orders
set.sort(); set.sort();
} }
let e_enc = Arc::new(ByteBuf::from(entry.encode()?)); let e_enc = Arc::new(ByteBuf::from(entry.encode()?));
@ -220,7 +222,16 @@ impl<F: TableSchema, R: TableReplication> Table<F, R> {
for (write_sets, entry_enc) in entries_vec.iter() { for (write_sets, entry_enc) in entries_vec.iter() {
for write_set in write_sets.as_ref().iter() { for write_set in write_sets.as_ref().iter() {
for node in write_set.iter() { for node in write_set.iter() {
call_list.entry(*node).or_default().push(entry_enc.clone()) let node_entries = call_list.entry(*node).or_default();
match node_entries.last() {
Some(x) if Arc::ptr_eq(x, entry_enc) => {
// skip if entry already in list to send to this node
// (could happen if node is in several write sets for this entry)
}
_ => {
node_entries.push(entry_enc.clone());
}
}
} }
} }
} }