add dashmap

tailcallhq · Sep 13, 2024 · d2921d9 · d2921d9
1 parent a7e4403
commit d2921d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/projects/ssddOnTop/Cargo.toml b/projects/ssddOnTop/Cargo.toml
@@ -49,6 +49,7 @@ http = "1.1.0"
 url = "2.5.2"
 schemars = {version = "0.8.17", features = ["derive"]}
 async-recursion = "1.1.1"
+dashmap = "6.1.0"
 
 [dev-dependencies]
 http-cache = "0.18.0"

diff --git a/projects/ssddOnTop/src/ir/eval_io.rs b/projects/ssddOnTop/src/ir/eval_io.rs
@@ -8,14 +8,13 @@ use std::num::NonZeroU64;
 pub async fn eval_io(io: &IO, ctx: &mut EvalContext<'_>) -> anyhow::Result<Value> {
     let key = io.cache_key(ctx);
 
-    if let Some(val) = ctx.request_ctx.cache.get(&key).await? {
+    if let Some(val) = ctx.request_ctx.cache.get(&key) {
         Ok(val.clone())
     } else {
         let val = eval_io_inner(io, ctx).await?;
         ctx.request_ctx
             .cache
-            .set(key, val.clone(), NonZeroU64::MAX)
-            .await?;
+            .insert(key, val.clone());
         Ok(val)
     }
 }

diff --git a/projects/ssddOnTop/src/request_context.rs b/projects/ssddOnTop/src/request_context.rs
@@ -8,6 +8,7 @@ use anyhow::Error;
 use derive_setters::Setters;
 use std::num::NonZeroU64;
 use std::sync::{Arc, Mutex};
+use dashmap::DashMap;
 
 #[derive(Clone)]
 pub struct CacheErr(String);
@@ -31,7 +32,8 @@ pub struct RequestContext {
     pub min_max_age: Arc<Mutex<Option<i32>>>,
     pub cache_public: Arc<Mutex<Option<bool>>>,
     pub runtime: TargetRuntime,
-    pub cache: InMemoryCache<IoId, Value>,
+    pub cache: DashMap<IoId, Value>,
+    // pub cache: InMemoryCache<IoId, Value>,
     // pub cache: Dedupe<IoId, Result<Value, CacheErr>>,
 }
 
@@ -44,7 +46,8 @@ impl RequestContext {
             cache_public: Arc::new(Mutex::new(None)),
             runtime: target_runtime,
             // cache: Dedupe::new(1, true),
-            cache: InMemoryCache::new(),
+            // cache: InMemoryCache::new(),
+            cache: Default::default(),
         }
     }
     fn set_min_max_age_conc(&self, min_max_age: i32) {
@@ -99,7 +102,8 @@ impl From<&AppCtx> for RequestContext {
             cache_public: Arc::new(Mutex::new(None)),
             runtime: app_ctx.runtime.clone(),
             // cache: Dedupe::new(1, true),
-            cache: InMemoryCache::new(),
+            // cache: InMemoryCache::new(),
+            cache: Default::default(),
         }
     }
 }