chore: add sqlite feature flag (#1683)

* chore: add sqlite feature flag

* chore: fix clippy warings

* ci: fix clippy

* chore: add rev file persistence

* ci: fix clippy

Co-authored-by: nathan <[email protected]>

Author: appflowy

.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

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}

frontend/rust-lib/Cargo.lock

@@ -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",

frontend/rust-lib/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"]
 

frontend/rust-lib/dart-ffi/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"]

frontend/rust-lib/flowy-core/Cargo.toml

@@ -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(",")
 }

frontend/rust-lib/flowy-core/src/lib.rs

@@ -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"]

frontend/rust-lib/flowy-database/Cargo.toml

@@ -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 {

frontend/rust-lib/flowy-database/src/kv/kv.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)