aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac3
-rw-r--r--src/bin2c/bin2c.c4
-rw-r--r--src/libstore/Makefile.am5
-rw-r--r--src/libstore/local-store.cc119
-rw-r--r--src/libstore/local-store.hh8
-rw-r--r--src/libstore/schema.sql27
6 files changed, 151 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index f6d983fda..f726b1ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,9 @@ AC_SUBST(bzip2_bin_test)
AC_CHECK_LIB(pthread, pthread_mutex_init)
+LDFLAGS="-lsqlite3"
+
+
AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
[do not initialise DB etc. in `make install']),
init_state=$enableval, init_state=yes)
diff --git a/src/bin2c/bin2c.c b/src/bin2c/bin2c.c
index 18bf81d69..5ed8a5708 100644
--- a/src/bin2c/bin2c.c
+++ b/src/bin2c/bin2c.c
@@ -14,10 +14,10 @@ int main(int argc, char * * argv)
{
int c;
if (argc != 2) abort();
- print("static unsigned char %s[] = {", argv[1]);
+ print("static unsigned char %s[] = { ", argv[1]);
while ((c = getchar()) != EOF) {
print("0x%02x, ", (unsigned char) c);
}
- print("};\n");
+ print("0 };\n");
return 0;
}
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index 863871519..0140857b8 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -19,5 +19,10 @@ EXTRA_DIST = derivations-ast.def derivations-ast.cc
AM_CXXFLAGS = -Wall \
-I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil
+local-store.lo: schema.sql.hh
+
+%.sql.hh: %.sql
+ ../bin2c/bin2c schema < $< > $@ || (rm $@ && exit 1)
+
derivations-ast.cc derivations-ast.hh: ../aterm-helper.pl derivations-ast.def
$(perl) $(srcdir)/../aterm-helper.pl derivations-ast.hh derivations-ast.cc < $(srcdir)/derivations-ast.def
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 7c8db745c..55637dd85 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -22,6 +22,16 @@
namespace nix {
+class SQLiteError : public Error
+{
+public:
+ SQLiteError(sqlite3 * db, const format & f)
+ : Error(format("%1%: %2%") % f.str() % sqlite3_errmsg(db))
+ {
+ }
+};
+
+
void checkStoreNotSymlink()
{
if (getEnv("NIX_IGNORE_SYMLINK_STORE") == "1") return;
@@ -42,6 +52,7 @@ void checkStoreNotSymlink()
LocalStore::LocalStore()
{
+ db = 0;
substitutablePathsLoaded = false;
schemaPath = nixDBPath + "/schema";
@@ -50,9 +61,6 @@ LocalStore::LocalStore()
/* Create missing state directories if they don't already exist. */
createDirs(nixStore);
- createDirs(nixDBPath + "/info");
- createDirs(nixDBPath + "/referrer");
- createDirs(nixDBPath + "/failed");
Path profilesDir = nixStateDir + "/profiles";
createDirs(nixStateDir + "/profiles");
createDirs(nixStateDir + "/temproots");
@@ -88,7 +96,12 @@ LocalStore::LocalStore()
writeFile(schemaPath, (format("%1%") % nixSchemaVersion).str());
}
if (curSchema == 1) throw Error("your Nix store is no longer supported");
- if (curSchema < nixSchemaVersion) upgradeStore12();
+ if (curSchema < 5)
+ throw Error(
+ "Your Nix store has a database in Berkeley DB format,\n"
+ "which is no longer supported. To convert to the new format,\n"
+ "please upgrade Nix to version 0.12 first.");
+ if (curSchema < 6) upgradeStore6();
doFsync = queryBoolSetting("fsync-metadata", false);
}
@@ -99,6 +112,9 @@ LocalStore::~LocalStore()
try {
flushDelayedUpdates();
+ if (db && sqlite3_close(db) != SQLITE_OK)
+ throw SQLiteError(db, "closing database");
+
foreach (RunningSubstituters::iterator, i, runningSubstituters) {
i->second.to.close();
i->second.from.close();
@@ -123,6 +139,22 @@ int LocalStore::getSchema()
}
+#include "schema.sql.hh"
+
+void LocalStore::initSchema()
+{
+ if (sqlite3_open_v2((nixDBPath + "/db.sqlite").c_str(), &db,
+ SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 0) != SQLITE_OK)
+ throw Error("cannot open SQLite database");
+
+ if (sqlite3_busy_timeout(db, 60000) != SQLITE_OK)
+ throw SQLiteError(db, "sett");
+
+ if (sqlite3_exec(db, (const char *) schema, 0, 0, 0) != SQLITE_OK)
+ throw SQLiteError(db, "initialising database schema");
+}
+
+
void canonicalisePathMetaData(const Path & path, bool recurse)
{
checkInterrupt();
@@ -1171,15 +1203,78 @@ void LocalStore::verifyStore(bool checkContents)
}
-/* Upgrade from schema 4 (Nix 0.11) to schema 5 (Nix >= 0.12). The
- old schema uses Berkeley DB, the new one stores store path
- meta-information in files. */
-void LocalStore::upgradeStore12()
+/* Upgrade from schema 5 (Nix 0.12) to schema 6 (Nix >= 0.15). */
+void LocalStore::upgradeStore6()
{
- throw Error(
- "Your Nix store has a database in Berkeley DB format,\n"
- "which is no longer supported. To convert to the new format,\n"
- "please upgrade Nix to version 0.12 first.");
+ if (!lockFile(globalLock, ltWrite, false)) {
+ printMsg(lvlError, "waiting for exclusive access to the Nix store...");
+ lockFile(globalLock, ltWrite, true);
+ }
+
+ printMsg(lvlError, "upgrading Nix store to new schema (this may take a while)...");
+
+ initSchema();
+
+ PathSet validPaths = queryValidPaths();
+
+ sqlite3_stmt * registerStmt;
+ if (sqlite3_prepare_v2(db, "insert into ValidPaths (path, hash, registrationTime) values (?, ?, ?);",
+ -1, &registerStmt, 0) != SQLITE_OK)
+ throw SQLiteError(db, "creating statement");
+
+ sqlite3_stmt * addRefStmt;
+ if (sqlite3_prepare_v2(db, "insert into Refs (referrer, reference) values (?, ?);",
+ -1, &addRefStmt, 0) != SQLITE_OK)
+ throw SQLiteError(db, "creating statement");
+
+ if (sqlite3_exec(db, "begin;", 0, 0, 0) != SQLITE_OK)
+ throw SQLiteError(db, "running `begin' command");
+
+ foreach (PathSet::iterator, i, validPaths) {
+ ValidPathInfo info = queryPathInfo(*i, true);
+
+ if (sqlite3_reset(registerStmt) != SQLITE_OK)
+ throw SQLiteError(db, "resetting statement");
+ if (sqlite3_bind_text(registerStmt, 1, i->c_str(), -1, SQLITE_TRANSIENT) != SQLITE_OK)
+ throw SQLiteError(db, "binding argument 1");
+ string h = "sha256:" + printHash(info.hash);
+ if (sqlite3_bind_text(registerStmt, 2, h.c_str(), -1, SQLITE_TRANSIENT) != SQLITE_OK)
+ throw SQLiteError(db, "binding argument 2");
+ if (sqlite3_bind_int(registerStmt, 3, info.registrationTime) != SQLITE_OK)
+ throw SQLiteError(db, "binding argument 3");
+ if (sqlite3_step(registerStmt) != SQLITE_DONE)
+ throw SQLiteError(db, "registering valid path in database");
+
+ foreach (PathSet::iterator, j, info.references) {
+ if (sqlite3_reset(addRefStmt) != SQLITE_OK)
+ throw SQLiteError(db, "resetting statement");
+ if (sqlite3_bind_text(addRefStmt, 1, i->c_str(), -1, SQLITE_TRANSIENT) != SQLITE_OK)
+ throw SQLiteError(db, "binding argument 1");
+ if (sqlite3_bind_text(addRefStmt, 2, j->c_str(), -1, SQLITE_TRANSIENT) != SQLITE_OK)
+ throw SQLiteError(db, "binding argument 2");
+ if (sqlite3_step(addRefStmt) != SQLITE_DONE)
+ throw SQLiteError(db, "adding reference to database");
+ }
+
+ std::cerr << ".";
+ }
+
+ std::cerr << "\n";
+
+ if (sqlite3_exec(db, "commit;", 0, 0, 0) != SQLITE_OK)
+ throw SQLiteError(db, "running `commit' command");
+
+ if (sqlite3_finalize(registerStmt) != SQLITE_OK)
+ throw SQLiteError(db, "finalizing statement");
+
+ if (sqlite3_finalize(addRefStmt) != SQLITE_OK)
+ throw SQLiteError(db, "finalizing statement");
+
+ throw Error("foo");
+
+ writeFile(schemaPath, (format("%1%") % nixSchemaVersion).str());
+
+ lockFile(globalLock, ltRead, true);
}
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 31f8d9109..f29565680 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -6,6 +6,8 @@
#include "store-api.hh"
#include "util.hh"
+#include <sqlite3.h>
+
namespace nix {
@@ -161,8 +163,12 @@ private:
/* Whether to do an fsync() after writing Nix metadata. */
bool doFsync;
+ sqlite3 * db;
+
int getSchema();
+ void initSchema();
+
void registerValidPath(const ValidPathInfo & info, bool ignoreValidity = false);
ValidPathInfo queryPathInfo(const Path & path, bool ignoreErrors = false);
@@ -177,7 +183,7 @@ private:
void invalidatePath(const Path & path);
- void upgradeStore12();
+ void upgradeStore6();
struct GCState;
diff --git a/src/libstore/schema.sql b/src/libstore/schema.sql
new file mode 100644
index 000000000..e24132943
--- /dev/null
+++ b/src/libstore/schema.sql
@@ -0,0 +1,27 @@
+pragma foreign_keys = on;
+
+create table if not exists ValidPaths (
+ path text primary key not null,
+ hash text not null,
+ registrationTime integer not null
+);
+
+create table if not exists Refs (
+ referrer text not null,
+ reference text not null,
+ primary key (referrer, reference),
+ foreign key (referrer) references ValidPaths(path)
+ on delete cascade
+ deferrable initially deferred,
+ foreign key (reference) references ValidPaths(path)
+ on delete restrict
+ deferrable initially deferred
+);
+
+create table if not exists FailedDerivations (
+ path text primary key not null,
+ time integer not null
+);
+
+create index IndexReferrer on Refs(referrer);
+create index IndexReference on Refs(reference);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:53:32 +0000