From 4de6ae09516c800f4337a0ccb6cfd4e1e67e32cf Mon Sep 17 00:00:00 2001
From: Hiram Chirino <hiram@hiramchirino.com>
Date: Fri, 24 May 2024 10:31:47 -0400
Subject: [PATCH] Apply PR feedback.

* rewrote the inter_ourselfs_inner, we now avoid a full clone
* remove unneeded clone of the limits.
* avoid sending a re-sync counter if it has expired.
---
 .../src/storage/distributed/cr_counter_value.rs   | 15 ++++++---------
 limitador/src/storage/distributed/mod.rs          |  7 +++----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/limitador/src/storage/distributed/cr_counter_value.rs b/limitador/src/storage/distributed/cr_counter_value.rs
index ebf0216c..2caaa666 100644
--- a/limitador/src/storage/distributed/cr_counter_value.rs
+++ b/limitador/src/storage/distributed/cr_counter_value.rs
@@ -133,15 +133,12 @@ impl<A: Ord> CrCounterValue<A> {
         (expiry.into_inner(), map)
     }
 
-    pub fn into_ourselves_inner(self) -> (SystemTime, A, u64) {
-        let Self {
-            ourselves,
-            max_value: _,
-            value,
-            others: _,
-            expiry,
-        } = self;
-        (expiry.into_inner(), ourselves, value.into_inner())
+    pub fn local_values(&self) -> (SystemTime, &A, u64) {
+        (
+            self.expiry.clone().into_inner(),
+            &self.ourselves,
+            self.value.load(Ordering::Relaxed),
+        )
     }
 
     fn reset(&self, expiry: SystemTime) {
diff --git a/limitador/src/storage/distributed/mod.rs b/limitador/src/storage/distributed/mod.rs
index e2ca8c42..00506b24 100644
--- a/limitador/src/storage/distributed/mod.rs
+++ b/limitador/src/storage/distributed/mod.rs
@@ -251,7 +251,6 @@ impl CrInMemoryStorage {
         {
             let limits = limits.clone();
             tokio::spawn(async move {
-                let limits = limits.clone();
                 while let Some(sender) = re_sync_queue_rx.recv().await {
                     process_re_sync(&limits, sender).await;
                 }
@@ -311,11 +310,11 @@ async fn process_re_sync(
         let update = {
             let limits = limits.read().unwrap();
             limits.get(&key).and_then(|store_value| {
-                let (expiry, ourself, value) = store_value.clone().into_ourselves_inner();
-                if value == 0 {
+                let (expiry, ourself, value) = store_value.local_values();
+                if value == 0 || expiry <= SystemTime::now() {
                     None // no point in sending a counter that is empty
                 } else {
-                    let values = HashMap::from([(ourself, value)]);
+                    let values = HashMap::from([(ourself.clone(), value)]);
                     Some(CounterUpdate {
                         key: key.clone(),
                         values,