chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: decode update when spawn blocking when update size exceeds the… (#769) 

* chore: decode update when spawn blocking when update size exceeds the threshold size

* chore: use 1mb as threshold
This commit is contained in:
Nathan.fooo 2024-08-30 11:30:15 +08:00 committed by GitHub
parent 773efcd91a
commit 5278203394
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/collab-rt-protocol/src/protocol.rs
View File

@ -6,6 +6,7 @@ use collab::core::collab::{TransactionExt, TransactionMutExt};
use collab::core::origin::CollabOrigin;
use collab::lock::RwLock;
use collab::preclude::Collab;
use tokio::task::spawn_blocking;
use yrs::updates::decoder::Decode;
use yrs::updates::encoder::{Encode, Encoder};
use yrs::{ReadTxn, StateVector, Transact, Update};
@ -194,6 +195,20 @@ pub trait CollabSyncProtocol {
}
}
const LARGE_UPDATE_THRESHOLD: usize = 1024 * 1024; // 1MB
#[inline]
async fn decode_update(update: Vec<u8>) -> Result<Update, RTProtocolError> {
let update = if update.len() > LARGE_UPDATE_THRESHOLD {
spawn_blocking(move || Update::decode_v1(&update))
.await
.map_err(|err| RTProtocolError::Internal(err.into()))?
} else {
Update::decode_v1(&update)
}?;
Ok(update)
}
/// Handles incoming messages from the client/server
pub async fn handle_message_follow_protocol<P>(
message_origin: &CollabOrigin,
@ -214,14 +229,14 @@ where
Ok(update)
},
SyncMessage::SyncStep2(update) => {
let update = Update::decode_v1(&update)?;
let update = decode_update(update).await?;
let mut lock = collab.write().await;
let collab = (*lock).borrow_mut();
protocol.handle_sync_step2(message_origin, collab.get_mut_awareness(), update)?;
Ok(None)
},
SyncMessage::Update(update) => {
let update = Update::decode_v1(&update)?;
let update = decode_update(update).await?;
let mut lock = collab.write().await;
let collab = (*lock).borrow_mut();
protocol.handle_update(message_origin, collab.get_mut_awareness(), update)?;

3
tests/yrs_version/document_test.rs
View File

@ -1,10 +1,9 @@
use crate::yrs_version::util::read_bytes_from_file;
use collab::core::collab::DataSource;
use collab::core::origin::CollabOrigin;
use collab::entity::EncodedCollab;
use collab_document::document::Document;
use crate::yrs_version::util::read_bytes_from_file;
/// Load collaboration data that was encoded using Yjs version 0.17.
#[test]
fn load_yrs_0172_version_get_started_document_using_current_yrs_version() {