chore: remove invalid revisions (#1816)

Author: appflowy

.gitignore

@@ -21,7 +21,6 @@ node_modules
 
 **/resources/proto
 
-frontend/.vscode/*
 !frontend/.vscode/settings.json
 !frontend/.vscode/tasks.json
 !frontend/.vscode/launch.json

frontend/.vscode/launch.json

@@ -12,7 +12,7 @@
             "type": "dart",
             "preLaunchTask": "AF: Build Appflowy Core",
             "env": {
-                "RUST_LOG": "trace"
+                "RUST_LOG": "trace",
                 // "RUST_LOG": "debug"
             },
             "cwd": "${workspaceRoot}/app_flowy"

frontend/rust-lib/flowy-client-sync/src/util.rs

@@ -32,16 +32,18 @@ pub fn contain_newline(s: &str) -> bool {
 pub fn recover_operation_from_revisions<T>(
     revisions: Vec<Revision>,
     validator: impl Fn(&DeltaOperations<T>) -> bool,
-) -> Option<DeltaOperations<T>>
+) -> Option<(DeltaOperations<T>, i64)>
 where
     T: OperationAttributes + DeserializeOwned + OperationAttributes,
 {
     let mut new_operations = DeltaOperations::<T>::new();
+    let mut rev_id = 0;
     for revision in revisions {
         if let Ok(operations) = DeltaOperations::<T>::from_bytes(revision.bytes) {
             match new_operations.compose(&operations) {
                 Ok(composed_operations) => {
                     if validator(&composed_operations) {
+                        rev_id = revision.rev_id;
                         new_operations = composed_operations;
                     } else {
                         break;
@@ -56,7 +58,7 @@ where
     if new_operations.is_empty() {
         None
     } else {
-        Some(new_operations)
+        Some((new_operations, rev_id))
     }
 }
 

frontend/rust-lib/flowy-database/src/manager.rs

@@ -1,5 +1,7 @@
 use crate::entities::DatabaseViewLayout;
-use crate::services::grid_editor::{DatabaseRevisionEditor, GridRevisionMergeable};
+use crate::services::grid_editor::{
+    DatabaseRevisionEditor, GridRevisionCloudService, GridRevisionMergeable, GridRevisionSerde,
+};
 use crate::services::persistence::block_index::BlockIndexCache;
 use crate::services::persistence::kv::DatabaseKVPersistence;
 use crate::services::persistence::migration::DatabaseMigration;
@@ -144,10 +146,16 @@ impl DatabaseManager {
         pool: Arc<ConnectionPool>,
     ) -> Result<Arc<DatabaseRevisionEditor>, FlowyError> {
         let user = self.database_user.clone();
-        let rev_manager = self.make_database_rev_manager(database_id, pool.clone())?;
+        let token = user.token()?;
+        let cloud = Arc::new(GridRevisionCloudService::new(token));
+        let mut rev_manager = self.make_database_rev_manager(database_id, pool.clone())?;
+        let database_pad = Arc::new(RwLock::new(
+            rev_manager.initialize::<GridRevisionSerde>(Some(cloud)).await?,
+        ));
         let database_editor = DatabaseRevisionEditor::new(
             database_id,
             user,
+            database_pad,
             rev_manager,
             self.block_index_cache.clone(),
             self.task_scheduler.clone(),

frontend/rust-lib/flowy-database/src/services/block_editor.rs

@@ -199,7 +199,7 @@ impl RevisionObjectDeserializer for DatabaseBlockRevisionSerde {
         Ok(pad)
     }
 
-    fn recover_operations_from_revisions(_revisions: Vec<Revision>) -> Option<Self::Output> {
+    fn recover_from_revisions(_revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
         None
     }
 }

frontend/rust-lib/flowy-database/src/services/grid_editor.rs

@@ -57,15 +57,12 @@ impl DatabaseRevisionEditor {
     pub async fn new(
         database_id: &str,
         user: Arc<dyn DatabaseUser>,
-        mut rev_manager: RevisionManager<Arc<ConnectionPool>>,
+        database_pad: Arc<RwLock<DatabaseRevisionPad>>,
+        rev_manager: RevisionManager<Arc<ConnectionPool>>,
         persistence: Arc<BlockIndexCache>,
         task_scheduler: Arc<RwLock<TaskDispatcher>>,
     ) -> FlowyResult<Arc<Self>> {
-        let token = user.token()?;
-        let cloud = Arc::new(GridRevisionCloudService { token });
-        let database_pad = rev_manager.initialize::<GridRevisionSerde>(Some(cloud)).await?;
         let rev_manager = Arc::new(rev_manager);
-        let database_pad = Arc::new(RwLock::new(database_pad));
         let cell_data_cache = AnyTypeCache::<u64>::new();
 
         // Block manager
@@ -891,7 +888,7 @@ impl RevisionObjectDeserializer for GridRevisionSerde {
         Ok(pad)
     }
 
-    fn recover_operations_from_revisions(_revisions: Vec<Revision>) -> Option<Self::Output> {
+    fn recover_from_revisions(_revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
         None
     }
 }
@@ -901,11 +898,18 @@ impl RevisionObjectSerializer for GridRevisionSerde {
         Ok(operations.json_bytes())
     }
 }
-struct GridRevisionCloudService {
+
+pub struct GridRevisionCloudService {
     #[allow(dead_code)]
     token: String,
 }
 
+impl GridRevisionCloudService {
+    pub fn new(token: String) -> Self {
+        Self { token }
+    }
+}
+
 impl RevisionCloudService for GridRevisionCloudService {
     #[tracing::instrument(level = "trace", skip(self))]
     fn fetch_object(&self, _user_id: &str, _object_id: &str) -> FutureResult<Vec<Revision>, FlowyError> {

frontend/rust-lib/flowy-database/src/services/view_editor/trait_impl.rs

@@ -42,7 +42,7 @@ impl RevisionObjectDeserializer for GridViewRevisionSerde {
         Ok(pad)
     }
 
-    fn recover_operations_from_revisions(_revisions: Vec<Revision>) -> Option<Self::Output> {
+    fn recover_from_revisions(_revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
         None
     }
 }

frontend/rust-lib/flowy-document/src/editor/document.rs

@@ -87,7 +87,7 @@ impl RevisionObjectDeserializer for DocumentRevisionSerde {
         Result::<Document, FlowyError>::Ok(document)
     }
 
-    fn recover_operations_from_revisions(_revisions: Vec<Revision>) -> Option<Self::Output> {
+    fn recover_from_revisions(_revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
         None
     }
 }

frontend/rust-lib/flowy-document/src/old_editor/editor.rs

@@ -263,7 +263,7 @@ impl RevisionObjectDeserializer for DeltaDocumentRevisionSerde {
         })
     }
 
-    fn recover_operations_from_revisions(_revisions: Vec<Revision>) -> Option<Self::Output> {
+    fn recover_from_revisions(_revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
         None
     }
 }

frontend/rust-lib/flowy-folder/src/services/folder_editor.rs

@@ -107,12 +107,12 @@ impl RevisionObjectDeserializer for FolderRevisionSerde {
         Ok(FolderPad::from_operations(operations)?)
     }
 
-    fn recover_operations_from_revisions(revisions: Vec<Revision>) -> Option<Self::Output> {
-        if let Some(operations) = recover_operation_from_revisions(revisions, |operations| {
+    fn recover_from_revisions(revisions: Vec<Revision>) -> Option<(Self::Output, i64)> {
+        if let Some((operations, rev_id)) = recover_operation_from_revisions(revisions, |operations| {
             FolderPad::from_operations(operations.clone()).is_ok()
         }) {
             if let Ok(pad) = FolderPad::from_operations(operations) {
-                return Some(pad);
+                return Some((pad, rev_id));
             }
         }
         None