From ed07104aeb592411e116b933e4de01220e541510 Mon Sep 17 00:00:00 2001 From: Bartosz Sypytkowski Date: Sat, 14 Dec 2024 09:42:15 +0100 Subject: [PATCH] chore: remove from editing collab param in get encode collab method --- libs/database/src/collab/collab_storage.rs | 1 - .../src/collab/storage.rs | 56 +------------------ .../src/group/group_init.rs | 2 +- .../appflowy-collaborate/src/group/manager.rs | 4 +- .../src/indexer/provider.rs | 2 +- src/api/workspace.rs | 5 +- src/biz/collab/utils.rs | 1 - 7 files changed, 7 insertions(+), 64 deletions(-) diff --git a/libs/database/src/collab/collab_storage.rs b/libs/database/src/collab/collab_storage.rs index 6a6cefc6..6726328f 100644 --- a/libs/database/src/collab/collab_storage.rs +++ b/libs/database/src/collab/collab_storage.rs @@ -114,7 +114,6 @@ pub trait CollabStorage: Send + Sync + 'static { &self, origin: GetCollabOrigin, params: QueryCollabParams, - from_editing_collab: bool, ) -> AppResult; async fn batch_get_collab( diff --git a/services/appflowy-collaborate/src/collab/storage.rs b/services/appflowy-collaborate/src/collab/storage.rs index bdc0b06b..d838f43e 100644 --- a/services/appflowy-collaborate/src/collab/storage.rs +++ b/services/appflowy-collaborate/src/collab/storage.rs @@ -131,47 +131,6 @@ where .await?; Ok(()) } - async fn get_encode_collab_from_editing(&self, oid: &str) -> Option { - let object_id = oid.to_string(); - let (ret, rx) = tokio::sync::oneshot::channel(); - let timeout_duration = Duration::from_secs(5); - - // Attempt to send the command to the realtime server - if let Err(err) = self - .rt_cmd_sender - .send(CollaborationCommand::GetEncodeCollab { object_id, ret }) - .await - { - error!( - "Failed to send get encode collab command to realtime server: {}", - err - ); - return None; - } - - // Await the response from the realtime server with a timeout - match timeout(timeout_duration, rx).await { - Ok(Ok(Some(encode_collab))) => Some(encode_collab), - Ok(Ok(None)) => { - trace!("Editing collab not found: `{}`", oid); - None - }, - Ok(Err(err)) => { - error!( - "Failed to get collab from realtime server `{}`: {}", - oid, err - ); - None - }, - Err(_) => { - error!( - "Timeout trying to read collab `{}` from realtime server", - oid - ); - None - }, - } - } async fn batch_get_encode_collab_from_editing( &self, @@ -397,12 +356,11 @@ where } } - #[instrument(level = "trace", skip_all, fields(oid = %params.object_id, from_editing_collab = %from_editing_collab))] + #[instrument(level = "trace", skip_all, fields(oid = %params.object_id))] async fn get_encode_collab( &self, origin: GetCollabOrigin, params: QueryCollabParams, - from_editing_collab: bool, ) -> AppResult { params.validate()?; match origin { @@ -416,18 +374,6 @@ where GetCollabOrigin::Server => {}, } - // Early return if editing collab is initialized, as it indicates no need to query further. - if from_editing_collab { - // Attempt to retrieve encoded collab from the editing collab - if let Some(value) = self.get_encode_collab_from_editing(¶ms.object_id).await { - trace!( - "Did get encode collab {} from editing collab", - params.object_id - ); - return Ok(value); - } - } - let encode_collab = self .cache .get_encode_collab(¶ms.workspace_id, params.inner) diff --git a/services/appflowy-collaborate/src/group/group_init.rs b/services/appflowy-collaborate/src/group/group_init.rs index 071a32e7..dc428ff3 100644 --- a/services/appflowy-collaborate/src/group/group_init.rs +++ b/services/appflowy-collaborate/src/group/group_init.rs @@ -1226,7 +1226,7 @@ impl CollabPersister { ); let result = self .storage - .get_encode_collab(GetCollabOrigin::Server, params, false) + .get_encode_collab(GetCollabOrigin::Server, params) .await; match result { Ok(encoded_collab) => encoded_collab.doc_state, diff --git a/services/appflowy-collaborate/src/group/manager.rs b/services/appflowy-collaborate/src/group/manager.rs index 39ff4cc8..b7faba79 100644 --- a/services/appflowy-collaborate/src/group/manager.rs +++ b/services/appflowy-collaborate/src/group/manager.rs @@ -121,7 +121,7 @@ where let params = QueryCollabParams::new(object_id, collab_type.clone(), workspace_id); let res = self .storage - .get_encode_collab(GetCollabOrigin::Server, params, false) + .get_encode_collab(GetCollabOrigin::Server, params) .await; let state_vector = match res { Ok(collab) => Collab::new_with_source( @@ -186,7 +186,7 @@ where S: CollabStorage, { let encode_collab = storage - .get_encode_collab(GetCollabOrigin::User { uid }, params.clone(), false) + .get_encode_collab(GetCollabOrigin::User { uid }, params.clone()) .await?; let result = Collab::new_with_source( CollabOrigin::Server, diff --git a/services/appflowy-collaborate/src/indexer/provider.rs b/services/appflowy-collaborate/src/indexer/provider.rs index ee02b6fa..69fb5044 100644 --- a/services/appflowy-collaborate/src/indexer/provider.rs +++ b/services/appflowy-collaborate/src/indexer/provider.rs @@ -116,7 +116,7 @@ impl IndexerProvider { match &cid.collab_type { CollabType::Document => { let collab = match storage - .get_encode_collab(GetCollabOrigin::Server, cid.clone().into(), false) + .get_encode_collab(GetCollabOrigin::Server, cid.clone().into()) .await { Ok(collab) => collab, Err(err) => { diff --git a/src/api/workspace.rs b/src/api/workspace.rs index 45472c19..dcf707f3 100644 --- a/src/api/workspace.rs +++ b/src/api/workspace.rs @@ -867,7 +867,7 @@ async fn get_collab_handler( let object_id = params.object_id.clone(); let encode_collab = state .collab_access_control_storage - .get_encode_collab(GetCollabOrigin::User { uid }, params, true) + .get_encode_collab(GetCollabOrigin::User { uid }, params) .await .map_err(AppResponseError::from)?; @@ -903,7 +903,7 @@ async fn v1_get_collab_handler( let encode_collab = state .collab_access_control_storage - .get_encode_collab(GetCollabOrigin::User { uid }, param, true) + .get_encode_collab(GetCollabOrigin::User { uid }, param) .await .map_err(AppResponseError::from)?; @@ -1188,7 +1188,6 @@ async fn create_collab_snapshot_handler( .get_encode_collab( GetCollabOrigin::User { uid }, QueryCollabParams::new(&object_id, collab_type.clone(), &workspace_id), - true, ) .await? .doc_state; diff --git a/src/biz/collab/utils.rs b/src/biz/collab/utils.rs index c89bceb7..87165fb7 100644 --- a/src/biz/collab/utils.rs +++ b/src/biz/collab/utils.rs @@ -224,7 +224,6 @@ pub async fn get_latest_collab_encoded( collab_type, }, }, - true, ) .await }