Introduce check for local and memory stores before wrapping with cach…

…ing layer
splitgraph · Mar 11, 2024 · 4ecaf2a · 4ecaf2a
1 parent b33bbf9
commit 4ecaf2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/catalog/metastore.rs b/src/catalog/metastore.rs
@@ -166,7 +166,10 @@ impl Metastore {
                     })?
                     .clone();
 
-                if let Some(ref cache) = self.object_store_cache {
+                if (location.starts_with("file://") || location.starts_with("memory://"))
+                    && let Some(ref cache) = self.object_store_cache
+                {
+                    // Wrap the non-local store with the caching layer
                     store = cache.wrap_store(store);
                 }
 

diff --git a/src/config/schema.rs b/src/config/schema.rs
@@ -386,15 +386,15 @@ impl Default for Metrics {
 pub struct ObjectCacheProperties {
     pub capacity: u64,
     pub min_fetch_size: u64,
-    pub ttl_s: u64,
+    pub ttl: u64,
 }
 
 impl Default for ObjectCacheProperties {
     fn default() -> Self {
         Self {
             capacity: DEFAULT_CACHE_CAPACITY,
             min_fetch_size: DEFAULT_MIN_FETCH_SIZE,
-            ttl_s: DEFAULT_CACHE_ENTRY_TTL.as_secs(),
+            ttl: DEFAULT_CACHE_ENTRY_TTL.as_secs(),
         }
     }
 }
@@ -409,7 +409,7 @@ impl ObjectCacheProperties {
             &path,
             self.min_fetch_size,
             self.capacity,
-            Duration::from_secs(self.ttl_s),
+            Duration::from_secs(self.ttl),
         ))
     }
 }
@@ -557,7 +557,7 @@ dsn = "postgresql://user:pass@localhost:5432/somedb"
 
 [misc.object_store_cache]
 min_fetch_size = 4096
-ttl_s = 10
+ttl = 10
 "#;
 
     const TEST_CONFIG_BASIC: &str = r#"
@@ -630,7 +630,7 @@ cache_control = "private, max-age=86400"
     #[case::basic_s3(TEST_CONFIG_S3, None)]
     #[case::basic_s3_with_cache(
         TEST_CONFIG_S3_WITH_CACHE,
-        Some(ObjectCacheProperties{ capacity: DEFAULT_CACHE_CAPACITY, min_fetch_size: 4096, ttl_s: 10 }))
+        Some(ObjectCacheProperties{ capacity: DEFAULT_CACHE_CAPACITY, min_fetch_size: 4096, ttl: 10 }))
     ]
     fn test_parse_config_with_s3(
         #[case] config_str: &str,