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

ensure removalWorkaround matches old code

Browse source
This commit is contained in:
Brannon King 2019-12-11 15:11:15 -07:00
parent 7b27b9694c
commit 4be42d04f7
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/claimtrie/trie.cpp
View file

@ -641,14 +641,21 @@ bool CClaimTrieCacheBase::removeClaim(const CUint160& claimId, const CTxOutPoint
// because it's a parent one and should not be effectively erased // because it's a parent one and should not be effectively erased
// we had a bug in the old code where that situation would force a zero delay on re-add // we had a bug in the old code where that situation would force a zero delay on re-add
if (true) { // TODO: hard fork this out (which we already tried once but failed) if (true) { // TODO: hard fork this out (which we already tried once but failed)
db << "SELECT nodeName FROM claims WHERE nodeName LIKE ?1 " const static std::string charsThatBreakLikeOp("_%\0", 3);
bool cantUseLike = nodeName.find_first_of(charsThatBreakLikeOp) != std::string::npos;
auto query = cantUseLike ? (db << "SELECT nodeName FROM claims WHERE SUBSTR(nodeName, 1, ?3) = ?1 "
"AND activationHeight < ?2 AND expirationHeight > ?2 ORDER BY nodeName LIMIT 1" "AND activationHeight < ?2 AND expirationHeight > ?2 ORDER BY nodeName LIMIT 1"
<< nodeName + '%' << nNextHeight << nodeName << nNextHeight << nodeName.size()) :
>> [this, &nodeName](const std::string& shortestMatch) { (db << "SELECT nodeName FROM claims WHERE nodeName LIKE ?1 "
"AND activationHeight < ?2 AND expirationHeight > ?2 ORDER BY nodeName LIMIT 1"
<< nodeName + '%' << nNextHeight);
for (auto&& row: query) {
std::string shortestMatch;
row >> shortestMatch;
if (shortestMatch != nodeName) if (shortestMatch != nodeName)
// set this when there are no more claims on that name and that node still has children // set this when there are no more claims on that name and that node still has children
removalWorkaround.insert(nodeName); removalWorkaround.insert(nodeName);
}; }
} }
return true; return true;
} }

4
src/sqlite/hdr/sqlite_modern_cpp/errors.h
View file

@ -9,8 +9,8 @@ namespace sqlite {
class sqlite_exception: public std::runtime_error { class sqlite_exception: public std::runtime_error {
public: public:
sqlite_exception(const char* msg, str_ref sql, int code = -1): runtime_error(sql + ':' + msg), code(code), sql(sql) {} sqlite_exception(const char* msg, str_ref sql, int code = -1): runtime_error(msg + std::string(": ") + sql), code(code), sql(sql) {}
sqlite_exception(int code, str_ref sql, const char *msg = nullptr): runtime_error(sql + ':' + (msg ? msg : sqlite3_errstr(code))), code(code), sql(sql) {} sqlite_exception(int code, str_ref sql, const char *msg = nullptr): runtime_error((msg ? msg : sqlite3_errstr(code)) + std::string(": ") + sql), code(code), sql(sql) {}
int get_code() const {return code & 0xFF;} int get_code() const {return code & 0xFF;}
int get_extended_code() const {return code;} int get_extended_code() const {return code;}
std::string get_sql() const {return sql;} std::string get_sql() const {return sql;}