chore: grid block meta editor

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

@@ -17,7 +17,8 @@ use flowy_collaboration::{client_folder::FolderPad, entities::ws_data::ServerRev
 use flowy_error::FlowyError;
 use flowy_folder_data_model::entities::view::ViewDataType;
 use flowy_folder_data_model::user_default;
-use flowy_sync::RevisionWebSocket;
+use flowy_sync::disk::SQLiteTextBlockRevisionPersistence;
+use flowy_sync::{RevisionManager, RevisionPersistence, RevisionWebSocket};
 use lazy_static::lazy_static;
 use lib_infra::future::FutureResult;
 use std::{collections::HashMap, convert::TryInto, fmt::Formatter, sync::Arc};
@@ -163,7 +164,12 @@ impl FolderManager {
         let _ = self.persistence.initialize(user_id, &folder_id).await?;
 
         let pool = self.persistence.db_pool()?;
-        let folder_editor = ClientFolderEditor::new(user_id, &folder_id, token, pool, self.web_socket.clone()).await?;
+        let disk_cache = Arc::new(SQLiteTextBlockRevisionPersistence::new(&user_id, pool));
+        let rev_persistence = Arc::new(RevisionPersistence::new(user_id, folder_id.as_ref(), disk_cache));
+        let rev_manager = RevisionManager::new(user_id, folder_id.as_ref(), rev_persistence);
+
+        let folder_editor =
+            ClientFolderEditor::new(user_id, &folder_id, token, rev_manager, self.web_socket.clone()).await?;
         *self.folder_editor.write().await = Some(Arc::new(folder_editor));
 
         let _ = self.app_controller.initialize()?;

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

@@ -5,14 +5,16 @@ use flowy_collaboration::{
 };
 
 use crate::manager::FolderId;
+use bytes::Bytes;
 use flowy_collaboration::util::make_delta_from_revisions;
 use flowy_error::{FlowyError, FlowyResult};
+use flowy_sync::disk::RevisionDiskCache;
 use flowy_sync::{
-    RevisionCloudService, RevisionCompact, RevisionManager, RevisionObjectBuilder, RevisionPersistence,
+    RevisionCloudService, RevisionCompactor, RevisionManager, RevisionObjectBuilder, RevisionPersistence,
     RevisionWebSocket, RevisionWebSocketManager,
 };
 use lib_infra::future::FutureResult;
-use lib_ot::core::PlainTextAttributes;
+use lib_ot::core::{Delta, PlainTextAttributes};
 use lib_sqlite::ConnectionPool;
 use parking_lot::RwLock;
 use std::sync::Arc;
@@ -30,19 +32,13 @@ impl ClientFolderEditor {
         user_id: &str,
         folder_id: &FolderId,
         token: &str,
-        pool: Arc<ConnectionPool>,
+        mut rev_manager: RevisionManager,
         web_socket: Arc<dyn RevisionWebSocket>,
     ) -> FlowyResult<Self> {
-        let rev_persistence = Arc::new(RevisionPersistence::new(user_id, folder_id.as_ref(), pool));
-        let mut rev_manager = RevisionManager::new(user_id, folder_id.as_ref(), rev_persistence);
         let cloud = Arc::new(FolderRevisionCloudService {
             token: token.to_string(),
         });
-        let folder = Arc::new(RwLock::new(
-            rev_manager
-                .load::<FolderPadBuilder, FolderRevisionCompact>(cloud)
-                .await?,
-        ));
+        let folder = Arc::new(RwLock::new(rev_manager.load::<FolderPadBuilder>(cloud).await?));
         let rev_manager = Arc::new(rev_manager);
         let ws_manager = make_folder_ws_manager(
             user_id,
@@ -86,7 +82,7 @@ impl ClientFolderEditor {
         );
         let _ = futures::executor::block_on(async {
             self.rev_manager
-                .add_local_revision::<FolderRevisionCompact>(&revision)
+                .add_local_revision(&revision, Box::new(FolderRevisionCompactor()))
                 .await
         })?;
         Ok(())
@@ -128,24 +124,10 @@ impl ClientFolderEditor {
     }
 }
 
-struct FolderRevisionCompact();
-impl RevisionCompact for FolderRevisionCompact {
-    fn compact_revisions(user_id: &str, object_id: &str, mut revisions: Vec<Revision>) -> FlowyResult<Revision> {
-        if revisions.is_empty() {
-            return Err(FlowyError::internal().context("Can't compact the empty folder's revisions"));
-        }
-
-        if revisions.len() == 1 {
-            return Ok(revisions.pop().unwrap());
-        }
-
-        let first_revision = revisions.first().unwrap();
-        let last_revision = revisions.last().unwrap();
-
-        let (base_rev_id, rev_id) = first_revision.pair_rev_id();
-        let md5 = last_revision.md5.clone();
+struct FolderRevisionCompactor();
+impl RevisionCompactor for FolderRevisionCompactor {
+    fn bytes_from_revisions(&self, revisions: Vec<Revision>) -> FlowyResult<Bytes> {
         let delta = make_delta_from_revisions::<PlainTextAttributes>(revisions)?;
-        let delta_data = delta.to_bytes();
-        Ok(Revision::new(object_id, base_rev_id, rev_id, delta_data, user_id, md5))
+        Ok(delta.to_bytes())
     }
 }

frontend/rust-lib/flowy-folder/src/services/persistence/migration.rs

@@ -11,6 +11,7 @@ use flowy_folder_data_model::entities::{
     view::{RepeatedView, View},
     workspace::Workspace,
 };
+use flowy_sync::disk::SQLiteTextBlockRevisionPersistence;
 use flowy_sync::{RevisionLoader, RevisionPersistence};
 use std::sync::Arc;
 
@@ -87,7 +88,8 @@ impl FolderMigration {
             return Ok(None);
         }
         let pool = self.database.db_pool()?;
-        let rev_persistence = Arc::new(RevisionPersistence::new(user_id, folder_id.as_ref(), pool.clone()));
+        let disk_cache = Arc::new(SQLiteTextBlockRevisionPersistence::new(&user_id, pool));
+        let rev_persistence = Arc::new(RevisionPersistence::new(user_id, folder_id.as_ref(), disk_cache));
         let (revisions, _) = RevisionLoader {
             object_id: folder_id.as_ref().to_owned(),
             user_id: self.user_id.clone(),