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

Don't assert extra conflict range is ready

This commit is contained in:
Andrew Noyes 2020-05-04 19:26:40 +00:00
parent d2e2532287
commit b65c089edc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fdbclient/ReadYourWrites.actor.cpp
View File

@ -1049,11 +1049,11 @@ public:
ryw->nativeReadRanges = ryw->tr.readConflictRanges(); ryw->nativeReadRanges = ryw->tr.readConflictRanges();
ryw->nativeWriteRanges = ryw->tr.writeConflictRanges(); ryw->nativeWriteRanges = ryw->tr.writeConflictRanges();
for (const auto& f : ryw->tr.getExtraReadConflictRanges()) { for (const auto& f : ryw->tr.getExtraReadConflictRanges()) {
ASSERT(f.isReady() && f.get().first < f.get().second); if (f.isReady() && f.get().first < f.get().second)
ryw->nativeReadRanges.push_back( ryw->nativeReadRanges.push_back(
ryw->nativeReadRanges.arena(), ryw->nativeReadRanges.arena(),
KeyRangeRef(f.get().first, f.get().second) KeyRangeRef(f.get().first, f.get().second)
.withPrefix(readConflictRangeKeysRange.begin, ryw->nativeReadRanges.arena())); .withPrefix(readConflictRangeKeysRange.begin, ryw->nativeReadRanges.arena()));
} }
if (ryw->resetPromise.isSet()) if (ryw->resetPromise.isSet())
@ -1587,10 +1587,10 @@ Standalone<RangeResultRef> ReadYourWritesTransaction::getReadConflictRangeInters
readConflicts.insert(range.withPrefix(readConflictRangeKeysRange.begin, result.arena()), readConflicts.insert(range.withPrefix(readConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1")); LiteralStringRef("1"));
for (const auto& f : tr.getExtraReadConflictRanges()) { for (const auto& f : tr.getExtraReadConflictRanges()) {
ASSERT(f.isReady() && f.get().first < f.get().second); if (f.isReady() && f.get().first < f.get().second)
readConflicts.insert( readConflicts.insert(KeyRangeRef(f.get().first, f.get().second)
KeyRangeRef(f.get().first, f.get().second).withPrefix(readConflictRangeKeysRange.begin, result.arena()), .withPrefix(readConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1")); LiteralStringRef("1"));
} }
auto beginIter = readConflicts.rangeContaining(kr.begin); auto beginIter = readConflicts.rangeContaining(kr.begin);
if (beginIter->begin() != kr.begin) ++beginIter; if (beginIter->begin() != kr.begin) ++beginIter;