nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-13 14:02:42 +01:00
Code Activity

Convert more methods

Browse source 
Fixed one test, broke another
This commit is contained in:
John Ericson 2023-05-08 18:50:16 -04:00
parent 59a8099038
commit b3d320c594
3 changed files with 123 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/libstore/local-overlay-store.cc
View file

@ -3,6 +3,12 @@
namespace nix {
Path LocalOverlayStoreConfig::toUpperPath(const StorePath & path) {
auto res = upperLayer + "/" + path.to_string();
warn("upper path: %s", res);
return res;
}
LocalOverlayStore::LocalOverlayStore(const Params & params)
: StoreConfig(params)
, LocalFSStoreConfig(params)
@ -30,7 +36,6 @@ void LocalOverlayStore::registerDrvOutput(const Realisation & info)
void LocalOverlayStore::queryPathInfoUncached(const StorePath & path,
Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept
{
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
LocalStore::queryPathInfoUncached(path,
@ -55,6 +60,79 @@ void LocalOverlayStore::queryPathInfoUncached(const StorePath & path,
}
void LocalOverlayStore::queryRealisationUncached(const DrvOutput & drvOutput,
Callback<std::shared_ptr<const Realisation>> callback) noexcept
{
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
LocalStore::queryRealisationUncached(drvOutput,
{[this, drvOutput, callbackPtr](std::future<std::shared_ptr<const Realisation>> fut) {
try {
auto info = fut.get();
if (info)
return (*callbackPtr)(std::move(info));
} catch (...) {
return callbackPtr->rethrow();
}
// If we don't have it, check lower store
lowerStore->queryRealisation(drvOutput,
{[callbackPtr](std::future<std::shared_ptr<const Realisation>> fut) {
try {
(*callbackPtr)(fut.get());
} catch (...) {
return callbackPtr->rethrow();
}
}});
}});
}
bool LocalOverlayStore::isValidPathUncached(const StorePath & path)
{
auto res = LocalStore::isValidPathUncached(path);
if (res) return res;
return lowerStore->isValidPath(path);
}
void LocalOverlayStore::addToStore(const ValidPathInfo & info, Source & source,
RepairFlag repair, CheckSigsFlag checkSigs)
{
LocalStore::addToStore(info, source, repair, checkSigs);
if (lowerStore->isValidPath(info.path)) {
// dedup stores
deletePath(toUpperPath(info.path));
}
}
StorePath LocalOverlayStore::addToStoreFromDump(Source & dump, std::string_view name,
FileIngestionMethod method, HashType hashAlgo, RepairFlag repair, const StorePathSet & references)
{
auto path = LocalStore::addToStoreFromDump(dump, name, method, hashAlgo, repair, references);
if (lowerStore->isValidPath(path)) {
// dedup stores
deletePath(toUpperPath(path));
}
return path;
}
StorePath LocalOverlayStore::addTextToStore(
std::string_view name,
std::string_view s,
const StorePathSet & references,
RepairFlag repair)
{
auto path = LocalStore::addTextToStore(name, s, references, repair);
if (lowerStore->isValidPath(path)) {
// dedup stores
deletePath(toUpperPath(path));
}
return path;
}
static RegisterStoreImplementation<LocalOverlayStore, LocalOverlayStoreConfig> regLocalOverlayStore;
}

29
src/libstore/local-overlay-store.hh
View file

@ -22,6 +22,12 @@ struct LocalOverlayStoreConfig : virtual LocalStoreConfig
for the lower store. The default is `auto` (i.e. use the Nix daemon or `/nix/store` directly).
Must be a store with a store dir on the file system.
Must be used as OverlayFS lower layer for this store's store dir.
)"};
const Setting<std::string> upperLayer{(StoreConfig*) this, "", "upper-layer",
R"(
Must be used as OverlayFS upper layer for this store's store dir.
)"};
const std::string name() override { return "Experimental Local Overlay Store"; }
@ -34,6 +40,12 @@ struct LocalOverlayStoreConfig : virtual LocalStoreConfig
//#include "local-overlay-store.md"
;
}
/**
* Given a store path, get its location (if it is exists) in the
* upper layer of the overlayfs.
*/
Path toUpperPath(const StorePath & path);
};
/**
@ -74,6 +86,23 @@ private:
void queryPathInfoUncached(const StorePath & path,
Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept override;
bool isValidPathUncached(const StorePath & path) override;
void addToStore(const ValidPathInfo & info, Source & source,
RepairFlag repair, CheckSigsFlag checkSigs) override;
StorePath addToStoreFromDump(Source & dump, std::string_view name,
FileIngestionMethod method, HashType hashAlgo, RepairFlag repair, const StorePathSet & references) override;
StorePath addTextToStore(
std::string_view name,
std::string_view s,
const StorePathSet & references,
RepairFlag repair) override;
void queryRealisationUncached(const DrvOutput&,
Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
};
}