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

re-enabled range feeds

This commit is contained in:
Evan Tschannen 2021-03-04 22:45:58 -08:00
parent 077d5cb774
commit fcdfb608c3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/ApplyMetadataMutation.cpp
View File

@ -319,7 +319,7 @@ void applyMetadataMutations(SpanID const& spanContext, UID const& dbgid, Arena&
if (firstRange == ranges.end()) { if (firstRange == ranges.end()) {
ranges.begin().value().populateTags(); ranges.begin().value().populateTags();
TraceEvent("RangeFeedTags1").detail("Tags", describe(ranges.begin().value().tags)); TraceEvent("RangeFeedTags1").detail("Tags", describe(ranges.begin().value().tags));
//toCommit->addTags(ranges.begin().value().tags); toCommit->addTags(ranges.begin().value().tags);
} }
else { else {
std::set<Tag> allSources; std::set<Tag> allSources;
@ -328,9 +328,9 @@ void applyMetadataMutations(SpanID const& spanContext, UID const& dbgid, Arena&
allSources.insert(r.value().tags.begin(), r.value().tags.end()); allSources.insert(r.value().tags.begin(), r.value().tags.end());
} }
TraceEvent("RangeFeedTags2").detail("Tags", describe(allSources)); TraceEvent("RangeFeedTags2").detail("Tags", describe(allSources));
//toCommit->addTags(allSources); toCommit->addTags(allSources);
} }
//toCommit->writeTypedMessage(privatized); toCommit->writeTypedMessage(privatized);
} }
} }
} else if (m.param2.size() > 1 && m.param2[0] == systemKeys.begin[0] && m.type == MutationRef::ClearRange) { } else if (m.param2.size() > 1 && m.param2[0] == systemKeys.begin[0] && m.type == MutationRef::ClearRange) {

2
fdbserver/storageserver.actor.cpp
View File

@ -2883,7 +2883,6 @@ private:
Key rangeFeedId = m.param1.removePrefix(rangeFeedPrivatePrefix); Key rangeFeedId = m.param1.removePrefix(rangeFeedPrivatePrefix);
KeyRange rangeFeedRange = decodeRangeFeedValue( m.param2 ); KeyRange rangeFeedRange = decodeRangeFeedValue( m.param2 );
TraceEvent("AddingRangeFeed", data->thisServerID).detail("RangeID", rangeFeedId.printable()).detail("Range", rangeFeedRange.toString()); TraceEvent("AddingRangeFeed", data->thisServerID).detail("RangeID", rangeFeedId.printable()).detail("Range", rangeFeedRange.toString());
/*
Reference<RangeFeedInfo> rangeFeedInfo( new RangeFeedInfo() ); Reference<RangeFeedInfo> rangeFeedInfo( new RangeFeedInfo() );
rangeFeedInfo->range = rangeFeedRange; rangeFeedInfo->range = rangeFeedRange;
rangeFeedInfo->id = rangeFeedId; rangeFeedInfo->id = rangeFeedId;
@ -2893,7 +2892,6 @@ private:
r->value().push_back( rangeFeedInfo ); r->value().push_back( rangeFeedInfo );
} }
data->keyRangeFeed.coalesce( rangeFeedRange.contents() ); data->keyRangeFeed.coalesce( rangeFeedRange.contents() );
*/
} else { } else {
ASSERT(false); // Unknown private mutation ASSERT(false); // Unknown private mutation
} }