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

Fix compiling error of reverse iterators 

MacOS and Windows compiler doesn't like the use of "!=" operator of
std::map::reverse_iterator.
This commit is contained in:
Jingyu Zhou 2020-03-03 21:15:36 -08:00
parent a0fb8ad5fc
commit a015277e49
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbserver/BackupProgress.actor.cpp
View File

@ -64,19 +64,18 @@ std::map<std::tuple<LogEpoch, Version, int>, std::map<Tag, Version>> BackupProgr
updateTagVersions(&tagVersions, &tags, progressIt->second, info.epochEnd, epoch);
} else {
auto rit = findPreviousProgress(epoch);
if (rit != progress.rend()) {
if (!(rit == progress.rend())) {
// A partial recovery can result in empty epoch that copies previous
// epoch's version range. In this case, we should check previous
// epoch's savedVersion.
int savedMore = 0;
for (auto [tag, version] : rit->second) {
if (version > info.epochBegin) {
if (version >= info.epochBegin) {
savedMore++;
}
}
if (savedMore > 1) {
ASSERT(savedMore == rit->second.size()); // all tags should saved more
ASSERT(savedMore == info.logRouterTags); // Smae number as logRouterTags
if (savedMore > 0) {
ASSERT(info.logRouterTags == rit->second.size()); // Same number as logRouterTags
updateTagVersions(&tagVersions, &tags, rit->second, info.epochEnd, epoch);
}

2
fdbserver/BackupProgress.actor.h
View File

@ -84,7 +84,7 @@ private:
const std::map<Tag, Version>& progress, Version endVersion, LogEpoch epoch);
std::map<LogEpoch, std::map<Tag, Version>>::reverse_iterator findPreviousProgress(LogEpoch epoch) {
for (auto it = progress.rbegin(); it != progress.rend(); ++it) {
for (auto it = progress.rbegin(); !(it == progress.rend()); ++it) {
if (it->first < epoch) return it;
}
return progress.rend();