lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libstore: BinaryCacheStore::getFile{ -> Contents}

Browse source 
if we want have getFile return a source instead of consuming a sink
we'll have to disambiguate this overload another way, eg like this.

Change-Id: Ia26de2020c309a37e7ccc3775c1ad1f32e0a778b
This commit is contained in:
eldritch horrors 2024-05-03 21:46:07 +02:00
parent fed34594d8
commit 3425e90d76
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/binary-cache-store.cc
View file

@ -38,7 +38,7 @@ void BinaryCacheStore::init()
{ {
std::string cacheInfoFile = "nix-cache-info"; std::string cacheInfoFile = "nix-cache-info";
auto cacheInfo = getFile(cacheInfoFile); auto cacheInfo = getFileContents(cacheInfoFile);
if (!cacheInfo) { if (!cacheInfo) {
upsertFile(cacheInfoFile, "StoreDir: " + storeDir + "\n", "text/x-nix-cache-info"); upsertFile(cacheInfoFile, "StoreDir: " + storeDir + "\n", "text/x-nix-cache-info");
} else { } else {
@ -69,10 +69,10 @@ void BinaryCacheStore::upsertFile(const std::string & path,
void BinaryCacheStore::getFile(const std::string & path, Sink & sink) void BinaryCacheStore::getFile(const std::string & path, Sink & sink)
{ {
sink(*getFile(path)); sink(*getFileContents(path));
} }
std::optional<std::string> BinaryCacheStore::getFile(const std::string & path) std::optional<std::string> BinaryCacheStore::getFileContents(const std::string & path)
{ {
StringSink sink; StringSink sink;
try { try {
@ -359,7 +359,7 @@ std::shared_ptr<const ValidPathInfo> BinaryCacheStore::queryPathInfoUncached(con
auto narInfoFile = narInfoFileFor(storePath); auto narInfoFile = narInfoFileFor(storePath);
auto data = getFile(narInfoFile); auto data = getFileContents(narInfoFile);
if (!data) return nullptr; if (!data) return nullptr;
@ -446,7 +446,7 @@ std::shared_ptr<const Realisation> BinaryCacheStore::queryRealisationUncached(co
{ {
auto outputInfoFilePath = realisationsPrefix + "/" + id.to_string() + ".doi"; auto outputInfoFilePath = realisationsPrefix + "/" + id.to_string() + ".doi";
auto data = getFile(outputInfoFilePath); auto data = getFileContents(outputInfoFilePath);
if (!data) return {}; if (!data) return {};
auto realisation = Realisation::fromJSON( auto realisation = Realisation::fromJSON(
@ -486,7 +486,7 @@ std::optional<std::string> BinaryCacheStore::getBuildLogExact(const StorePath &
debug("fetching build log from binary cache '%s/%s'", getUri(), logPath); debug("fetching build log from binary cache '%s/%s'", getUri(), logPath);
return getFile(logPath); return getFileContents(logPath);
} }
void BinaryCacheStore::addBuildLog(const StorePath & drvPath, std::string_view log) void BinaryCacheStore::addBuildLog(const StorePath & drvPath, std::string_view log)

2
src/libstore/binary-cache-store.hh
View file

@ -85,7 +85,7 @@ public:
*/ */
virtual void getFile(const std::string & path, Sink & sink); virtual void getFile(const std::string & path, Sink & sink);
virtual std::optional<std::string> getFile(const std::string & path); virtual std::optional<std::string> getFileContents(const std::string & path);
public: public:

2
src/libstore/http-binary-cache-store.cc
View file

@ -164,7 +164,7 @@ protected:
} }
} }
std::optional<std::string> getFile(const std::string & path) override std::optional<std::string> getFileContents(const std::string & path) override
{ {
checkEnabled(); checkEnabled();