aboutsummaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
Diffstat (limited to 'src/table')
-rw-r--r--src/table/sync.rs8
-rw-r--r--src/table/table.rs3
2 files changed, 5 insertions, 6 deletions
diff --git a/src/table/sync.rs b/src/table/sync.rs
index cfcbc4b5..1561a2e5 100644
--- a/src/table/sync.rs
+++ b/src/table/sync.rs
@@ -123,15 +123,15 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> {
let mut sync_futures = result_tracker
.nodes
- .iter()
- .map(|(node, _)| *node)
+ .keys()
+ .copied()
.map(|node| {
let must_exit = must_exit.clone();
async move {
if node == my_id {
(node, Ok(()))
} else {
- (node, self.do_sync_with(&partition, node, must_exit).await)
+ (node, self.do_sync_with(partition, node, must_exit).await)
}
}
})
@@ -145,7 +145,7 @@ impl<F: TableSchema, R: TableReplication> TableSyncer<F, R> {
}
if result_tracker.too_many_failures() {
- return Err(result_tracker.quorum_error());
+ Err(result_tracker.quorum_error())
} else {
Ok(())
}
diff --git a/src/table/table.rs b/src/table/table.rs
index 05a0dab1..a5be2910 100644
--- a/src/table/table.rs
+++ b/src/table/table.rs
@@ -209,8 +209,7 @@ impl<F: TableSchema, R: TableReplication> Table<F, R> {
// it takes part, to optimize the detection of a quorum.
let mut write_sets = entries_vec
.iter()
- .map(|(wss, _)| wss.as_ref().iter().map(|ws| ws.as_slice()))
- .flatten()
+ .flat_map(|(wss, _)| wss.as_ref().iter().map(|ws| ws.as_slice()))
.collect::<Vec<&[Uuid]>>();
write_sets.sort();
write_sets.dedup();