From a60e9a729059bb064fdadc119e927d0bee5ae855 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Tue, 28 Apr 2020 18:47:52 +0000 Subject: [PATCH] Fix bug - emit kv pair if we end in a conflict range --- fdbclient/ReadYourWrites.actor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fdbclient/ReadYourWrites.actor.cpp b/fdbclient/ReadYourWrites.actor.cpp index 93939ab3d6..5756c139ee 100644 --- a/fdbclient/ReadYourWrites.actor.cpp +++ b/fdbclient/ReadYourWrites.actor.cpp @@ -1597,6 +1597,14 @@ Standalone ReadYourWritesTransaction::getWriteConflictRangeInter } } } + + if (inConflictRange && conflictBegin < kr.end) { + result.push_back( + result.arena(), + KeyValueRef(conflictBegin.toArena(result.arena()) + .withPrefix(LiteralStringRef("\xff\xff/transaction/write_conflict_range/"), result.arena()), + LiteralStringRef("1"))); + } return result; }