Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binary-cache-store: UpsertFile accept Source & instead of std::istream

Browse Source
This commit is contained in:
Sergei Zimmerman
2025-10-28 03:02:02 +03:00
committed by John Ericson
parent e3c41407f9
commit e947c895ec
6 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libstore/binary-cache-store.cc
View File

@@ -79,7 +79,8 @@ std::optional<std::string> BinaryCacheStore::getNixCacheInfo()
void BinaryCacheStore::upsertFile(
const std::string & path, std::string && data, const std::string & mimeType, uint64_t sizeHint)
{
upsertFile(path, std::make_shared<std::stringstream>(std::move(data)), mimeType, sizeHint);
StringSource source{data};
upsertFile(path, source, mimeType, sizeHint);
}
void BinaryCacheStore::getFile(const std::string & path, Callback<std::optional<std::string>> callback) noexcept
@@ -271,12 +272,10 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
/* Atomically write the NAR file. */
if (repair || !fileExists(narInfo->url)) {
AutoCloseFD fd = toDescriptor(open(fnTemp.c_str(), O_RDONLY));
FdSource source{fd.get()};
stats.narWrite++;
upsertFile(
narInfo->url,
std::make_shared<std::fstream>(fnTemp, std::ios_base::in | std::ios_base::binary),
"application/x-nix-nar",
narInfo->fileSize);
upsertFile(narInfo->url, source, "application/x-nix-nar", narInfo->fileSize);
} else
stats.narWriteAverted++;