guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: don't require explicit retrySQLite return type

Browse Source 
auto to the rescue!

Change-Id: I56c0fc7ccf2631bb7891a041bf228d32d198d219
This commit is contained in:
eldritch horrors
2025-01-19 16:40:26 +01:00
parent 10104b8ac1
commit 4c2ec80fcb
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/libstore/local-store.cc
+16 -17
View File
@@ -760,7 +760,7 @@ void LocalStore::registerDrvOutput(const Realisation & info, CheckSigsFlag check
void LocalStore::registerDrvOutput(const Realisation & info)
{
experimentalFeatureSettings.require(Xp::CaDerivations);
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
if (auto oldR = queryRealisation_(*state, info.id)) {
if (info.isCompatibleWith(*oldR)) {
@@ -817,7 +817,7 @@ void LocalStore::cacheDrvOutputMapping(
const std::string & outputName,
const StorePath & output)
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
state.stmts->AddDerivationOutput.use()
(deriver)
(outputName)
@@ -880,7 +880,7 @@ uint64_t LocalStore::addValidPath(State & state,
std::shared_ptr<const ValidPathInfo> LocalStore::queryPathInfoUncached(const StorePath & path)
{
return retrySQLite<std::shared_ptr<const ValidPathInfo>>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
return queryPathInfoInternal(*state, path);
});
@@ -968,7 +968,7 @@ bool LocalStore::isValidPath_(State & state, const StorePath & path)
bool LocalStore::isValidPathUncached(const StorePath & path)
{
return retrySQLite<bool>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
return isValidPath_(*state, path);
});
@@ -986,7 +986,7 @@ StorePathSet LocalStore::queryValidPaths(const StorePathSet & paths, SubstituteF
StorePathSet LocalStore::queryAllValidPaths()
{
return retrySQLite<StorePathSet>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
auto use(state->stmts->QueryValidPaths.use());
StorePathSet res;
@@ -1007,7 +1007,7 @@ void LocalStore::queryReferrers(State & state, const StorePath & path, StorePath
void LocalStore::queryReferrers(const StorePath & path, StorePathSet & referrers)
{
return retrySQLite<void>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
queryReferrers(*state, path, referrers);
});
@@ -1016,7 +1016,7 @@ void LocalStore::queryReferrers(const StorePath & path, StorePathSet & referrers
StorePathSet LocalStore::queryValidDerivers(const StorePath & path)
{
return retrySQLite<StorePathSet>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
auto useQueryValidDerivers(state->stmts->QueryValidDerivers.use()(printStorePath(path)));
@@ -1033,7 +1033,7 @@ StorePathSet LocalStore::queryValidDerivers(const StorePath & path)
std::map<std::string, std::optional<StorePath>>
LocalStore::queryStaticPartialDerivationOutputMap(const StorePath & path)
{
return retrySQLite<std::map<std::string, std::optional<StorePath>>>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
std::map<std::string, std::optional<StorePath>> outputs;
uint64_t drvId;
@@ -1053,7 +1053,7 @@ std::optional<StorePath> LocalStore::queryPathFromHashPart(const std::string & h
Path prefix = config_.storeDir + "/" + hashPart;
return retrySQLite<std::optional<StorePath>>([&]() -> std::optional<StorePath> {
return retrySQLite([&]() -> std::optional<StorePath> {
auto state(_state.lock());
auto useQueryPathFromHashPart(state->stmts->QueryPathFromHashPart.use()(prefix));
@@ -1113,7 +1113,7 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos)
registering operation. */
if (settings.syncBeforeRegistering) sync();
return retrySQLite<void>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
SQLiteTxn txn(state->db);
@@ -1504,7 +1504,7 @@ std::pair<Path, AutoCloseFD> LocalStore::createTempDirInStore()
void LocalStore::invalidatePathChecked(const StorePath & path)
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
SQLiteTxn txn(state->db);
@@ -1755,7 +1755,7 @@ void LocalStore::upgradeStore7()
void LocalStore::addSignatures(const StorePath & storePath, const StringSet & sigs)
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
SQLiteTxn txn(state->db);
@@ -1852,11 +1852,10 @@ std::optional<const Realisation> LocalStore::queryRealisation_(
std::shared_ptr<const Realisation> LocalStore::queryRealisationUncached(const DrvOutput & id)
{
auto maybeRealisation
= retrySQLite<std::optional<const Realisation>>([&]() {
auto state(_state.lock());
return queryRealisation_(*state, id);
});
auto maybeRealisation = retrySQLite([&]() {
auto state(_state.lock());
return queryRealisation_(*state, id);
});
if (maybeRealisation)
return std::make_shared<const Realisation>(maybeRealisation.value());
else
lix/libstore/nar-info-disk-cache.cc
+8 -10
View File
@@ -136,7 +136,7 @@ public:
)");
/* Periodically purge expired entries from the database. */
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto now = time(0);
SQLiteStmt queryLastPurge(state->db, "select value from LastPurge");
@@ -191,7 +191,7 @@ private:
public:
int createCache(const std::string & uri, const Path & storeDir, bool wantMassQuery, int priority) override
{
return retrySQLite<int>([&]() {
return retrySQLite([&]() {
auto state(_state.lock());
SQLiteTxn txn(state->db);
@@ -224,7 +224,7 @@ public:
std::optional<CacheInfo> upToDateCacheExists(const std::string & uri) override
{
return retrySQLite<std::optional<CacheInfo>>([&]() -> std::optional<CacheInfo> {
return retrySQLite([&]() -> std::optional<CacheInfo> {
auto state(_state.lock());
auto cache(queryCacheRaw(*state, uri));
if (!cache)
@@ -240,8 +240,7 @@ public:
std::pair<Outcome, std::shared_ptr<NarInfo>> lookupNarInfo(
const std::string & uri, const std::string & hashPart) override
{
return retrySQLite<std::pair<Outcome, std::shared_ptr<NarInfo>>>(
[&]() -> std::pair<Outcome, std::shared_ptr<NarInfo>> {
return retrySQLite([&]() -> std::pair<Outcome, std::shared_ptr<NarInfo>> {
auto state(_state.lock());
auto & cache(getCache(*state, uri));
@@ -285,8 +284,7 @@ public:
std::pair<Outcome, std::shared_ptr<Realisation>> lookupRealisation(
const std::string & uri, const DrvOutput & id) override
{
return retrySQLite<std::pair<Outcome, std::shared_ptr<Realisation>>>(
[&]() -> std::pair<Outcome, std::shared_ptr<Realisation>> {
return retrySQLite([&]() -> std::pair<Outcome, std::shared_ptr<Realisation>> {
auto state(_state.lock());
auto & cache(getCache(*state, uri));
@@ -318,7 +316,7 @@ public:
const std::string & uri, const std::string & hashPart,
std::shared_ptr<const ValidPathInfo> info) override
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
auto & cache(getCache(*state, uri));
@@ -358,7 +356,7 @@ public:
const std::string & uri,
const Realisation & realisation) override
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
auto & cache(getCache(*state, uri));
@@ -376,7 +374,7 @@ public:
const std::string & uri,
const DrvOutput & id) override
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
auto state(_state.lock());
auto & cache(getCache(*state, uri));
lix/libstore/sqlite.cc
+1 -1
View File
@@ -98,7 +98,7 @@ void SQLite::isCache()
void SQLite::exec(const std::string & stmt)
{
retrySQLite<void>([&]() {
retrySQLite([&]() {
if (sqlite3_exec(db, stmt.c_str(), 0, 0, 0) != SQLITE_OK)
SQLiteError::throw_(db, "executing SQLite statement '%s'", stmt);
});
lix/libstore/sqlite.hh
+2 -2
View File
@@ -167,8 +167,8 @@ void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning);
* Convenience function for retrying a SQLite transaction when the
* database is busy.
*/
template<typename T, typename F>
T retrySQLite(F && fun)
template<typename F>
auto retrySQLite(F && fun)
{
time_t nextWarning = time(0) + 1;