nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 21:16:02 +01:00
Code Activity

Merge pull request #155 from DeterminateSystems/revert-150-concurrent-eval-cache

Browse source 
Revert "Use WAL mode for SQLite cache databases"
This commit is contained in:
Cole Helbling 2025-07-21 01:06:39 +00:00 • committed by GitHub
commit 55375cf2d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/sqlite.cc
View file

@ -93,7 +93,7 @@ SQLite::~SQLite()
void SQLite::isCache() void SQLite::isCache()
{ {
exec("pragma synchronous = off"); exec("pragma synchronous = off");
exec("pragma main.journal_mode = wal"); exec("pragma main.journal_mode = truncate");
} }
void SQLite::exec(const std::string & stmt) void SQLite::exec(const std::string & stmt)
@ -250,7 +250,7 @@ void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning)
if (now > nextWarning) { if (now > nextWarning) {
nextWarning = now + 10; nextWarning = now + 10;
logWarning({ logWarning({
.msg = e.info().msg .msg = HintFmt(e.what())
}); });
} }

8
src/libutil/util.cc
View file

@ -190,10 +190,8 @@ void ignoreExceptionInDestructor(Verbosity lvl)
try { try {
try { try {
throw; throw;
} catch (Error & e) {
printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);
} catch (std::exception & e) { } catch (std::exception & e) {
printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what()); printMsg(lvl, "error (ignored): %1%", e.what());
} }
} catch (...) { } } catch (...) { }
} }
@ -204,10 +202,8 @@ void ignoreExceptionExceptInterrupt(Verbosity lvl)
throw; throw;
} catch (const Interrupted & e) { } catch (const Interrupted & e) {
throw; throw;
} catch (Error & e) {
printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);
} catch (std::exception & e) { } catch (std::exception & e) {
printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what()); printMsg(lvl, "error (ignored): %1%", e.what());
} }
} }