Optimize lock_and_execute_merge_updates

reearth · Oct 4, 2024 · 332f84c · 332f84c
1 parent 23a8a0d
commit 332f84c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/websocket/crates/infra/src/persistence/redis/flow_project_redis_data_manager.rs b/websocket/crates/infra/src/persistence/redis/flow_project_redis_data_manager.rs
@@ -439,11 +439,10 @@ impl FlowProjectRedisDataManager {
         &self,
     ) -> Result<(Vec<u8>, Vec<String>), FlowProjectRedisDataManagerError> {
         self.global_lock
-            .lock_updates(&self.project_id, 5000, |_| {
-                Box::pin(async move { Ok::<(), FlowProjectRedisDataManagerError>(()) })
+            .lock_updates(&self.project_id, 5000, |_| async {
+                Ok::<(), FlowProjectRedisDataManagerError>(())
             })
-            .await
-            .map_err(FlowProjectRedisDataManagerError::from)?
+            .await?
             .await?;
 
         self.execute_merge_updates().await

diff --git a/websocket/crates/infra/src/persistence/redis/redis_client.rs b/websocket/crates/infra/src/persistence/redis/redis_client.rs
@@ -1,10 +1,6 @@
 use std::sync::Arc;
 
-use redis::{
-    aio::{ConnectionLike, MultiplexedConnection},
-    streams::StreamMaxlen,
-    AsyncCommands, Client,
-};
+use redis::{aio::MultiplexedConnection, streams::StreamMaxlen, AsyncCommands, Client};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::sync::Mutex;