From 5d0d8cf4d164461ff6d85a5dba863e13ef983871 Mon Sep 17 00:00:00 2001
From: Bartosz Sypytkowski <b.sypytkowski@gmail.com>
Date: Wed, 23 Oct 2024 10:52:37 +0200
Subject: [PATCH] chore: fixed collab ack

---
 services/appflowy-collaborate/src/group/group_init.rs | 8 ++++----
 tests/collab/util.rs                                  | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/services/appflowy-collaborate/src/group/group_init.rs b/services/appflowy-collaborate/src/group/group_init.rs
index 8782e335..d523a829 100644
--- a/services/appflowy-collaborate/src/group/group_init.rs
+++ b/services/appflowy-collaborate/src/group/group_init.rs
@@ -200,7 +200,7 @@ impl CollabGroup {
     sv.merge(update.state_vector);
     drop(sv);
 
-    let seq_num = state.seq_no.fetch_add(1, Ordering::SeqCst);
+    let seq_num = state.seq_no.fetch_add(1, Ordering::SeqCst) + 1;
     tracing::trace!(
       "broadcasting collab update from {} ({} bytes) - seq_num: {}",
       update.sender,
@@ -493,7 +493,7 @@ impl CollabGroup {
         message_origin,
         state.object_id.to_string(),
         msg_id,
-        state.seq_no.fetch_add(1, Ordering::SeqCst),
+        state.seq_no.load(Ordering::SeqCst),
       ));
     }
 
@@ -547,7 +547,7 @@ impl CollabGroup {
                     message_origin.clone(),
                     state.object_id.to_string(),
                     msg_id,
-                    state.seq_no.fetch_add(1, Ordering::SeqCst),
+                    state.seq_no.load(Ordering::SeqCst),
                   )
                   .with_payload(payload.unwrap_or_default()),
                 );
@@ -571,7 +571,7 @@ impl CollabGroup {
                   message_origin.clone(),
                   state.object_id.to_string(),
                   msg_id,
-                  state.seq_no.fetch_add(1, Ordering::SeqCst),
+                  state.seq_no.load(Ordering::SeqCst),
                 )
                 .with_code(code)
                 .with_payload(payload),
diff --git a/tests/collab/util.rs b/tests/collab/util.rs
index 7994ceb6..34527a38 100644
--- a/tests/collab/util.rs
+++ b/tests/collab/util.rs
@@ -1,4 +1,4 @@
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 use anyhow::Context;
 use collab::core::origin::CollabOrigin;
@@ -134,7 +134,12 @@ impl TestScenario {
   }
 
   pub async fn execute(&self, collab: CollabRef) -> String {
-    for t in self.txns.iter() {
+    let len = self.txns.len();
+    let start = Instant::now();
+    for (i, t) in self.txns.iter().take(50_000).enumerate() {
+      if i % 10_000 == 0 {
+        tracing::trace!("step #{}/{} - {:?}", i + 1, len, start.elapsed());
+      }
       let mut lock = collab.write().await;
       let collab = lock.borrow_mut();
       let mut txn = collab.context.transact_mut();