ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQL in online delete cleanup:

Browse Source 
* SQL statement is corrected to perform an implicit JOIN
* Add unit test
This commit is contained in:
seelabs
2015-03-30 13:02:17 -07:00
committed by Tom Ritchford
parent b3254e2b18
commit 7e25a3a942
2 changed files with 87 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/ripple/app/data/tests/SociDB.test.cpp
View File

@@ -295,11 +295,94 @@ public:
remove (dbPath);
}
}
void testSQLiteDeleteWithSubselect()
{
testcase ("deleteWithSubselect");
BasicConfig c;
setupSQLiteConfig (c, getDatabasePath ());
SociConfig sc (c, "SociTestDB");
{
soci::session s;
sc.open (s);
const char* dbInit[] = {
"BEGIN TRANSACTION;",
"CREATE TABLE Ledgers ( \
LedgerHash CHARACTER(64) PRIMARY KEY, \
LedgerSeq BIGINT UNSIGNED \
);",
"CREATE INDEX SeqLedger ON Ledgers(LedgerSeq);",
"CREATE TABLE Validations ( \
LedgerHash CHARACTER(64) \
);",
"CREATE INDEX ValidationsByHash ON \
Validations(LedgerHash);",
"END TRANSACTION;"};
int dbInitCount = std::extent<decltype(dbInit)>::value;
for (int i = 0; i < dbInitCount; ++i)
{
s << dbInit[i];
}
char lh[65];
memset (lh, 'a', 64);
lh[64] = '\0';
int toIncIndex = 63;
int const numRows = 16;
std::vector<std::string> ledgerHashes;
std::vector<int> ledgerIndexes;
ledgerHashes.reserve(numRows);
ledgerIndexes.reserve(numRows);
for (int i = 0; i < numRows; ++i)
{
++lh[toIncIndex];
if (lh[toIncIndex] == 'z')
--toIncIndex;
ledgerHashes.emplace_back(lh);
ledgerIndexes.emplace_back(i);
}
std::string slh (lh);
s << "INSERT INTO Ledgers (LedgerHash, LedgerSeq) VALUES "
"(:lh, :li);",
soci::use (ledgerHashes), soci::use (ledgerIndexes);
s << "INSERT INTO Validations (LedgerHash) VALUES "
"(:lh);", soci::use (ledgerHashes);
std::vector<int> ledgersLS (numRows * 2);
std::vector<std::string> validationsLH (numRows * 2);
s << "SELECT LedgerSeq FROM Ledgers;", soci::into (ledgersLS);
s << "SELECT LedgerHash FROM Validations;",
soci::into (validationsLH);
expect (ledgersLS.size () == numRows &&
validationsLH.size () == numRows);
s << "DELETE FROM Validations WHERE LedgerHash IN "
"(SELECT Ledgers.LedgerHash FROM Validations JOIN Ledgers ON "
"Validations.LedgerHash=Ledgers.LedgerHash WHERE "
"Ledgers.LedgerSeq < :num);",
soci::use (numRows / 2);
validationsLH.resize (numRows * 2);
s << "SELECT LedgerHash FROM Validations;",
soci::into (validationsLH);
expect (validationsLH.size () == numRows / 2);
for (auto i = ledgerHashes.begin () + numRows / 2;
i != ledgerHashes.end ();
++i)
{
expect (find (validationsLH.begin (), validationsLH.end (), *i)
!= validationsLH.end ());
}
}
using namespace boost::filesystem;
// Remove the database
path dbPath (sc.connectionString ());
if (is_regular_file (dbPath))
remove (dbPath);
}
void testSQLite ()
{
testSQLiteFileNames ();
testSQLiteSession ();
testSQLiteSelect ();
testSQLiteDeleteWithSubselect();
}
void run ()
{

6
src/ripple/app/misc/SHAMapStoreImp.cpp
View File

@@ -573,8 +573,10 @@ SHAMapStoreImp::clearPrior (LedgerIndex lastRotated)
// the validations table
clearSql (*ledgerDb_, lastRotated,
"SELECT MIN(LedgerSeq) FROM Ledgers;",
"DELETE FROM Validations WHERE Ledgers.LedgerSeq < %u"
" AND Validations.LedgerHash = Ledgers.LedgerHash;");
"DELETE FROM Validations WHERE LedgerHash IN "
"(SELECT Ledgers.LedgerHash FROM Validations JOIN Ledgers ON "
"Validations.LedgerHash=Ledgers.LedgerHash WHERE Ledgers.LedgerSeq < %u);");
if (health())
return;