improve memory usage of map?

akarras · Feb 4, 2024 · 2380304 · 2380304
1 parent eb12061
commit 2380304
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ultros/Cargo.toml b/ultros/Cargo.toml
@@ -54,3 +54,4 @@ image.workspace = true
 isocountry = "0.3.2"
 git-const.workspace = true
 http-body-util = "0.1.0"
+arrayvec = "0.7.4"
diff --git a/ultros/src/analyzer_service.rs b/ultros/src/analyzer_service.rs
@@ -13,7 +13,6 @@ use futures::StreamExt;
 use itertools::Itertools;
 use poise::serenity_prelude::Timestamp;
 use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
 use tracing::log::info;
 use ultros_api_types::{websocket::ListingEventData, ActiveListing, Retainer};
 use ultros_db::{
@@ -132,7 +131,7 @@ impl From<&ultros_api_types::SaleHistory> for SaleSummary {
 
 #[derive(Debug, Default, Clone)]
 pub(crate) struct SaleHistory {
-    pub(crate) item_map: HashMap<ItemKey, SmallVec<[SaleSummary; SALE_HISTORY_SIZE]>>,
+    pub(crate) item_map: HashMap<ItemKey, arrayvec::ArrayVec<SaleSummary, SALE_HISTORY_SIZE>>,
 }
 
 impl SaleHistory {
@@ -143,11 +142,17 @@ impl SaleHistory {
         let entries = self
             .item_map
             .entry(sale.into())
-            .or_insert_with(SmallVec::new_const);
+            .or_default();
+        let sale: SaleSummary = sale.into();
         if entries.len() == SALE_HISTORY_SIZE {
-            let _ = entries.pop();
+            let last_entry = entries.last().expect("We just checked len");
+            if last_entry.sale_date < sale.sale_date {
+                let _ = entries.pop();
+                entries.push(sale);
+            }
+        } else {
+            entries.push(sale);
         }
-        entries.push(sale.into());
         entries.sort_by_key(|sale| Reverse(sale.sale_date));
     }
 }

diff --git a/ultros/src/web/oauth.rs b/ultros/src/web/oauth.rs
@@ -119,7 +119,7 @@ pub async fn begin_login(
         CookieBuilder::new("pkce_challenge", pkce_challenge.as_str().to_string())
             .same_site(SameSite::Strict)
             .secure(true)
-            .finish(),
+            .build(),
     );
     let cookies = cookies.add(Cookie::new("pkce_verifier", pkce_verifier.secret().clone()));