Merge pull request #22 from Dushistov/migrate-to-clc-master

Dushistov · web-flow · commit e6bb6e3d5548 · 2020-05-25T17:42:38.000+03:00
migration to current couchbase-lite-core master
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -86,6 +86,13 @@ jobs:
         with:
           cmake-version: '3.9.6'
           github-api-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Add fr_FR locale
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          set -e
+          sudo locale-gen fr_FR
+          sudo update-locale
+        shell: bash
       - name: Run tests
         run: |
           set -e
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,2 +1,6 @@
 [workspace]
-members = ["couchbase-lite-core-sys", "couchbase-lite", "chat-demo"]
+members = ["couchbase-lite-core-sys", "couchbase-lite", "chat-demo"]
+
+[patch.'crates-io']
+http = { git = "https://github.com/Dushistov/http", rev = "3ad3b825edc3a0d9048a6af5ab524f2fc51bde30" }
+tungstenite = { git = "https://github.com/Dushistov/tungstenite-rs", rev = "de80b9bced480d407665e46001fc2d7a6874d71e" }
diff --git a/chat-demo/Cargo.toml b/chat-demo/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-couchbase-lite = { path = "../couchbase-lite" }
+couchbase-lite = { path = "../couchbase-lite", features = ["replication"] }
 serde = { version = "1.0.104", features = ["derive"] }
 tokio = { version = "0.2.6", features = ["io-std", "io-util"] }
 log = "0.4.8"
diff --git a/chat-demo/src/main.rs b/chat-demo/src/main.rs
@@ -1,10 +1,10 @@
 use couchbase_lite::{
-    fallible_streaming_iterator::FallibleStreamingIterator, use_c4_civet_web_socket_factory,
-    Database, DatabaseConfig, Document, ReplicatorState,
+    fallible_streaming_iterator::FallibleStreamingIterator, use_web_sockets, Database,
+    DatabaseConfig, Document, ReplicatorState,
 };
 use log::{error, trace};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashSet, env, path::Path};
+use std::{collections::HashSet, env, path::Path, sync::mpsc};
 use tokio::prelude::*;
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -24,7 +24,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap_or_else(|| "ws://192.168.1.132:4984/demo/".to_string());
     let token: Option<String> = env::args().nth(3);
 
-    use_c4_civet_web_socket_factory();
+    use_web_sockets(runtime.handle().clone());
     let (db_thread, db_exec) = run_db_thread(db_path);
     let db_exec_repl = db_exec.clone();
     db_exec.spawn(move |db| {
@@ -56,11 +56,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     });
 
-    let db_exec2 = db_exec.clone();
+    let db_exec_repl = db_exec.clone();
     db_exec.spawn(move |db| {
         if let Some(db) = db.as_mut() {
             db.register_observer(move || {
-                db_exec2
+                db_exec_repl
                     .spawn(|db| print_external_changes(db).expect("read external changes failed"));
             })
             .expect("register observer failed");
@@ -69,10 +69,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     });
 
-    let db_exec3 = db_exec.clone();
     let mut stdin = tokio::io::BufReader::new(tokio::io::stdin());
     static EDIT_PREFIX: &'static str = "edit ";
 
+    let db_exec_repl = db_exec.clone();
     runtime.block_on(async move {
         let mut buf = String::new();
         let mut edit_id = None;
@@ -84,7 +84,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             let msg = &buf;
             let msg = msg.trim_end();
             if !msg.is_empty() {
-                if msg.starts_with(EDIT_PREFIX) {
+                if msg == "quit" {
+                    println!("Time to quit");
+                    break;
+                } else if msg.starts_with(EDIT_PREFIX) {
                     edit_id = Some((&msg[EDIT_PREFIX.len()..]).to_string());
                     println!("ready to edit message {:?}", edit_id);
                 } else {
@@ -93,7 +96,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                     {
                         let msg = msg.to_string();
                         let edit_id = edit_id.take();
-                        db_exec.spawn(move |db| {
+                        db_exec_repl.spawn(move |db| {
                             if let Some(mut db) = db.as_mut() {
                                 save_msg(&mut db, &msg, edit_id.as_ref().map(String::as_str))
                                     .expect("save to db failed");
@@ -108,14 +111,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     });
 
-    db_exec3.spawn(|db| {
+    db_exec.spawn(|db| {
         if let Some(db) = db.as_mut() {
             db.clear_observers();
+            db.stop_replicator();
         } else {
             eprintln!("db is NOT open");
         }
     });
-    drop(db_exec3);
+    drop(db_exec);
     db_thread.join().unwrap();
     println!("exiting");
     Ok(())
@@ -125,7 +129,7 @@ type Job<T> = Box<dyn FnOnce(&mut Option<T>) + Send>;
 
 #[derive(Clone)]
 struct DbQueryExecutor {
-    inner: std::sync::mpsc::Sender<Job<Database>>,
+    inner: mpsc::Sender<Job<Database>>,
 }
 
 impl DbQueryExecutor {
diff --git a/ci/build_and_run_tests.py b/ci/build_and_run_tests.py
@@ -35,6 +35,10 @@ def build_and_test_cpp_part(src_root: str):
     check_call(["ls"], cwd = cmake_build_dir)
     check_call(["cmake", "--build", ".", "--", "-j%d" % (cpu_count() + 1)],
                cwd = cmake_build_dir)
+    os.environ["LiteCoreTestsQuiet"] = "1"
+    check_call(["./CppTests", "-r", "list"], cwd = os.path.join(cmake_build_dir, "LiteCore", "tests"))
+    check_call(["./C4Tests", "-r", "list"], cwd = os.path.join(cmake_build_dir, "C", "tests"))
+
 
 @show_timing
 def build_and_test_rust_part(src_root: str):
diff --git a/couchbase-lite-core-sys/Cargo.toml b/couchbase-lite-core-sys/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 
 [build-dependencies]
 cmake = "0.1.42"
-bindgen = "0.52.0"
-cc = "1.0.48"
+bindgen = "0.53.2"
+cc = "1.0.53"
diff --git a/couchbase-lite-core-sys/build.rs b/couchbase-lite-core-sys/build.rs
@@ -9,6 +9,7 @@ use std::{
 fn main() {
     let dst = cmake::Config::new(Path::new("couchbase-lite-core"))
         .define("DISABLE_LTO_BUILD", "True")
+        .define("SANITIZE_FOR_DEBUG_ENABLED", "False")
         .build_target("LiteCore")
         .build()
         .join("build");
@@ -80,6 +81,7 @@ fn main() {
             .join("fleece")
             .join("API"),
         Path::new("couchbase-lite-core").into(),
+        Path::new(".").into(),
     ];
     let target = getenv_unwrap("TARGET");
     let mut framework_dirs = vec![];
@@ -99,11 +101,23 @@ fn main() {
             "fleece/FLSlice.h",
             "c4Document+Fleece.h",
             "fleece/Fleece.h",
-            "Replicator/CivetWebSocket.hh",
+            "couch_lite_log_retrans.hpp",
         ],
         &out_dir.join("c4_header.rs"),
     )
     .expect("bindgen failed");
+
+    let mut cc_builder = cc::Build::new();
+
+    for inc in &includes {
+        cc_builder.include(inc);
+    }
+
+    cc_builder
+        .cpp(true)
+        .flag_if_supported("-std=c++11")
+        .file("couch_lite_log_retrans.cpp")
+        .compile("couch_lite_log_retrans");
 }
 
 /// Convert something like
@@ -154,6 +168,7 @@ fn run_bindgen_for_c_headers<P: AsRef<Path>>(
         .header(c_file_path.to_str().unwrap())
         .generate_comments(false)
         .prepend_enum_name(true)
+        .size_t_is_usize(true)
         .rustfmt_bindings(false);
     bindings = include_dirs.iter().fold(bindings, |acc, x| {
         acc.clang_arg("-I".to_string() + x.as_ref().to_str().unwrap())
diff --git a/couchbase-lite-core-sys/couch_lite_log_retrans.cpp b/couchbase-lite-core-sys/couch_lite_log_retrans.cpp
@@ -0,0 +1,20 @@
+#include <atomic>
+
+#include "couch_lite_log_retrans.hpp"
+
+
+static std::atomic<C4LogCallbackR> g_rust_log_callback{nullptr};
+
+static void rust_log_callback(C4LogDomain d, C4LogLevel l,
+                              const char *fmt C4NONNULL, va_list) {
+  C4LogCallbackR rust_log_callback = g_rust_log_callback.load(std::memory_order_relaxed);
+  if (rust_log_callback != nullptr) {
+    rust_log_callback(d, l, fmt);
+  }
+}
+
+void c4log_setRustCallback(C4LogLevel level, C4LogCallbackR callback) noexcept {
+  g_rust_log_callback.store(callback, std::memory_order_relaxed);
+  c4log_writeToCallback(level, rust_log_callback, true);
+}
+
diff --git a/couchbase-lite-core-sys/couch_lite_log_retrans.hpp b/couchbase-lite-core-sys/couch_lite_log_retrans.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "c4Base.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*C4LogCallbackR)(C4LogDomain, C4LogLevel, const char *msg C4NONNULL);
+
+void c4log_setRustCallback(C4LogLevel level, C4LogCallbackR callback) C4API;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/couchbase-lite-core-sys/couchbase-lite-core b/couchbase-lite-core-sys/couchbase-lite-core
@@ -1 +1 @@
-Subproject commit 075266347791a0c2498590507b7240a68bb7c5df
+Subproject commit 902e9d00ca6be8ae6163b812027dfaf6e6332352
diff --git a/couchbase-lite-core-sys/src/lib.rs b/couchbase-lite-core-sys/src/lib.rs
@@ -1,3 +1,23 @@
 mod c4_header;
 
 pub use c4_header::*;
+
+use std::os::raw::c_void;
+
+//bindgen can not handle inline functions so
+
+#[inline]
+pub unsafe fn c4db_release(db: *mut C4Database) {
+    c4base_release(db as *mut c_void)
+}
+
+#[inline]
+#[allow(non_snake_case)]
+pub unsafe fn FLSliceResult_Release(s: FLSliceResult) {
+    _FLBuf_Release(s.buf);
+}
+
+#[inline]
+pub unsafe fn c4query_release(r: *mut C4Query) {
+    c4base_release(r as *mut c_void)
+}
diff --git a/couchbase-lite/Cargo.toml b/couchbase-lite/Cargo.toml
@@ -4,7 +4,10 @@ version = "0.2.0"
 authors = ["Evgeniy A. Dushistov <dushistov@mail.ru>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = ["replication", "tls"]
+replication = ["tokio-tungstenite", "http", "tokio", "futures-util",  "tokio-tls"]
+tls = ["tokio-tungstenite/tls"]
 
 [dependencies]
 couchbase-lite-core-sys = { path = "../couchbase-lite-core-sys" }
@@ -16,7 +19,12 @@ fallible-streaming-iterator = "0.1.9"
 bitflags = "1.2.1"
 once_cell = "1.2.0"
 log = "0.4.8"
+tokio-tungstenite = { version = "0.10.1", optional = true }
+http = { version = "0.2.1", optional = true }
+tokio = { version = "0.2", default-features = false, features = ["sync", "macros"], optional = true }
+futures-util = { version = "0.3.5", optional = true }
+tokio-tls = { version = "0.3.1", optional = true }
 
 [dev-dependencies]
 tempfile = "3.0"
-env_logger = "0.7"
+env_logger = "0.7"
diff --git a/couchbase-lite/src/document.rs b/couchbase-lite/src/document.rs
@@ -1,7 +1,7 @@
 use crate::{
     error::{c4error_init, Error},
     ffi::{
-        c4db_encodeJSON, c4doc_bodyAsJSON, c4doc_free, c4doc_loadRevisionBody, kDocExists,
+        c4db_encodeJSON, c4doc_bodyAsJSON, c4doc_loadRevisionBody, c4doc_release, kDocExists,
         kRevDeleted, C4Document, C4DocumentFlags, C4RevisionFlags,
     },
     fl_slice::{fl_slice_to_str_unchecked, AsFlSlice, FlSliceOwner},
@@ -175,6 +175,6 @@ impl C4DocumentOwner {
 
 impl Drop for C4DocumentOwner {
     fn drop(&mut self) {
-        unsafe { c4doc_free(self.0.as_ptr()) };
+        unsafe { c4doc_release(self.0.as_ptr()) };
     }
 }
diff --git a/couchbase-lite/src/fl_slice.rs b/couchbase-lite/src/fl_slice.rs
@@ -96,3 +96,8 @@ pub(crate) unsafe fn fl_slice_to_str_unchecked<'a>(s: FLSlice) -> &'a str {
     let bytes: &[u8] = slice::from_raw_parts(s.buf as *const u8, s.size);
     str::from_utf8_unchecked(bytes)
 }
+
+#[inline]
+pub(crate) unsafe fn fl_slice_to_slice<'a>(s: FLSlice) -> &'a [u8] {
+    slice::from_raw_parts(s.buf as *const u8, s.size)
+}
diff --git a/couchbase-lite/src/lib.rs b/couchbase-lite/src/lib.rs
diff --git a/couchbase-lite/src/log_reroute.rs b/couchbase-lite/src/log_reroute.rs
diff --git a/couchbase-lite/src/query.rs b/couchbase-lite/src/query.rs
diff --git a/couchbase-lite/src/repl_transport.rs b/couchbase-lite/src/repl_transport.rs
diff --git a/couchbase-lite/src/replicator.rs b/couchbase-lite/src/replicator.rs
diff --git a/couchbase-lite/src/value.rs b/couchbase-lite/src/value.rs
