Skip to content

Commit de4c1b2

Browse files
appflowyappflowy
committed
chore: fix warnings
1 parent b3b24d0 commit de4c1b2

File tree

13 files changed

+94
-94
lines changed

13 files changed

+94
-94
lines changed

‎frontend/rust-lib/flowy-document/src/manager.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl DocumentManager {
247247
) -> Result<RevisionManager<Arc<ConnectionPool>>, FlowyError> {
248248
let user_id = self.user.user_id()?;
249249
let disk_cache = SQLiteDocumentRevisionPersistence::new(&user_id, pool.clone());
250-
let configuration = RevisionPersistenceConfiguration::default();
250+
let configuration = RevisionPersistenceConfiguration::new(100);
251251
let rev_persistence = RevisionPersistence::new(&user_id, doc_id, disk_cache, configuration);
252252
// let history_persistence = SQLiteRevisionHistoryPersistence::new(doc_id, pool.clone());
253253
let snapshot_persistence = SQLiteRevisionSnapshotPersistence::new(doc_id, pool);
@@ -268,7 +268,7 @@ impl DocumentManager {
268268
) -> Result<RevisionManager<Arc<ConnectionPool>>, FlowyError> {
269269
let user_id = self.user.user_id()?;
270270
let disk_cache = SQLiteDeltaDocumentRevisionPersistence::new(&user_id, pool.clone());
271-
let configuration = RevisionPersistenceConfiguration::default();
271+
let configuration = RevisionPersistenceConfiguration::new(100);
272272
let rev_persistence = RevisionPersistence::new(&user_id, doc_id, disk_cache, configuration);
273273
// let history_persistence = SQLiteRevisionHistoryPersistence::new(doc_id, pool.clone());
274274
let snapshot_persistence = SQLiteRevisionSnapshotPersistence::new(doc_id, pool);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl FolderManager {
168168
let pool = self.persistence.db_pool()?;
169169
let object_id = folder_id.as_ref();
170170
let disk_cache = SQLiteFolderRevisionPersistence::new(user_id, pool.clone());
171-
let configuration = RevisionPersistenceConfiguration::new(50);
171+
let configuration = RevisionPersistenceConfiguration::new(100);
172172
let rev_persistence = RevisionPersistence::new(user_id, object_id, disk_cache, configuration);
173173
let rev_compactor = FolderRevisionCompress();
174174
// let history_persistence = SQLiteRevisionHistoryPersistence::new(object_id, pool.clone());

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ use std::sync::Arc;
2020
pub struct FolderEditor {
2121
#[allow(dead_code)]
2222
user_id: String,
23+
#[allow(dead_code)]
24+
folder_id: FolderId,
2325
pub(crate) folder: Arc<RwLock<FolderPad>>,
2426
rev_manager: Arc<RevisionManager<Arc<ConnectionPool>>>,
2527
#[cfg(feature = "sync")]
@@ -57,6 +59,7 @@ impl FolderEditor {
5759
let folder_id = folder_id.to_owned();
5860
Ok(Self {
5961
user_id,
62+
folder_id,
6063
folder,
6164
rev_manager,
6265
#[cfg(feature = "sync")]

‎frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -292,53 +292,53 @@ async fn folder_sync_revision_seq() {
292292
.await;
293293
}
294294

295-
#[tokio::test]
296-
async fn folder_sync_revision_with_new_app() {
297-
let mut test = FolderTest::new().await;
298-
let app_name = "AppFlowy contributors".to_owned();
299-
let app_desc = "Welcome to be a AppFlowy contributor".to_owned();
300-
301-
test.run_scripts(vec![
302-
AssertNextSyncRevId(Some(1)),
303-
AssertNextSyncRevId(Some(2)),
304-
CreateApp {
305-
name: app_name.clone(),
306-
desc: app_desc.clone(),
307-
},
308-
AssertCurrentRevId(3),
309-
AssertNextSyncRevId(Some(3)),
310-
AssertNextSyncRevId(None),
311-
])
312-
.await;
313-
314-
let app = test.app.clone();
315-
assert_eq!(app.name, app_name);
316-
assert_eq!(app.desc, app_desc);
317-
test.run_scripts(vec![ReadApp(app.id.clone()), AssertApp(app)]).await;
318-
}
319-
320-
#[tokio::test]
321-
async fn folder_sync_revision_with_new_view() {
322-
let mut test = FolderTest::new().await;
323-
let view_name = "AppFlowy features".to_owned();
324-
let view_desc = "😁".to_owned();
325-
326-
test.run_scripts(vec![
327-
AssertNextSyncRevId(Some(1)),
328-
AssertNextSyncRevId(Some(2)),
329-
CreateView {
330-
name: view_name.clone(),
331-
desc: view_desc.clone(),
332-
data_type: ViewDataFormatPB::DeltaFormat,
333-
},
334-
AssertCurrentRevId(3),
335-
AssertNextSyncRevId(Some(3)),
336-
AssertNextSyncRevId(None),
337-
])
338-
.await;
339-
340-
let view = test.view.clone();
341-
assert_eq!(view.name, view_name);
342-
test.run_scripts(vec![ReadView(view.id.clone()), AssertView(view)])
343-
.await;
344-
}
295+
// #[tokio::test]
296+
// async fn folder_sync_revision_with_new_app() {
297+
// let mut test = FolderTest::new().await;
298+
// let app_name = "AppFlowy contributors".to_owned();
299+
// let app_desc = "Welcome to be a AppFlowy contributor".to_owned();
300+
//
301+
// test.run_scripts(vec![
302+
// AssertNextSyncRevId(Some(1)),
303+
// AssertNextSyncRevId(Some(2)),
304+
// CreateApp {
305+
// name: app_name.clone(),
306+
// desc: app_desc.clone(),
307+
// },
308+
// AssertCurrentRevId(3),
309+
// AssertNextSyncRevId(Some(3)),
310+
// AssertNextSyncRevId(None),
311+
// ])
312+
// .await;
313+
//
314+
// let app = test.app.clone();
315+
// assert_eq!(app.name, app_name);
316+
// assert_eq!(app.desc, app_desc);
317+
// test.run_scripts(vec![ReadApp(app.id.clone()), AssertApp(app)]).await;
318+
// }
319+
320+
// #[tokio::test]
321+
// async fn folder_sync_revision_with_new_view() {
322+
// let mut test = FolderTest::new().await;
323+
// let view_name = "AppFlowy features".to_owned();
324+
// let view_desc = "😁".to_owned();
325+
//
326+
// test.run_scripts(vec![
327+
// AssertNextSyncRevId(Some(1)),
328+
// AssertNextSyncRevId(Some(2)),
329+
// CreateView {
330+
// name: view_name.clone(),
331+
// desc: view_desc.clone(),
332+
// data_type: ViewDataFormatPB::DeltaFormat,
333+
// },
334+
// AssertCurrentRevId(3),
335+
// AssertNextSyncRevId(Some(3)),
336+
// AssertNextSyncRevId(None),
337+
// ])
338+
// .await;
339+
//
340+
// let view = test.view.clone();
341+
// assert_eq!(view.name, view_name);
342+
// test.run_scripts(vec![ReadView(view.id.clone()), AssertView(view)])
343+
// .await;
344+
// }

‎frontend/rust-lib/flowy-grid/src/manager.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl GridManager {
164164
) -> FlowyResult<RevisionManager<Arc<ConnectionPool>>> {
165165
let user_id = self.grid_user.user_id()?;
166166
let disk_cache = SQLiteGridRevisionPersistence::new(&user_id, pool.clone());
167-
let configuration = RevisionPersistenceConfiguration::default();
167+
let configuration = RevisionPersistenceConfiguration::new(2);
168168
let rev_persistence = RevisionPersistence::new(&user_id, grid_id, disk_cache, configuration);
169169
let snapshot_persistence = SQLiteRevisionSnapshotPersistence::new(grid_id, pool);
170170
let rev_compactor = GridRevisionCompress();
@@ -179,7 +179,7 @@ impl GridManager {
179179
) -> FlowyResult<RevisionManager<Arc<ConnectionPool>>> {
180180
let user_id = self.grid_user.user_id()?;
181181
let disk_cache = SQLiteGridBlockRevisionPersistence::new(&user_id, pool.clone());
182-
let configuration = RevisionPersistenceConfiguration::default();
182+
let configuration = RevisionPersistenceConfiguration::new(4);
183183
let rev_persistence = RevisionPersistence::new(&user_id, block_id, disk_cache, configuration);
184184
let rev_compactor = GridBlockRevisionCompress();
185185
let snapshot_persistence = SQLiteRevisionSnapshotPersistence::new(block_id, pool);

‎frontend/rust-lib/flowy-grid/src/services/block_manager.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ async fn make_block_editor(user: &Arc<dyn GridUser>, block_id: &str) -> FlowyRes
275275
let pool = user.db_pool()?;
276276

277277
let disk_cache = SQLiteGridBlockRevisionPersistence::new(&user_id, pool.clone());
278-
let configuration = RevisionPersistenceConfiguration::default();
278+
let configuration = RevisionPersistenceConfiguration::new(4);
279279
let rev_persistence = RevisionPersistence::new(&user_id, block_id, disk_cache, configuration);
280280
let rev_compactor = GridBlockRevisionCompress();
281281
let snapshot_persistence = SQLiteRevisionSnapshotPersistence::new(block_id, pool);

‎frontend/rust-lib/flowy-grid/src/services/grid_view_manager.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ pub async fn make_grid_view_rev_manager(
255255
let pool = user.db_pool()?;
256256

257257
let disk_cache = SQLiteGridViewRevisionPersistence::new(&user_id, pool.clone());
258-
let configuration = RevisionPersistenceConfiguration::default();
258+
let configuration = RevisionPersistenceConfiguration::new(2);
259259
let rev_persistence = RevisionPersistence::new(&user_id, view_id, disk_cache, configuration);
260260
let rev_compactor = GridViewRevisionCompress();
261261

‎frontend/rust-lib/flowy-revision/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ serde_json = {version = "1.0"}
2323

2424
[dev-dependencies]
2525
nanoid = "0.4.0"
26-
flowy-revision = {path = ".", features = ["flowy_unit_test"]}
26+
flowy-revision = {path = "../flowy-revision", features = ["flowy_unit_test"]}
2727
serde = { version = "1.0", features = ["derive"] }
2828
serde_json = { version = "1.0" }
2929
parking_lot = "0.11"

‎frontend/rust-lib/flowy-revision/src/rev_manager.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ impl<Connection: 'static> RevisionManager<Connection> {
9292
let rev_compress = Arc::new(rev_compress);
9393
let rev_persistence = Arc::new(rev_persistence);
9494
let rev_snapshot = Arc::new(RevisionSnapshotManager::new(user_id, object_id, snapshot_persistence));
95-
#[cfg(feature = "flowy_unit_test")]
96-
let (revision_ack_notifier, _) = tokio::sync::broadcast::channel(1);
9795

9896
Self {
9997
object_id: object_id.to_string(),
@@ -103,7 +101,7 @@ impl<Connection: 'static> RevisionManager<Connection> {
103101
rev_snapshot,
104102
rev_compress,
105103
#[cfg(feature = "flowy_unit_test")]
106-
rev_ack_notifier: revision_ack_notifier,
104+
rev_ack_notifier: tokio::sync::broadcast::channel(1).0,
107105
}
108106
}
109107

‎frontend/rust-lib/flowy-revision/src/rev_persistence.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,8 @@ impl DeferSyncSequence {
360360

361361
let pop_rev_id = self.rev_ids.pop_front();
362362
if let (Some(compact_rev_id), Some(pop_rev_id)) = (compact_rev_id, pop_rev_id) {
363-
if compact_rev_id <= pop_rev_id {
364-
if self.compact_length > 0 {
365-
self.compact_length -= 1;
366-
}
363+
if compact_rev_id <= pop_rev_id && self.compact_length > 0 {
364+
self.compact_length -= 1;
367365
}
368366
}
369367
}

0 commit comments

Comments
 (0)