From 7d14f5c3310f5380ca14391e79bd1fc214d5f5c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Apr 2016 17:53:47 +0200 Subject: Implement S3BinaryCacheStore::queryAllValidPaths() This allows commands like "nix verify --all" or "nix path-info --all" to work on S3 caches. Unfortunately, this requires some ugly hackery: when querying the contents of the bucket, we don't want to have to read every .narinfo file. But the S3 bucket keys only include the hash part of each store path, not the name part. So as a special exception queryAllValidPaths() can now return store paths *without* the name part, and queryPathInfo() accepts such store paths (returning a ValidPathInfo object containing the full name). --- src/libstore/binary-cache-store.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libstore/binary-cache-store.cc') diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index dacdeb3f52fd..4445bfd27a12 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -94,13 +94,15 @@ void BinaryCacheStore::addToCache(const ValidPathInfo & info, upsertFile(narInfoFile, narInfo->to_string()); + auto hashPart = storePathToHash(narInfo->path); + { auto state_(state.lock()); - state_->pathInfoCache.upsert(narInfo->path, std::shared_ptr(narInfo)); + state_->pathInfoCache.upsert(hashPart, std::shared_ptr(narInfo)); } if (diskCache) - diskCache->upsertNarInfo(getUri(), std::shared_ptr(narInfo)); + diskCache->upsertNarInfo(getUri(), hashPart, std::shared_ptr(narInfo)); stats.narInfoWrite++; } @@ -197,8 +199,6 @@ std::shared_ptr BinaryCacheStore::queryPathInfoUncached(const Pat if (!data) return 0; auto narInfo = make_ref(*data, narInfoFile); - if (narInfo->path != storePath) - throw Error(format("NAR info file for store path ‘%1%’ does not match ‘%2%’") % narInfo->path % storePath); stats.narInfoRead++; -- cgit 1.4.1