Refactor ConflictingKeysImpl::getRange to use containedRanges to simplify the code

sfc-gh-clin · sfc-gh-clin · commit fdd298f469bf · 2022-07-22T14:15:18.000-07:00
diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp
@@ -694,17 +694,12 @@ Future<RangeResult> ConflictingKeysImpl::getRange(ReadYourWritesTransaction* ryw
                                                   GetRangeLimits limitsHint) const {
 	RangeResult result;
 	if (ryw->getTransactionState()->conflictingKeys) {
-		auto krMapPtr = ryw->getTransactionState()->conflictingKeys.get();
-		auto beginIter = krMapPtr->rangeContaining(kr.begin);
-		auto endIter = krMapPtr->rangeContaining(kr.end);
-
-		if (!kr.contains(beginIter->begin()) && beginIter != endIter)
-			++beginIter;
-		for (auto it = beginIter; it != endIter; ++it) {
+		auto ranges = ryw->getTransactionState()->conflictingKeys->containedRanges(kr);
+		for (auto it = ranges.begin(); it != ranges.end(); ++it) {
 			result.push_back_deep(result.arena(), KeyValueRef(it->begin(), it->value()));
 		}
-		if (kr.contains(endIter->begin()))
-			result.push_back_deep(result.arena(), KeyValueRef(endIter->begin(), endIter->value()));
+		if (kr.contains(ranges.end()->begin()))
+			result.push_back_deep(result.arena(), KeyValueRef(ranges.end()->begin(), ranges.end()->value()));
 	}
 	return result;
 }
