Build-To-Use: 4.2.0-7

jianminzhao · jianminzhao · commit 3f38bbcd8edc · 2026-07-01T18:56:05.000-07:00
CBL-8578: Fixed dumb bug in RingBuffer causing BT TLS streams to fail. (#2516) CBL-8580: Use AtomicRetained in Replicator::Subreplicators (#2517) CBL-8516: Add a timeout to C4WebSocket::waitForTLSHandshake() (#2514) EE: CBL-8516: Don't let MeshManager hang waiting for TLS handshake (#147) (#156) CBL-8512: Re-add a suspended Bonjour peer if it's rediscovered (#154) CBL-8510: Fix connect timeout check in LiteCoreBTCentral (#153) CBL-8514: Improved TLSCodec error handling (#145) (#155)
diff --git a/.github/workflows/warn_release.yml b/.github/workflows/warn_release.yml
@@ -1,8 +1,19 @@
 on:
   workflow_call: # So it can be used by our other repos
-  pull_request:  # And also be used for itself
-    branches: ['release/**']
-  workflow_dispatch:  # manual trigger via GitHub UI
+  pull_request: # And also be used for itself
+    types: [opened]
+    branches: ["release/**"]
+    paths:
+      - "C/**"
+      - "Crypto/**"
+      - "LiteCore/**"
+      - "MSVC/**"
+      - "Networking/**"
+      - "Replicator/**"
+      - "REST/**"
+      - "vendor/fleece"
+
+  workflow_dispatch: # manual trigger via GitHub UI
 
 jobs:
   warn-release:
@@ -23,6 +34,7 @@ jobs:
 
             - [ ] A response to a customer ask
             - [ ] A change per our security policy
-            - [ ] A non-functional change (i.e. changes needed for building an older version)
+            - [ ] A non-functional change (e.g. changes needed for building an older version)
+            - [ ] A bug fix for a x.y.0 release
             - [ ] A change that has been granted an exception (please comment)`
             })
diff --git a/LiteCore/Support/RingBuffer.hh b/LiteCore/Support/RingBuffer.hh
@@ -58,7 +58,7 @@ namespace litecore {
             if ( end >= _capacity ) end -= _capacity;
             size_t n1 = std::min(n, _capacity - end);
             ::memcpy(&_buffer[end], data.buf, n1);
-            if ( n1 > n ) ::memcpy(&_buffer[0], &data[n1], n - n1);
+            if ( n1 < n ) ::memcpy(&_buffer[0], &data[n1], n - n1);
             _size += n;
             return n;
         }
diff --git a/LiteCore/tests/N1QLParserTest.cc b/LiteCore/tests/N1QLParserTest.cc
@@ -600,16 +600,20 @@ TEST_CASE_METHOD(N1QLParserTest, "N1QL Performance", "[Query][N1QL][C]") {
 
     SECTION("Very Long Query") {
         // 3b1fe0d6fe46a5a4e1655dbe6f42e89154a189dd, this query takes 4 seconds
-        n1ql       = "SELECT doc.* FROM _ doc WHERE "
-                     "doc.type = 'Model' AND "
-                     "doc.s NOT IN ('A', 'B', 'V') AND "
-                     "((doc.model.total.totalA "
-                     "- ifnull(doc.model.totalA.totalB, 0)) "
-                     "> 0 OR doc.t = false) AND "
-                     "(doc.q IS NULL OR "
-                     "ifnull(doc.q.e, 'e') = 'e' AND "
-                     "ifnull(doc.q.m, 0) == 0)";
+        n1ql = "SELECT doc.* FROM _ doc WHERE "
+               "doc.type = 'Model' AND "
+               "doc.s NOT IN ('A', 'B', 'V') AND "
+               "((doc.model.total.totalA "
+               "- ifnull(doc.model.totalA.totalB, 0)) "
+               "> 0 OR doc.t = false) AND "
+               "(doc.q IS NULL OR "
+               "ifnull(doc.q.e, 'e') = 'e' AND "
+               "ifnull(doc.q.m, 0) == 0)";
+#ifdef _MSC_VER
+        checkBound = 10.0;
+#else
         checkBound = 1.0;
+#endif
     }
 
     Stopwatch sw;
diff --git a/Networking/WebSockets/c4WebSocket.cc b/Networking/WebSockets/c4WebSocket.cc
@@ -134,9 +134,10 @@ namespace litecore::repl {
         catchAndWarn() return false;
     }
 
-    bool C4WebSocket::waitForTLSHandshake() {
+    bool C4WebSocket::waitForTLSHandshake(unsigned timeoutSecs) {
         unique_lock lock(_mutex);
-        _tlsHandshakeCondition.wait(lock, [this] { return _peerCertData != nullslice || _closed; });
+        _tlsHandshakeCondition.wait_for(lock, chrono::seconds(timeoutSecs),
+                                        [this] { return _peerCertData != nullslice || _closed; });
         return _peerCertData != nullslice && !_closed;
     }
 
diff --git a/Networking/WebSockets/c4WebSocket.hh b/Networking/WebSockets/c4WebSocket.hh
@@ -47,7 +47,7 @@ namespace litecore::repl {
         void closeWithException();
 
         /** Blocks until the TLS handshake completes or the socket closes. Returns true on success. */
-        [[nodiscard]] bool waitForTLSHandshake();
+        [[nodiscard]] bool waitForTLSHandshake(unsigned timeoutSecs);
 
         // WebSocket public API:
         void connect() override;
diff --git a/Replicator/Replicator.cc b/Replicator/Replicator.cc
@@ -252,9 +252,13 @@ namespace litecore::repl {
 
     // Called after the checkpoint is established.
     void Replicator::startReplicating(CollectionIndex coll) {
-        if ( _options->push(coll) > kC4Passive ) _subRepls[coll].pusher->start();
-        if ( _options->pull(coll) > kC4Passive )
-            _subRepls[coll].puller->start(_subRepls[coll].checkpointer->remoteMinSequence());
+        if ( _options->push(coll) > kC4Passive ) {
+            if ( auto pusher = _subRepls[coll].pusher.get() ) pusher->start();
+        }
+        if ( _options->pull(coll) > kC4Passive ) {
+            if ( auto puller = _subRepls[coll].puller.get() )
+                puller->start(_subRepls[coll].checkpointer->remoteMinSequence());
+        }
     }
 
     pair<int, websocket::Headers> Replicator::httpResponse() const {
@@ -379,9 +383,9 @@ namespace litecore::repl {
 
         CollectionIndex coll = task->collectionIndex();
         if ( coll != kNotCollectionIndex ) {
-            if ( task == _subRepls[coll].pusher ) {
+            if ( auto pusher = _subRepls[coll].pusher.get(); pusher == task ) {
                 updatePushStatus(coll, taskStatus);
-            } else if ( task == _subRepls[coll].puller ) {
+            } else if ( auto puller = _subRepls[coll].puller.get(); puller == task ) {
                 updatePullStatus(coll, taskStatus);
             }
         }
@@ -656,8 +660,8 @@ namespace litecore::repl {
         // Clear connection() and notify the other agents to do the same:
         _connectionClosed();
         for ( auto& sub : _subRepls ) {
-            if ( sub.pusher ) sub.pusher->connectionClosed();
-            if ( sub.puller ) sub.puller->connectionClosed();
+            if ( auto pusher = sub.pusher.get() ) pusher->connectionClosed();
+            if ( auto puller = sub.puller.get() ) puller->connectionClosed();
         }
 
         if ( status.isNormal() && closedByPeer && _options->isActive() ) {
@@ -718,9 +722,10 @@ namespace litecore::repl {
                 cLogInfo(coll, "No local checkpoint '%.*s'", SPLAT(sub.checkpointer->initialCheckpointID()));
                 // If pulling into an empty db with no checkpoint, it's safe to skip deleted
                 // revisions as an optimization.
-                if ( _options->pull(coll) > kC4Passive && sub.puller
+                if ( auto puller = sub.puller.get();
+                     puller && _options->pull(coll) > kC4Passive
                      && _db->useCollection(sub.collectionSpec)->getLastSequence() == 0_seq )
-                    sub.puller->setSkipDeleted();
+                    puller->setSkipDeleted();
             }
             return true;
         } catch ( ... ) {
@@ -767,8 +772,9 @@ namespace litecore::repl {
 
             if ( !refresh && sub.hadLocalCheckpoint ) {
                 // Compare checkpoints, reset if mismatched:
-                bool valid = sub.checkpointer->validateWith(remoteCheckpoint);
-                if ( !valid && sub.pusher ) sub.pusher->checkpointIsInvalid();
+                if ( !sub.checkpointer->validateWith(remoteCheckpoint) ) {
+                    if ( auto pusher = sub.pusher.get() ) pusher->checkpointIsInvalid();
+                }
 
                 if ( !refresh ) {
                     // Now we have the checkpoints! Time to start replicating:
@@ -898,8 +904,9 @@ namespace litecore::repl {
 
                     if ( _subRepls[i].hadLocalCheckpoint ) {
                         // Compare checkpoints, reset if mismatched:
-                        bool valid = _subRepls[i].checkpointer->validateWith(remoteCheckpoints[i]);
-                        if ( !valid && _subRepls[i].pusher ) _subRepls[i].pusher->checkpointIsInvalid();
+                        if ( !_subRepls[i].checkpointer->validateWith(remoteCheckpoints[i]) ) {
+                            if ( auto pusher = _subRepls[i].pusher.get() ) pusher->checkpointIsInvalid();
+                        }
                     }
                     // Now we have the checkpoints! Time to start replicating:
                     startReplicating(i);
diff --git a/Replicator/Replicator.hh b/Replicator/Replicator.hh
@@ -11,14 +11,14 @@
 //
 
 #pragma once
+#include "AtomicRetained.hh"
 #include "Worker.hh"
 #include "Checkpointer.hh"
 #include "BLIPConnection.hh"
 #include "Batcher.hh"
 #include "Stopwatch.hh"
 #include "c4DatabaseTypes.h"
 #include <access_lock.hh>
-#include <array>
 #include <optional>
 #include <utility>
 
@@ -232,8 +232,8 @@ namespace litecore::repl {
         // Member variables:
 
         struct SubReplicator {
-            Retained<Pusher>         pusher;
-            Retained<Puller>         puller;
+            AtomicRetained<Pusher>   pusher;
+            AtomicRetained<Puller>   puller;
             Status                   pushStatus;                        // Current status of Pusher
             Status                   pullStatus;                        // Current status of Puller
             unique_ptr<Checkpointer> checkpointer;                      // Object that manages checkpoints
diff --git a/licenses/BSL-Couchbase.txt b/licenses/BSL-Couchbase.txt
@@ -2,7 +2,7 @@ COUCHBASE BUSINESS SOURCE LICENSE AGREEMENT
 
 Business Source License 1.1
 Licensor:  Couchbase, Inc.
-Licensed Work:  Couchbase Lite Version 4.1
+Licensed Work:  Couchbase Lite Version 4.2
 The Licensed Work is © 2021-Present Couchbase, Inc.
 
 Additional Use Grant: You may make production use of the Licensed Work, provided
diff --git a/vendor/fleece b/vendor/fleece
@@ -1 +1 @@
-Subproject commit ace0a65628bc13690efc019a87c7f553cf33eece
+Subproject commit c85566da78083dd6231e4294cc040aa8876dfef9

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace litecore {`
`58`	`58`	`if ( end >= _capacity ) end -= _capacity;`
`59`	`59`	`size_t n1 = std::min(n, _capacity - end);`
`60`	`60`	`::memcpy(&_buffer[end], data.buf, n1);`
`61`		`- if ( n1 > n ) ::memcpy(&_buffer[0], &data[n1], n - n1);`
	`61`	`+ if ( n1 < n ) ::memcpy(&_buffer[0], &data[n1], n - n1);`
`62`	`62`	`_size += n;`
`63`	`63`	`return n;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,10 @@ namespace litecore::repl {`
`134`	`134`	`catchAndWarn() return false;`
`135`	`135`	`}`
`136`	`136`
`137`		`- bool C4WebSocket::waitForTLSHandshake() {`
	`137`	`+ bool C4WebSocket::waitForTLSHandshake(unsigned timeoutSecs) {`
`138`	`138`	`unique_lock lock(_mutex);`
`139`		`- _tlsHandshakeCondition.wait(lock, [this] { return _peerCertData != nullslice \|\| _closed; });`
	`139`	`+ _tlsHandshakeCondition.wait_for(lock, chrono::seconds(timeoutSecs),`
	`140`	`+ [this] { return _peerCertData != nullslice \|\| _closed; });`
`140`	`141`	`return _peerCertData != nullslice && !_closed;`
`141`	`142`	`}`
`142`	`143`