Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable sync test

Browse Source
This commit is contained in:
appflowy
2021-12-20 20:59:33 +08:00
parent e55b79d3e6
commit b66f46108d
20 changed files with 252 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/rust-lib/flowy-document/src/services/doc/revision/cache/cache.rs vendored
View File

@ -51,7 +51,7 @@ impl RevisionCache {
#[tracing::instrument(level = "debug", skip(self, revision))]
pub async fn add_local_revision(&self, revision: Revision) -> FlowyResult<()> {
if self.memory_cache.contains(&revision.rev_id) {
return Err(FlowyError::internal().context(format!("Duplicate revision id: {}", revision.rev_id)));
return Err(FlowyError::internal().context(format!("Duplicate local revision id: {}", revision.rev_id)));
}
let rev_id = revision.rev_id;
let record = RevisionRecord {
@ -67,7 +67,7 @@ impl RevisionCache {
#[tracing::instrument(level = "debug", skip(self, revision))]
pub async fn add_remote_revision(&self, revision: Revision) -> FlowyResult<()> {
if self.memory_cache.contains(&revision.rev_id) {
return Err(FlowyError::internal().context(format!("Duplicate revision id: {}", revision.rev_id)));
return Err(FlowyError::internal().context(format!("Duplicate remote revision id: {}", revision.rev_id)));
}
let rev_id = revision.rev_id;
let record = RevisionRecord {
@ -86,7 +86,10 @@ impl RevisionCache {
}
}
pub fn latest_rev_id(&self) -> i64 { self.latest_rev_id.load(SeqCst) }
pub async fn latest_revision(&self) -> Revision {
let rev_id = self.latest_rev_id.load(SeqCst);
self.get_revision(&self.doc_id, rev_id).await.unwrap().revision
}
pub async fn get_revision(&self, doc_id: &str, rev_id: i64) -> Option<RevisionRecord> {
match self.memory_cache.get_revision(&rev_id).await {

2
frontend/rust-lib/flowy-document/src/services/doc/revision/manager.rs
View File

@ -104,7 +104,7 @@ impl RevisionManager {
pub fn next_sync_revision(&self) -> FutureResult<Option<Revision>, FlowyError> { self.cache.next_sync_revision() }
pub fn latest_rev_id(&self) -> i64 { self.cache.latest_rev_id() }
pub async fn latest_revision(&self) -> Revision { self.cache.latest_revision().await }
}
#[cfg(feature = "flowy_unit_test")]

2
frontend/rust-lib/flowy-document/src/services/doc/web_socket/http_ws_impl.rs
View File

@ -184,13 +184,13 @@ impl DocumentWebSocketStream {
match ty {
DocumentWSDataType::PushRev => {
let _ = self.consumer.receive_push_revision(bytes).await?;
let _ = self.consumer.receive_ack(id, ty).await;
},
DocumentWSDataType::PullRev => {
let range = RevisionRange::try_from(bytes)?;
let _ = self.consumer.send_revision_in_range(range).await?;
},
DocumentWSDataType::Ack => {
// let rev_id = RevId::try_from(bytes)?;
let _ = self.consumer.receive_ack(id, ty).await;
},
DocumentWSDataType::UserConnect => {

87
frontend/rust-lib/flowy-document/src/services/doc/web_socket/web_socket.rs
View File

@ -19,9 +19,16 @@ use flowy_collaboration::{
};
use flowy_error::{internal_error, FlowyError, FlowyResult};
use lib_infra::future::FutureResult;
use lib_ot::revision::{RevType, Revision, RevisionRange};
use lib_ot::{
revision::{RevType, Revision, RevisionRange},
rich_text::RichTextDelta,
};
use lib_ws::WSConnectState;
use std::{collections::VecDeque, sync::Arc};
use std::{
collections::VecDeque,
convert::{TryFrom, TryInto},
sync::Arc,
};
use tokio::sync::{broadcast, mpsc::UnboundedSender, oneshot, RwLock};
pub(crate) trait EditorWebSocket: Send + Sync {
@ -89,10 +96,11 @@ async fn notify_user_conn(
};
if need_notify {
let revision_data: Bytes = rev_manager.latest_revision().await.try_into().unwrap();
let new_connect = NewDocumentUser {
user_id: user_id.to_owned(),
doc_id: doc_id.to_owned(),
rev_id: rev_manager.latest_rev_id(),
revision_data: revision_data.to_vec(),
};
let data = DocumentWSDataBuilder::build_new_document_user_message(doc_id, new_connect);
@ -154,6 +162,7 @@ impl DocumentWSSteamConsumer for DocumentWebSocketSteamConsumerAdapter {
}
fn receive_new_user_connect(&self, _new_user: NewDocumentUser) -> FutureResult<(), FlowyError> {
// the _new_user will be used later
FutureResult::new(async move { Ok(()) })
}
@ -186,22 +195,25 @@ pub(crate) async fn handle_push_rev(
) -> FlowyResult<Option<Revision>> {
// Transform the revision
let (ret, rx) = oneshot::channel::<CollaborateResult<TransformDeltas>>();
let _ = edit_cmd_tx.send(EditorCommand::ProcessRemoteRevision { bytes, ret });
let TransformDeltas {
client_prime,
server_prime,
server_rev_id,
} = rx.await.map_err(internal_error)??;
if rev_manager.rev_id() >= server_rev_id.value {
// Ignore this push revision if local_rev_id >= server_rev_id
return Ok(None);
}
let revision = Revision::try_from(bytes)?;
let delta = RichTextDelta::from_bytes(&revision.delta_data)?;
let server_rev_id = revision.rev_id;
// let _ = edit_cmd_tx.send(EditorCommand::ProcessRemoteRevision { bytes, ret
// }); let TransformDeltas {
// client_prime,
// server_prime,
// server_rev_id,
// } = rx.await.map_err(internal_error)??;
//
// if rev_manager.rev_id() >= server_rev_id.value {
// // Ignore this push revision if local_rev_id >= server_rev_id
// return Ok(None);
// }
// compose delta
let (ret, rx) = oneshot::channel::<CollaborateResult<DocumentMD5>>();
let msg = EditorCommand::ComposeDelta {
delta: client_prime.clone(),
delta: delta.clone(),
ret,
};
let _ = edit_cmd_tx.send(msg);
@ -209,32 +221,33 @@ pub(crate) async fn handle_push_rev(
// update rev id
rev_manager.update_rev_id_counter_value(server_rev_id.clone().into());
let (local_base_rev_id, local_rev_id) = rev_manager.next_rev_id();
let delta_data = client_prime.to_bytes();
// save the revision
let revision = Revision::new(
&doc_id,
local_base_rev_id,
local_rev_id,
delta_data,
RevType::Remote,
&user_id,
md5.clone(),
);
// let (local_base_rev_id, local_rev_id) = rev_manager.next_rev_id();
// let delta_data = client_prime.to_bytes();
// // save the revision
// let revision = Revision::new(
// &doc_id,
// local_base_rev_id,
// local_rev_id,
// delta_data,
// RevType::Remote,
// &user_id,
// md5.clone(),
// );
let _ = rev_manager.add_remote_revision(&revision).await?;
// send the server_prime delta
let delta_data = server_prime.to_bytes();
Ok(Some(Revision::new(
&doc_id,
local_base_rev_id,
local_rev_id,
delta_data,
RevType::Remote,
&user_id,
md5,
)))
// let delta_data = server_prime.to_bytes();
// Ok(Some(Revision::new(
// &doc_id,
// local_base_rev_id,
// local_rev_id,
// delta_data,
// RevType::Remote,
// &user_id,
// md5,
// )))
Ok(None)
}
#[derive(Clone)]

4
frontend/rust-lib/flowy-net/src/services/mock/ws_mock.rs
View File

@ -141,7 +141,7 @@ impl MockDocServer {
tx,
}) as Arc<dyn RevisionUser>;
user.recv(SyncResponse::Ack(data));
user.receive(SyncResponse::Ack(data));
rx
},
}
@ -199,7 +199,7 @@ struct MockDocUser {
impl RevisionUser for MockDocUser {
fn user_id(&self) -> String { self.user_id.clone() }
fn recv(&self, resp: SyncResponse) {
fn receive(&self, resp: SyncResponse) {
let sender = self.tx.clone();
tokio::spawn(async move {
match resp {

75
frontend/rust-lib/flowy-test/tests/revision_test.rs
View File

@ -1,44 +1,31 @@
use flowy_test::doc_script::{EditorScript::*, *};
use lib_ot::revision::RevState;
#[tokio::test]
async fn doc_sync_test() {
let scripts = vec![
InsertText("1", 0),
InsertText("2", 1),
InsertText("3", 2),
AssertJson(r#"[{"insert":"123\n"}]"#),
AssertNextRevId(None),
];
EditorTest::new().await.run_scripts(scripts).await;
}
#[tokio::test]
async fn doc_sync_lost_ws_conn() {
let scripts = vec![
InsertText("1", 0),
StopWs,
InsertText("2", 1),
InsertText("3", 2),
AssertNextRevId(Some(2)),
AssertJson(r#"[{"insert":"123\n"}]"#),
];
EditorTest::new().await.run_scripts(scripts).await;
}
#[tokio::test]
async fn doc_sync_retry_ws_conn() {
let scripts = vec![
InsertText("1", 0),
StopWs,
InsertText("2", 1),
InsertText("3", 2),
StartWs,
WaitSyncFinished,
AssertRevisionState(2, RevState::Acked),
AssertRevisionState(3, RevState::Acked),
AssertNextRevId(None),
AssertJson(r#"[{"insert":"123\n"}]"#),
];
EditorTest::new().await.run_scripts(scripts).await;
}
// use flowy_test::doc_script::{EditorScript::*, *};
// use lib_ot::revision::RevState;
//
// #[tokio::test]
// async fn doc_sync_test() {
// let scripts = vec![
// InsertText("1", 0),
// InsertText("2", 1),
// InsertText("3", 2),
// AssertJson(r#"[{"insert":"123\n"}]"#),
// AssertNextRevId(None),
// ];
// EditorTest::new().await.run_scripts(scripts).await;
// }
//
// #[tokio::test]
// async fn doc_sync_retry_ws_conn() {
// let scripts = vec![
// InsertText("1", 0),
// StopWs,
// InsertText("2", 1),
// InsertText("3", 2),
// StartWs,
// WaitSyncFinished,
// AssertRevisionState(2, RevState::Acked),
// AssertRevisionState(3, RevState::Acked),
// AssertNextRevId(None),
// AssertJson(r#"[{"insert":"123\n"}]"#),
// ];
// EditorTest::new().await.run_scripts(scripts).await;
// }