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

merge master into branch

Browse Source
This commit is contained in:
Nathan Nichols
2021-05-10 15:10:58 -05:00
parent 3faf27fc4f f32af6bb2d
commit 945598d953
7 changed files with 328 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
reporting/PostgresBackend.cpp
View File

@@ -329,7 +329,7 @@ PostgresBackend::fetchLedgerPage(
std::uint32_t ledgerSequence,
std::uint32_t limit) const
{
auto index = getIndexOfSeq(ledgerSequence);
auto index = getKeyIndexOfSeq(ledgerSequence);
if (!index)
return {};
PgQuery pgQuery(pgPool_);
@@ -337,7 +337,7 @@ PostgresBackend::fetchLedgerPage(
std::stringstream sql;
sql << "SELECT key FROM keys WHERE ledger_seq = " << std::to_string(*index);
if (cursor)
sql << " AND key < \'\\x" << ripple::strHex(*cursor) << "\'";
sql << " AND key > \'\\x" << ripple::strHex(*cursor) << "\'";
sql << " ORDER BY key ASC LIMIT " << std::to_string(limit);
BOOST_LOG_TRIVIAL(debug) << __func__ << sql.str();
auto res = pgQuery(sql.str().data());
@@ -366,6 +366,8 @@ PostgresBackend::fetchLedgerPage(
return {results, returnCursor, "Data may be incomplete"};
return {results, returnCursor};
}
if (!cursor)
return {{}, {}, "Data may be incomplete"};
return {};
}
@@ -436,6 +438,7 @@ PostgresBackend::fetchBookOffers(
return {complete, results};
}
std::vector<Blob> blobs = fetchLedgerObjects(keys, ledgerSequence);
return {true, {}};
};
@@ -748,7 +751,8 @@ PostgresBackend::doFinishWrites() const
bool
PostgresBackend::writeKeys(
std::unordered_set<ripple::uint256> const& keys,
uint32_t ledgerSequence) const
uint32_t ledgerSequence,
bool isAsync) const
{
BOOST_LOG_TRIVIAL(debug) << __func__;
PgQuery pgQuery(pgPool_);
@@ -782,7 +786,8 @@ PostgresBackend::writeBooks(
std::unordered_map<
ripple::uint256,
std::unordered_set<ripple::uint256>> const& books,
uint32_t ledgerSequence) const
uint32_t ledgerSequence,
bool isAsync) const
{
BOOST_LOG_TRIVIAL(debug) << __func__;
PgQuery pgQuery(pgPool_);