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

chore: update collab libs rev (#3342)

Browse Source
This commit is contained in:
Nathan.fooo
2023-09-06 16:00:23 +08:00
committed by GitHub
parent 790580eea4
commit a0fc4b86b0
9 changed files with 99 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/rust-lib/flowy-user/src/migrations/migrate_to_new_user.rs
View File

@ -144,7 +144,7 @@ where
vec![],
);
database_with_views_collab.with_origin_transact_mut(|txn| {
old_collab_r_txn.load_doc(
old_collab_r_txn.load_doc_with_txn(
old_user.session.user_id,
&old_user.session.user_workspace.database_views_aggregate_id,
txn,
@ -186,14 +186,15 @@ where
}
}
fn migrate_workspace_folder<'a, W>(
fn migrate_workspace_folder<'a, 'b, W>(
old_to_new_id_map: &mut OldToNewIdMap,
old_user: &MigrationUser,
old_collab_r_txn: &'a W,
old_collab_r_txn: &'b W,
new_user: &MigrationUser,
new_collab_w_txn: &'a W,
) -> Result<(), PersistenceError>
where
'a: 'b,
W: YrsDocAction<'a>,
PersistenceError: From<W::Error>,
{
@ -203,8 +204,9 @@ where
let new_workspace_id = &new_user.session.user_workspace.id;
let old_folder_collab = Collab::new(old_uid, old_workspace_id, "phantom", vec![]);
old_folder_collab
.with_origin_transact_mut(|txn| old_collab_r_txn.load_doc(old_uid, old_workspace_id, txn))?;
old_folder_collab.with_origin_transact_mut(|txn| {
old_collab_r_txn.load_doc_with_txn(old_uid, old_workspace_id, txn)
})?;
let old_folder = Folder::open(Arc::new(MutexCollab::from_collab(old_folder_collab)), None);
let mut folder_data = old_folder
.get_folder_data()
@ -417,7 +419,7 @@ where
for object_id in object_ids {
let collab = Collab::new(old_user.session.user_id, object_id, "phantom", vec![]);
match collab.with_origin_transact_mut(|txn| {
old_collab_r_txn.load_doc(old_user.session.user_id, &object_id, txn)
old_collab_r_txn.load_doc_with_txn(old_user.session.user_id, &object_id, txn)
}) {
Ok(_) => {
collab_by_oid.insert(object_id.clone(), collab);

12
frontend/rust-lib/flowy-user/src/migrations/sync_new_user.rs
View File

@ -175,7 +175,7 @@ fn get_collab_init_update(
let _ = collab.with_origin_transact_mut(|txn| {
collab_db
.read_txn()
.load_doc(uid, &collab_object.object_id, txn)
.load_doc_with_txn(uid, &collab_object.object_id, txn)
})?;
let update = collab.encode_as_update_v1().0;
if update.is_empty() {
@ -194,7 +194,7 @@ fn get_database_init_update(
let _ = collab.with_origin_transact_mut(|txn| {
collab_db
.read_txn()
.load_doc(uid, &collab_object.object_id, txn)
.load_doc_with_txn(uid, &collab_object.object_id, txn)
})?;
let row_ids = get_database_row_ids(&collab).unwrap_or_default();
@ -215,7 +215,11 @@ async fn sync_folder(
let (folder, update) = {
let collab = Collab::new(uid, workspace_id, "phantom", vec![]);
// Use the temporary result to short the lifetime of the TransactionMut
collab.with_origin_transact_mut(|txn| collab_db.read_txn().load_doc(uid, workspace_id, txn))?;
collab.with_origin_transact_mut(|txn| {
collab_db
.read_txn()
.load_doc_with_txn(uid, workspace_id, txn)
})?;
let update = collab.encode_as_update_v1().0;
(
MutexFolder::new(Folder::open(
@ -264,7 +268,7 @@ async fn sync_database_views(
.with_origin_transact_mut(|txn| {
collab_db
.read_txn()
.load_doc(uid, database_views_aggregate_id, txn)
.load_doc_with_txn(uid, database_views_aggregate_id, txn)
})
.map(|_| {
(