mirror of
https://github.com/apple/foundationdb.git
synced 2025-05-15 02:18:39 +08:00
trivial merge
This commit is contained in:
commit
3dfe7a51e0
@ -51,9 +51,9 @@ ILogSystem::ServerPeekCursor::ServerPeekCursor(Reference<AsyncVar<OptionalInterf
|
|||||||
bool parallelGetMore)
|
bool parallelGetMore)
|
||||||
: interf(interf), tag(tag), rd(results.arena, results.messages, Unversioned()), messageVersion(begin), end(end),
|
: interf(interf), tag(tag), rd(results.arena, results.messages, Unversioned()), messageVersion(begin), end(end),
|
||||||
poppedVersion(0), hasMsg(false), randomID(deterministicRandom()->randomUniqueID()),
|
poppedVersion(0), hasMsg(false), randomID(deterministicRandom()->randomUniqueID()),
|
||||||
returnIfBlocked(returnIfBlocked), onlySpilled(false), parallelGetMore(parallelGetMore), sequence(0), lastReset(0),
|
returnIfBlocked(returnIfBlocked), onlySpilled(false), parallelGetMore(parallelGetMore),
|
||||||
resetCheck(Void()), slowReplies(0), fastReplies(0), unknownReplies(0),
|
usePeekStream(SERVER_KNOBS->PEEK_USEING_STREAMING), sequence(0), lastReset(0), resetCheck(Void()), slowReplies(0),
|
||||||
usePeekStream(SERVER_KNOBS->PEEK_USEING_STREAMING) {
|
fastReplies(0), unknownReplies(0) {
|
||||||
this->results.maxKnownVersion = 0;
|
this->results.maxKnownVersion = 0;
|
||||||
this->results.minKnownCommittedVersion = 0;
|
this->results.minKnownCommittedVersion = 0;
|
||||||
TraceEvent("SPC_Starting", randomID)
|
TraceEvent("SPC_Starting", randomID)
|
||||||
@ -73,8 +73,8 @@ ILogSystem::ServerPeekCursor::ServerPeekCursor(TLogPeekReply const& results,
|
|||||||
: tag(tag), results(results), rd(results.arena, results.messages, Unversioned()), messageVersion(messageVersion),
|
: tag(tag), results(results), rd(results.arena, results.messages, Unversioned()), messageVersion(messageVersion),
|
||||||
end(end), poppedVersion(poppedVersion), messageAndTags(message), hasMsg(hasMsg),
|
end(end), poppedVersion(poppedVersion), messageAndTags(message), hasMsg(hasMsg),
|
||||||
randomID(deterministicRandom()->randomUniqueID()), returnIfBlocked(false), onlySpilled(false),
|
randomID(deterministicRandom()->randomUniqueID()), returnIfBlocked(false), onlySpilled(false),
|
||||||
parallelGetMore(false), sequence(0), lastReset(0), resetCheck(Void()), slowReplies(0), fastReplies(0),
|
parallelGetMore(false), usePeekStream(false), sequence(0), lastReset(0), resetCheck(Void()), slowReplies(0),
|
||||||
unknownReplies(0), usePeekStream(false) {
|
fastReplies(0), unknownReplies(0) {
|
||||||
//TraceEvent("SPC_Clone", randomID);
|
//TraceEvent("SPC_Clone", randomID);
|
||||||
this->results.maxKnownVersion = 0;
|
this->results.maxKnownVersion = 0;
|
||||||
this->results.minKnownCommittedVersion = 0;
|
this->results.minKnownCommittedVersion = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user