Browse Source

comment out ack code for later use.

appflowy 3 years ago
parent
commit
22c8850cea

+ 1 - 1
frontend/Makefile.toml

@@ -15,7 +15,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 VERSION = "0.0.2"
-FEATURES = "flutter,http_server"
+FEATURES = "flutter"
 PRODUCT_NAME = "AppFlowy"
 #CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html
 CRATE_TYPE = "staticlib"

+ 7 - 6
frontend/rust-lib/flowy-sync/src/rev_manager.rs

@@ -105,12 +105,13 @@ impl RevisionManager {
 
     #[tracing::instrument(level = "debug", skip(self), err)]
     pub async fn ack_revision(&self, rev_id: i64) -> Result<(), FlowyError> {
-        if self.revision_sync_seq.ack(&rev_id).await.is_ok() {
-            self.revision_cache.ack(rev_id).await;
-
-            #[cfg(feature = "flowy_unit_test")]
-            let _ = self.revision_ack_notifier.send(rev_id);
-        }
+        // For the moment, we comment out the following code in order to cause sync bugs.
+        // if self.revision_sync_seq.ack(&rev_id).await.is_ok() {
+        //     self.revision_cache.ack(rev_id).await;
+        //
+        //     #[cfg(feature = "flowy_unit_test")]
+        //     let _ = self.revision_ack_notifier.send(rev_id);
+        // }
         Ok(())
     }
 

+ 1 - 1
shared-lib/flowy-collaboration/src/synchronizer.rs

@@ -128,7 +128,7 @@ where
             }
             Ordering::Equal => {
                 // Do nothing
-                tracing::warn!("Applied {} revision rev_id is the same as cur_rev_id", self.object_id);
+                tracing::trace!("Applied {} revision rev_id is the same as cur_rev_id", self.object_id);
             }
             Ordering::Greater => {
                 // The client delta is outdated. Transform the client revision delta and then