From 863ebc2d6d38c816d12fd4e7d4ca595c658d452b Mon Sep 17 00:00:00 2001 From: chaoguang <13974480+zjuLcg@users.noreply.github.com> Date: Tue, 31 Mar 2020 18:49:59 -0700 Subject: [PATCH] fix merge conflict --- fdbclient/ReadYourWrites.actor.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/fdbclient/ReadYourWrites.actor.cpp b/fdbclient/ReadYourWrites.actor.cpp index 7f8443f278..fa406d0b4a 100644 --- a/fdbclient/ReadYourWrites.actor.cpp +++ b/fdbclient/ReadYourWrites.actor.cpp @@ -1280,13 +1280,11 @@ Future< Standalone > ReadYourWritesTransaction::getRange( } } -<<<<<<< HEAD // start with simplest point, special key space are only allowed to query if both begin and end start with \xff\xff const KeyRef specialKeyPrefix = systemKeys.end; if (begin.getKey().startsWith(specialKeyPrefix) && end.getKey().startsWith(specialKeyPrefix)) return getDatabase()->specialKeySpace->getRange(Reference(this), begin, end, limits, snapshot, reverse); -======= // Use special key prefix "\xff\xff/transaction/conflicting_keys/", // to retrieve keys which caused latest not_committed(conflicting with another transaction) error. // The returned key value pairs are interpretted as : @@ -1323,7 +1321,6 @@ Future< Standalone > ReadYourWritesTransaction::getRange( } } ->>>>>>> upstream/master if(checkUsedDuringCommit()) { return used_during_commit(); }