Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

chore: add sqlite feature flag (#1683)

Nathan.fooo6a36bcd31d99
diff --git a/.github/workflows/rust_ci.yaml b/.github/workflows/rust_ci.yaml
index 998aae024a..dc230301a4 100644
--- a/.github/workflows/rust_ci.yaml
+++ b/.github/workflows/rust_ci.yaml
@@ -66,19 +66,19 @@ jobs:
working-directory: frontend/rust-lib/
- name: clippy rust-lib
- run: cargo clippy --no-default-features
+ run: cargo clippy --features="rev-sqlite"
working-directory: frontend/rust-lib
- name: Run rust-lib tests
working-directory: frontend/rust-lib
- run: RUST_LOG=info cargo test --no-default-features --features="sync"
+ run: RUST_LOG=info cargo test --no-default-features --features="sync,rev-sqlite"
- name: rustfmt shared-lib
run: cargo fmt --all -- --check
working-directory: shared-lib
- name: clippy shared-lib
- run: cargo clippy --no-default-features
+ run: cargo clippy -- -D warnings
working-directory: shared-lib
- name: Run shared-lib tests
diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml
index 5c6df7fbf2..35f1d9389f 100644
--- a/frontend/Makefile.toml
+++ b/frontend/Makefile.toml
@@ -23,7 +23,7 @@ CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
CARGO_MAKE_CRATE_NAME = "dart-ffi"
LIB_NAME = "dart_ffi"
CURRENT_APP_VERSION = "0.0.9.1"
-FEATURES = "flutter"
+FLUTTER_DESKTOP_FEATURES = "flutter,rev-sqlite"
PRODUCT_NAME = "AppFlowy"
# CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html
# If you update the macOS's CRATE_TYPE, don't forget to update the
@@ -150,7 +150,7 @@ script = ['''
echo BUILD_FLAG: ${BUILD_FLAG}
echo TARGET_OS: ${TARGET_OS}
echo RUST_COMPILE_TARGET: ${RUST_COMPILE_TARGET}
- echo FEATURES: ${FEATURES}
+ echo FEATURES: ${FLUTTER_DESKTOP_FEATURES}
echo PRODUCT_EXT: ${PRODUCT_EXT}
echo APP_ENVIRONMENT: ${APP_ENVIRONMENT}
echo ${platforms}
diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock
index a008802542..f191fb5b2b 100644
--- a/frontend/rust-lib/Cargo.lock
+++ b/frontend/rust-lib/Cargo.lock
@@ -884,8 +884,12 @@ dependencies = [
"diesel",
"diesel_derives",
"diesel_migrations",
+ "error-chain",
"lazy_static",
- "lib-sqlite",
+ "libsqlite3-sys",
+ "openssl",
+ "r2d2",
+ "scheduled-thread-pool",
"tracing",
]
@@ -928,6 +932,7 @@ dependencies = [
"flowy-error",
"flowy-http-model",
"flowy-revision",
+ "flowy-revision-persistence",
"flowy-sync",
"flowy-test",
"futures",
@@ -964,7 +969,6 @@ dependencies = [
"http-flowy",
"lib-dispatch",
"lib-ot",
- "lib-sqlite",
"protobuf",
"r2d2",
"serde_json",
@@ -987,6 +991,7 @@ dependencies = [
"flowy-folder",
"flowy-http-model",
"flowy-revision",
+ "flowy-revision-persistence",
"flowy-sync",
"flowy-test",
"folder-rev-model",
@@ -1029,6 +1034,7 @@ dependencies = [
"flowy-grid",
"flowy-http-model",
"flowy-revision",
+ "flowy-revision-persistence",
"flowy-sync",
"flowy-task",
"flowy-test",
@@ -1116,6 +1122,7 @@ dependencies = [
"flowy-error",
"flowy-http-model",
"flowy-revision",
+ "flowy-revision-persistence",
"futures",
"futures-util",
"lib-infra",
@@ -1130,6 +1137,14 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "flowy-revision-persistence"
+version = "0.1.0"
+dependencies = [
+ "flowy-error",
+ "flowy-http-model",
+]
+
[[package]]
name = "flowy-sync"
version = "0.1.0"
@@ -1831,22 +1846,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "lib-sqlite"
-version = "0.1.0"
-dependencies = [
- "diesel",
- "diesel_derives",
- "diesel_migrations",
- "error-chain",
- "lazy_static",
- "libsqlite3-sys",
- "log",
- "openssl",
- "r2d2",
- "scheduled-thread-pool",
-]
-
[[package]]
name = "lib-ws"
version = "0.1.0"
diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml
index 4bf7012153..4283e2c9f5 100644
--- a/frontend/rust-lib/Cargo.toml
+++ b/frontend/rust-lib/Cargo.toml
@@ -2,7 +2,6 @@
members = [
"lib-dispatch",
"lib-log",
- "lib-sqlite",
"flowy-net",
"flowy-core",
"dart-ffi",
@@ -14,6 +13,7 @@ members = [
"flowy-document",
"flowy-error",
"flowy-revision",
+ "flowy-revision-persistence",
"flowy-grid",
"flowy-task",
"flowy-sync",
diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml
index 7acea53d1e..a43c7ea5a8 100644
--- a/frontend/rust-lib/dart-ffi/Cargo.toml
+++ b/frontend/rust-lib/dart-ffi/Cargo.toml
@@ -31,8 +31,9 @@ dart-notify = { path = "../dart-notify" }
flowy-derive = { path = "../flowy-derive" }
[features]
-default = ["flowy-core/dart", "flutter"]
+default = ["flowy-core/dart", "flutter", "rev-sqlite"]
flutter = []
+rev-sqlite = ["flowy-core/rev-sqlite"]
http_sync = ["flowy-core/http_sync", "flowy-core/use_bunyan"]
openssl_vendored = ["flowy-core/openssl_vendored"]
diff --git a/frontend/rust-lib/flowy-core/Cargo.toml b/frontend/rust-lib/flowy-core/Cargo.toml
index 47ba9b5d20..1556931c48 100644
--- a/frontend/rust-lib/flowy-core/Cargo.toml
+++ b/frontend/rust-lib/flowy-core/Cargo.toml
@@ -13,7 +13,7 @@ flowy-net = { path = "../flowy-net" }
flowy-folder = { path = "../flowy-folder", default-features = false }
flowy-grid = { path = "../flowy-grid", default-features = false }
grid-rev-model = { path = "../../../shared-lib/grid-rev-model" }
-flowy-database = { path = "../flowy-database" }
+flowy-database = { path = "../flowy-database", optional = true }
flowy-document = { path = "../flowy-document", default-features = false }
flowy-revision = { path = "../flowy-revision" }
flowy-task = { path = "../flowy-task" }
@@ -39,4 +39,11 @@ dart = [
"flowy-grid/dart",
"flowy-document/dart",
]
+rev-sqlite = [
+ "flowy-database",
+ "flowy-user/rev-sqlite",
+ "flowy-folder/rev-sqlite",
+ "flowy-grid/rev-sqlite",
+ "flowy-document/rev-sqlite",
+]
openssl_vendored = ["flowy-database/openssl_vendored"]
diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rs
index aa259bb3f1..dbe0c09601 100644
--- a/frontend/rust-lib/flowy-core/src/lib.rs
+++ b/frontend/rust-lib/flowy-core/src/lib.rs
@@ -79,7 +79,7 @@ impl FlowySDKConfig {
fn crate_log_filter(level: String) -> String {
let level = std::env::var("RUST_LOG").unwrap_or(level);
let mut filters = vec![];
- filters.push(format!("flowy_sdk={}", level));
+ filters.push(format!("flowy_core={}", level));
filters.push(format!("flowy_folder={}", level));
filters.push(format!("flowy_user={}", level));
filters.push(format!("flowy_document={}", level));
@@ -95,7 +95,7 @@ fn crate_log_filter(level: String) -> String {
// filters.push(format!("lib_dispatch={}", level));
filters.push(format!("dart_ffi={}", "info"));
- filters.push(format!("flowy_database={}", level));
+ filters.push(format!("flowy_database={}", "info"));
filters.push(format!("flowy_net={}", "info"));
filters.join(",")
}
diff --git a/frontend/rust-lib/flowy-database/Cargo.toml b/frontend/rust-lib/flowy-database/Cargo.toml
index 5eae411e2b..a924096e9f 100644
--- a/frontend/rust-lib/flowy-database/Cargo.toml
+++ b/frontend/rust-lib/flowy-database/Cargo.toml
@@ -9,9 +9,14 @@ edition = "2018"
diesel = { version = "1.4.8", features = ["sqlite"] }
diesel_derives = { version = "1.4.1", features = ["sqlite"] }
diesel_migrations = { version = "1.4.0", features = ["sqlite"] }
-lib-sqlite = { path = "../lib-sqlite" }
tracing = { version = "0.1", features = ["log"] }
lazy_static = "1.4.0"
+r2d2 = "0.8.9"
+libsqlite3-sys = { version = ">=0.8.0, <0.24.0", features = ["bundled"] }
+scheduled-thread-pool = "0.2.5"
+error-chain = "=0.12.0"
+openssl = { version = "0.10.38", optional = true }
+
[features]
-openssl_vendored = ["lib-sqlite/openssl_vendored"]
+openssl_vendored = ["openssl/vendored"]
diff --git a/frontend/rust-lib/flowy-database/src/kv/kv.rs b/frontend/rust-lib/flowy-database/src/kv/kv.rs
index d13c353d2c..7c48f51d01 100644
--- a/frontend/rust-lib/flowy-database/src/kv/kv.rs
+++ b/frontend/rust-lib/flowy-database/src/kv/kv.rs
@@ -1,8 +1,8 @@
use crate::kv::schema::{kv_table, kv_table::dsl, KV_SQL};
+use crate::sqlite::{DBConnection, Database, PoolConfig};
use ::diesel::{query_dsl::*, ExpressionMethods};
use diesel::{Connection, SqliteConnection};
use lazy_static::lazy_static;
-use lib_sqlite::{DBConnection, Database, PoolConfig};
use std::{path::Path, sync::RwLock};
macro_rules! impl_get_func {
diff --git a/frontend/rust-lib/flowy-database/src/lib.rs b/frontend/rust-lib/flowy-database/src/lib.rs
index ea606bd520..6a7f94fbae 100644
--- a/frontend/rust-lib/flowy-database/src/lib.rs
+++ b/frontend/rust-lib/flowy-database/src/lib.rs
@@ -3,13 +3,16 @@ pub use diesel_derives::*;
use diesel_migrations::*;
use std::{fmt::Debug, io, path::Path};
pub mod kv;
+mod sqlite;
+
+use crate::sqlite::PoolConfig;
+pub use crate::sqlite::{ConnectionPool, DBConnection, Database};
-use lib_sqlite::PoolConfig;
-pub use lib_sqlite::{ConnectionPool, DBConnection, Database};
pub mod schema;
#[macro_use]
pub mod macros;
+
#[macro_use]
extern crate diesel;
#[macro_use]
@@ -41,7 +44,7 @@ pub fn init(storage_path: &str) -> Result<Database, io::Error> {
fn as_io_error<E>(e: E) -> io::Error
where
- E: Into<lib_sqlite::Error> + Debug,
+ E: Into<crate::sqlite::Error> + Debug,
{
let msg = format!("{:?}", e);
io::Error::new(io::ErrorKind::NotConnected, msg)
diff --git a/frontend/rust-lib/lib-sqlite/src/conn_ext.rs b/frontend/rust-lib/flowy-database/src/sqlite/conn_ext.rs
similarity index 95%
rename from frontend/rust-lib/lib-sqlite/src/conn_ext.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/conn_ext.rs
index 73c04ce091..e784c4dcbe 100644
--- a/frontend/rust-lib/lib-sqlite/src/conn_ext.rs
+++ b/frontend/rust-lib/flowy-database/src/sqlite/conn_ext.rs
@@ -1,4 +1,4 @@
-use crate::errors::*;
+use crate::sqlite::errors::*;
use diesel::{dsl::sql, expression::SqlLiteral, query_dsl::LoadQuery, Connection, RunQueryDsl, SqliteConnection};
pub trait ConnectionExtension: Connection {
diff --git a/frontend/rust-lib/lib-sqlite/src/database.rs b/frontend/rust-lib/flowy-database/src/sqlite/database.rs
similarity index 92%
rename from frontend/rust-lib/lib-sqlite/src/database.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/database.rs
index 49af0a9e0f..160bc887cc 100644
--- a/frontend/rust-lib/lib-sqlite/src/database.rs
+++ b/frontend/rust-lib/flowy-database/src/sqlite/database.rs
@@ -1,4 +1,4 @@
-use crate::{
+use crate::sqlite::{
errors::*,
pool::{ConnectionManager, ConnectionPool, PoolConfig},
};
@@ -17,7 +17,7 @@ impl Database {
let uri = db_file_uri(dir, name);
if !std::path::PathBuf::from(dir).exists() {
- log::error!("Create database failed. {} not exists", &dir);
+ tracing::error!("Create database failed. {} not exists", &dir);
}
let pool = ConnectionPool::new(pool_config, &uri)?;
diff --git a/frontend/rust-lib/lib-sqlite/src/errors.rs b/frontend/rust-lib/flowy-database/src/sqlite/errors.rs
similarity index 100%
rename from frontend/rust-lib/lib-sqlite/src/errors.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/errors.rs
diff --git a/frontend/rust-lib/lib-sqlite/src/lib.rs b/frontend/rust-lib/flowy-database/src/sqlite/mod.rs
similarity index 100%
rename from frontend/rust-lib/lib-sqlite/src/lib.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/mod.rs
diff --git a/frontend/rust-lib/lib-sqlite/src/pool.rs b/frontend/rust-lib/flowy-database/src/sqlite/pool.rs
similarity index 95%
rename from frontend/rust-lib/lib-sqlite/src/pool.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/pool.rs
index b5a3074b66..50dbcc4bc9 100644
--- a/frontend/rust-lib/lib-sqlite/src/pool.rs
+++ b/frontend/rust-lib/flowy-database/src/sqlite/pool.rs
@@ -1,4 +1,4 @@
-use crate::{errors::*, pragma::*};
+use crate::sqlite::{errors::*, pragma::*};
use diesel::{connection::Connection, SqliteConnection};
use r2d2::{CustomizeConnection, ManageConnection, Pool};
use scheduled_thread_pool::ScheduledThreadPool;
@@ -45,6 +45,7 @@ impl ConnectionPool {
}
}
+#[allow(dead_code)]
pub type OnExecFunc = Box<dyn Fn() -> Box<dyn Fn(&SqliteConnection, &str)> + Send + Sync>;
pub struct PoolConfig {
@@ -85,7 +86,7 @@ pub struct ConnectionManager {
impl ManageConnection for ConnectionManager {
type Connection = SqliteConnection;
- type Error = crate::Error;
+ type Error = crate::sqlite::Error;
fn connect(&self) -> Result<Self::Connection> {
Ok(SqliteConnection::establish(&self.db_uri)?)
@@ -140,7 +141,7 @@ impl DatabaseCustomizer {
}
}
-impl CustomizeConnection<SqliteConnection, crate::Error> for DatabaseCustomizer {
+impl CustomizeConnection<SqliteConnection, crate::sqlite::Error> for DatabaseCustomizer {
fn on_acquire(&self, conn: &mut SqliteConnection) -> Result<()> {
conn.pragma_set_busy_timeout(self.config.busy_timeout)?;
if self.config.journal_mode != SQLiteJournalMode::WAL {
diff --git a/frontend/rust-lib/lib-sqlite/src/pragma.rs b/frontend/rust-lib/flowy-database/src/sqlite/pragma.rs
similarity index 95%
rename from frontend/rust-lib/lib-sqlite/src/pragma.rs
rename to frontend/rust-lib/flowy-database/src/sqlite/pragma.rs
index 448203afd8..566c0c540d 100644
--- a/frontend/rust-lib/lib-sqlite/src/pragma.rs
+++ b/frontend/rust-lib/flowy-database/src/sqlite/pragma.rs
@@ -1,5 +1,5 @@
#![allow(clippy::upper_case_acronyms)]
-use crate::errors::{Error, Result};
+use crate::sqlite::errors::{Error, Result};
use diesel::{
expression::SqlLiteral,
query_dsl::load_dsl::LoadQuery,
@@ -7,7 +7,7 @@ use diesel::{
SqliteConnection,
};
-use crate::conn_ext::ConnectionExtension;
+use crate::sqlite::conn_ext::ConnectionExtension;
use std::{
convert::{TryFrom, TryInto},
fmt,
@@ -20,7 +20,7 @@ pub trait PragmaExtension: ConnectionExtension {
Some(schema) => format!("PRAGMA {}.{} = '{}'", schema, key, val),
None => format!("PRAGMA {} = '{}'", key, val),
};
- log::trace!("SQLITE {}", query);
+ tracing::trace!("SQLITE {}", query);
self.exec(&query)?;
Ok(())
}
@@ -33,7 +33,7 @@ pub trait PragmaExtension: ConnectionExtension {
Some(schema) => format!("PRAGMA {}.{} = '{}'", schema, key, val),
None => format!("PRAGMA {} = '{}'", key, val),
};
- log::trace!("SQLITE {}", query);
+ tracing::trace!("SQLITE {}", query);
self.query::<ST, T>(&query)
}
@@ -45,7 +45,7 @@ pub trait PragmaExtension: ConnectionExtension {
Some(schema) => format!("PRAGMA {}.{}", schema, key),
None => format!("PRAGMA {}", key),
};
- log::trace!("SQLITE {}", query);
+ tracing::trace!("SQLITE {}", query);
self.query::<ST, T>(&query)
}
diff --git a/frontend/rust-lib/flowy-document/Cargo.toml b/frontend/rust-lib/flowy-document/Cargo.toml
index 6c6162dc37..3c3cf532a5 100644
--- a/frontend/rust-lib/flowy-document/Cargo.toml
+++ b/frontend/rust-lib/flowy-document/Cargo.toml
@@ -15,8 +15,9 @@ lib-ws = { path = "../../../shared-lib/lib-ws" }
lib-infra = { path = "../../../shared-lib/lib-infra" }
lib-dispatch = { path = "../lib-dispatch" }
-flowy-database = { path = "../flowy-database" }
+flowy-database = { path = "../flowy-database", optional = true }
flowy-revision = { path = "../flowy-revision" }
+flowy-revision-persistence = { path = "../flowy-revision-persistence" }
flowy-error = { path = "../flowy-error", features = ["collaboration", "ot", "http_server", "serde", "db"] }
dart-notify = { path = "../dart-notify" }
@@ -58,5 +59,6 @@ flowy-codegen = { path = "../flowy-codegen"}
[features]
sync = []
cloud_sync = ["sync"]
+rev-sqlite = ["flowy-database"]
flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-revision/flowy_unit_test"]
dart = ["flowy-codegen/dart", "dart-notify/dart"]
\ No newline at end of file
diff --git a/frontend/rust-lib/flowy-document/src/services/migration.rs b/frontend/rust-lib/flowy-document/src/services/migration.rs
index d2bc254bb5..9d04cc25e2 100644
--- a/frontend/rust-lib/flowy-document/src/services/migration.rs
+++ b/frontend/rust-lib/flowy-document/src/services/migration.rs
@@ -6,7 +6,7 @@ use flowy_database::kv::KV;
use flowy_error::FlowyResult;
use flowy_http_model::revision::Revision;
use flowy_http_model::util::md5;
-use flowy_revision::disk::{RevisionDiskCache, SyncRecord};
+use flowy_revision_persistence::{RevisionDiskCache, SyncRecord};
use flowy_sync::util::make_operations_from_revisions;
use std::sync::Arc;
diff --git a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs
index 84d3a88a2e..2f6fb65d3d 100644
--- a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs
+++ b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v0.rs
@@ -11,7 +11,7 @@ use flowy_http_model::{
revision::{Revision, RevisionRange},
util::md5,
};
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::collections::HashMap;
use std::sync::Arc;
@@ -25,7 +25,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersi
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- DeltaRevisionSql::create(revision_records, &*conn)?;
+ DeltaRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -57,7 +57,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersi
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = DeltaRevisionSql::update(changeset, conn)?;
+ DeltaRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -78,8 +78,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDeltaDocumentRevisionPersi
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- DeltaRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- DeltaRevisionSql::create(inserted_records, &*conn)?;
+ DeltaRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ DeltaRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs
index e3c3ea286a..561a1763b8 100644
--- a/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs
+++ b/frontend/rust-lib/flowy-document/src/services/persistence/rev_sqlite/document_rev_sqlite_v1.rs
@@ -11,7 +11,7 @@ use flowy_http_model::{
revision::{Revision, RevisionRange},
util::md5,
};
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::sync::Arc;
pub struct SQLiteDocumentRevisionPersistence {
@@ -24,7 +24,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistenc
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- DocumentRevisionSql::create(revision_records, &*conn)?;
+ DocumentRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -56,7 +56,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistenc
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = DocumentRevisionSql::update(changeset, conn)?;
+ DocumentRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -77,8 +77,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteDocumentRevisionPersistenc
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- DocumentRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- DocumentRevisionSql::create(inserted_records, &*conn)?;
+ DocumentRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ DocumentRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-document/tests/old_document/old_document_test.rs b/frontend/rust-lib/flowy-document/tests/old_document/old_document_test.rs
index 0c35fa1ac3..f910b2bb2f 100644
--- a/frontend/rust-lib/flowy-document/tests/old_document/old_document_test.rs
+++ b/frontend/rust-lib/flowy-document/tests/old_document/old_document_test.rs
@@ -1,5 +1,5 @@
use crate::old_document::script::{EditorScript::*, *};
-use flowy_revision::disk::RevisionState;
+use flowy_revision_persistence::RevisionState;
use lib_ot::core::{count_utf16_code_units, Interval};
#[tokio::test]
diff --git a/frontend/rust-lib/flowy-document/tests/old_document/script.rs b/frontend/rust-lib/flowy-document/tests/old_document/script.rs
index cd8e8f79f4..e523566da7 100644
--- a/frontend/rust-lib/flowy-document/tests/old_document/script.rs
+++ b/frontend/rust-lib/flowy-document/tests/old_document/script.rs
@@ -1,6 +1,6 @@
use flowy_document::old_editor::editor::DeltaDocumentEditor;
use flowy_document::TEXT_BLOCK_SYNC_INTERVAL_IN_MILLIS;
-use flowy_revision::disk::RevisionState;
+use flowy_revision_persistence::RevisionState;
use flowy_test::{helper::ViewTest, FlowySDKTest};
use lib_ot::{core::Interval, text_delta::DeltaTextOperations};
use std::sync::Arc;
diff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.toml
index bf6bfbd25b..d0d77ab957 100644
--- a/frontend/rust-lib/flowy-error/Cargo.toml
+++ b/frontend/rust-lib/flowy-error/Cargo.toml
@@ -20,14 +20,13 @@ serde_json = {version = "1.0", optional = true}
http-flowy = { git = "https://github.com/AppFlowy-IO/AppFlowy-Server", optional = true}
flowy-database = { path = "../flowy-database", optional = true}
r2d2 = { version = "0.8", optional = true}
-lib-sqlite = { path = "../lib-sqlite", optional = true }
[features]
collaboration = ["flowy-sync"]
ot = ["lib-ot"]
serde = ["serde_json"]
http_server = ["http-flowy"]
-db = ["flowy-database", "lib-sqlite", "r2d2"]
+db = ["flowy-database", "r2d2"]
dart = ["flowy-codegen/dart"]
[build-dependencies]
diff --git a/frontend/rust-lib/flowy-error/src/ext/database.rs b/frontend/rust-lib/flowy-error/src/ext/database.rs
index 064105f62b..56fe8d1d4d 100644
--- a/frontend/rust-lib/flowy-error/src/ext/database.rs
+++ b/frontend/rust-lib/flowy-error/src/ext/database.rs
@@ -11,11 +11,3 @@ impl std::convert::From<::r2d2::Error> for FlowyError {
FlowyError::internal().context(error)
}
}
-
-// use diesel::result::{Error, DatabaseErrorKind};
-// use lib_sqlite::ErrorKind;
-impl std::convert::From<lib_sqlite::Error> for FlowyError {
- fn from(error: lib_sqlite::Error) -> Self {
- FlowyError::internal().context(error)
- }
-}
diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml
index eb3405026c..bf1a1c8c02 100644
--- a/frontend/rust-lib/flowy-folder/Cargo.toml
+++ b/frontend/rust-lib/flowy-folder/Cargo.toml
@@ -14,11 +14,12 @@ lib-ot = { path = "../../../shared-lib/lib-ot" }
lib-infra = { path = "../../../shared-lib/lib-infra" }
flowy-document = { path = "../flowy-document" }
-flowy-database = { path = "../flowy-database" }
+flowy-database = { path = "../flowy-database", optional = true }
flowy-error = { path = "../flowy-error", features = ["db", "http_server"]}
dart-notify = { path = "../dart-notify" }
lib-dispatch = { path = "../lib-dispatch" }
flowy-revision = { path = "../flowy-revision" }
+flowy-revision-persistence = { path = "../flowy-revision-persistence" }
parking_lot = "0.12.1"
protobuf = {version = "2.18.0"}
@@ -49,5 +50,6 @@ flowy-codegen = { path = "../flowy-codegen"}
default = []
sync = []
cloud_sync = ["sync"]
+rev-sqlite = ["flowy-database", "flowy-folder/rev-sqlite"]
flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-revision/flowy_unit_test"]
dart = ["flowy-codegen/dart", "dart-notify/dart"]
\ No newline at end of file
diff --git a/frontend/rust-lib/flowy-folder/src/entities/trash.rs b/frontend/rust-lib/flowy-folder/src/entities/trash.rs
index e36f987c1d..70d9a64f1a 100644
--- a/frontend/rust-lib/flowy-folder/src/entities/trash.rs
+++ b/frontend/rust-lib/flowy-folder/src/entities/trash.rs
@@ -105,7 +105,7 @@ impl std::default::Default for TrashType {
}
}
-#[derive(PartialEq, ProtoBuf, Default, Debug, Clone)]
+#[derive(PartialEq, Eq, ProtoBuf, Default, Debug, Clone)]
pub struct RepeatedTrashIdPB {
#[pb(index = 1)]
pub items: Vec<TrashIdPB>,
diff --git a/frontend/rust-lib/flowy-folder/src/services/app/controller.rs b/frontend/rust-lib/flowy-folder/src/services/app/controller.rs
index 53fe391f0e..f908ba857c 100644
--- a/frontend/rust-lib/flowy-folder/src/services/app/controller.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/app/controller.rs
@@ -52,8 +52,8 @@ impl AppController {
pub(crate) async fn create_app_on_local(&self, app: AppRevision) -> Result<AppPB, FlowyError> {
self.persistence
.begin_transaction(|transaction| {
- let _ = transaction.create_app(app.clone())?;
- let _ = notify_apps_changed(&app.workspace_id, self.trash_controller.clone(), &transaction)?;
+ transaction.create_app(app.clone())?;
+ notify_apps_changed(&app.workspace_id, self.trash_controller.clone(), &transaction)?;
Ok(())
})
.await?;
@@ -101,9 +101,9 @@ impl AppController {
pub(crate) async fn move_app(&self, app_id: &str, from: usize, to: usize) -> FlowyResult<()> {
self.persistence
.begin_transaction(|transaction| {
- let _ = transaction.move_app(app_id, from, to)?;
+ transaction.move_app(app_id, from, to)?;
let app = transaction.read_app(app_id)?;
- let _ = notify_apps_changed(&app.workspace_id, self.trash_controller.clone(), &transaction)?;
+ notify_apps_changed(&app.workspace_id, self.trash_controller.clone(), &transaction)?;
Ok(())
})
.await?;
diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs
index 66cca6df03..b4048476c3 100644
--- a/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/mod.rs
@@ -3,6 +3,7 @@ pub mod rev_sqlite;
pub mod version_1;
mod version_2;
+use crate::services::persistence::rev_sqlite::SQLiteFolderRevisionPersistence;
use crate::{
event_map::WorkspaceDatabase,
manager::FolderId,
@@ -11,12 +12,10 @@ use crate::{
use flowy_database::ConnectionPool;
use flowy_error::{FlowyError, FlowyResult};
use flowy_http_model::revision::Revision;
-use flowy_revision::disk::{RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionDiskCache, RevisionState, SyncRecord};
use flowy_sync::client_folder::FolderPad;
-use folder_rev_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
-
-use crate::services::persistence::rev_sqlite::SQLiteFolderRevisionPersistence;
use flowy_sync::server_folder::FolderOperationsBuilder;
+use folder_rev_model::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
use std::sync::Arc;
use tokio::sync::RwLock;
pub use version_1::{app_sql::*, trash_sql::*, v1_impl::V1Transaction, view_sql::*, workspace_sql::*};
diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs
index 64b9757d69..0ca3167ed2 100644
--- a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_rev_sqlite.rs
@@ -9,7 +9,7 @@ use flowy_database::{
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
use flowy_http_model::util::md5;
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::sync::Arc;
pub struct SQLiteFolderRevisionPersistence {
@@ -22,7 +22,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistence
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- FolderRevisionSql::create(revision_records, &*conn)?;
+ FolderRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -54,7 +54,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistence
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = FolderRevisionSql::update(changeset, conn)?;
+ FolderRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -75,8 +75,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteFolderRevisionPersistence
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- FolderRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- FolderRevisionSql::create(inserted_records, &*conn)?;
+ FolderRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ FolderRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_snapshot_sqlite_impl.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_snapshot_sqlite_impl.rs
index 09d2334fcb..7ca2695a17 100644
--- a/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_snapshot_sqlite_impl.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/rev_sqlite/folder_snapshot_sqlite_impl.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::unused_unit)]
use bytes::Bytes;
use flowy_database::{
prelude::*,
diff --git a/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs
index 9429023f9a..b9dd9809d5 100644
--- a/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/persistence/version_1/v1_impl.rs
@@ -15,7 +15,7 @@ pub struct V1Transaction<'a>(pub &'a DBConnection);
impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
fn create_workspace(&self, user_id: &str, workspace_rev: WorkspaceRevision) -> FlowyResult<()> {
- WorkspaceTableSql::create_workspace(user_id, workspace_rev, &*self.0)?;
+ WorkspaceTableSql::create_workspace(user_id, workspace_rev, self.0)?;
Ok(())
}
@@ -34,12 +34,12 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
}
fn create_app(&self, app_rev: AppRevision) -> FlowyResult<()> {
- AppTableSql::create_app(app_rev, &*self.0)?;
+ AppTableSql::create_app(app_rev, self.0)?;
Ok(())
}
fn update_app(&self, changeset: AppChangeset) -> FlowyResult<()> {
- AppTableSql::update_app(changeset, &*self.0)?;
+ AppTableSql::update_app(changeset, self.0)?;
Ok(())
}
@@ -64,7 +64,7 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
}
fn create_view(&self, view_rev: ViewRevision) -> FlowyResult<()> {
- ViewTableSql::create_view(view_rev, &*self.0)?;
+ ViewTableSql::create_view(view_rev, self.0)?;
Ok(())
}
@@ -80,13 +80,13 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
}
fn update_view(&self, changeset: ViewChangeset) -> FlowyResult<()> {
- ViewTableSql::update_view(changeset, &*self.0)?;
+ ViewTableSql::update_view(changeset, self.0)?;
Ok(())
}
fn delete_view(&self, view_id: &str) -> FlowyResult<ViewRevision> {
let view_revision: ViewRevision = ViewTableSql::read_view(view_id, self.0)?.into();
- ViewTableSql::delete_view(view_id, &*self.0)?;
+ ViewTableSql::delete_view(view_id, self.0)?;
Ok(view_revision)
}
@@ -95,7 +95,7 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
}
fn create_trash(&self, trashes: Vec<TrashRevision>) -> FlowyResult<()> {
- TrashTableSql::create_trash(trashes, &*self.0)?;
+ TrashTableSql::create_trash(trashes, self.0)?;
Ok(())
}
@@ -114,7 +114,7 @@ impl<'a> FolderPersistenceTransaction for V1Transaction<'a> {
None => TrashTableSql::delete_all(self.0),
Some(trash_ids) => {
for trash_id in &trash_ids {
- TrashTableSql::delete_trash(trash_id, &*self.0)?;
+ TrashTableSql::delete_trash(trash_id, self.0)?;
}
Ok(())
}
diff --git a/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs b/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs
index 63ffb7b0b8..092f2f4482 100644
--- a/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/trash/controller.rs
@@ -168,7 +168,7 @@ impl TrashController {
self.persistence
.begin_transaction(|transaction| {
- let _ = transaction.create_trash(trash_revs.clone())?;
+ transaction.create_trash(trash_revs.clone())?;
let _ = self.create_trash_on_server(trash_revs);
notify_trash_changed(transaction.read_trash(None)?);
diff --git a/frontend/rust-lib/flowy-folder/src/services/view/controller.rs b/frontend/rust-lib/flowy-folder/src/services/view/controller.rs
index 308aaae424..dc2d3b7fc0 100644
--- a/frontend/rust-lib/flowy-folder/src/services/view/controller.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/view/controller.rs
@@ -238,9 +238,9 @@ impl ViewController {
pub(crate) async fn move_view(&self, view_id: &str, from: usize, to: usize) -> Result<(), FlowyError> {
self.persistence
.begin_transaction(|transaction| {
- let _ = transaction.move_view(view_id, from, to)?;
+ transaction.move_view(view_id, from, to)?;
let view = transaction.read_view(view_id)?;
- let _ = notify_views_changed(&view.app_id, self.trash_controller.clone(), &transaction)?;
+ notify_views_changed(&view.app_id, self.trash_controller.clone(), &transaction)?;
Ok(())
})
.await?;
diff --git a/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs
index 14ada4ef60..d69d8d0e5a 100644
--- a/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs
+++ b/frontend/rust-lib/flowy-folder/src/services/workspace/event_handler.rs
@@ -122,7 +122,7 @@ fn read_workspaces_on_server(
for workspace_rev in &workspace_revs {
let m_workspace = workspace_rev.clone();
let app_revs = m_workspace.apps.clone();
- let _ = transaction.create_workspace(&user_id, m_workspace)?;
+ transaction.create_workspace(&user_id, m_workspace)?;
tracing::trace!("Save {} apps", app_revs.len());
for app_rev in app_revs {
let view_revs = app_rev.belongings.clone();
diff --git a/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs b/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs
index f7b93ed30a..ef42afaf67 100644
--- a/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs
+++ b/frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs
@@ -1,7 +1,7 @@
use crate::script::{invalid_workspace_name_test_case, FolderScript::*, FolderTest};
use flowy_folder::entities::view::ViewDataFormatPB;
use flowy_folder::entities::workspace::CreateWorkspacePayloadPB;
-use flowy_revision::disk::RevisionState;
+use flowy_revision_persistence::RevisionState;
use flowy_test::{event_builder::*, FlowySDKTest};
#[tokio::test]
diff --git a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs
index 67ac4affa3..55eadb6198 100644
--- a/frontend/rust-lib/flowy-folder/tests/workspace/script.rs
+++ b/frontend/rust-lib/flowy-folder/tests/workspace/script.rs
@@ -15,8 +15,8 @@ use flowy_folder::entities::{
};
use flowy_folder::event_map::FolderEvent::*;
use flowy_folder::{errors::ErrorCode, services::folder_editor::FolderEditor};
-use flowy_revision::disk::RevisionState;
use flowy_revision::REVISION_WRITE_INTERVAL_IN_MILLIS;
+use flowy_revision_persistence::RevisionState;
use flowy_test::{event_builder::*, FlowySDKTest};
use std::{sync::Arc, time::Duration};
use tokio::time::sleep;
@@ -259,13 +259,12 @@ pub async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> Wor
desc: desc.to_owned(),
};
- let workspace = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateWorkspace)
.payload(request)
.async_send()
.await
- .parse::<WorkspacePB>();
- workspace
+ .parse::<WorkspacePB>()
}
pub async fn read_workspace(sdk: &FlowySDKTest, workspace_id: Option<String>) -> Vec<WorkspacePB> {
@@ -300,13 +299,12 @@ pub async fn create_app(sdk: &FlowySDKTest, workspace_id: &str, name: &str, desc
color_style: Default::default(),
};
- let app = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateApp)
.payload(create_app_request)
.async_send()
.await
- .parse::<AppPB>();
- app
+ .parse::<AppPB>()
}
pub async fn read_app(sdk: &FlowySDKTest, app_id: &str) -> AppPB {
@@ -314,14 +312,12 @@ pub async fn read_app(sdk: &FlowySDKTest, app_id: &str) -> AppPB {
value: app_id.to_owned(),
};
- let app = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(ReadApp)
.payload(request)
.async_send()
.await
- .parse::<AppPB>();
-
- app
+ .parse::<AppPB>()
}
pub async fn update_app(sdk: &FlowySDKTest, app_id: &str, name: Option<String>, desc: Option<String>) {
@@ -369,13 +365,12 @@ pub async fn create_view(
layout,
view_content_data: vec![],
};
- let view = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateView)
.payload(request)
.async_send()
.await
- .parse::<ViewPB>();
- view
+ .parse::<ViewPB>()
}
pub async fn read_view(sdk: &FlowySDKTest, view_id: &str) -> ViewPB {
diff --git a/frontend/rust-lib/flowy-grid/Cargo.toml b/frontend/rust-lib/flowy-grid/Cargo.toml
index ac8289f476..122f79816f 100644
--- a/frontend/rust-lib/flowy-grid/Cargo.toml
+++ b/frontend/rust-lib/flowy-grid/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
lib-dispatch = { path = "../lib-dispatch" }
dart-notify = { path = "../dart-notify" }
flowy-revision = { path = "../flowy-revision" }
+flowy-revision-persistence = { path = "../flowy-revision-persistence" }
flowy-task= { path = "../flowy-task" }
flowy-error = { path = "../flowy-error", features = ["db"]}
flowy-derive = { path = "../flowy-derive" }
@@ -17,7 +18,7 @@ lib-infra = { path = "../../../shared-lib/lib-infra" }
grid-rev-model = { path = "../../../shared-lib/grid-rev-model" }
flowy-sync = { path = "../flowy-sync"}
flowy-http-model = { path = "../../../shared-lib/flowy-http-model" }
-flowy-database = { path = "../flowy-database" }
+flowy-database = { path = "../flowy-database", optional = true }
anyhow = "1.0"
strum = "0.21"
@@ -56,5 +57,6 @@ flowy-codegen = { path = "../flowy-codegen"}
[features]
default = []
+rev-sqlite = ["flowy-database"]
dart = ["flowy-codegen/dart", "dart-notify/dart"]
flowy_unit_test = ["flowy-revision/flowy_unit_test"]
\ No newline at end of file
diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs
index 30b982579a..7882d41af2 100644
--- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs
+++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs
@@ -182,7 +182,7 @@ impl CellDataChangeset for NumberTypeOptionPB {
let number_cell_data = self.format_cell_data(&data)?;
match self.format {
- NumberFormat::Num => Ok((number_cell_data.to_string().into(), number_cell_data.to_string().into())),
+ NumberFormat::Num => Ok((number_cell_data.to_string(), number_cell_data.to_string().into())),
_ => Ok((data, number_cell_data.to_string().into())),
}
}
diff --git a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rs b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rs
index 7bfdb8b1f5..11a10f787c 100644
--- a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rs
+++ b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_block_sqlite_impl.rs
@@ -9,7 +9,7 @@ use flowy_database::{
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
use flowy_http_model::util::md5;
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::sync::Arc;
pub struct SQLiteGridBlockRevisionPersistence {
@@ -22,7 +22,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridBlockRevisionPersisten
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- GridMetaRevisionSql::create(revision_records, &*conn)?;
+ GridMetaRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -54,7 +54,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridBlockRevisionPersisten
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = GridMetaRevisionSql::update(changeset, conn)?;
+ GridMetaRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -75,8 +75,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridBlockRevisionPersisten
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- GridMetaRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- GridMetaRevisionSql::create(inserted_records, &*conn)?;
+ GridMetaRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ GridMetaRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_snapshot_sqlite_impl.rs b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_snapshot_sqlite_impl.rs
index 7aa7bc630a..d7456c31b8 100644
--- a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_snapshot_sqlite_impl.rs
+++ b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_snapshot_sqlite_impl.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::unused_unit)]
use bytes::Bytes;
use flowy_database::{
prelude::*,
diff --git a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs
index d66f9d244d..846faa4639 100644
--- a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs
+++ b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_sqlite_impl.rs
@@ -9,7 +9,7 @@ use flowy_database::{
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
use flowy_http_model::util::md5;
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::sync::Arc;
pub struct SQLiteGridRevisionPersistence {
@@ -22,7 +22,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridRevisionPersistence {
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- GridRevisionSql::create(revision_records, &*conn)?;
+ GridRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -54,7 +54,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridRevisionPersistence {
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = GridRevisionSql::update(changeset, conn)?;
+ GridRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -75,8 +75,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridRevisionPersistence {
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- GridRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- GridRevisionSql::create(inserted_records, &*conn)?;
+ GridRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ GridRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs
index cdc4f0b5f4..81830779de 100644
--- a/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs
+++ b/frontend/rust-lib/flowy-grid/src/services/persistence/rev_sqlite/grid_view_sqlite_impl.rs
@@ -9,7 +9,7 @@ use flowy_database::{
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
use flowy_http_model::util::md5;
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::sync::Arc;
pub struct SQLiteGridViewRevisionPersistence {
@@ -31,7 +31,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridViewRevisionPersistenc
fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
- GridViewRevisionSql::create(revision_records, &*conn)?;
+ GridViewRevisionSql::create(revision_records, &conn)?;
Ok(())
}
@@ -63,7 +63,7 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridViewRevisionPersistenc
let conn = &*self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
for changeset in changesets {
- let _ = GridViewRevisionSql::update(changeset, conn)?;
+ GridViewRevisionSql::update(changeset, conn)?;
}
Ok(())
})?;
@@ -84,8 +84,8 @@ impl RevisionDiskCache<Arc<ConnectionPool>> for SQLiteGridViewRevisionPersistenc
) -> Result<(), Self::Error> {
let conn = self.pool.get().map_err(internal_error)?;
conn.immediate_transaction::<_, FlowyError, _>(|| {
- GridViewRevisionSql::delete(object_id, deleted_rev_ids, &*conn)?;
- GridViewRevisionSql::create(inserted_records, &*conn)?;
+ GridViewRevisionSql::delete(object_id, deleted_rev_ids, &conn)?;
+ GridViewRevisionSql::create(inserted_records, &conn)?;
Ok(())
})
}
diff --git a/frontend/rust-lib/flowy-grid/tests/grid/cell_test/test.rs b/frontend/rust-lib/flowy-grid/tests/grid/cell_test/test.rs
index 43e16c71ee..3ec08b59c2 100644
--- a/frontend/rust-lib/flowy-grid/tests/grid/cell_test/test.rs
+++ b/frontend/rust-lib/flowy-grid/tests/grid/cell_test/test.rs
@@ -94,9 +94,8 @@ async fn url_cell_date_test() {
for (i, cell) in cells.iter().enumerate() {
let url_cell_data = cell.get_url_field_cell_data().unwrap();
- match i {
- 0 => assert_eq!(url_cell_data.url.as_str(), "https://www.appflowy.io/"),
- _ => {}
+ if i == 0 {
+ assert_eq!(url_cell_data.url.as_str(), "https://www.appflowy.io/")
}
}
}
diff --git a/frontend/rust-lib/flowy-grid/tests/grid/snapshot_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/snapshot_test/script.rs
index d63ac76ed2..8dc751322c 100644
--- a/frontend/rust-lib/flowy-grid/tests/grid/snapshot_test/script.rs
+++ b/frontend/rust-lib/flowy-grid/tests/grid/snapshot_test/script.rs
@@ -47,9 +47,7 @@ impl GridSnapshotTest {
}
pub async fn grid_pad(&self) -> GridRevisionPad {
- let pad = self.editor.grid_pad();
- let pad = (*pad.read().await).clone();
- pad
+ self.editor.grid_pad().read().await.clone()
}
pub async fn run_scripts(&mut self, scripts: Vec<SnapshotScript>) {
diff --git a/frontend/rust-lib/flowy-net/src/local_server/server.rs b/frontend/rust-lib/flowy-net/src/local_server/server.rs
index 47794be05f..b29657ba70 100644
--- a/frontend/rust-lib/flowy-net/src/local_server/server.rs
+++ b/frontend/rust-lib/flowy-net/src/local_server/server.rs
@@ -48,7 +48,8 @@ impl LocalServer {
}
pub async fn stop(&self) {
- if let Some(stop_tx) = self.stop_tx.read().clone() {
+ let sender = self.stop_tx.read().clone();
+ if let Some(stop_tx) = sender {
let _ = stop_tx.send(()).await;
}
}
diff --git a/frontend/rust-lib/flowy-revision-persistence/Cargo.toml b/frontend/rust-lib/flowy-revision-persistence/Cargo.toml
new file mode 100644
index 0000000000..bd483b40ca
--- /dev/null
+++ b/frontend/rust-lib/flowy-revision-persistence/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "flowy-revision-persistence"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+flowy-error = { path = "../flowy-error" }
+flowy-http-model = { path = "../../../shared-lib/flowy-http-model" }
+
+[features]
+rev-file = []
diff --git a/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/file_persistence.rs b/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/file_persistence.rs
new file mode 100644
index 0000000000..32dc6e09ef
--- /dev/null
+++ b/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/file_persistence.rs
@@ -0,0 +1,54 @@
+use crate::{RevisionChangeset, RevisionDiskCache, SyncRecord};
+use flowy_error::FlowyResult;
+use flowy_http_model::revision::RevisionRange;
+
+pub struct FileRevisionDiskCache {
+ path: String,
+}
+
+pub type FileRevisionDiskCacheConnection = ();
+
+impl RevisionDiskCache<FileRevisionDiskCacheConnection> for FileRevisionDiskCache {
+ type Error = ();
+
+ fn create_revision_records(&self, revision_records: Vec<SyncRecord>) -> Result<(), Self::Error> {
+ Ok(())
+ }
+
+ fn get_connection(&self) -> Result<FileRevisionDiskCacheConnection, Self::Error> {
+ return Ok(());
+ }
+
+ fn read_revision_records(
+ &self,
+ object_id: &str,
+ rev_ids: Option<Vec<i64>>,
+ ) -> Result<Vec<SyncRecord>, Self::Error> {
+ Ok(vec![])
+ }
+
+ fn read_revision_records_with_range(
+ &self,
+ object_id: &str,
+ range: &RevisionRange,
+ ) -> Result<Vec<SyncRecord>, Self::Error> {
+ Ok(vec![])
+ }
+
+ fn update_revision_record(&self, changesets: Vec<RevisionChangeset>) -> FlowyResult<()> {
+ Ok(())
+ }
+
+ fn delete_revision_records(&self, object_id: &str, rev_ids: Option<Vec<i64>>) -> Result<(), Self::Error> {
+ Ok(())
+ }
+
+ fn delete_and_insert_records(
+ &self,
+ object_id: &str,
+ deleted_rev_ids: Option<Vec<i64>>,
+ inserted_records: Vec<SyncRecord>,
+ ) -> Result<(), Self::Error> {
+ todo!()
+ }
+}
diff --git a/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/mod.rs b/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/mod.rs
new file mode 100644
index 0000000000..e4b00e9b19
--- /dev/null
+++ b/frontend/rust-lib/flowy-revision-persistence/src/disk_cache_impl/mod.rs
@@ -0,0 +1,2 @@
+#[cfg(feature = "rev-file")]
+pub mod file_persistence;
diff --git a/frontend/rust-lib/flowy-revision/src/cache/disk.rs b/frontend/rust-lib/flowy-revision-persistence/src/lib.rs
similarity index 99%
rename from frontend/rust-lib/flowy-revision/src/cache/disk.rs
rename to frontend/rust-lib/flowy-revision-persistence/src/lib.rs
index f9cd7e0855..5196b43578 100644
--- a/frontend/rust-lib/flowy-revision/src/cache/disk.rs
+++ b/frontend/rust-lib/flowy-revision-persistence/src/lib.rs
@@ -1,3 +1,5 @@
+mod disk_cache_impl;
+
use flowy_error::{FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
use std::fmt::Debug;
diff --git a/frontend/rust-lib/flowy-revision/Cargo.toml b/frontend/rust-lib/flowy-revision/Cargo.toml
index 916b99c140..f68731d570 100644
--- a/frontend/rust-lib/flowy-revision/Cargo.toml
+++ b/frontend/rust-lib/flowy-revision/Cargo.toml
@@ -10,6 +10,7 @@ flowy-http-model = { path = "../../../shared-lib/flowy-http-model" }
lib-ws = { path = "../../../shared-lib/lib-ws" }
lib-infra = { path = "../../../shared-lib/lib-infra" }
flowy-error = { path = "../flowy-error" }
+flowy-revision-persistence= { path = "../flowy-revision-persistence" }
tracing = { version = "0.1", features = ["log"] }
tokio = {version = "1", features = ["sync"]}
bytes = { version = "1.1" }
diff --git a/frontend/rust-lib/flowy-revision/src/cache/memory.rs b/frontend/rust-lib/flowy-revision/src/cache/memory.rs
index 8b222eab3f..d0980f9d35 100644
--- a/frontend/rust-lib/flowy-revision/src/cache/memory.rs
+++ b/frontend/rust-lib/flowy-revision/src/cache/memory.rs
@@ -1,8 +1,8 @@
-use crate::disk::SyncRecord;
use crate::REVISION_WRITE_INTERVAL_IN_MILLIS;
use dashmap::DashMap;
use flowy_error::{FlowyError, FlowyResult};
use flowy_http_model::revision::RevisionRange;
+use flowy_revision_persistence::SyncRecord;
use std::{borrow::Cow, sync::Arc, time::Duration};
use tokio::{sync::RwLock, task::JoinHandle};
diff --git a/frontend/rust-lib/flowy-revision/src/cache/mod.rs b/frontend/rust-lib/flowy-revision/src/cache/mod.rs
index 4f3ee5c19f..c9d1f8bd22 100644
--- a/frontend/rust-lib/flowy-revision/src/cache/mod.rs
+++ b/frontend/rust-lib/flowy-revision/src/cache/mod.rs
@@ -1,3 +1,2 @@
-pub mod disk;
pub(crate) mod memory;
pub mod reset;
diff --git a/frontend/rust-lib/flowy-revision/src/cache/reset.rs b/frontend/rust-lib/flowy-revision/src/cache/reset.rs
index 498b583cd1..2bdab1eea2 100644
--- a/frontend/rust-lib/flowy-revision/src/cache/reset.rs
+++ b/frontend/rust-lib/flowy-revision/src/cache/reset.rs
@@ -1,8 +1,8 @@
-use crate::disk::{RevisionDiskCache, SyncRecord};
use crate::{RevisionLoader, RevisionPersistence, RevisionPersistenceConfiguration};
use bytes::Bytes;
use flowy_error::{FlowyError, FlowyResult};
use flowy_http_model::revision::Revision;
+use flowy_revision_persistence::{RevisionDiskCache, SyncRecord};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
use std::sync::Arc;
diff --git a/frontend/rust-lib/flowy-revision/src/rev_manager.rs b/frontend/rust-lib/flowy-revision/src/rev_manager.rs
index 3be04ae001..b24ac5725e 100644
--- a/frontend/rust-lib/flowy-revision/src/rev_manager.rs
+++ b/frontend/rust-lib/flowy-revision/src/rev_manager.rs
@@ -286,7 +286,7 @@ impl<Connection: 'static> RevisionManager<Connection> {
pub fn ack_notify(&self) -> tokio::sync::broadcast::Receiver<i64> {
self.rev_ack_notifier.subscribe()
}
- pub fn get_all_revision_records(&self) -> FlowyResult<Vec<crate::disk::SyncRecord>> {
+ pub fn get_all_revision_records(&self) -> FlowyResult<Vec<flowy_revision_persistence::SyncRecord>> {
self.rev_persistence.load_all_records(&self.object_id)
}
}
diff --git a/frontend/rust-lib/flowy-revision/src/rev_persistence.rs b/frontend/rust-lib/flowy-revision/src/rev_persistence.rs
index beebd96ec9..c0f20e4ea4 100644
--- a/frontend/rust-lib/flowy-revision/src/rev_persistence.rs
+++ b/frontend/rust-lib/flowy-revision/src/rev_persistence.rs
@@ -1,12 +1,9 @@
-use crate::cache::{
- disk::{RevisionChangeset, RevisionDiskCache},
- memory::RevisionMemoryCacheDelegate,
-};
-use crate::disk::{RevisionState, SyncRecord};
+use crate::cache::memory::RevisionMemoryCacheDelegate;
use crate::memory::RevisionMemoryCache;
use crate::RevisionMergeable;
use flowy_error::{internal_error, FlowyError, FlowyResult};
use flowy_http_model::revision::{Revision, RevisionRange};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, RevisionState, SyncRecord};
use std::collections::{HashMap, VecDeque};
use std::{borrow::Cow, sync::Arc};
diff --git a/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs b/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs
index 234e46f4f6..9680117b4b 100644
--- a/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs
+++ b/frontend/rust-lib/flowy-revision/tests/revision_test/script.rs
@@ -1,10 +1,10 @@
use bytes::Bytes;
use flowy_error::{internal_error, FlowyError, FlowyResult};
-use flowy_revision::disk::{RevisionChangeset, RevisionDiskCache, SyncRecord};
use flowy_revision::{
RevisionManager, RevisionMergeable, RevisionObjectDeserializer, RevisionPersistence,
RevisionPersistenceConfiguration, RevisionSnapshot, RevisionSnapshotDiskCache, REVISION_WRITE_INTERVAL_IN_MILLIS,
};
+use flowy_revision_persistence::{RevisionChangeset, RevisionDiskCache, SyncRecord};
use flowy_http_model::revision::{Revision, RevisionRange};
use flowy_http_model::util::md5;
diff --git a/frontend/rust-lib/flowy-test/src/helper.rs b/frontend/rust-lib/flowy-test/src/helper.rs
index 69d4cf34ef..827de47fdc 100644
--- a/frontend/rust-lib/flowy-test/src/helper.rs
+++ b/frontend/rust-lib/flowy-test/src/helper.rs
@@ -70,13 +70,12 @@ async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> Workspa
desc: desc.to_owned(),
};
- let workspace = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateWorkspace)
.payload(request)
.async_send()
.await
- .parse::<WorkspacePB>();
- workspace
+ .parse::<WorkspacePB>()
}
async fn open_workspace(sdk: &FlowySDKTest, workspace_id: &str) {
@@ -98,13 +97,12 @@ async fn create_app(sdk: &FlowySDKTest, name: &str, desc: &str, workspace_id: &s
color_style: Default::default(),
};
- let app = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateApp)
.payload(create_app_request)
.async_send()
.await
- .parse::<AppPB>();
- app
+ .parse::<AppPB>()
}
async fn create_view(
@@ -124,13 +122,12 @@ async fn create_view(
view_content_data: data,
};
- let view = FolderEventBuilder::new(sdk.clone())
+ FolderEventBuilder::new(sdk.clone())
.event(CreateView)
.payload(request)
.async_send()
.await
- .parse::<ViewPB>();
- view
+ .parse::<ViewPB>()
}
pub fn root_dir() -> String {
diff --git a/frontend/rust-lib/flowy-test/src/lib.rs b/frontend/rust-lib/flowy-test/src/lib.rs
index bc2914235a..3110502e81 100644
--- a/frontend/rust-lib/flowy-test/src/lib.rs
+++ b/frontend/rust-lib/flowy-test/src/lib.rs
@@ -45,8 +45,7 @@ impl FlowySDKTest {
}
pub async fn sign_up(&self) -> SignUpContext {
- let context = async_sign_up(self.inner.dispatcher()).await;
- context
+ async_sign_up(self.inner.dispatcher()).await
}
pub async fn init_user(&self) -> UserProfilePB {
diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml
index f6f51fa542..4d06f48ade 100644
--- a/frontend/rust-lib/flowy-user/Cargo.toml
+++ b/frontend/rust-lib/flowy-user/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
flowy-derive = { path = "../flowy-derive" }
-flowy-database = { path = "../flowy-database" }
+flowy-database = { path = "../flowy-database", optional = true }
flowy-error = { path = "../flowy-error", features = ["db", "http_server"] }
lib-infra = { path = "../../../shared-lib/lib-infra" }
@@ -45,6 +45,7 @@ rand_core = "0.6.3"
rand = "0.8.5"
[features]
+rev-sqlite = ["flowy-database"]
dart = ["flowy-codegen/dart", "dart-notify/dart"]
[build-dependencies]
diff --git a/frontend/rust-lib/lib-sqlite/Cargo.toml b/frontend/rust-lib/lib-sqlite/Cargo.toml
deleted file mode 100644
index 141acd8fd8..0000000000
--- a/frontend/rust-lib/lib-sqlite/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "lib-sqlite"
-version = "0.1.0"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-r2d2 = "0.8.9"
-libsqlite3-sys = { version = ">=0.8.0, <0.24.0", features = ["bundled"] }
-diesel = { version = "1.4.8", features = ["sqlite"] }
-diesel_derives = { version = "1.4.1", features = ["sqlite"] }
-diesel_migrations = { version = "1.4.0", features = ["sqlite"] }
-lazy_static = "1.4.0"
-scheduled-thread-pool = "0.2.5"
-error-chain = "=0.12.0"
-log = "0.4.11"
-openssl = { version = "0.10.38", optional = true }
-
-[features]
-openssl_vendored = ["openssl/vendored"]
diff --git a/frontend/scripts/makefile/desktop.toml b/frontend/scripts/makefile/desktop.toml
index 5471ab2442..4776a2bcaa 100644
--- a/frontend/scripts/makefile/desktop.toml
+++ b/frontend/scripts/makefile/desktop.toml
@@ -67,8 +67,8 @@ script = [
"""
cd rust-lib/
rustup show
- echo cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
- cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
+ echo cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
+ cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
cd ../
""",
]
@@ -105,7 +105,7 @@ private = true
script = [
"""
cd rust-lib
- exec cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
+ exec cargo build --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
cd ..
""",
]
@@ -128,7 +128,7 @@ run_task = { name = [
script = [
"""
cd rust-lib/
- cargo build --${BUILD_FLAG} --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FEATURES}"
+ cargo build --${BUILD_FLAG} --package=dart-ffi --target ${RUST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
cd ../
""",
]
@@ -216,8 +216,8 @@ script = [
"""
cd rust-lib/
rustup show
- echo cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FEATURES}"
- RUST_LOG=${RUST_LOG} cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FEATURES}"
+ echo cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
+ RUST_LOG=${RUST_LOG} cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
cd ../
""",
]
@@ -229,8 +229,8 @@ script = [
"""
cd rust-lib/
rustup show
- echo cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FEATURES}"
- cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FEATURES}"
+ echo cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
+ cargo build --package=dart-ffi --target ${TEST_COMPILE_TARGET} --features "${FLUTTER_DESKTOP_FEATURES}"
cd ../
""",
]
diff --git a/frontend/scripts/makefile/tests.toml b/frontend/scripts/makefile/tests.toml
index ecb15012c1..6bdcdf0dea 100644
--- a/frontend/scripts/makefile/tests.toml
+++ b/frontend/scripts/makefile/tests.toml
@@ -32,7 +32,7 @@ run_task = { name = ["rust_lib_unit_test", "shared_lib_unit_test"] }
description = "Run rust-lib unit tests"
script = '''
cd rust-lib
-cargo test --no-default-features --features="sync"
+cargo test --no-default-features --features="sync, rev-sqlite"
'''
[tasks.shared_lib_unit_test]
diff --git a/shared-lib/flowy-http-model/src/revision.rs b/shared-lib/flowy-http-model/src/revision.rs
index e068fe10ce..bec31d728a 100644
--- a/shared-lib/flowy-http-model/src/revision.rs
+++ b/shared-lib/flowy-http-model/src/revision.rs
@@ -67,9 +67,9 @@ impl Revision {
impl std::fmt::Debug for Revision {
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
- let _ = f.write_fmt(format_args!("object_id {}, ", self.object_id))?;
- let _ = f.write_fmt(format_args!("base_rev_id {}, ", self.base_rev_id))?;
- let _ = f.write_fmt(format_args!("rev_id {}, ", self.rev_id))?;
+ f.write_fmt(format_args!("object_id {}, ", self.object_id))?;
+ f.write_fmt(format_args!("base_rev_id {}, ", self.base_rev_id))?;
+ f.write_fmt(format_args!("rev_id {}, ", self.rev_id))?;
Ok(())
}
}
diff --git a/shared-lib/flowy-http-model/src/ws_data.rs b/shared-lib/flowy-http-model/src/ws_data.rs
index 56a9bab56d..64edf4f413 100644
--- a/shared-lib/flowy-http-model/src/ws_data.rs
+++ b/shared-lib/flowy-http-model/src/ws_data.rs
@@ -44,7 +44,7 @@ impl ClientRevisionWSData {
object_id: object_id.to_owned(),
ty: ClientRevisionWSDataType::ClientPing,
revisions: vec![],
- rev_id: rev_id,
+ rev_id,
}
}
}
@@ -61,7 +61,7 @@ impl std::convert::TryFrom<ClientRevisionWSData> for Bytes {
type Error = serde_json::Error;
fn try_from(bytes: ClientRevisionWSData) -> Result<Self, Self::Error> {
- serde_json::to_vec(&bytes).map(|bytes| Bytes::from(bytes))
+ serde_json::to_vec(&bytes).map(Bytes::from)
}
}
@@ -91,7 +91,7 @@ impl std::convert::TryFrom<ServerRevisionWSData> for Bytes {
type Error = serde_json::Error;
fn try_from(bytes: ServerRevisionWSData) -> Result<Self, Self::Error> {
- serde_json::to_vec(&bytes).map(|bytes| Bytes::from(bytes))
+ serde_json::to_vec(&bytes).map(Bytes::from)
}
}
diff --git a/shared-lib/lib-ot/src/core/attributes/attribute.rs b/shared-lib/lib-ot/src/core/attributes/attribute.rs
index 90c2398440..6438ccc05c 100644
--- a/shared-lib/lib-ot/src/core/attributes/attribute.rs
+++ b/shared-lib/lib-ot/src/core/attributes/attribute.rs
@@ -124,7 +124,7 @@ impl AttributeHashMap {
impl Display for AttributeHashMap {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for (key, value) in self.0.iter() {
- let _ = f.write_str(&format!("{:?}:{:?}", key, value))?;
+ f.write_str(&format!("{:?}:{:?}", key, value))?;
}
Ok(())
}
diff --git a/shared-lib/lib-ot/src/core/delta/cursor.rs b/shared-lib/lib-ot/src/core/delta/cursor.rs
index 42c28dae10..abb08e2870 100644
--- a/shared-lib/lib-ot/src/core/delta/cursor.rs
+++ b/shared-lib/lib-ot/src/core/delta/cursor.rs
@@ -206,7 +206,7 @@ pub struct OpMetric();
impl Metric for OpMetric {
fn seek<T: OperationAttributes>(cursor: &mut OperationsCursor<T>, op_offset: usize) -> SeekResult {
- let _ = check_bound(cursor.op_offset, op_offset)?;
+ check_bound(cursor.op_offset, op_offset)?;
let mut seek_cursor = OperationsCursor::new(cursor.delta, cursor.origin_iv);
while let Some((_, op)) = seek_cursor.iter.next() {
@@ -226,7 +226,7 @@ pub struct Utf16CodeUnitMetric();
impl Metric for Utf16CodeUnitMetric {
fn seek<T: OperationAttributes>(cursor: &mut OperationsCursor<T>, offset: usize) -> SeekResult {
if offset > 0 {
- let _ = check_bound(cursor.consume_count, offset)?;
+ check_bound(cursor.consume_count, offset)?;
let _ = cursor.next_with_len(Some(offset));
}
diff --git a/shared-lib/lib-ot/src/core/delta/operation/operation_serde.rs b/shared-lib/lib-ot/src/core/delta/operation/operation_serde.rs
index 6d30178c91..f2b0843049 100644
--- a/shared-lib/lib-ot/src/core/delta/operation/operation_serde.rs
+++ b/shared-lib/lib-ot/src/core/delta/operation/operation_serde.rs
@@ -113,9 +113,9 @@ where
{
let len = false as usize + 1 + if self.attributes.is_empty() { 0 } else { 1 };
let mut serde_state = serializer.serialize_struct("Retain", len)?;
- let _ = serde::ser::SerializeStruct::serialize_field(&mut serde_state, "retain", &self.n)?;
+ serde::ser::SerializeStruct::serialize_field(&mut serde_state, "retain", &self.n)?;
if !self.attributes.is_empty() {
- let _ = serde::ser::SerializeStruct::serialize_field(&mut serde_state, "attributes", &self.attributes)?;
+ serde::ser::SerializeStruct::serialize_field(&mut serde_state, "attributes", &self.attributes)?;
}
serde::ser::SerializeStruct::end(serde_state)
}
@@ -216,9 +216,9 @@ where
{
let len = false as usize + 1 + if self.attributes.is_empty() { 0 } else { 1 };
let mut serde_state = serializer.serialize_struct("Insert", len)?;
- let _ = serde::ser::SerializeStruct::serialize_field(&mut serde_state, "insert", &self.s)?;
+ serde::ser::SerializeStruct::serialize_field(&mut serde_state, "insert", &self.s)?;
if !self.attributes.is_empty() {
- let _ = serde::ser::SerializeStruct::serialize_field(&mut serde_state, "attributes", &self.attributes)?;
+ serde::ser::SerializeStruct::serialize_field(&mut serde_state, "attributes", &self.attributes)?;
}
serde::ser::SerializeStruct::end(serde_state)
}
diff --git a/shared-lib/lib-ot/src/core/node_tree/operation_serde.rs b/shared-lib/lib-ot/src/core/node_tree/operation_serde.rs
index 5bb5c48e29..b35281d11e 100644
--- a/shared-lib/lib-ot/src/core/node_tree/operation_serde.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/operation_serde.rs
@@ -12,7 +12,7 @@ impl Serialize for NodeOperations {
let operations = self.values();
let mut seq = serializer.serialize_seq(Some(operations.len()))?;
for operation in operations {
- let _ = seq.serialize_element(&operation)?;
+ seq.serialize_element(&operation)?;
}
seq.end()
}
diff --git a/shared-lib/lib-ot/src/core/node_tree/transaction.rs b/shared-lib/lib-ot/src/core/node_tree/transaction.rs
index 70c017c218..6ff481c7b7 100644
--- a/shared-lib/lib-ot/src/core/node_tree/transaction.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/transaction.rs
@@ -249,18 +249,7 @@ impl TransactionBuilder {
}
fn get_deleted_node_data(&self, node_tree: &NodeTree, node_id: NodeId) -> NodeData {
- let node_data = node_tree.get_node(node_id).unwrap();
- let mut children = vec![];
- node_tree.get_children_ids(node_id).into_iter().for_each(|child_id| {
- children.push(self.get_deleted_node_data(node_tree, child_id));
- });
-
- NodeData {
- node_type: node_data.node_type.clone(),
- attributes: node_data.attributes.clone(),
- body: node_data.body.clone(),
- children,
- }
+ recursive_get_deleted_node_data(node_tree, node_id)
}
pub fn push(mut self, op: NodeOperation) -> Self {
@@ -272,3 +261,19 @@ impl TransactionBuilder {
Transaction::from_operations(self.operations)
}
}
+
+fn recursive_get_deleted_node_data(node_tree: &NodeTree, node_id: NodeId) -> NodeData {
+ let node_data = node_tree.get_node(node_id).unwrap();
+ let mut children = vec![];
+ node_tree.get_children_ids(node_id).into_iter().for_each(|child_id| {
+ let child = recursive_get_deleted_node_data(node_tree, child_id);
+ children.push(child);
+ });
+
+ NodeData {
+ node_type: node_data.node_type.clone(),
+ attributes: node_data.attributes.clone(),
+ body: node_data.body.clone(),
+ children,
+ }
+}
diff --git a/shared-lib/lib-ot/src/core/node_tree/tree.rs b/shared-lib/lib-ot/src/core/node_tree/tree.rs
index 050160c7e9..78d37f0e08 100644
--- a/shared-lib/lib-ot/src/core/node_tree/tree.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/tree.rs
@@ -31,7 +31,7 @@ impl NodeTree {
pub fn from_node_data(node_data: NodeData, context: NodeTreeContext) -> Result<Self, OTError> {
let mut tree = Self::new(context);
- let _ = tree.insert_nodes(&0_usize.into(), vec![node_data])?;
+ tree.insert_nodes(&0_usize.into(), vec![node_data])?;
Ok(tree)
}
@@ -68,7 +68,7 @@ impl NodeTree {
let operations = operations.into();
let mut node_tree = NodeTree::new(context);
for (_, operation) in operations.into_inner().into_iter().enumerate() {
- let _ = node_tree.apply_op(operation)?;
+ node_tree.apply_op(operation)?;
}
Ok(node_tree)
}
@@ -76,7 +76,7 @@ impl NodeTree {
pub fn from_transaction<T: Into<Transaction>>(transaction: T, context: NodeTreeContext) -> Result<Self, OTError> {
let transaction = transaction.into();
let mut tree = Self::new(context);
- let _ = tree.apply_transaction(transaction)?;
+ tree.apply_transaction(transaction)?;
Ok(tree)
}
@@ -473,7 +473,7 @@ impl NodeTree {
None => tracing::warn!("The path: {:?} does not contain any nodes", path),
Some(node) => {
let node = node.get_mut();
- let _ = f(node)?;
+ f(node)?;
}
}
Ok(())
diff --git a/shared-lib/lib-ot/src/core/node_tree/tree_serde.rs b/shared-lib/lib-ot/src/core/node_tree/tree_serde.rs
index a946a012c0..366e1d0561 100644
--- a/shared-lib/lib-ot/src/core/node_tree/tree_serde.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/tree_serde.rs
@@ -26,7 +26,7 @@ impl Serialize for NodeTree {
let mut seq = serializer.serialize_seq(Some(children.len()))?;
for child in children {
if let Some(child_node_data) = self.get_node_data(child) {
- let _ = seq.serialize_element(&child_node_data)?;
+ seq.serialize_element(&child_node_data)?;
}
}
seq.end()
diff --git a/shared-lib/lib-ot/src/text_delta/macros.rs b/shared-lib/lib-ot/src/text_delta/macros.rs
index 26a2ac0886..0ca226733d 100644
--- a/shared-lib/lib-ot/src/text_delta/macros.rs
+++ b/shared-lib/lib-ot/src/text_delta/macros.rs
@@ -4,7 +4,7 @@ macro_rules! inline_attribute_entry {
$key: ident,
$value: ty
) => {
- pub fn $key(value: $value) -> crate::core::AttributeEntry {
+ pub fn $key(value: $value) -> $crate::core::AttributeEntry {
AttributeEntry {
key: BuildInTextAttributeKey::$key.as_ref().to_string(),
value: value.into(),
@@ -19,7 +19,7 @@ macro_rules! inline_list_attribute_entry {
$key: ident,
$value: expr
) => {
- pub fn $key(b: bool) -> crate::core::AttributeEntry {
+ pub fn $key(b: bool) -> $crate::core::AttributeEntry {
let value = match b {
true => $value,
false => "",
diff --git a/shared-lib/lib-ot/tests/node/transaction_compose_test.rs b/shared-lib/lib-ot/tests/node/transaction_compose_test.rs
index 4b5dd11b76..0622b49e86 100644
--- a/shared-lib/lib-ot/tests/node/transaction_compose_test.rs
+++ b/shared-lib/lib-ot/tests/node/transaction_compose_test.rs
@@ -10,7 +10,7 @@ fn transaction_compose_update_after_insert_test() {
// Modify the same path, the operations will be merged after composing if possible.
let mut transaction_a = TransactionBuilder::new().insert_node_at_path(0, node_data).build();
let transaction_b = TransactionBuilder::new().update_node_at_path(0, changeset).build();
- let _ = transaction_a.compose(transaction_b).unwrap();
+ transaction_a.compose(transaction_b).unwrap();
// The operations are merged into one operation
assert_eq!(transaction_a.operations.len(), 1);
@@ -46,14 +46,14 @@ fn transaction_compose_multiple_update_test() {
let inverted = Transaction::from_operations(other_transaction.operations.inverted());
// the update operation will be merged into insert operation
- let _ = transaction.compose(other_transaction).unwrap();
+ transaction.compose(other_transaction).unwrap();
assert_eq!(transaction.operations.len(), 1);
assert_eq!(
transaction.to_json().unwrap(),
r#"{"operations":[{"op":"insert","path":[0],"nodes":[{"type":"text","body":{"delta":[{"insert":"Hello world😁"}]}}]}]}"#
);
- let _ = transaction.compose(inverted).unwrap();
+ transaction.compose(inverted).unwrap();
assert_eq!(
transaction.to_json().unwrap(),
r#"{"operations":[{"op":"insert","path":[0],"nodes":[{"type":"text","body":{"delta":[{"insert":"Hello"}]}}]}]}"#
diff --git a/shared-lib/lib-ws/src/ws.rs b/shared-lib/lib-ws/src/ws.rs
index f66e477449..aa297c4a0f 100644
--- a/shared-lib/lib-ws/src/ws.rs
+++ b/shared-lib/lib-ws/src/ws.rs
@@ -232,8 +232,7 @@ pub struct WSSender(MsgSender);
impl WSSender {
pub fn send_msg<T: Into<WebSocketRawMessage>>(&self, msg: T) -> Result<(), WSError> {
let msg = msg.into();
- let _ = self
- .0
+ self.0
.unbounded_send(msg.into())
.map_err(|e| WSError::internal().context(e))?;
Ok(())
@@ -261,7 +260,7 @@ impl WSSender {
reason: reason.to_owned().into(),
};
let msg = Message::Close(Some(frame));
- let _ = self.0.unbounded_send(msg).map_err(|e| WSError::internal().context(e))?;
+ self.0.unbounded_send(msg).map_err(|e| WSError::internal().context(e))?;
Ok(())
}
}