Skip to content

CBL-7599: Send Database UID to Sync Gateway on blipsync #2403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jianminzhao wants to merge 1 commit into
base: release/4.0
Choose a base branch
from
+5 −6
Open

CBL-7599: Send Database UID to Sync Gateway on blipsync #2403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Replicator/Replicator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "StringUtil.hh"
#include "Logging.hh"
#include "Headers.hh"
#include "UUID.hh"
#include "Instrumentation.hh"
#include "fleece/Mutable.hh"

Expand Down Expand Up @@ -117,11 +118,6 @@ namespace litecore::repl {
_loggingID = string(db->useLocked()->getPath()) + " " + _loggingID;
_importance = 2;

string dbLogName = db->useLocked([](const C4Database* db) {
DatabaseImpl* impl = asInternal(db);
return impl->dataFile()->loggingName();
});

#ifdef LITECORE_CPPTEST
_delayChangesResponse = _options->delayChangesResponse();
_disableReplacementRevs = _options->disableReplacementRevs();
Expand Down Expand Up @@ -835,7 +831,10 @@ namespace litecore::repl {
logVerbose("Requesting get collections");

MessageBuilder msg("getCollections"_sl);
auto& enc = msg.jsonBody();
UUID uuid = _db->useLocked([](C4Database* db) { return db->getPublicUUID(); });
msg["uuid"_sl] = uuid.to_string();

auto& enc = msg.jsonBody();
enc.beginDict();
enc.writeKey("checkpoint_ids"_sl);
enc.beginArray();
Expand Down