LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

changed to WAL, changed coin table to unspent, added unspent::address

Browse source
This commit is contained in:
Brannon King 2020-01-02 17:47:28 -07:00
parent fbba425901
commit 4b5f9e650b
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/claimtrie/trie.cpp
View file

@ -41,7 +41,7 @@ void applyPragmas(sqlite::database& db, std::size_t cache)
{ {
db << "PRAGMA cache_size=-" + std::to_string(cache); // in -KB db << "PRAGMA cache_size=-" + std::to_string(cache); // in -KB
db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit
db << "PRAGMA journal_mode=MEMORY"; db << "PRAGMA journal_mode=WAL";
db << "PRAGMA temp_store=MEMORY"; db << "PRAGMA temp_store=MEMORY";
db << "PRAGMA case_sensitive_like=true"; db << "PRAGMA case_sensitive_like=true";

42
src/txdb.cpp
View file

@ -8,8 +8,10 @@
#include <chainparams.h> #include <chainparams.h>
#include <claimtrie/sqlite.h> #include <claimtrie/sqlite.h>
#include <hash.h> #include <hash.h>
#include <key_io.h>
#include <random.h> #include <random.h>
#include <pow.h> #include <pow.h>
#include <script/standard.h>
#include <shutdown.h> #include <shutdown.h>
#include <uint256.h> #include <uint256.h>
#include <util.h> #include <util.h>
@ -29,26 +31,28 @@ CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe)
{ {
db << "PRAGMA cache_size=-" + std::to_string(nCacheSize >> 10); // in -KB db << "PRAGMA cache_size=-" + std::to_string(nCacheSize >> 10); // in -KB
db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit
db << "PRAGMA journal_mode=MEMORY"; db << "PRAGMA journal_mode=WAL";
db << "PRAGMA temp_store=MEMORY"; db << "PRAGMA temp_store=MEMORY";
db << "PRAGMA case_sensitive_like=true"; db << "PRAGMA case_sensitive_like=true";
db << "CREATE TABLE IF NOT EXISTS coin (txID BLOB NOT NULL COLLATE BINARY, txN INTEGER NOT NULL, " db << "CREATE TABLE IF NOT EXISTS unspent (txID BLOB NOT NULL COLLATE BINARY, txN INTEGER NOT NULL, "
"isCoinbase INTEGER NOT NULL, blockHeight INTEGER NOT NULL, amount INTEGER NOT NULL, " "isCoinbase INTEGER NOT NULL, blockHeight INTEGER NOT NULL, amount INTEGER NOT NULL, "
"script BLOB NOT NULL COLLATE BINARY, PRIMARY KEY(txID, txN));"; "script BLOB NOT NULL COLLATE BINARY, address TEXT, PRIMARY KEY(txID, txN));";
db << "CREATE INDEX IF NOT EXISTS unspent_address ON unspent(address)";
db << "CREATE TABLE IF NOT EXISTS marker (" db << "CREATE TABLE IF NOT EXISTS marker ("
"name TEXT NOT NULL PRIMARY KEY, " "name TEXT NOT NULL PRIMARY KEY, "
"value BLOB NOT NULL)"; "value BLOB NOT NULL)";
if (fWipe) { if (fWipe) {
db << "DELETE FROM coin"; db << "DELETE FROM unspent";
db << "DELETE FROM marker"; db << "DELETE FROM marker";
} }
} }
bool CCoinsViewDB::GetCoin(const COutPoint &outpoint, Coin &coin) const { bool CCoinsViewDB::GetCoin(const COutPoint &outpoint, Coin &coin) const {
auto query = db << "SELECT isCoinbase, blockHeight, amount, script FROM coin " auto query = db << "SELECT isCoinbase, blockHeight, amount, script FROM unspent "
"WHERE txID = ? and txN = ?" << outpoint.hash << outpoint.n; "WHERE txID = ? and txN = ?" << outpoint.hash << outpoint.n;
for (auto&& row: query) { for (auto&& row: query) {
uint32_t coinbase = 0, height = 0; uint32_t coinbase = 0, height = 0;
@ -61,7 +65,7 @@ bool CCoinsViewDB::GetCoin(const COutPoint &outpoint, Coin &coin) const {
} }
bool CCoinsViewDB::HaveCoin(const COutPoint &outpoint) const { bool CCoinsViewDB::HaveCoin(const COutPoint &outpoint) const {
auto query = db << "SELECT 1 FROM coin " auto query = db << "SELECT 1 FROM unspent "
"WHERE txID = ? and txN = ?" << outpoint.hash << outpoint.n; "WHERE txID = ? and txN = ?" << outpoint.hash << outpoint.n;
for (auto&& row: query) for (auto&& row: query)
return true; return true;
@ -111,12 +115,19 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock, boo
db << "INSERT OR REPLACE INTO marker VALUES('head_block', ?)" << hashBlock; db << "INSERT OR REPLACE INTO marker VALUES('head_block', ?)" << hashBlock;
for (auto it = mapCoins.begin(); it != mapCoins.end();) { for (auto it = mapCoins.begin(); it != mapCoins.end();) {
if (it->second.flags & CCoinsCacheEntry::DIRTY) { if (it->second.flags & CCoinsCacheEntry::DIRTY) {
if (it->second.coin.IsSpent()) if (it->second.coin.IsSpent()) {
db << "DELETE FROM coin WHERE txID = ? AND txN = ?" << it->first.hash << it->first.n; // at present the "IsSpent" flag is used for both "spent" and "block going backwards"
else db << "DELETE FROM unspent WHERE txID = ? AND txN = ?" << it->first.hash << it->first.n;
db << "INSERT OR REPLACE INTO coin VALUES(?,?,?,?,?,?)" << it->first.hash << it->first.n }
else {
CTxDestination address;
std::string destination;
if (ExtractDestination(it->second.coin.out.scriptPubKey, address))
destination = EncodeDestination(address);
db << "INSERT OR REPLACE INTO unspent VALUES(?,?,?,?,?,?,?)" << it->first.hash << it->first.n
<< it->second.coin.fCoinBase << it->second.coin.nHeight << it->second.coin.fCoinBase << it->second.coin.nHeight
<< it->second.coin.out.nValue << it->second.coin.out.scriptPubKey; << it->second.coin.out.nValue << it->second.coin.out.scriptPubKey << destination;
}
changed++; changed++;
} }
count++; count++;
@ -149,7 +160,7 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock, boo
size_t CCoinsViewDB::EstimateSize() const size_t CCoinsViewDB::EstimateSize() const
{ {
size_t ret = 0; size_t ret = 0;
db << "SELECT COUNT(*) FROM coin" >> ret; db << "SELECT COUNT(*) FROM unspent" >> ret;
return ret * 100; return ret * 100;
} }
@ -158,7 +169,7 @@ CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe)
{ {
db << "PRAGMA cache_size=-" + std::to_string(nCacheSize >> 10); // in -KB db << "PRAGMA cache_size=-" + std::to_string(nCacheSize >> 10); // in -KB
db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit db << "PRAGMA synchronous=OFF"; // don't disk sync after transaction commit
db << "PRAGMA journal_mode=MEMORY"; db << "PRAGMA journal_mode=WAL";
db << "PRAGMA temp_store=MEMORY"; db << "PRAGMA temp_store=MEMORY";
db << "PRAGMA case_sensitive_like=true"; db << "PRAGMA case_sensitive_like=true";
@ -190,7 +201,8 @@ CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe)
"nonce INTEGER NOT NULL " "nonce INTEGER NOT NULL "
")"; ")";
db << "CREATE INDEX IF NOT EXISTS block_info_height ON block_info (height)"; db << "CREATE UNIQUE INDEX IF NOT EXISTS block_info_height ON block_info (height)";
db << "CREATE UNIQUE INDEX IF NOT EXISTS block_file_data_pos ON block_info (file, dataPos)";
db << "CREATE TABLE IF NOT EXISTS tx_to_block (" db << "CREATE TABLE IF NOT EXISTS tx_to_block ("
"txID BLOB NOT NULL PRIMARY KEY, " "txID BLOB NOT NULL PRIMARY KEY, "
@ -246,7 +258,7 @@ CCoinsViewCursor *CCoinsViewDB::Cursor() const
CCoinsViewDBCursor::CCoinsViewDBCursor(const uint256 &hashBlockIn, const CCoinsViewDB* view) CCoinsViewDBCursor::CCoinsViewDBCursor(const uint256 &hashBlockIn, const CCoinsViewDB* view)
: CCoinsViewCursor(hashBlockIn), owner(view), : CCoinsViewCursor(hashBlockIn), owner(view),
query(owner->db << "SELECT * FROM coin") // txID, txN, isCoinbase, blockHeight, amount, script query(owner->db << "SELECT txID, txN, isCoinbase, blockHeight, amount, script FROM unspent")
{ {
iter = query.begin(); iter = query.begin();
} }