From 2ba368bdc1bc8fe2a26c37b36545d0e5d74fda4f Mon Sep 17 00:00:00 2001 From: gillchristian Date: Sun, 20 Oct 2024 15:07:39 +0200 Subject: [PATCH] inserted -> created --- src/commands/keys.rs | 2 +- src/store.rs | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/commands/keys.rs b/src/commands/keys.rs index d79c975..89578e8 100644 --- a/src/commands/keys.rs +++ b/src/commands/keys.rs @@ -24,7 +24,7 @@ impl Executable for Keys { let matching_keys = store .iter() .filter(|(key, _)| glob_match(self.pattern.as_str(), key)) - .sorted_by(|(_, a), (_, b)| b.inserted_at.cmp(&a.inserted_at)) + .sorted_by(|(_, a), (_, b)| b.created_at.cmp(&a.created_at)) .map(|(key, _)| Frame::Bulk(Bytes::from(key.to_string()))) .collect::>(); diff --git a/src/store.rs b/src/store.rs index 980fd1d..a0ab6b3 100644 --- a/src/store.rs +++ b/src/store.rs @@ -61,12 +61,12 @@ impl<'a> InnerStoreLocked<'a> { // Ensure any previous TTL is removed. let removed = self.remove(&key); - let inserted_at = removed.map(|v| v.inserted_at).unwrap_or(Instant::now()); + let created_at = removed.map(|v| v.created_at).unwrap_or(Instant::now()); let value = Value { data, expires_at: None, - inserted_at, + created_at, }; self.state.keys.insert(key, value); } @@ -75,13 +75,13 @@ impl<'a> InnerStoreLocked<'a> { // Ensure any previous TTL is removed. let removed = self.remove(&key); - let inserted_at = removed.map(|v| v.inserted_at).unwrap_or(Instant::now()); + let created_at = removed.map(|v| v.created_at).unwrap_or(Instant::now()); let expires_at = Instant::now() + ttl; let value = Value { data, expires_at: Some(expires_at), - inserted_at, + created_at, }; self.state.keys.insert(key.clone(), value); @@ -149,10 +149,7 @@ impl<'a> InnerStoreLocked<'a> { } pub fn iter(&self) -> impl Iterator { - self.state - .keys - .iter() - .map(|(key, value)| (key, value)) + self.state.keys.iter().map(|(key, value)| (key, value)) } pub fn incr_by(&mut self, key: &str, increment: T) -> Result @@ -238,7 +235,7 @@ type Key = String; pub struct Value { pub data: Bytes, pub expires_at: Option, - pub inserted_at: Instant, + pub created_at: Instant, } pub struct State {