ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-23 05:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

proper handling of deleted objects

Browse Source
This commit is contained in:
CJ Cobb
2022-03-16 10:04:56 -04:00
committed by CJ Cobb
parent f41bfa3715
commit f8437b9ba4
6 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/BackendInterface.cpp
View File

@@ -250,7 +250,8 @@ BackendInterface::fetchLedgerPage(
LedgerPage page;
std::vector<ripple::uint256> keys;
while (keys.size() < limit)
bool reachedEnd = false;
while (keys.size() < limit && !reachedEnd)
{
ripple::uint256 const& curCursor = keys.size() ? keys.back()
: cursor ? *cursor
@@ -258,15 +259,17 @@ BackendInterface::fetchLedgerPage(
uint32_t seq = outOfOrder ? range->maxSequence : ledgerSequence;
auto succ = fetchSuccessorKey(curCursor, seq, yield);
if (!succ)
break;
BOOST_LOG_TRIVIAL(trace) << ripple::strHex(*succ);
keys.push_back(std::move(*succ));
reachedEnd = true;
else
keys.push_back(std::move(*succ));
}
auto objects = fetchLedgerObjects(keys, ledgerSequence, yield);
for (size_t i = 0; i < objects.size(); ++i)
{
if (!objects[i].size())
if (objects[i].size())
page.objects.push_back({std::move(keys[i]), std::move(objects[i])});
else if (!outOfOrder)
{
BOOST_LOG_TRIVIAL(error)
<< __func__ << " incorrect successor table. key = "
@@ -277,12 +280,11 @@ BackendInterface::fetchLedgerPage(
msg << " - " << ripple::strHex(keys[j]);
}
BOOST_LOG_TRIVIAL(error) << __func__ << msg.str();
assert(false);
}
assert(objects[i].size());
page.objects.push_back({std::move(keys[i]), std::move(objects[i])});
}
if (page.objects.size() >= limit)
page.cursor = page.objects.back().key;
if (!reachedEnd)
page.cursor = keys.back();
return page;
}