fix: adjust cache settings

Author: zacharyhamm

lib/dal/src/workspace_snapshot.rs

@@ -1224,11 +1224,6 @@ impl WorkspaceSnapshot {
                     // This is the key for an entry in a map.
                     EdgeWeightKind::Contain(Some(key)) => hasher.update(key.as_bytes()),
 
-                    // This is the kind of the action.
-                    EdgeWeightKind::ActionPrototype(kind) => {
-                        hasher.update(kind.to_string().as_bytes())
-                    }
-
                     EdgeWeightKind::Use { is_default } => {
                         hasher.update(is_default.to_string().as_bytes())
                     }
@@ -1241,6 +1236,7 @@ impl WorkspaceSnapshot {
                     // in the edge itself.
                     EdgeWeightKind::AuthenticationPrototype
                     | EdgeWeightKind::Action
+                    | EdgeWeightKind::ActionPrototype
                     | EdgeWeightKind::Contain(None)
                     | EdgeWeightKind::FrameContains
                     | EdgeWeightKind::PrototypeArgument

lib/si-layer-cache/src/layer_cache.rs

@@ -1,4 +1,5 @@
 use std::{collections::HashMap, fmt::Display, path::Path, sync::Arc};
+use telemetry::prelude::*;
 
 use serde::{de::DeserializeOwned, Serialize};
 use si_data_pg::{PgPool, PgPoolConfig};
@@ -49,6 +50,7 @@ where
             Some(memory_value) => Some(memory_value),
             None => match self.disk_cache.get(&key)? {
                 Some(value) => {
+                    info!("hitting sled");
                     let deserialized: V = postcard::from_bytes(&value)?;
 
                     self.memory_cache.insert(key, deserialized.clone()).await;
@@ -57,6 +59,7 @@ where
                 None => match self.pg.get(&key).await? {
                     Some(value) => {
                         let deserialized: V = postcard::from_bytes(&value)?;
+                        info!("hitting pg");
 
                         self.memory_cache
                             .insert(key.clone(), deserialized.clone())

lib/si-layer-cache/src/memory_cache.rs

@@ -1,8 +1,12 @@
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 
 use moka::future::Cache;
 use serde::{de::DeserializeOwned, Serialize};
 
+const DEFAULT_SIZE: u64 = 65_536;
+const DEFAULT_TTL: Duration = Duration::from_secs(60 * 60 * 24 * 2);
+const DEFAULT_TTI: Duration = Duration::from_secs(60 * 60 * 24);
+
 #[derive(Clone, Debug)]
 pub struct MemoryCache<V>
 where
@@ -26,7 +30,11 @@ where
 {
     pub fn new() -> Self {
         Self {
-            cache: Cache::new(u64::MAX),
+            cache: Cache::builder()
+                .max_capacity(DEFAULT_SIZE)
+                .time_to_idle(DEFAULT_TTI)
+                .time_to_live(DEFAULT_TTL)
+                .build(),
         }
     }