ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix count/limit logic.

Browse Source
This commit is contained in:
JoelKatz
2013-03-27 18:14:53 -07:00
parent e9168702a4
commit 878caf1989
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -1065,27 +1065,27 @@ void NetworkOPs::setMode(OperatingMode om)
std::string std::string
NetworkOPs::transactionsSQL(std::string selection, const RippleAddress& account, int32 minLedger, int32 maxLedger, bool descending, uint32 offset, int limit, bool binary, bool bAdmin) NetworkOPs::transactionsSQL(std::string selection, const RippleAddress& account,
int32 minLedger, int32 maxLedger, bool descending, uint32 offset, int limit,
bool binary, bool count, bool bAmin)
{ {
uint32 NONBINARY_PAGE_LENGTH = 200; uint32 NONBINARY_PAGE_LENGTH = 200;
uint32 BINARY_PAGE_LENGTH = 500; uint32 BINARY_PAGE_LENGTH = 500;
uint32 ADMIN_PAGE_LENGTH = 100000;
uint32 numberOfResults = limit;
if (limit == -1) uint32 numberOfResults;
numberOfResults = ADMIN_PAGE_LENGTH; if (count)
numberOfResults = 1000000000;
if (!bAdmin) else if (limit < 0)
numberOfResults = std::min(binary ? BINARY_PAGE_LENGTH : NONBINARY_PAGE_LENGTH, numberOfResults); numberOfResults = binary ? BINARY_PAGE_LENGTH : NONBINARY_PAGE_LENGTH;
else if (!bAdmin)
numberOfResults = std::min(binary ? BINARY_PAGE_LENGTH : NONBINARY_PAGE_LENGTH, static_cast<uint32>(limit));
std::string maxClause = ""; std::string maxClause = "";
std::string minClause = ""; std::string minClause = "";
if (maxLedger != -1) { if (maxLedger != -1)
maxClause = boost::str(boost::format("AND AccountTransactions.LedgerSeq <= '%u'") % maxLedger); maxClause = boost::str(boost::format("AND AccountTransactions.LedgerSeq <= '%u'") % maxLedger);
} if (minLedger != -1)
if (minLedger != -1) {
minClause = boost::str(boost::format("AND AccountTransactions.LedgerSeq >= '%u'") % minLedger); minClause = boost::str(boost::format("AND AccountTransactions.LedgerSeq >= '%u'") % minLedger);
}
std::string sql = std::string sql =
boost::str(boost::format("SELECT %s FROM " boost::str(boost::format("SELECT %s FROM "
@@ -1110,7 +1110,8 @@ std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> >
{ // can be called with no locks { // can be called with no locks
std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > ret; std::vector< std::pair<Transaction::pointer, TransactionMetaSet::pointer> > ret;
std::string sql = NetworkOPs::transactionsSQL("AccountTransactions.LedgerSeq,Status,RawTxn,TxnMeta", account, minLedger, maxLedger, descending, offset, limit, false, bAdmin); std::string sql = NetworkOPs::transactionsSQL("AccountTransactions.LedgerSeq,Status,RawTxn,TxnMeta", account,
minLedger, maxLedger, descending, offset, limit, false, false, bAdmin);
{ {
Database* db = theApp->getTxnDB()->getDB(); Database* db = theApp->getTxnDB()->getDB();
@@ -1143,7 +1144,8 @@ std::vector<NetworkOPs::txnMetaLedgerType> NetworkOPs::getAccountTxsB(
{ // can be called with no locks { // can be called with no locks
std::vector< txnMetaLedgerType> ret; std::vector< txnMetaLedgerType> ret;
std::string sql = NetworkOPs::transactionsSQL("AccountTransactions.LedgerSeq,Status,RawTxn,TxnMeta", account, minLedger, maxLedger, descending, offset, limit, true/*binary*/, bAdmin); std::string sql = NetworkOPs::transactionsSQL("AccountTransactions.LedgerSeq,Status,RawTxn,TxnMeta", account,
minLedger, maxLedger, descending, offset, limit, true/*binary*/, false, bAdmin);
{ {
Database* db = theApp->getTxnDB()->getDB(); Database* db = theApp->getTxnDB()->getDB();
@@ -1187,7 +1189,8 @@ uint32
NetworkOPs::countAccountTxs(const RippleAddress& account, int32 minLedger, int32 maxLedger) NetworkOPs::countAccountTxs(const RippleAddress& account, int32 minLedger, int32 maxLedger)
{ // can be called with no locks { // can be called with no locks
uint32 ret = 0; uint32 ret = 0;
std::string sql = NetworkOPs::transactionsSQL("COUNT(*) AS 'TransactionCount'", account, minLedger, maxLedger, false, 0, -1, true, true); std::string sql = NetworkOPs::transactionsSQL("COUNT(*) AS 'TransactionCount'", account,
minLedger, maxLedger, false, 0, -1, true, true, true);
Database* db = theApp->getTxnDB()->getDB(); Database* db = theApp->getTxnDB()->getDB();
ScopedLock sl(theApp->getTxnDB()->getDBLock()); ScopedLock sl(theApp->getTxnDB()->getDBLock());