Build-To-Use: 4.1.0-57

CBL-8083: Added TLSContext::registerPrivateKey() [CBL-8083] (#2453)
CBL-7988: Upgrade SQLite to 3.51.3 (#2452)
CBL-7866: Exception when decode a cbllog binary file (#2447)
CBL-7774: Increase WS Ping/Pong timeout to 20s from 10s (#2424)
CBL-7991: Error when creating a partial value index with compound expressions (#2444)
CBL-7782: Query for document count() is too slow for big database (#2439)

EE:
CBL-7962: Handle CBManagerStateResetting (#121)
CBL-7985: Fix crash in MeshManager::maybeConnect (#120)
c874deb   Move TLSCodec.hh to P2P/include folder

Author: jianminzhao

.github/workflows/build.yml

@@ -29,8 +29,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        include:
+          - os: ubuntu-latest
+            cc: clang
+            cxx: clang++
+          - os: macOS-latest
+          - os: windows-latest
     runs-on: ${{ matrix.os }}
+    env:
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
 
     steps:
     - uses: actions/checkout@v2

C/Cpp_include/c4Database.hh

@@ -210,6 +210,9 @@ struct C4Database
 
     virtual C4Timestamp nextDocExpiration() const = 0;
 
+    // Deleted Table:
+    virtual bool isDeletedTableComplete() const = 0;
+
     // Blobs:
 
     virtual C4BlobStore& getBlobStore() const = 0;

C/c4Log.cc

@@ -18,6 +18,7 @@
 #include "LogObserver.hh"
 #include "Logging.hh"
 #include "PlatformIO.hh"  // For vasprintf on Windows
+#include "fleece/PlatformCompat.hh"
 #include "WebSocketInterface.hh"
 #include "c4ExceptionUtils.hh"
 
@@ -302,7 +303,8 @@ C4LogDomain c4log_getDomain(const char* name, bool create) noexcept {
     if ( !name ) return kC4DefaultLog;
     auto domain = LogDomain::named(name);
     // LogDomain instances are never deleted, so it's fine to use `new` and `strdup`.
-    if ( !domain && create ) domain = new LogDomain(strdup(name));
+    if ( !domain && create ) domain = new LogDomain(cbl_strdup(name));
+
     return asExternal(domain);
 }
 

C/include/c4Compat.h

@@ -138,10 +138,10 @@
 
 
 // Type-checking for printf-style vararg functions:
-#ifdef _MSC_VER
-#    define __printflike(A, B)
-#else
-#    ifndef __printflike
+#ifndef __printflike
+#    if __has_attribute(__format__)
 #        define __printflike(fmtarg, firstvararg) __attribute__((__format__(__printf__, fmtarg, firstvararg)))
+#    else
+#        define __printflike(A, B)
 #    endif
 #endif

C/include/c4Database.h

@@ -94,6 +94,7 @@ NODISCARD CBL_CORE_API C4Database* c4db_openAgain(C4Database* db, C4Error* C4NUL
         @param destinationName  The name (without filename extension) of the database to create.
         @param config  Database configuration (including destination directory.)
         @param error  On failure, error info will be written here.
+        \note if there is an open database on the sourcePath, it will fail with error code kC4ErrorBusy
         @return  True on success, false on failure. */
 NODISCARD CBL_CORE_API bool c4db_copyNamed(C4String sourcePath, C4String destinationName,
                                            const C4DatabaseConfig2* config, C4Error* C4NULLABLE error) C4API;

C/tests/CMakeLists.txt

@@ -139,3 +139,18 @@ target_include_directories(
 file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/C/tests)
 file(COPY ../../LiteCore/tests/data/replacedb/ios120/iosdb.cblite2
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/LiteCore/tests/data/replacedb/ios120)
+
+if(WIN32)
+    add_custom_command(TARGET C4Tests POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                $<TARGET_FILE:LiteCore>
+                $<TARGET_FILE_DIR:C4Tests>
+    )
+
+    add_custom_command(TARGET C4Tests POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                $<TARGET_PDB_FILE:LiteCore>
+                $<TARGET_FILE_DIR:C4Tests>
+        VERBATIM
+    )
+endif()

C/tests/c4CertificateTest.cc

@@ -16,6 +16,7 @@
 #    include "CertHelper.hh"
 #    ifdef WIN32
 #        include "Winsock2.h"
+#        include "Ws2tcpip.h"
 #        define in_addr_t unsigned long
 #    else
 #        include <arpa/inet.h>
@@ -41,7 +42,8 @@ TEST_CASE("C4Certificate smoke test", "[Certs][C]") {
 }
 
 TEST_CASE("C4Certificate Subject Name", "[Certs][C]") {
-    auto                ipAddr = htonl(inet_addr("127.0.0.1"));
+    struct in_addr ipAddr;
+    REQUIRE(inet_pton(AF_INET, "127.0.0.1", &ipAddr) == 1);
     fleece::slice       ipAddrSlice((void*)&ipAddr, sizeof(in_addr_t));
     C4CertNameComponent nameComponents[] = {{kC4Cert_CommonName, "CommonName"_sl},
                                             {kC4Cert_Pseudonym, "Pseudonym"_sl},

C/tests/c4DatabaseTest.cc

@@ -233,9 +233,8 @@ N_WAY_TEST_CASE_METHOD(C4DatabaseTest, "Test delete while database open", "[Data
 #ifdef FAIL_FAST
     CHECK(slice(message) == "LiteCore Busy, \"Can't delete db file while the caller has open connections\"");
 #else
-    CHECK(slice(message)
-          == "LiteCore Busy, \"Can't delete db file while other connections are open. The open connections are tagged "
-             "appOpened.\"");
+    CHECK(slice(message).hasPrefix("LiteCore Busy, \"Can't delete db file while other connections are open. The open "
+                                   "connections are tagged "));
 #endif
     FLSliceResult_Release(message);
 }
@@ -369,6 +368,39 @@ N_WAY_TEST_CASE_METHOD(C4DatabaseTest, "Database Enumerator", "[Database][Docume
     CHECK(i == 100);
 }
 
+N_WAY_TEST_CASE_METHOD(C4DatabaseTest, "Database Enumerator with V3.0 Database",
+                       "[Database][Document][Enumerator][C]") {
+    closeDB();
+    auto              name   = copyFixtureDB("db_versions/db_3_0_0_names_100_with_deleted.cblite2");
+    C4DatabaseConfig2 config = {slice(TempDir())};
+    config.flags &= !kC4DB_Create;
+    db = REQUIRED(c4db_openNamed(name, &config, ERROR_INFO()));
+
+    auto                defaultColl = getCollection(db, kC4DefaultCollectionSpec);
+    C4EnumeratorOptions options     = kC4DefaultEnumeratorOptions;
+    options.flags &= ~kC4IncludeBodies;
+
+    C4Error                  error;
+    c4::ref<C4DocEnumerator> e                = REQUIRED(c4coll_enumerateAllDocs(defaultColl, &options, WITH_ERROR()));
+    bool                     isFirstIteration = true;
+    while ( c4enum_next(e, &error) ) {
+        if ( isFirstIteration ) {
+            // to allow Housekeeper/migration to catch up, in order to hit SQLITE_BUSY_SNAPSHOT
+            std::this_thread::sleep_for(1ms);
+            isFirstIteration = false;
+        }
+        auto doc = c4enum_getDocument(e, ERROR_INFO());
+        REQUIRE(doc);
+
+        CHECK(c4doc_getProperties(doc) == nullptr);
+        // Doc was loaded without its body, but it should load on demand:
+        CHECK(c4doc_loadRevisionBody(doc, WITH_ERROR()));  // have to explicitly load the body
+
+        c4doc_release(doc);
+    }
+    CHECK(error == C4Error{});
+}
+
 N_WAY_TEST_CASE_METHOD(C4DatabaseTest, "Database Enumerator With Info", "[Database][Enumerator][C]") {
     setupAllDocs();
     C4Error             error;
@@ -877,7 +909,16 @@ N_WAY_TEST_CASE_METHOD(C4DatabaseTest, "Database copy", "[Database][C]") {
 
     if ( !c4db_deleteNamed(kNuName, slice(nuPath), &error) ) { REQUIRE(error.code == 0); }
 
+    {
+        ExpectingExceptions x;
+        // The source db cannot be open to copyNamed from.
+        REQUIRE(!c4db_copyNamed(c4str(srcPathStr.c_str()), kNuName, &config, &error));
+        CHECK(error.domain == LiteCoreDomain);
+        CHECK(error.code == kC4ErrorBusy);
+    }
+    REQUIRED(c4db_close(db, nullptr));
     REQUIRE(c4db_copyNamed(c4str(srcPathStr.c_str()), kNuName, &config, WITH_ERROR()));
+
     auto nudb = c4db_openNamed(kNuName, &config, ERROR_INFO());
     REQUIRE(nudb);
     auto defaultColl = getCollection(nudb, kC4DefaultCollectionSpec);

C/tests/c4QueryTest.cc

@@ -317,6 +317,48 @@ N_WAY_TEST_CASE_METHOD(C4QueryTest, "C4Query partial value index", "[Query][C]")
     }
 }
 
+N_WAY_TEST_CASE_METHOD(C4QueryTest, "C4Query partial value index with compound expressions", "[Query][C]") {
+    C4Error err;
+    auto    defaultColl = getCollection(db, kC4DefaultCollectionSpec);
+
+    // First add some documents with specific fields to test
+    {
+        TransactionHelper t(db);
+        createFleeceRev(db, "compound1"_sl, kRevID,
+                        R"({"locationID": "store1", "status": "active", "isPurged": false})"_sl);
+        createFleeceRev(db, "compound2"_sl, kRevID,
+                        R"({"locationID": "store2", "status": "inactive", "isPurged": true})"_sl);
+        createFleeceRev(db, "compound3"_sl, kRevID,
+                        R"({"locationID": "store1", "status": "active", "isPurged": true})"_sl);
+    }
+
+    // Create a partial value index with compound expressions
+    C4IndexOptions options{};
+    options.where = R"(["=", [".isPurged"], false])";
+
+    // This is what was causing the bug - a value index with multiple expressions and a WHERE clause
+    REQUIRE(c4coll_createIndex(defaultColl, C4STR("compound_idx"), c4str(R"([".locationID", ".status", ".isPurged"])"),
+                               kC4JSONQuery, kC4ValueIndex, &options, WITH_ERROR(&err)));
+
+    // Verify that the index works by running a query that would use it
+    compileSelect("SELECT META().id FROM _ WHERE locationID = 'store1' AND status = 'active' AND isPurged = false",
+                  kC4N1QLQuery);
+    REQUIRE(query);
+    CHECK(run() == (vector<string>{"compound1"}));
+
+    // Create another index with N1QL syntax to verify that works too
+    C4IndexOptions options2{};
+    options2.where = "isPurged = true";
+    REQUIRE(c4coll_createIndex(defaultColl, C4STR("compound_idx2"), c4str("locationID, status, isPurged"), kC4N1QLQuery,
+                               kC4ValueIndex, &options2, WITH_ERROR(&err)));
+
+    // Verify the second index works
+    compileSelect("SELECT META().id FROM _ WHERE locationID = 'store1' AND status = 'active' AND isPurged = true",
+                  kC4N1QLQuery);
+    REQUIRE(query);
+    CHECK(run() == (vector<string>{"compound3"}));
+}
+
 static bool lookForIndex(C4Database* db, slice name) {
     bool found       = false;
     auto defaultColl = C4QueryTest::getCollection(db, kC4DefaultCollectionSpec);
@@ -1690,8 +1732,18 @@ N_WAY_TEST_CASE_METHOD(C4QueryTest, "Multiple C4Query observers", "[Query][C][!t
 }
 
 N_WAY_TEST_CASE_METHOD(C4QueryTest, "C4Query observers lifetime", "[Query][C][!throws]") {
+    int sw = 0;
+    SECTION("With 3.0 DB") {
+        closeDB();
+        auto              name   = copyFixtureDB("db_versions/db_3_0_0_names_100_with_deleted.cblite2");
+        C4DatabaseConfig2 config = {slice(TempDir())};
+        config.flags &= !kC4DB_Create;
+        db = REQUIRED(c4db_openNamed(name, &config, ERROR_INFO()));
+        sw = GENERATE(0, 1, 2, 3);
+    }
+    SECTION("With current DB") { sw = GENERATE(0, 1, 2, 3); }
+
     compile(json5("['=', ['.', 'contact', 'address', 'state'], 'CA']"));
-    const int sw = GENERATE(0, 1, 2, 3);
 
     struct State {
         C4Query*         query;

C/tests/c4Test.cc

@@ -122,7 +122,7 @@ void C4ExpectException(C4ErrorDomain domain, int code, const std::function<void(
 
 #pragma mark - C4TEST CLASS
 
-#if defined(CMAKE) && defined(_MSC_VER)
+#if defined(CMAKE) && defined(_MSC_VER) && !defined(__clang__)
 string C4Test::sFixturesDir           = "../C/tests/data/";
 string C4Test::sReplicatorFixturesDir = "../Replicator/tests/data/";
 #else