From 58ef4d9a95584fb89ebcf6222fbac6e698aa6b0b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Jul 2012 11:08:47 -0400 Subject: [PATCH] Add a function queryValidPaths() queryValidPaths() combines multiple calls to isValidPath() in one. This matters when using the Nix daemon because it reduces latency. For instance, on "nix-env -qas \*" it reduces execution time from 5.7s to 4.7s (which is indistinguishable from the non-daemon case). --- src/libstore/local-store.cc | 9 +++++++++ src/libstore/local-store.hh | 2 ++ src/libstore/remote-store.cc | 17 +++++++++++++++++ src/libstore/remote-store.hh | 2 ++ src/libstore/store-api.hh | 3 +++ src/libstore/worker-protocol.hh | 1 + src/nix-env/nix-env.cc | 9 ++++++--- src/nix-worker/nix-worker.cc | 9 +++++++++ 8 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 89c5279b1..e3d23fdfb 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -744,6 +744,15 @@ bool LocalStore::isValidPath(const Path & path) } +PathSet LocalStore::queryValidPaths(const PathSet & paths) +{ + PathSet res; + foreach (PathSet::const_iterator, i, paths) + if (isValidPath(*i)) res.insert(*i); + return res; +} + + PathSet LocalStore::queryAllValidPaths() { SQLiteStmt stmt; diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index d24c2da0e..7398c1b9e 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -99,6 +99,8 @@ public: bool isValidPath(const Path & path); + PathSet queryValidPaths(const PathSet & paths); + PathSet queryAllValidPaths(); ValidPathInfo queryPathInfo(const Path & path); diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 04a9e28c9..0cd29c575 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -217,6 +217,23 @@ bool RemoteStore::isValidPath(const Path & path) } +PathSet RemoteStore::queryValidPaths(const PathSet & paths) +{ + if (GET_PROTOCOL_MINOR(daemonVersion) < 12) { + PathSet res; + foreach (PathSet::const_iterator, i, paths) + if (isValidPath(*i)) res.insert(*i); + return res; + } else { + openConnection(); + writeInt(wopQueryValidPaths, to); + writeStrings(paths, to); + processStderr(); + return readStorePaths(from); + } +} + + PathSet RemoteStore::queryAllValidPaths() { openConnection(); diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh index 6e9249837..2668fe256 100644 --- a/src/libstore/remote-store.hh +++ b/src/libstore/remote-store.hh @@ -27,6 +27,8 @@ public: bool isValidPath(const Path & path); + PathSet queryValidPaths(const PathSet & paths); + PathSet queryAllValidPaths(); ValidPathInfo queryPathInfo(const Path & path); diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 802591766..13dcd9269 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -113,6 +113,9 @@ public: /* Check whether a path is valid. */ virtual bool isValidPath(const Path & path) = 0; + /* Query which of the given paths is valid. */ + virtual PathSet queryValidPaths(const PathSet & paths) = 0; + /* Query the set of all valid paths. */ virtual PathSet queryAllValidPaths() = 0; diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index cacd56f14..b34ad4846 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -41,6 +41,7 @@ typedef enum { wopImportPaths = 27, wopQueryDerivationOutputNames = 28, wopQuerySubstitutablePathInfos = 29, + wopQueryValidPaths = 30, } WorkerOp; diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 2fd4246dd..91b82c0d0 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -932,6 +932,7 @@ static void opQuery(Globals & globals, /* Query which paths have substitutes. */ SubstitutablePathInfos subs; + PathSet validPaths; if (printStatus) { PathSet paths; foreach (vector::iterator, i, elems2) @@ -941,6 +942,7 @@ static void opQuery(Globals & globals, printMsg(lvlTalkative, format("skipping derivation named `%1%' which gives an assertion failure") % i->name); i->setFailed(); } + validPaths = store->queryValidPaths(paths); store->querySubstitutablePathInfos(paths, subs); } @@ -966,9 +968,10 @@ static void opQuery(Globals & globals, XMLAttrs attrs; if (printStatus) { - bool hasSubs = subs.find(i->queryOutPath(globals.state)) != subs.end(); - bool isInstalled = installed.find(i->queryOutPath(globals.state)) != installed.end(); - bool isValid = store->isValidPath(i->queryOutPath(globals.state)); + Path outPath = i->queryOutPath(globals.state); + bool hasSubs = subs.find(outPath) != subs.end(); + bool isInstalled = installed.find(outPath) != installed.end(); + bool isValid = validPaths.find(outPath) != validPaths.end(); if (xmlOutput) { attrs["installed"] = isInstalled ? "1" : "0"; attrs["valid"] = isValid ? "1" : "0"; diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index e786318ad..4d22f7885 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -297,6 +297,15 @@ static void performOp(unsigned int clientVersion, break; } + case wopQueryValidPaths: { + PathSet paths = readStorePaths(from); + startWork(); + PathSet res = store->queryValidPaths(paths); + stopWork(); + writeStrings(res, to); + break; + } + case wopHasSubstitutes: { Path path = readStorePath(from); startWork();