diff --git a/src/collector.rs b/src/collector.rs index 382610c..c8a9b7b 100644 --- a/src/collector.rs +++ b/src/collector.rs @@ -299,7 +299,7 @@ impl Inner { .entry(labels) .or_insert_with(Summary::with_defaults); - let h = histogram.get_inner().clear_with(|samples| { + histogram.get_inner().clear_with(|samples| { for sample in samples { entry.add(*sample); } @@ -311,8 +311,6 @@ impl Inner { } metrics::gauge!("relay.collector.distributions.size").set(recordable(total_len)); - - h } let d = self.distributions.read().unwrap().clone(); diff --git a/src/db.rs b/src/db.rs index 03c591c..a686fb6 100644 --- a/src/db.rs +++ b/src/db.rs @@ -605,28 +605,30 @@ impl Db { pub(crate) async fn add_blocks(&self, domains: Vec) -> Result<(), Error> { self.unblock(move |inner| { - let mut connected_batch = Batch::default(); - let mut blocked_batch = Batch::default(); - let mut allowed_batch = Batch::default(); - - for connected in inner.connected_by_domain(&domains) { - connected_batch.remove(connected.as_str().as_bytes()); - } - - for authority in &domains { - blocked_batch.insert(domain_key(authority), authority.as_bytes()); - allowed_batch.remove(domain_key(authority)); - } - let res = ( &inner.connected_actor_ids, &inner.blocked_domains, &inner.allowed_domains, ) .transaction(|(connected, blocked, allowed)| { - inner.connected_actor_ids.apply_batch(&connected_batch)?; - inner.blocked_domains.apply_batch(&blocked_batch)?; - inner.allowed_domains.apply_batch(&allowed_batch)?; + let mut connected_batch = Batch::default(); + let mut blocked_batch = Batch::default(); + let mut allowed_batch = Batch::default(); + + for connected in inner.connected_by_domain(&domains) { + connected_batch.remove(connected.as_str().as_bytes()); + } + + for authority in &domains { + blocked_batch + .insert(domain_key(authority).as_bytes(), authority.as_bytes()); + allowed_batch.remove(domain_key(authority).as_bytes()); + } + + connected.apply_batch(&connected_batch)?; + blocked.apply_batch(&blocked_batch)?; + allowed.apply_batch(&allowed_batch)?; + Ok(()) }); @@ -651,7 +653,7 @@ impl Db { let mut blocked_batch = Batch::default(); for authority in &domains { - blocked_batch.remove(domain_key(authority)); + blocked_batch.remove(domain_key(authority).as_bytes()); } inner.blocked_domains.apply_batch(blocked_batch)?; @@ -669,7 +671,7 @@ impl Db { let mut allowed_batch = Batch::default(); for authority in &domains { - allowed_batch.insert(domain_key(authority), authority.as_bytes()); + allowed_batch.insert(domain_key(authority).as_bytes(), authority.as_bytes()); } inner.allowed_domains.apply_batch(allowed_batch)?; @@ -701,7 +703,7 @@ impl Db { let mut allowed_batch = Batch::default(); for authority in &domains { - allowed_batch.remove(domain_key(authority)); + allowed_batch.remove(domain_key(authority).as_bytes()); } inner.allowed_domains.apply_batch(allowed_batch)?;