Moka v0.12 support

abdolence · Sep 18, 2023 · 19cda79 · 19cda79
1 parent 556130b
commit 19cda79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ async-trait = "0.1"
 hex = "0.4"
 backoff = { version = "0.4", features = ["tokio"] }
 redb = { version = "1.1", optional = true }
-moka = { version = "0.11", features = ["future"], optional = true } # Caching library
+moka = { version = "0.12", features = ["future"], optional = true } # Caching library
 
 [dev-dependencies]
 cargo-husky = { version = "1.5", default-features = false, features = ["run-for-all", "prepush-hook", "run-cargo-fmt"] }

diff --git a/src/cache/backends/memory_backend.rs b/src/cache/backends/memory_backend.rs
@@ -3,7 +3,7 @@ use crate::*;
 use async_trait::async_trait;
 use chrono::Utc;
 use futures::stream::BoxStream;
-use moka::future::{Cache, CacheBuilder, ConcurrentCacheExt};
+use moka::future::{Cache, CacheBuilder};
 
 use futures::TryStreamExt;
 use std::collections::HashMap;
@@ -78,7 +78,7 @@ impl FirestoreMemoryCacheBackend {
                             })
                             .await?;
 
-                        mem_cache.sync();
+                        mem_cache.run_pending_tasks().await;
 
                         info!(
                             "Preloading collection `{}` has been finished. Loaded: {} entries",
@@ -183,7 +183,7 @@ impl FirestoreCacheDocsByPathSupport for FirestoreMemoryCacheBackend {
         document_path: &str,
     ) -> FirestoreResult<Option<FirestoreDocument>> {
         match self.collection_caches.get(collection_id) {
-            Some(mem_cache) => Ok(mem_cache.get(document_path)),
+            Some(mem_cache) => Ok(mem_cache.get(document_path).await),
             None => Ok(None),
         }
     }