wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing merge conficts

This commit is contained in:
Josh Slocum 2022-07-20 08:20:48 -05:00
parent 3f8f44dd16
commit e3cbd63b6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/workloads/ChangeFeedOperations.actor.cpp
View File

@ -271,11 +271,11 @@ ACTOR Future<Void> liveReader(Database cx, Reference<FeedTestData> data, Version
// pendingCheck wasn't empty before whenAtLeast, and nextCheckVersion = the front version, so if
// either of these are true, the data was popped concurrently and we can move on to checking the
// next value
TEST(true); // popped while waiting for whenAtLeast to check next value
CODE_PROBE(true, "popped while waiting for whenAtLeast to check next value");
continue;
}
while (!buffered.empty() && buffered.front().version < data->poppingVersion) {
TEST(true); // live reader ignoring data that is being popped
CODE_PROBE(true, "live reader ignoring data that is being popped");
buffered.pop_front();
}
if (buffered.empty()) {