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

Use approximate write range for set_versionstamped_key

This commit is contained in:
Andrew Noyes 2020-05-04 04:43:50 +00:00
parent b7cd6b20e8
commit 0c514e91c7
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/NativeAPI.actor.cpp
View File

@ -2433,7 +2433,7 @@ void Transaction::atomicOp(const KeyRef& key, const ValueRef& operand, MutationR
t.mutations.push_back( req.arena, MutationRef( operationType, r.begin, v ) );
if( addConflictRange )
if (addConflictRange && operationType != MutationRef::SetVersionstampedKey)
t.write_conflict_ranges.push_back( req.arena, r );
TEST(true); //NativeAPI atomic operation

83
fdbclient/ReadYourWrites.actor.cpp
View File

@ -1136,7 +1136,7 @@ public:
ReadYourWritesTransaction::ReadYourWritesTransaction(Database const& cx)
: cache(&arena), writes(&arena), tr(cx), retries(0), approximateSize(0), creationTime(now()), commitStarted(false),
options(tr), deferredError(cx->deferredError) {
options(tr), deferredError(cx->deferredError), versionStampFuture(tr.getVersionstamp()) {
std::copy(cx.getTransactionDefaults().begin(), cx.getTransactionDefaults().end(),
std::back_inserter(persistentOptions));
applyPersistentOptions();
@ -1586,56 +1586,54 @@ Standalone<RangeResultRef> ReadYourWritesTransaction::getReadConflictRangeInters
}
Standalone<RangeResultRef> ReadYourWritesTransaction::getWriteConflictRangeIntersecting(KeyRangeRef kr) {
if (writeConflictRangeUnknown) {
throw accessed_unreadable();
}
ASSERT(writeConflictRangeKeysRange.contains(kr));
Standalone<RangeResultRef> result;
// Memory owned by result
CoalescedKeyRefRangeMap<ValueRef> writeConflicts{ LiteralStringRef("0"), specialKeys.end };
for (const auto& k : versionStampKeys) {
KeyRange range;
if (versionStampFuture.isValid() && versionStampFuture.isReady() && !versionStampFuture.isError()) {
const auto& stamp = versionStampFuture.get();
StringRef key(range.arena(), k); // Copy
ASSERT(k.size() >= 4);
int32_t pos;
memcpy(&pos, k.end() - sizeof(int32_t), sizeof(int32_t));
pos = littleEndian32(pos);
ASSERT(pos >= 0 && pos + stamp.size() <= key.size());
memcpy(mutateString(key) + pos, stamp.begin(), stamp.size());
*(mutateString(key) + key.size() - 4) = '\x00';
// singleKeyRange, but share begin and end's memory
range = KeyRangeRef(key.substr(0, key.size() - 4), key.substr(0, key.size() - 3));
} else {
range = getVersionstampKeyRange(result.arena(), k, tr.getCachedReadVersion().orDefault(0), getMaxReadKey());
}
writeConflicts.insert(range.withPrefix(writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1"));
}
if (!options.readYourWritesDisabled) {
kr = kr.removePrefix(writeConflictRangeKeysRange.begin);
KeyRangeRef strippedWriteRangePrefix = kr.removePrefix(writeConflictRangeKeysRange.begin);
WriteMap::iterator it(&writes);
it.skip(kr.begin);
if (it.beginKey() != allKeys.begin) --it;
bool inConflictRange = false;
ExtStringRef conflictBegin;
for (; it.beginKey() < kr.end; ++it) {
if (it.is_conflict_range() && !inConflictRange) {
conflictBegin = std::max(ExtStringRef(allKeys.begin), it.beginKey());
inConflictRange = true;
} else if (!it.is_conflict_range() && inConflictRange) {
KeyRangeRef keyrange(conflictBegin.toArena(result.arena()), it.beginKey().toArena(result.arena()));
if (kr.contains(keyrange.begin))
result.push_back(result.arena(), KeyValueRef(keyrange.begin.withPrefix(
writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1")));
if (kr.contains(keyrange.end))
result.push_back(result.arena(), KeyValueRef(keyrange.end.withPrefix(
writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("0")));
inConflictRange = false;
it.skip(strippedWriteRangePrefix.begin);
for (; it.beginKey() < strippedWriteRangePrefix.end; ++it) {
if (it.is_conflict_range()) {
writeConflicts.insert(
KeyRangeRef(it.beginKey().toArena(result.arena()), it.endKey().toArena(result.arena()))
.withPrefix(writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1"));
}
}
if (inConflictRange) {
KeyRef begin = conflictBegin.toArena(result.arena());
if (kr.contains(begin))
result.push_back(result.arena(),
KeyValueRef(begin.withPrefix(writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1")));
}
} else {
CoalescedKeyRefRangeMap<ValueRef> writeConflicts{ LiteralStringRef("0"), specialKeys.end };
for (const auto& range : tr.writeConflictRanges())
writeConflicts.insert(range.withPrefix(writeConflictRangeKeysRange.begin, result.arena()),
LiteralStringRef("1"));
auto beginIter = writeConflicts.rangeContaining(kr.begin);
if (beginIter->begin() != kr.begin) ++beginIter;
for (auto it = beginIter; it->begin() < kr.end; ++it) {
result.push_back(result.arena(), KeyValueRef(it->begin(), it->value()));
}
}
auto beginIter = writeConflicts.rangeContaining(kr.begin);
if (beginIter->begin() != kr.begin) ++beginIter;
for (auto it = beginIter; it->begin() < kr.end; ++it) {
result.push_back(result.arena(), KeyValueRef(it->begin(), it->value()));
}
return result;
@ -1686,9 +1684,10 @@ void ReadYourWritesTransaction::atomicOp( const KeyRef& key, const ValueRef& ope
}
if(operationType == MutationRef::SetVersionstampedKey) {
writeConflictRangeUnknown = true;
// this does validation of the key and needs to be performed before the readYourWritesDisabled path
KeyRangeRef range = getVersionstampKeyRange(arena, k, tr.getCachedReadVersion().orDefault(0), getMaxReadKey());
versionStampKeys.push_back_deep(arena, k);
addWriteConflict = false;
if(!options.readYourWritesDisabled) {
writeRangeToNativeTransaction(range);
writes.addUnmodifiedAndUnreadableRange(range);
@ -2094,7 +2093,9 @@ void ReadYourWritesTransaction::reset() {
persistentOptions.clear();
options.reset(tr);
transactionDebugInfo.clear();
versionStampKeys = VectorRef<KeyRef>();
tr.fullReset();
versionStampFuture = tr.getVersionstamp();
std::copy(tr.getDatabase().getTransactionDefaults().begin(), tr.getDatabase().getTransactionDefaults().end(), std::back_inserter(persistentOptions));
resetRyow();
}

6
fdbclient/ReadYourWrites.h
View File

@ -162,9 +162,9 @@ private:
double creationTime;
bool commitStarted;
// If true, then this transactions write conflict range is not known until commit time.
// Currently only set if this transaction has a SetVersionstampedKey mutation
bool writeConflictRangeUnknown = false;
// For reading conflict ranges from the special key space
VectorRef<KeyRef> versionStampKeys;
Future<Standalone<StringRef>> versionStampFuture;
Reference<TransactionDebugInfo> transactionDebugInfo;