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

Rename class

Browse source
This commit is contained in:
Eelco Dolstra 2016-02-18 12:51:10 +01:00
parent de77cc2910
commit a992f688d1
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/hydra-queue-runner/binary-cache-store.cc
View file

@ -9,7 +9,7 @@
namespace nix { namespace nix {
LocalBinaryCache::LocalBinaryCache(ref<Store> localStore, const Path & binaryCacheDir, BinaryCacheStore::BinaryCacheStore(ref<Store> localStore, const Path & binaryCacheDir,
const Path & secretKeyFile, const Path & publicKeyFile) const Path & secretKeyFile, const Path & publicKeyFile)
: localStore(localStore) : localStore(localStore)
, binaryCacheDir(binaryCacheDir) , binaryCacheDir(binaryCacheDir)
@ -30,7 +30,7 @@ LocalBinaryCache::LocalBinaryCache(ref<Store> localStore, const Path & binaryCac
} }
} }
Path LocalBinaryCache::narInfoFileFor(const Path & storePath) Path BinaryCacheStore::narInfoFileFor(const Path & storePath)
{ {
assertStorePath(storePath); assertStorePath(storePath);
return binaryCacheDir + "/" + storePathToHash(storePath) + ".narinfo"; return binaryCacheDir + "/" + storePathToHash(storePath) + ".narinfo";
@ -46,7 +46,7 @@ void atomicWrite(const Path & path, const std::string & s)
del.cancel(); del.cancel();
} }
void LocalBinaryCache::addToCache(const ValidPathInfo & info, void BinaryCacheStore::addToCache(const ValidPathInfo & info,
const string & nar) const string & nar)
{ {
Path narInfoFile = narInfoFileFor(info.path); Path narInfoFile = narInfoFileFor(info.path);
@ -80,7 +80,7 @@ void LocalBinaryCache::addToCache(const ValidPathInfo & info,
atomicWrite(narInfoFile, narInfo.to_string()); atomicWrite(narInfoFile, narInfo.to_string());
} }
NarInfo LocalBinaryCache::readNarInfo(const Path & storePath) NarInfo BinaryCacheStore::readNarInfo(const Path & storePath)
{ {
Path narInfoFile = narInfoFileFor(storePath); Path narInfoFile = narInfoFileFor(storePath);
NarInfo narInfo = NarInfo(readFile(narInfoFile), narInfoFile); NarInfo narInfo = NarInfo(readFile(narInfoFile), narInfoFile);
@ -94,12 +94,12 @@ NarInfo LocalBinaryCache::readNarInfo(const Path & storePath)
return narInfo; return narInfo;
} }
bool LocalBinaryCache::isValidPath(const Path & storePath) bool BinaryCacheStore::isValidPath(const Path & storePath)
{ {
return pathExists(narInfoFileFor(storePath)); return pathExists(narInfoFileFor(storePath));
} }
void LocalBinaryCache::exportPath(const Path & storePath, bool sign, Sink & sink) void BinaryCacheStore::exportPath(const Path & storePath, bool sign, Sink & sink)
{ {
assert(!sign); assert(!sign);
@ -127,7 +127,7 @@ void LocalBinaryCache::exportPath(const Path & storePath, bool sign, Sink & sink
sink << exportMagic << storePath << res.references << res.deriver << 0; sink << exportMagic << storePath << res.references << res.deriver << 0;
} }
Paths LocalBinaryCache::importPaths(bool requireSignature, Source & source) Paths BinaryCacheStore::importPaths(bool requireSignature, Source & source)
{ {
assert(!requireSignature); assert(!requireSignature);
Paths res; Paths res;
@ -159,7 +159,7 @@ struct NopSink : ParseSink
{ {
}; };
Path LocalBinaryCache::importPath(Source & source) Path BinaryCacheStore::importPath(Source & source)
{ {
/* FIXME: some cut&paste of LocalStore::importPath(). */ /* FIXME: some cut&paste of LocalStore::importPath(). */
@ -187,12 +187,12 @@ Path LocalBinaryCache::importPath(Source & source)
return info.path; return info.path;
} }
ValidPathInfo LocalBinaryCache::queryPathInfo(const Path & storePath) ValidPathInfo BinaryCacheStore::queryPathInfo(const Path & storePath)
{ {
return ValidPathInfo(readNarInfo(storePath)); return ValidPathInfo(readNarInfo(storePath));
} }
void LocalBinaryCache::querySubstitutablePathInfos(const PathSet & paths, void BinaryCacheStore::querySubstitutablePathInfos(const PathSet & paths,
SubstitutablePathInfos & infos) SubstitutablePathInfos & infos)
{ {
PathSet left; PathSet left;
@ -213,7 +213,7 @@ void LocalBinaryCache::querySubstitutablePathInfos(const PathSet & paths,
localStore->querySubstitutablePathInfos(left, infos); localStore->querySubstitutablePathInfos(left, infos);
} }
void LocalBinaryCache::buildPaths(const PathSet & paths, BuildMode buildMode) void BinaryCacheStore::buildPaths(const PathSet & paths, BuildMode buildMode)
{ {
for (auto & storePath : paths) { for (auto & storePath : paths) {
assert(!isDerivation(storePath)); assert(!isDerivation(storePath));
@ -238,7 +238,7 @@ void LocalBinaryCache::buildPaths(const PathSet & paths, BuildMode buildMode)
} }
} }
void LocalBinaryCache::ensurePath(const Path & path) void BinaryCacheStore::ensurePath(const Path & path)
{ {
buildPaths({path}); buildPaths({path});
} }

4
src/hydra-queue-runner/binary-cache-store.hh
View file

@ -7,7 +7,7 @@ namespace nix {
struct NarInfo; struct NarInfo;
class LocalBinaryCache : public nix::Store class BinaryCacheStore : public nix::Store
{ {
private: private:
ref<Store> localStore; ref<Store> localStore;
@ -18,7 +18,7 @@ private:
public: public:
LocalBinaryCache(ref<Store> localStore, const Path & binaryCacheDir, BinaryCacheStore(ref<Store> localStore, const Path & binaryCacheDir,
const Path & secretKeyFile, const Path & publicKeyFile); const Path & secretKeyFile, const Path & publicKeyFile);
private: private:

2
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -33,7 +33,7 @@ ref<Store> State::getLocalStore()
ref<Store> State::getDestStore() ref<Store> State::getDestStore()
{ {
return make_ref<LocalBinaryCache>(getLocalStore(), return make_ref<BinaryCacheStore>(getLocalStore(),
"/tmp/binary-cache", "/tmp/binary-cache",
"/home/eelco/Misc/Keys/test.nixos.org/secret", "/home/eelco/Misc/Keys/test.nixos.org/secret",
"/home/eelco/Misc/Keys/test.nixos.org/public"); "/home/eelco/Misc/Keys/test.nixos.org/public");