Merge pull request #186 from Kuadrant/faster-baby-ii

 Improving perf when using InMemory storage

limitador/src/counter.rs

@@ -102,14 +102,10 @@ impl Hash for Counter {
  fn hash<H: Hasher>(&self, state: &mut H) {
  self.limit.hash(state);
 
- let mut encoded_vars = self
- .set_variables
- .iter()
- .map(|(k, v)| k.to_owned() + ":" + v)
- .collect::<Vec<String>>();
-
- encoded_vars.sort();
- encoded_vars.hash(state);
+ self.set_variables.iter().for_each(|(k, v)| {
+ k.hash(state);
+ v.hash(state);
+ });
  }
 }
 

limitador/src/limit.rs

@@ -406,24 +406,8 @@ impl Hash for Limit {
  fn hash<H: Hasher>(&self, state: &mut H) {
  self.namespace.hash(state);
  self.seconds.hash(state);
-
- let mut encoded_conditions = self
- .conditions
- .iter()
- .map(|c| c.clone().into())
- .collect::<Vec<String>>();
-
- encoded_conditions.sort();
- encoded_conditions.hash(state);
-
- let mut encoded_vars = self
- .variables
- .iter()
- .map(|c| c.to_string())
- .collect::<Vec<String>>();
-
- encoded_vars.sort();
- encoded_vars.hash(state);
+ self.conditions.iter().for_each(|e| e.hash(state));
+ self.variables.iter().for_each(|e| e.hash(state));
  }
 }
 

limitador/src/storage/disk/mod.rs

@@ -1,6 +1,5 @@
 use crate::storage::StorageErr;
 
-mod expiring_value;
 mod rocksdb_storage;
 
 pub use rocksdb_storage::RocksDbStorage as DiskStorage;

limitador/src/storage/disk/rocksdb_storage.rs

@@ -1,7 +1,7 @@
 use crate::counter::Counter;
 use crate::limit::Limit;
-use crate::storage::disk::expiring_value::ExpiringValue;
 use crate::storage::disk::OptimizeFor;
+use crate::storage::expiring_value::ExpiringValue;
 use crate::storage::keys::bin::{
  key_for_counter, partial_counter_from_counter_key, prefix_for_namespace,
 };

limitador/src/storage/disk/expiring_value.rs → limitador/src/storage/expiring_value.rs

@@ -24,6 +24,7 @@ impl ExpiringValue {
  self.value_at(SystemTime::now())
  }
 
+ #[must_use]
  pub fn update(self, delta: i64, ttl: u64, now: SystemTime) -> Self {
  let expiry = if self.expiry <= now {
  now + Duration::from_secs(ttl)
@@ -35,6 +36,18 @@ impl ExpiringValue {
  Self { value, expiry }
  }
 
+ pub fn update_mut(&mut self, delta: i64, ttl: u64, now: SystemTime) {
+ let expiry = if self.expiry <= now {
+ now + Duration::from_secs(ttl)
+ } else {
+ self.expiry
+ };
+
+ self.value = self.value_at(now) + delta;
+ self.expiry = expiry;
+ }
+
+ #[must_use]
  pub fn merge(self, other: ExpiringValue, now: SystemTime) -> Self {
  if self.expiry > now {
  ExpiringValue {