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

An optimization. Faster GetHex for exact strings.

Browse Source
This commit is contained in:
JoelKatz
2013-04-01 21:01:06 -07:00
parent 78d1a93e69
commit d73995e695
3 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpp/ripple/HashedObject.cpp
View File

@@ -269,7 +269,7 @@ int HashedObjectStore::import(const std::string& file)
uint256 hash;
std::string hashStr;
importDB->getStr("Hash", hashStr);
hash.SetHex(hashStr, true);
hash.SetHexExact(hashStr);
if (hash.isZero())
{
cLog(lsWARNING) << "zero hash found in import table";

30
src/cpp/ripple/Ledger.cpp
View File

@@ -611,13 +611,13 @@ Ledger::pointer Ledger::getSQL(const std::string& sql)
return Ledger::pointer();
db->getStr("LedgerHash", hash);
ledgerHash.SetHex(hash, true);
ledgerHash.SetHexExact(hash);
db->getStr("PrevHash", hash);
prevHash.SetHex(hash, true);
prevHash.SetHexExact(hash);
db->getStr("AccountSetHash", hash);
accountHash.SetHex(hash, true);
accountHash.SetHexExact(hash);
db->getStr("TransSetHash", hash);
transHash.SetHex(hash, true);
transHash.SetHexExact(hash);
totCoins = db->getBigInt("TotalCoins");
closingTime = db->getBigInt("ClosingTime");
prevClosingTime = db->getBigInt("PrevClosingTime");
@@ -671,10 +671,10 @@ Ledger::pointer Ledger::getSQL1(SqliteStatement *stmt)
unsigned closeFlags;
std::string hash;
ledgerHash.SetHex(stmt->peekString(0), true);
prevHash.SetHex(stmt->peekString(1), true);
accountHash.SetHex(stmt->peekString(2), true);
transHash.SetHex(stmt->peekString(3), true);
ledgerHash.SetHexExact(stmt->peekString(0));
prevHash.SetHexExact(stmt->peekString(1));
accountHash.SetHexExact(stmt->peekString(2));
transHash.SetHexExact(stmt->peekString(3));
totCoins = stmt->getInt64(4);
closingTime = stmt->getUInt32(5);
prevClosingTime = stmt->getUInt32(6);
@@ -717,7 +717,7 @@ uint256 Ledger::getHashByIndex(uint32 ledgerIndex)
db->endIterRows();
}
ret.SetHex(hash, true);
ret.SetHexExact(hash);
return ret;
}
@@ -746,8 +746,8 @@ bool Ledger::getHashesByIndex(uint32 ledgerIndex, uint256& ledgerHash, uint256&
return false;
}
ledgerHash.SetHex(pSt.peekString(0), true);
parentHash.SetHex(pSt.peekString(1), true);
ledgerHash.SetHexExact(pSt.peekString(0));
parentHash.SetHexExact(pSt.peekString(1));
return true;
@@ -768,8 +768,8 @@ bool Ledger::getHashesByIndex(uint32 ledgerIndex, uint256& ledgerHash, uint256&
db->endIterRows();
}
ledgerHash.SetHex(hash, true);
parentHash.SetHex(prevHash, true);
ledgerHash.SetHexExact(hash);
parentHash.SetHexExact(prevHash);
assert(ledgerHash.isNonZero() && ((ledgerIndex == 0) || parentHash.isNonZero()));
@@ -801,8 +801,8 @@ std::map< uint32, std::pair<uint256, uint256> > Ledger::getHashesByIndex(uint32
return ret;
if (!pSt.isRow(r))
return ret;
hashes.first.SetHex(pSt.peekString(1), true);
hashes.second.SetHex(pSt.peekString(2), true);
hashes.first.SetHexExact(pSt.peekString(1));
hashes.second.SetHexExact(pSt.peekString(2));
ret[pSt.getUInt32(0)] = hashes;
} while(1);

40
src/cpp/ripple/uint256.h
View File

@@ -219,6 +219,41 @@ public:
return strHex(begin(), size());
}
void SetHexExact(const char* psz)
{ // must be precisely the correct number of hex digits
static signed char phexdigit[256] = {
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1, -1,-1,-1,-1,
-1,0xa,0xb,0xc, 0xd,0xe,0xf,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,0xa,0xb,0xc, 0xd,0xe,0xf,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
};
char* pOut = reinterpret_cast<char*>(pn);
for (int i = 0; i < sizeof(pn); ++i)
{
*pOut = phexdigit[*psz++] << 4;
*pOut++ |= phexdigit[*psz++];
}
assert(*psz == 0);
assert(pOut == reinterpret_cast<char*>(end()));
}
// Allow leading whitespace.
// Allow leading "0x".
// To be valid must be '\0' terminated.
@@ -291,6 +326,11 @@ public:
return SetHex(str.c_str(), bStrict);
}
void SetHexExact(const std::string& str)
{
SetHexExact(str.c_str());
}
std::string ToString() const
{
return GetHex();