Fix conflict

Author: Dan Lambright

fdbserver/ApplyMetadataMutation.cpp

@@ -442,47 +442,6 @@ class ApplyMetadataMutationsImpl {
 			txnStateStore->set(KeyValueRef(m.param1, m.param2));
 	}
 
-	void checkSetChangeFeedPrefix(MutationRef m) {
-		if (!m.param1.startsWith(changeFeedPrefix)) {
-			return;
-		}
-		if (toCommit && keyInfo) {
-			KeyRange r = std::get<0>(decodeChangeFeedValue(m.param2));
-			MutationRef privatized = m;
-			privatized.clearChecksumAndAccumulativeIndex();
-			privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
-			auto ranges = keyInfo->intersectingRanges(r);
-			auto firstRange = ranges.begin();
-			++firstRange;
-			if (firstRange == ranges.end()) {
-				ranges.begin().value().populateTags();
-				if (acsBuilder != nullptr) {
-					updateMutationWithAcsAndAddMutationToAcsBuilder(acsBuilder,
-					                                                privatized,
-					                                                ranges.begin().value().tags,
-					                                                accumulativeChecksumIndex,
-					                                                epoch.get(),
-					                                                version,
-					                                                dbgid);
-				}
-				toCommit->addTags(ranges.begin().value().tags);
-			} else {
-				std::set<Tag> allSources;
-				for (auto r : ranges) {
-					r.value().populateTags();
-					allSources.insert(r.value().tags.begin(), r.value().tags.end());
-				}
-				if (acsBuilder != nullptr) {
-					updateMutationWithAcsAndAddMutationToAcsBuilder(
-					    acsBuilder, privatized, allSources, accumulativeChecksumIndex, epoch.get(), version, dbgid);
-				}
-				toCommit->addTags(allSources);
-			}
-			TraceEvent(SevDebug, "SendingPrivatized_ChangeFeed", dbgid).detail("M", privatized);
-			writeMutation(privatized);
-		}
-	}
-
 	void checkSetServerListPrefix(MutationRef m) {
 		if (!m.param1.startsWith(serverListPrefix)) {
 			return;
@@ -1596,8 +1555,7 @@ class ApplyMetadataMutationsImpl {
 						checkSetTenantMapPrefix(m);
 						checkSetOtherKeys(m);
 						break;
-					case '\x02': // 0x02 - Less common: \xff\x02/feed/, \xff\x02/cacheKeys/
-						checkSetChangeFeedPrefix(m);
+					case '\x02': // 0x02 - Less common: \xff\x02/cacheKeys/
 						checkSetCacheKeysPrefix(m);
 						checkSetTenantMapPrefix(m);
 						checkSetOtherKeys(m);