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

minor optimization tweaks, fixed one validHeight use

Browse source
This commit is contained in:
Brannon King 2019-12-06 17:04:22 -07:00 committed by Anthony Fieroni
parent c5b96f99e3
commit 49d468f775
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/claimtrie/trie.cpp
View file

@ -554,12 +554,15 @@ CUint256 CClaimTrieCacheBase::getMerkleHash()
if (!hash.IsNull()) if (!hash.IsNull())
return hash; return hash;
assert(transacting); // no data changed but we didn't have the root hash there already? assert(transacting); // no data changed but we didn't have the root hash there already?
auto updateQuery = db << "UPDATE nodes SET hash = ? WHERE name = ?";
db << "SELECT n.name, IFNULL((SELECT CASE WHEN t.claimID IS NULL THEN 0 ELSE t.height END FROM takeover t WHERE t.name = n.name " db << "SELECT n.name, IFNULL((SELECT CASE WHEN t.claimID IS NULL THEN 0 ELSE t.height END FROM takeover t WHERE t.name = n.name "
"ORDER BY t.height DESC LIMIT 1), 0) FROM nodes n WHERE n.hash IS NULL ORDER BY SIZE(n.name) DESC" "ORDER BY t.height DESC LIMIT 1), 0) FROM nodes n WHERE n.hash IS NULL ORDER BY n.name DESC"
>> [this, &hash](const std::string& name, int takeoverHeight) { >> [this, &hash, &updateQuery](const std::string& name, int takeoverHeight) {
hash = computeNodeHash(name, takeoverHeight); hash = computeNodeHash(name, takeoverHeight);
db << "UPDATE nodes SET hash = ? WHERE name = ?" << hash << name; updateQuery << hash << name;
updateQuery++;
}; };
updateQuery.used(true);
return hash; return hash;
} }
@ -1138,19 +1141,22 @@ bool CClaimTrieCacheBase::incrementBlock()
// for all dirty nodes look for new takeovers // for all dirty nodes look for new takeovers
ensureTransacting(); ensureTransacting();
db << "INSERT INTO nodes(name) SELECT nodeName FROM claims " db << "INSERT INTO nodes(name) SELECT nodeName FROM claims INDEXED BY claims_activationHeight "
"WHERE activationHeight = ?1 AND expirationHeight > ?1 " "WHERE activationHeight = ?1 AND expirationHeight > ?1 "
"ON CONFLICT(name) DO UPDATE SET hash = NULL" << nNextHeight; "ON CONFLICT(name) DO UPDATE SET hash = NULL"
<< nNextHeight;
// don't make new nodes for items in supports or items that expire this block that don't exist in claims // don't make new nodes for items in supports or items that expire this block that don't exist in claims
db << "UPDATE nodes SET hash = NULL WHERE name IN " db << "UPDATE nodes SET hash = NULL WHERE name IN "
"(SELECT nodeName FROM claims WHERE expirationHeight = ?1 " "(SELECT nodeName FROM claims WHERE expirationHeight = ?1 "
"UNION SELECT nodeName FROM supports WHERE expirationHeight = ?1 OR " "UNION SELECT nodeName FROM supports WHERE expirationHeight = ?1 OR activationHeight = ?1)"
"(validHeight = ?1 AND expirationHeight > ?1))" << nNextHeight; << nNextHeight;
auto insertTakeoverQuery = db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, ?)";
// takeover handling: // takeover handling:
db << "SELECT name FROM nodes WHERE hash IS NULL" db << "SELECT name FROM nodes WHERE hash IS NULL"
>> [this](const std::string& nameWithTakeover) { >> [this, &insertTakeoverQuery](const std::string& nameWithTakeover) {
// if somebody activates on this block and they are the new best, then everybody activates on this block // if somebody activates on this block and they are the new best, then everybody activates on this block
CClaimValue candidateValue; CClaimValue candidateValue;
auto hasCandidate = getInfoForName(nameWithTakeover, candidateValue, 1); auto hasCandidate = getInfoForName(nameWithTakeover, candidateValue, 1);
@ -1177,14 +1183,15 @@ bool CClaimTrieCacheBase::incrementBlock()
if (takeoverHappening) { if (takeoverHappening) {
if (hasCandidate) if (hasCandidate)
db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, ?)" insertTakeoverQuery << nameWithTakeover << nNextHeight << candidateValue.claimId;
<< nameWithTakeover << nNextHeight << candidateValue.claimId;
else else
db << "INSERT INTO takeover(name, height, claimID) VALUES(?, ?, NULL)" insertTakeoverQuery << nameWithTakeover << nNextHeight << nullptr;
<< nameWithTakeover << nNextHeight; insertTakeoverQuery++;
} }
}; };
insertTakeoverQuery.used(true);
nNextHeight++; nNextHeight++;
return true; return true;
} }
@ -1214,8 +1221,7 @@ bool CClaimTrieCacheBase::decrementBlock()
<< nNextHeight; << nNextHeight;
db << "UPDATE nodes SET hash = NULL WHERE name IN(" db << "UPDATE nodes SET hash = NULL WHERE name IN("
"SELECT nodeName FROM supports WHERE expirationHeight = ?1 " "SELECT nodeName FROM supports WHERE expirationHeight = ?1 OR activationHeight = ?1 "
"UNION SELECT nodeName FROM supports WHERE activationHeight = ?1 "
"UNION SELECT nodeName FROM claims WHERE activationHeight = ?1)" "UNION SELECT nodeName FROM claims WHERE activationHeight = ?1)"
<< nNextHeight; << nNextHeight;