philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* I forgot to catch SQLiteBusy in registerValidPaths(). So

Browse source 
registerValidPaths() now handles busy errors and registerValidPath()
  is simply a wrapper around it.
This commit is contained in:
Eelco Dolstra 2010-12-14 13:25:20 +00:00
parent d787285af9
commit 3dd02580e3
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/libstore/local-store.cc
View file

@ -463,7 +463,7 @@ unsigned long long LocalStore::addValidPath(const ValidPathInfo & info)
SQLiteStmtUse use(stmtRegisterValidPath); SQLiteStmtUse use(stmtRegisterValidPath);
stmtRegisterValidPath.bind(info.path); stmtRegisterValidPath.bind(info.path);
stmtRegisterValidPath.bind("sha256:" + printHash(info.hash)); stmtRegisterValidPath.bind("sha256:" + printHash(info.hash));
stmtRegisterValidPath.bind(info.registrationTime); stmtRegisterValidPath.bind(info.registrationTime == 0 ? time(0) : info.registrationTime);
if (info.deriver != "") if (info.deriver != "")
stmtRegisterValidPath.bind(info.deriver); stmtRegisterValidPath.bind(info.deriver);
else else
@ -506,31 +506,6 @@ void LocalStore::addReference(unsigned long long referrer, unsigned long long re
} }
void LocalStore::registerValidPath(const ValidPathInfo & info)
{
assert(info.hash.type == htSHA256);
ValidPathInfo info2(info);
if (info2.registrationTime == 0) info2.registrationTime = time(0);
while (1) {
try {
SQLiteTxn txn(db);
unsigned long long id = addValidPath(info2);
foreach (PathSet::const_iterator, i, info2.references)
addReference(id, queryValidPathId(*i));
txn.commit();
break;
} catch (SQLiteBusy & e) {
/* Retry; the `txn' destructor will roll back the current
transaction. */
}
}
}
void LocalStore::registerFailedPath(const Path & path) void LocalStore::registerFailedPath(const Path & path)
{ {
if (hasPathFailed(path)) return; if (hasPathFailed(path)) return;
@ -896,14 +871,26 @@ Hash LocalStore::queryPathHash(const Path & path)
} }
void LocalStore::registerValidPath(const ValidPathInfo & info)
{
ValidPathInfos infos;
infos.push_back(info);
registerValidPaths(infos);
}
void LocalStore::registerValidPaths(const ValidPathInfos & infos) void LocalStore::registerValidPaths(const ValidPathInfos & infos)
{ {
while (1) {
try {
SQLiteTxn txn(db); SQLiteTxn txn(db);
foreach (ValidPathInfos::const_iterator, i, infos) foreach (ValidPathInfos::const_iterator, i, infos) {
assert(i->hash.type == htSHA256);
/* !!! Maybe the registration info should be updated if the /* !!! Maybe the registration info should be updated if the
path is already valid. */ path is already valid. */
if (!isValidPath(i->path)) addValidPath(*i); if (!isValidPath(i->path)) addValidPath(*i);
}
foreach (ValidPathInfos::const_iterator, i, infos) { foreach (ValidPathInfos::const_iterator, i, infos) {
unsigned long long referrer = queryValidPathId(i->path); unsigned long long referrer = queryValidPathId(i->path);
@ -912,6 +899,12 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos)
} }
txn.commit(); txn.commit();
break;
} catch (SQLiteBusy & e) {
/* Retry; the `txn' destructor will roll back the current
transaction. */
}
}
} }