nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

Revert "Merge pull request #14097 from obsidiansystems/light-realisation-improvements"

Browse source 
This reverts commit dc8c1461da, reversing
changes made to 28adcfda32.
This commit is contained in:
Sergei Zimmerman 2025-10-05 21:54:32 +03:00
parent 7ba3ef21a6
commit 7e39ab4dc7
No known key found for this signature in database
32 changed files with 254 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcmd/built-path.cc
View file

@ -117,11 +117,10 @@ RealisedPath::Set BuiltPath::toRealisedPaths(Store & store) const
"the derivation '%s' has unrealised output '%s' (derived-path.cc/toRealisedPaths)", "the derivation '%s' has unrealised output '%s' (derived-path.cc/toRealisedPaths)",
store.printStorePath(p.drvPath->outPath()), store.printStorePath(p.drvPath->outPath()),
outputName); outputName);
DrvOutput key{*drvOutput, outputName}; auto thisRealisation = store.queryRealisation(DrvOutput{*drvOutput, outputName});
auto thisRealisation = store.queryRealisation(key);
assert(thisRealisation); // We’ve built it, so we must assert(thisRealisation); // We’ve built it, so we must
// have the realisation // have the realisation
res.insert(Realisation{*thisRealisation, std::move(key)}); res.insert(*thisRealisation);
} else { } else {
res.insert(outputPath); res.insert(outputPath);
} }

16
src/libstore-tests/common-protocol.cc
View file

@ -112,17 +112,20 @@ CHARACTERIZATION_TEST(
"realisation", "realisation",
(std::tuple<Realisation, Realisation>{ (std::tuple<Realisation, Realisation>{
Realisation{ Realisation{
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"},
},
DrvOutput{ DrvOutput{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz", .outputName = "baz",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"},
}, },
Realisation{ Realisation{
.id =
{ {
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"}, .signatures = {"asdf", "qwer"},
.dependentRealisations = .dependentRealisations =
@ -136,11 +139,6 @@ CHARACTERIZATION_TEST(
}, },
}, },
}, },
{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
},
})) }))
CHARACTERIZATION_TEST( CHARACTERIZATION_TEST(

15
src/libstore-tests/dummy-store.cc
View file

@ -1,6 +1,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "nix/store/dummy-store-impl.hh" #include "nix/store/dummy-store.hh"
#include "nix/store/globals.hh" #include "nix/store/globals.hh"
#include "nix/store/realisation.hh" #include "nix/store/realisation.hh"
@ -13,7 +13,7 @@ TEST(DummyStore, realisation_read)
auto store = [] { auto store = [] {
auto cfg = make_ref<DummyStoreConfig>(StoreReference::Params{}); auto cfg = make_ref<DummyStoreConfig>(StoreReference::Params{});
cfg->readOnly = false; cfg->readOnly = false;
return cfg->openDummyStore(); return cfg->openStore();
}(); }();
auto drvHash = Hash::parseExplicitFormatUnprefixed( auto drvHash = Hash::parseExplicitFormatUnprefixed(
@ -22,17 +22,6 @@ TEST(DummyStore, realisation_read)
auto outputName = "foo"; auto outputName = "foo";
EXPECT_EQ(store->queryRealisation({drvHash, outputName}), nullptr); EXPECT_EQ(store->queryRealisation({drvHash, outputName}), nullptr);
UnkeyedRealisation value{
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"},
};
store->buildTrace.insert({drvHash, {{outputName, make_ref<UnkeyedRealisation>(value)}}});
auto value2 = store->queryRealisation({drvHash, outputName});
ASSERT_TRUE(value2);
EXPECT_EQ(*value2, value);
} }
} // namespace nix } // namespace nix

6
src/libstore-tests/realisation.cc
View file

@ -49,9 +49,8 @@ INSTANTIATE_TEST_SUITE_P(
RealisationJsonTest, RealisationJsonTest,
([] { ([] {
Realisation simple{ Realisation simple{
{
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, .id =
},
{ {
.drvHash = Hash::parseExplicitFormatUnprefixed( .drvHash = Hash::parseExplicitFormatUnprefixed(
"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
@ -59,6 +58,7 @@ INSTANTIATE_TEST_SUITE_P(
HashFormat::Base16), HashFormat::Base16),
.outputName = "foo", .outputName = "foo",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"},
}; };
return ::testing::Values( return ::testing::Values(
std::pair{ std::pair{

26
src/libstore-tests/serve-protocol.cc
View file

@ -95,17 +95,20 @@ VERSIONED_CHARACTERIZATION_TEST(
defaultVersion, defaultVersion,
(std::tuple<Realisation, Realisation>{ (std::tuple<Realisation, Realisation>{
Realisation{ Realisation{
{ .id =
DrvOutput{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"}, .signatures = {"asdf", "qwer"},
}, },
Realisation{
.id =
{ {
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz", .outputName = "baz",
}, },
},
Realisation{
{
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"}, .signatures = {"asdf", "qwer"},
.dependentRealisations = .dependentRealisations =
@ -119,11 +122,6 @@ VERSIONED_CHARACTERIZATION_TEST(
}, },
}, },
}, },
{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
},
})) }))
VERSIONED_CHARACTERIZATION_TEST(ServeProtoTest, buildResult_2_2, "build-result-2.2", 2 << 8 | 2, ({ VERSIONED_CHARACTERIZATION_TEST(ServeProtoTest, buildResult_2_2, "build-result-2.2", 2 << 8 | 2, ({
@ -198,27 +196,25 @@ VERSIONED_CHARACTERIZATION_TEST(
{ {
"foo", "foo",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "foo", .outputName = "foo",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
}, },
}, },
{ {
"bar", "bar",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "bar", .outputName = "bar",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
}, },
}, },
}, },

52
src/libstore-tests/worker-protocol.cc
View file

@ -148,17 +148,20 @@ VERSIONED_CHARACTERIZATION_TEST(
defaultVersion, defaultVersion,
(std::tuple<Realisation, Realisation>{ (std::tuple<Realisation, Realisation>{
Realisation{ Realisation{
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"},
},
DrvOutput{ DrvOutput{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz", .outputName = "baz",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"},
}, },
Realisation{ Realisation{
.id =
{ {
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
.signatures = {"asdf", "qwer"}, .signatures = {"asdf", "qwer"},
.dependentRealisations = .dependentRealisations =
@ -172,11 +175,6 @@ VERSIONED_CHARACTERIZATION_TEST(
}, },
}, },
}, },
DrvOutput{
.drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
.outputName = "baz",
},
},
})) }))
VERSIONED_CHARACTERIZATION_TEST(WorkerProtoTest, buildResult_1_27, "build-result-1.27", 1 << 8 | 27, ({ VERSIONED_CHARACTERIZATION_TEST(WorkerProtoTest, buildResult_1_27, "build-result-1.27", 1 << 8 | 27, ({
@ -216,25 +214,25 @@ VERSIONED_CHARACTERIZATION_TEST(
{ {
"foo", "foo",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
},
DrvOutput{ DrvOutput{
.drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "foo", .outputName = "foo",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
}, },
}, },
{ {
"bar", "bar",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
},
DrvOutput{ DrvOutput{
.drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "bar", .outputName = "bar",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
}, },
}, },
}, },
@ -269,27 +267,25 @@ VERSIONED_CHARACTERIZATION_TEST(
{ {
"foo", "foo",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "foo", .outputName = "foo",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
}, },
}, },
{ {
"bar", "bar",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "bar", .outputName = "bar",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
}, },
}, },
}, },
@ -328,27 +324,25 @@ VERSIONED_CHARACTERIZATION_TEST(
{ {
"foo", "foo",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "foo", .outputName = "foo",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"},
}, },
}, },
{ {
"bar", "bar",
{ {
{ .id =
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
},
DrvOutput{ DrvOutput{
.drvHash = .drvHash =
Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="),
.outputName = "bar", .outputName = "bar",
}, },
.outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"},
}, },
}, },
}, },

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

@ -502,15 +502,10 @@ StorePath BinaryCacheStore::addToStore(
->path; ->path;
} }
std::string BinaryCacheStore::makeRealisationPath(const DrvOutput & id)
{
return realisationsPrefix + "/" + id.to_string() + ".doi";
}
void BinaryCacheStore::queryRealisationUncached( void BinaryCacheStore::queryRealisationUncached(
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept
{ {
auto outputInfoFilePath = makeRealisationPath(id); auto outputInfoFilePath = realisationsPrefix + "/" + id.to_string() + ".doi";
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback)); auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
@ -520,12 +515,11 @@ void BinaryCacheStore::queryRealisationUncached(
if (!data) if (!data)
return (*callbackPtr)({}); return (*callbackPtr)({});
std::shared_ptr<const UnkeyedRealisation> realisation; std::shared_ptr<const Realisation> realisation;
try { try {
realisation = std::make_shared<const UnkeyedRealisation>(nlohmann::json::parse(*data)); realisation = std::make_shared<const Realisation>(nlohmann::json::parse(*data));
} catch (Error & e) { } catch (Error & e) {
e.addTrace( e.addTrace({}, "while parsing file '%s' as a realisation", outputInfoFilePath);
{}, "while parsing file '%s' as a realisation for key '%s'", outputInfoFilePath, id.to_string());
throw; throw;
} }
return (*callbackPtr)(std::move(realisation)); return (*callbackPtr)(std::move(realisation));
@ -541,7 +535,8 @@ void BinaryCacheStore::registerDrvOutput(const Realisation & info)
{ {
if (diskCache) if (diskCache)
diskCache->upsertRealisation(config.getReference().render(/*FIXME withParams=*/false), info); diskCache->upsertRealisation(config.getReference().render(/*FIXME withParams=*/false), info);
upsertFile(makeRealisationPath(info.id), static_cast<nlohmann::json>(info).dump(), "application/json"); auto filePath = realisationsPrefix + "/" + info.id.to_string() + ".doi";
upsertFile(filePath, static_cast<nlohmann::json>(info).dump(), "application/json");
} }
ref<RemoteFSAccessor> BinaryCacheStore::getRemoteFSAccessor(bool requireValidPath) ref<RemoteFSAccessor> BinaryCacheStore::getRemoteFSAccessor(bool requireValidPath)

13
src/libstore/build/derivation-building-goal.cc
View file

@ -1092,22 +1092,13 @@ DerivationBuildingGoal::checkPathValidity(std::map<std::string, InitialOutput> &
// without the `ca-derivations` experimental flag). // without the `ca-derivations` experimental flag).
worker.store.registerDrvOutput( worker.store.registerDrvOutput(
Realisation{ Realisation{
{
.outPath = info.known->path,
},
drvOutput, drvOutput,
info.known->path,
}); });
} }
} }
if (info.known && info.known->isValid()) if (info.known && info.known->isValid())
validOutputs.emplace( validOutputs.emplace(i.first, Realisation{drvOutput, info.known->path});
i.first,
Realisation{
{
.outPath = info.known->path,
},
drvOutput,
});
} }
bool allValid = true; bool allValid = true;

59
src/libstore/build/derivation-goal.cc
View file

@ -190,17 +190,13 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
auto realisation = [&] { auto realisation = [&] {
auto take1 = get(success.builtOutputs, wantedOutput); auto take1 = get(success.builtOutputs, wantedOutput);
if (take1) if (take1)
return static_cast<UnkeyedRealisation>(*take1); return *take1;
/* The above `get` should work. But stateful tracking of /* The above `get` should work. But stateful tracking of
outputs in resolvedResult, this can get out of sync with the outputs in resolvedResult, this can get out of sync with the
store, which is our actual source of truth. For now we just store, which is our actual source of truth. For now we just
check the store directly if it fails. */ check the store directly if it fails. */
auto take2 = worker.evalStore.queryRealisation( auto take2 = worker.evalStore.queryRealisation(DrvOutput{*resolvedHash, wantedOutput});
DrvOutput{
.drvHash = *resolvedHash,
.outputName = wantedOutput,
});
if (take2) if (take2)
return *take2; return *take2;
@ -211,12 +207,8 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
}(); }();
if (!drv->type().isImpure()) { if (!drv->type().isImpure()) {
Realisation newRealisation{ auto newRealisation = realisation;
realisation, newRealisation.id = DrvOutput{*outputHash, wantedOutput};
{
.drvHash = *outputHash,
.outputName = wantedOutput,
}};
newRealisation.signatures.clear(); newRealisation.signatures.clear();
if (!drv->type().isFixed()) { if (!drv->type().isFixed()) {
auto & drvStore = worker.evalStore.isValidPath(drvPath) ? worker.evalStore : worker.store; auto & drvStore = worker.evalStore.isValidPath(drvPath) ? worker.evalStore : worker.store;
@ -266,16 +258,7 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
/* In checking mode, the builder will not register any outputs. /* In checking mode, the builder will not register any outputs.
So we want to make sure the ones that we wanted to check are So we want to make sure the ones that we wanted to check are
properly there. */ properly there. */
success.builtOutputs = {{ success.builtOutputs = {{wantedOutput, assertPathValidity()}};
wantedOutput,
{
assertPathValidity(),
{
.drvHash = outputHash,
.outputName = wantedOutput,
},
},
}};
} else { } else {
/* Otherwise the builder will give us info for out output, but /* Otherwise the builder will give us info for out output, but
also for other outputs. Filter down to just our output so as also for other outputs. Filter down to just our output so as
@ -390,20 +373,18 @@ Goal::Co DerivationGoal::repairClosure()
co_return doneSuccess(BuildResult::Success::AlreadyValid, assertPathValidity()); co_return doneSuccess(BuildResult::Success::AlreadyValid, assertPathValidity());
} }
std::optional<std::pair<UnkeyedRealisation, PathStatus>> DerivationGoal::checkPathValidity() std::optional<std::pair<Realisation, PathStatus>> DerivationGoal::checkPathValidity()
{ {
if (drv->type().isImpure()) if (drv->type().isImpure())
return std::nullopt; return std::nullopt;
auto drvOutput = DrvOutput{outputHash, wantedOutput}; auto drvOutput = DrvOutput{outputHash, wantedOutput};
std::optional<UnkeyedRealisation> mRealisation; std::optional<Realisation> mRealisation;
if (auto * mOutput = get(drv->outputs, wantedOutput)) { if (auto * mOutput = get(drv->outputs, wantedOutput)) {
if (auto mPath = mOutput->path(worker.store, drv->name, wantedOutput)) { if (auto mPath = mOutput->path(worker.store, drv->name, wantedOutput)) {
mRealisation = UnkeyedRealisation{ mRealisation = Realisation{drvOutput, std::move(*mPath)};
.outPath = std::move(*mPath),
};
} }
} else { } else {
throw Error( throw Error(
@ -431,14 +412,7 @@ std::optional<std::pair<UnkeyedRealisation, PathStatus>> DerivationGoal::checkPa
// derivation, and the output path is valid, but we don't have // derivation, and the output path is valid, but we don't have
// its realisation stored (probably because it has been built // its realisation stored (probably because it has been built
// without the `ca-derivations` experimental flag). // without the `ca-derivations` experimental flag).
worker.store.registerDrvOutput( worker.store.registerDrvOutput(*mRealisation);
Realisation{
*mRealisation,
{
.drvHash = outputHash,
.outputName = wantedOutput,
},
});
} }
return {{*mRealisation, status}}; return {{*mRealisation, status}};
@ -446,7 +420,7 @@ std::optional<std::pair<UnkeyedRealisation, PathStatus>> DerivationGoal::checkPa
return std::nullopt; return std::nullopt;
} }
UnkeyedRealisation DerivationGoal::assertPathValidity() Realisation DerivationGoal::assertPathValidity()
{ {
auto checkResult = checkPathValidity(); auto checkResult = checkPathValidity();
if (!(checkResult && checkResult->second == PathStatus::Valid)) if (!(checkResult && checkResult->second == PathStatus::Valid))
@ -454,20 +428,11 @@ UnkeyedRealisation DerivationGoal::assertPathValidity()
return checkResult->first; return checkResult->first;
} }
Goal::Done DerivationGoal::doneSuccess(BuildResult::Success::Status status, UnkeyedRealisation builtOutput) Goal::Done DerivationGoal::doneSuccess(BuildResult::Success::Status status, Realisation builtOutput)
{ {
buildResult.inner = BuildResult::Success{ buildResult.inner = BuildResult::Success{
.status = status, .status = status,
.builtOutputs = {{ .builtOutputs = {{wantedOutput, std::move(builtOutput)}},
wantedOutput,
{
std::move(builtOutput),
DrvOutput{
.drvHash = outputHash,
.outputName = wantedOutput,
},
},
}},
}; };
mcExpectedBuilds.reset(); mcExpectedBuilds.reset();

10
src/libstore/build/drv-output-substitution-goal.cc
View file

@ -43,10 +43,10 @@ Goal::Co DrvOutputSubstitutionGoal::init()
outPipe->createAsyncPipe(worker.ioport.get()); outPipe->createAsyncPipe(worker.ioport.get());
#endif #endif
auto promise = std::make_shared<std::promise<std::shared_ptr<const UnkeyedRealisation>>>(); auto promise = std::make_shared<std::promise<std::shared_ptr<const Realisation>>>();
sub->queryRealisation( sub->queryRealisation(
id, {[outPipe(outPipe), promise(promise)](std::future<std::shared_ptr<const UnkeyedRealisation>> res) { id, {[outPipe(outPipe), promise(promise)](std::future<std::shared_ptr<const Realisation>> res) {
try { try {
Finally updateStats([&]() { outPipe->writeSide.close(); }); Finally updateStats([&]() { outPipe->writeSide.close(); });
promise->set_value(res.get()); promise->set_value(res.get());
@ -75,7 +75,7 @@ Goal::Co DrvOutputSubstitutionGoal::init()
* The realisation corresponding to the given output id. * The realisation corresponding to the given output id.
* Will be filled once we can get it. * Will be filled once we can get it.
*/ */
std::shared_ptr<const UnkeyedRealisation> outputInfo; std::shared_ptr<const Realisation> outputInfo;
try { try {
outputInfo = promise->get_future().get(); outputInfo = promise->get_future().get();
@ -132,7 +132,7 @@ Goal::Co DrvOutputSubstitutionGoal::init()
} }
Goal::Co DrvOutputSubstitutionGoal::realisationFetched( Goal::Co DrvOutputSubstitutionGoal::realisationFetched(
Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub) Goals waitees, std::shared_ptr<const Realisation> outputInfo, nix::ref<nix::Store> sub)
{ {
waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath)); waitees.insert(worker.makePathSubstitutionGoal(outputInfo->outPath));
@ -145,7 +145,7 @@ Goal::Co DrvOutputSubstitutionGoal::realisationFetched(
co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed); co_return amDone(nrNoSubstituters > 0 ? ecNoSubstituters : ecFailed);
} }
worker.store.registerDrvOutput({*outputInfo, id}); worker.store.registerDrvOutput(*outputInfo);
trace("finished"); trace("finished");
co_return amDone(ecSuccess); co_return amDone(ecSuccess);

4
src/libstore/daemon.cc
View file

@ -964,7 +964,7 @@ static void performOp(
if (GET_PROTOCOL_MINOR(conn.protoVersion) < 31) { if (GET_PROTOCOL_MINOR(conn.protoVersion) < 31) {
auto outputId = DrvOutput::parse(readString(conn.from)); auto outputId = DrvOutput::parse(readString(conn.from));
auto outputPath = StorePath(readString(conn.from)); auto outputPath = StorePath(readString(conn.from));
store->registerDrvOutput(Realisation{{.outPath = outputPath}, outputId}); store->registerDrvOutput(Realisation{.id = outputId, .outPath = outputPath});
} else { } else {
auto realisation = WorkerProto::Serialise<Realisation>::read(*store, rconn); auto realisation = WorkerProto::Serialise<Realisation>::read(*store, rconn);
store->registerDrvOutput(realisation); store->registerDrvOutput(realisation);
@ -986,7 +986,7 @@ static void performOp(
} else { } else {
std::set<Realisation> realisations; std::set<Realisation> realisations;
if (info) if (info)
realisations.insert({*info, outputId}); realisations.insert(*info);
WorkerProto::write(*store, wconn, realisations); WorkerProto::write(*store, wconn, realisations);
} }
break; break;

19
src/libstore/dummy-store.cc
View file

@ -3,7 +3,6 @@
#include "nix/util/callback.hh" #include "nix/util/callback.hh"
#include "nix/util/memory-source-accessor.hh" #include "nix/util/memory-source-accessor.hh"
#include "nix/store/dummy-store-impl.hh" #include "nix/store/dummy-store-impl.hh"
#include "nix/store/realisation.hh"
#include <boost/unordered/concurrent_flat_map.hpp> #include <boost/unordered/concurrent_flat_map.hpp>
@ -252,10 +251,7 @@ struct DummyStoreImpl : DummyStore
void registerDrvOutput(const Realisation & output) override void registerDrvOutput(const Realisation & output) override
{ {
auto ref = make_ref<UnkeyedRealisation>(output); unsupported("registerDrvOutput");
buildTrace.insert_or_visit({output.id.drvHash, {{output.id.outputName, ref}}}, [&](auto & kv) {
kv.second.insert_or_assign(output.id.outputName, make_ref<UnkeyedRealisation>(output));
});
} }
void narFromPath(const StorePath & path, Sink & sink) override void narFromPath(const StorePath & path, Sink & sink) override
@ -270,18 +266,9 @@ struct DummyStoreImpl : DummyStore
throw Error("path '%s' is not valid", printStorePath(path)); throw Error("path '%s' is not valid", printStorePath(path));
} }
void queryRealisationUncached( void
const DrvOutput & drvOutput, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override queryRealisationUncached(const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override
{ {
bool visited = false;
buildTrace.cvisit(drvOutput.drvHash, [&](const auto & kv) {
if (auto it = kv.second.find(drvOutput.outputName); it != kv.second.end()) {
visited = true;
callback(it->second.get_ptr());
}
});
if (!visited)
callback(nullptr); callback(nullptr);
} }

17
src/libstore/include/nix/store/binary-cache-store.hh
View file

@ -80,22 +80,13 @@ private:
protected: protected:
/** // The prefix under which realisation infos will be stored
* The prefix under which realisation infos will be stored const std::string realisationsPrefix = "realisations";
*/
constexpr const static std::string realisationsPrefix = "realisations";
constexpr const static std::string cacheInfoFile = "nix-cache-info"; const std::string cacheInfoFile = "nix-cache-info";
BinaryCacheStore(Config &); BinaryCacheStore(Config &);
/**
* Compute the path to the given realisation
*
* It's `${realisationsPrefix}/${drvOutput}.doi`.
*/
std::string makeRealisationPath(const DrvOutput & id);
public: public:
virtual bool fileExists(const std::string & path) = 0; virtual bool fileExists(const std::string & path) = 0;
@ -184,7 +175,7 @@ public:
void registerDrvOutput(const Realisation & info) override; void registerDrvOutput(const Realisation & info) override;
void queryRealisationUncached( void queryRealisationUncached(
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override; const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
void narFromPath(const StorePath & path, Sink & sink) override; void narFromPath(const StorePath & path, Sink & sink) override;

6
src/libstore/include/nix/store/build/derivation-goal.hh
View file

@ -93,17 +93,17 @@ private:
* of the wanted output, and a `PathStatus` with the * of the wanted output, and a `PathStatus` with the
* current status of that output. * current status of that output.
*/ */
std::optional<std::pair<UnkeyedRealisation, PathStatus>> checkPathValidity(); std::optional<std::pair<Realisation, PathStatus>> checkPathValidity();
/** /**
* Aborts if any output is not valid or corrupt, and otherwise * Aborts if any output is not valid or corrupt, and otherwise
* returns a 'Realisation' for the wanted output. * returns a 'Realisation' for the wanted output.
*/ */
UnkeyedRealisation assertPathValidity(); Realisation assertPathValidity();
Co repairClosure(); Co repairClosure();
Done doneSuccess(BuildResult::Success::Status status, UnkeyedRealisation builtOutput); Done doneSuccess(BuildResult::Success::Status status, Realisation builtOutput);
Done doneFailure(BuildError ex); Done doneFailure(BuildError ex);
}; };

3
src/libstore/include/nix/store/build/drv-output-substitution-goal.hh
View file

@ -39,8 +39,7 @@ public:
GoalState state; GoalState state;
Co init(); Co init();
Co Co realisationFetched(Goals waitees, std::shared_ptr<const Realisation> outputInfo, nix::ref<nix::Store> sub);
realisationFetched(Goals waitees, std::shared_ptr<const UnkeyedRealisation> outputInfo, nix::ref<nix::Store> sub);
void timedOut(Error && ex) override void timedOut(Error && ex) override
{ {

12
src/libstore/include/nix/store/dummy-store-impl.hh
View file

@ -30,18 +30,6 @@ struct DummyStore : virtual Store
*/ */
boost::concurrent_flat_map<StorePath, PathInfoAndContents> contents; boost::concurrent_flat_map<StorePath, PathInfoAndContents> contents;
/**
* The build trace maps the pair of a content-addressing (fixed or
* floating) derivations an one of its output to a
* (content-addressed) store object.
*
* It is [curried](https://en.wikipedia.org/wiki/Currying), so we
* instead having a single output with a `DrvOutput` key, we have an
* outer map for the derivation, and inner maps for the outputs of a
* given derivation.
*/
boost::concurrent_flat_map<Hash, std::map<std::string, ref<UnkeyedRealisation>>> buildTrace;
DummyStore(ref<const Config> config) DummyStore(ref<const Config> config)
: Store{*config} : Store{*config}
, config(config) , config(config)

2
src/libstore/include/nix/store/dummy-store.hh
View file

@ -3,8 +3,6 @@
#include "nix/store/store-api.hh" #include "nix/store/store-api.hh"
#include <boost/unordered/concurrent_flat_map.hpp>
namespace nix { namespace nix {
struct DummyStore; struct DummyStore;

4
src/libstore/include/nix/store/legacy-ssh-store.hh
View file

@ -208,8 +208,8 @@ public:
*/ */
std::optional<TrustedFlag> isTrustedClient() override; std::optional<TrustedFlag> isTrustedClient() override;
void queryRealisationUncached( void
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override queryRealisationUncached(const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override
// TODO: Implement // TODO: Implement
{ {
unsupported("queryRealisation"); unsupported("queryRealisation");

2
src/libstore/include/nix/store/local-overlay-store.hh
View file

@ -173,7 +173,7 @@ private:
* Check lower store if upper DB does not have. * Check lower store if upper DB does not have.
*/ */
void queryRealisationUncached( void queryRealisationUncached(
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override; const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
/** /**
* Call `remountIfNecessary` after collecting garbage normally. * Call `remountIfNecessary` after collecting garbage normally.

6
src/libstore/include/nix/store/local-store.hh
View file

@ -385,10 +385,10 @@ public:
void cacheDrvOutputMapping( void cacheDrvOutputMapping(
State & state, const uint64_t deriver, const std::string & outputName, const StorePath & output); State & state, const uint64_t deriver, const std::string & outputName, const StorePath & output);
std::optional<const UnkeyedRealisation> queryRealisation_(State & state, const DrvOutput & id); std::optional<const Realisation> queryRealisation_(State & state, const DrvOutput & id);
std::optional<std::pair<int64_t, UnkeyedRealisation>> queryRealisationCore_(State & state, const DrvOutput & id); std::optional<std::pair<int64_t, Realisation>> queryRealisationCore_(State & state, const DrvOutput & id);
void queryRealisationUncached( void queryRealisationUncached(
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override; const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
std::optional<std::string> getVersion() override; std::optional<std::string> getVersion() override;

50
src/libstore/include/nix/store/realisation.hh
View file

@ -46,12 +46,12 @@ struct DrvOutput
static DrvOutput parse(const std::string &); static DrvOutput parse(const std::string &);
bool operator==(const DrvOutput &) const = default; GENERATE_CMP(DrvOutput, me->drvHash, me->outputName);
auto operator<=>(const DrvOutput &) const = default;
}; };
struct UnkeyedRealisation struct Realisation
{ {
DrvOutput id;
StorePath outPath; StorePath outPath;
StringSet signatures; StringSet signatures;
@ -64,35 +64,22 @@ struct UnkeyedRealisation
*/ */
std::map<DrvOutput, StorePath> dependentRealisations; std::map<DrvOutput, StorePath> dependentRealisations;
std::string fingerprint(const DrvOutput & key) const; std::string fingerprint() const;
void sign(const Signer &);
bool checkSignature(const PublicKeys & publicKeys, const std::string & sig) const;
size_t checkSignatures(const PublicKeys & publicKeys) const;
void sign(const DrvOutput & key, const Signer &); static std::set<Realisation> closure(Store &, const std::set<Realisation> &);
static void closure(Store &, const std::set<Realisation> &, std::set<Realisation> & res);
bool checkSignature(const DrvOutput & key, const PublicKeys & publicKeys, const std::string & sig) const; bool isCompatibleWith(const Realisation & other) const;
size_t checkSignatures(const DrvOutput & key, const PublicKeys & publicKeys) const; StorePath getPath() const
const StorePath & getPath() const
{ {
return outPath; return outPath;
} }
// TODO sketchy that it avoids signatures GENERATE_CMP(Realisation, me->id, me->outPath);
GENERATE_CMP(UnkeyedRealisation, me->outPath);
};
struct Realisation : UnkeyedRealisation
{
DrvOutput id;
bool isCompatibleWith(const UnkeyedRealisation & other) const;
static std::set<Realisation> closure(Store &, const std::set<Realisation> &);
static void closure(Store &, const std::set<Realisation> &, std::set<Realisation> & res);
bool operator==(const Realisation &) const = default;
auto operator<=>(const Realisation &) const = default;
}; };
/** /**
@ -116,13 +103,12 @@ struct OpaquePath
{ {
StorePath path; StorePath path;
const StorePath & getPath() const StorePath getPath() const
{ {
return path; return path;
} }
bool operator==(const OpaquePath &) const = default; GENERATE_CMP(OpaquePath, me->path);
auto operator<=>(const OpaquePath &) const = default;
}; };
/** /**
@ -130,7 +116,7 @@ struct OpaquePath
*/ */
struct RealisedPath struct RealisedPath
{ {
/** /*
* A path is either the result of the realisation of a derivation or * A path is either the result of the realisation of a derivation or
* an opaque blob that has been directly added to the store * an opaque blob that has been directly added to the store
*/ */
@ -152,14 +138,13 @@ struct RealisedPath
/** /**
* Get the raw store path associated to this * Get the raw store path associated to this
*/ */
const StorePath & path() const; StorePath path() const;
void closure(Store & store, Set & ret) const; void closure(Store & store, Set & ret) const;
static void closure(Store & store, const Set & startPaths, Set & ret); static void closure(Store & store, const Set & startPaths, Set & ret);
Set closure(Store & store) const; Set closure(Store & store) const;
bool operator==(const RealisedPath &) const = default; GENERATE_CMP(RealisedPath, me->raw);
auto operator<=>(const RealisedPath &) const = default;
}; };
class MissingRealisation : public Error class MissingRealisation : public Error
@ -182,5 +167,4 @@ public:
} // namespace nix } // namespace nix
JSON_IMPL(nix::UnkeyedRealisation)
JSON_IMPL(nix::Realisation) JSON_IMPL(nix::Realisation)

2
src/libstore/include/nix/store/remote-store.hh
View file

@ -102,7 +102,7 @@ struct RemoteStore : public virtual Store, public virtual GcStore, public virtua
void registerDrvOutput(const Realisation & info) override; void registerDrvOutput(const Realisation & info) override;
void queryRealisationUncached( void queryRealisationUncached(
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override; const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
void void
buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override; buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override;

9
src/libstore/include/nix/store/store-api.hh
View file

@ -31,7 +31,6 @@ MakeError(SubstituterDisabled, Error);
MakeError(InvalidStoreReference, Error); MakeError(InvalidStoreReference, Error);
struct UnkeyedRealisation;
struct Realisation; struct Realisation;
struct RealisedPath; struct RealisedPath;
struct DrvOutput; struct DrvOutput;
@ -399,12 +398,12 @@ public:
/** /**
* Query the information about a realisation. * Query the information about a realisation.
*/ */
std::shared_ptr<const UnkeyedRealisation> queryRealisation(const DrvOutput &); std::shared_ptr<const Realisation> queryRealisation(const DrvOutput &);
/** /**
* Asynchronous version of queryRealisation(). * Asynchronous version of queryRealisation().
*/ */
void queryRealisation(const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept; void queryRealisation(const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept;
/** /**
* Check whether the given valid path info is sufficiently attested, by * Check whether the given valid path info is sufficiently attested, by
@ -431,8 +430,8 @@ protected:
virtual void virtual void
queryPathInfoUncached(const StorePath & path, Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept = 0; queryPathInfoUncached(const StorePath & path, Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept = 0;
virtual void queryRealisationUncached( virtual void
const DrvOutput &, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept = 0; queryRealisationUncached(const DrvOutput &, Callback<std::shared_ptr<const Realisation>> callback) noexcept = 0;
public: public:

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

@ -77,7 +77,7 @@ void LocalOverlayStore::registerDrvOutput(const Realisation & info)
// First do queryRealisation on lower layer to populate DB // First do queryRealisation on lower layer to populate DB
auto res = lowerStore->queryRealisation(info.id); auto res = lowerStore->queryRealisation(info.id);
if (res) if (res)
LocalStore::registerDrvOutput({*res, info.id}); LocalStore::registerDrvOutput(*res);
LocalStore::registerDrvOutput(info); LocalStore::registerDrvOutput(info);
} }
@ -108,12 +108,12 @@ void LocalOverlayStore::queryPathInfoUncached(
} }
void LocalOverlayStore::queryRealisationUncached( void LocalOverlayStore::queryRealisationUncached(
const DrvOutput & drvOutput, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept const DrvOutput & drvOutput, Callback<std::shared_ptr<const Realisation>> callback) noexcept
{ {
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback)); auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
LocalStore::queryRealisationUncached( LocalStore::queryRealisationUncached(
drvOutput, {[this, drvOutput, callbackPtr](std::future<std::shared_ptr<const UnkeyedRealisation>> fut) { drvOutput, {[this, drvOutput, callbackPtr](std::future<std::shared_ptr<const Realisation>> fut) {
try { try {
auto info = fut.get(); auto info = fut.get();
if (info) if (info)
@ -123,7 +123,7 @@ void LocalOverlayStore::queryRealisationUncached(
} }
// If we don't have it, check lower store // If we don't have it, check lower store
lowerStore->queryRealisation( lowerStore->queryRealisation(
drvOutput, {[callbackPtr](std::future<std::shared_ptr<const UnkeyedRealisation>> fut) { drvOutput, {[callbackPtr](std::future<std::shared_ptr<const Realisation>> fut) {
try { try {
(*callbackPtr)(fut.get()); (*callbackPtr)(fut.get());
} catch (...) { } catch (...) {

17
src/libstore/local-store.cc
View file

@ -1036,7 +1036,7 @@ bool LocalStore::pathInfoIsUntrusted(const ValidPathInfo & info)
bool LocalStore::realisationIsUntrusted(const Realisation & realisation) bool LocalStore::realisationIsUntrusted(const Realisation & realisation)
{ {
return config->requireSigs && !realisation.checkSignatures(realisation.id, getPublicKeys()); return config->requireSigs && !realisation.checkSignatures(getPublicKeys());
} }
void LocalStore::addToStore(const ValidPathInfo & info, Source & source, RepairFlag repair, CheckSigsFlag checkSigs) void LocalStore::addToStore(const ValidPathInfo & info, Source & source, RepairFlag repair, CheckSigsFlag checkSigs)
@ -1586,7 +1586,7 @@ void LocalStore::addSignatures(const StorePath & storePath, const StringSet & si
}); });
} }
std::optional<std::pair<int64_t, UnkeyedRealisation>> std::optional<std::pair<int64_t, Realisation>>
LocalStore::queryRealisationCore_(LocalStore::State & state, const DrvOutput & id) LocalStore::queryRealisationCore_(LocalStore::State & state, const DrvOutput & id)
{ {
auto useQueryRealisedOutput(state.stmts->QueryRealisedOutput.use()(id.strHash())(id.outputName)); auto useQueryRealisedOutput(state.stmts->QueryRealisedOutput.use()(id.strHash())(id.outputName));
@ -1598,13 +1598,14 @@ LocalStore::queryRealisationCore_(LocalStore::State & state, const DrvOutput & i
return { return {
{realisationDbId, {realisationDbId,
UnkeyedRealisation{ Realisation{
.id = id,
.outPath = outputPath, .outPath = outputPath,
.signatures = signatures, .signatures = signatures,
}}}; }}};
} }
std::optional<const UnkeyedRealisation> LocalStore::queryRealisation_(LocalStore::State & state, const DrvOutput & id) std::optional<const Realisation> LocalStore::queryRealisation_(LocalStore::State & state, const DrvOutput & id)
{ {
auto maybeCore = queryRealisationCore_(state, id); auto maybeCore = queryRealisationCore_(state, id);
if (!maybeCore) if (!maybeCore)
@ -1630,13 +1631,13 @@ std::optional<const UnkeyedRealisation> LocalStore::queryRealisation_(LocalStore
} }
void LocalStore::queryRealisationUncached( void LocalStore::queryRealisationUncached(
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept
{ {
try { try {
auto maybeRealisation = retrySQLite<std::optional<const UnkeyedRealisation>>( auto maybeRealisation =
[&]() { return queryRealisation_(*_state->lock(), id); }); retrySQLite<std::optional<const Realisation>>([&]() { return queryRealisation_(*_state->lock(), id); });
if (maybeRealisation) if (maybeRealisation)
callback(std::make_shared<const UnkeyedRealisation>(maybeRealisation.value())); callback(std::make_shared<const Realisation>(maybeRealisation.value()));
else else
callback(nullptr); callback(nullptr);

5
src/libstore/misc.cc
View file

@ -360,12 +360,11 @@ drvOutputReferences(Store & store, const Derivation & drv, const StorePath & out
if (!outputHash) if (!outputHash)
throw Error( throw Error(
"output '%s' of derivation '%s' isn't realised", outputName, store.printStorePath(inputDrv)); "output '%s' of derivation '%s' isn't realised", outputName, store.printStorePath(inputDrv));
DrvOutput key{*outputHash, outputName}; auto thisRealisation = store.queryRealisation(DrvOutput{*outputHash, outputName});
auto thisRealisation = store.queryRealisation(key);
if (!thisRealisation) if (!thisRealisation)
throw Error( throw Error(
"output '%s' of derivation '%s' isn’t built", outputName, store.printStorePath(inputDrv)); "output '%s' of derivation '%s' isn’t built", outputName, store.printStorePath(inputDrv));
inputRealisations.insert({*thisRealisation, std::move(key)}); inputRealisations.insert(*thisRealisation);
} }
} }
if (!inputNode.value.empty()) { if (!inputNode.value.empty()) {

50
src/libstore/realisation.cc
View file

@ -39,7 +39,7 @@ void Realisation::closure(Store & store, const std::set<Realisation> & startOutp
std::set<Realisation> res; std::set<Realisation> res;
for (auto & [currentDep, _] : current.dependentRealisations) { for (auto & [currentDep, _] : current.dependentRealisations) {
if (auto currentRealisation = store.queryRealisation(currentDep)) if (auto currentRealisation = store.queryRealisation(currentDep))
res.insert({*currentRealisation, currentDep}); res.insert(*currentRealisation);
else else
throw Error("Unrealised derivation '%s'", currentDep.to_string()); throw Error("Unrealised derivation '%s'", currentDep.to_string());
} }
@ -61,25 +61,24 @@ void Realisation::closure(Store & store, const std::set<Realisation> & startOutp
}); });
} }
std::string UnkeyedRealisation::fingerprint(const DrvOutput & key) const std::string Realisation::fingerprint() const
{ {
nlohmann::json serialized = Realisation{*this, key}; nlohmann::json serialized = *this;
serialized.erase("signatures"); serialized.erase("signatures");
return serialized.dump(); return serialized.dump();
} }
void UnkeyedRealisation::sign(const DrvOutput & key, const Signer & signer) void Realisation::sign(const Signer & signer)
{ {
signatures.insert(signer.signDetached(fingerprint(key))); signatures.insert(signer.signDetached(fingerprint()));
} }
bool UnkeyedRealisation::checkSignature( bool Realisation::checkSignature(const PublicKeys & publicKeys, const std::string & sig) const
const DrvOutput & key, const PublicKeys & publicKeys, const std::string & sig) const
{ {
return verifyDetached(fingerprint(key), sig, publicKeys); return verifyDetached(fingerprint(), sig, publicKeys);
} }
size_t UnkeyedRealisation::checkSignatures(const DrvOutput & key, const PublicKeys & publicKeys) const size_t Realisation::checkSignatures(const PublicKeys & publicKeys) const
{ {
// FIXME: Maybe we should return `maxSigs` if the realisation corresponds to // FIXME: Maybe we should return `maxSigs` if the realisation corresponds to
// an input-addressed one − because in that case the drv is enough to check // an input-addressed one − because in that case the drv is enough to check
@ -87,18 +86,19 @@ size_t UnkeyedRealisation::checkSignatures(const DrvOutput & key, const PublicKe
size_t good = 0; size_t good = 0;
for (auto & sig : signatures) for (auto & sig : signatures)
if (checkSignature(key, publicKeys, sig)) if (checkSignature(publicKeys, sig))
good++; good++;
return good; return good;
} }
const StorePath & RealisedPath::path() const StorePath RealisedPath::path() const
{ {
return std::visit([](auto && arg) -> auto & { return arg.getPath(); }, raw); return std::visit([](auto && arg) { return arg.getPath(); }, raw);
} }
bool Realisation::isCompatibleWith(const UnkeyedRealisation & other) const bool Realisation::isCompatibleWith(const Realisation & other) const
{ {
assert(id == other.id);
if (outPath == other.outPath) { if (outPath == other.outPath) {
if (dependentRealisations.empty() != other.dependentRealisations.empty()) { if (dependentRealisations.empty() != other.dependentRealisations.empty()) {
warn( warn(
@ -144,7 +144,7 @@ namespace nlohmann {
using namespace nix; using namespace nix;
UnkeyedRealisation adl_serializer<UnkeyedRealisation>::from_json(const json & json0) Realisation adl_serializer<Realisation>::from_json(const json & json0)
{ {
auto json = getObject(json0); auto json = getObject(json0);
@ -157,39 +157,25 @@ UnkeyedRealisation adl_serializer<UnkeyedRealisation>::from_json(const json & js
for (auto & [jsonDepId, jsonDepOutPath] : getObject(*jsonDependencies)) for (auto & [jsonDepId, jsonDepOutPath] : getObject(*jsonDependencies))
dependentRealisations.insert({DrvOutput::parse(jsonDepId), jsonDepOutPath}); dependentRealisations.insert({DrvOutput::parse(jsonDepId), jsonDepOutPath});
return UnkeyedRealisation{ return Realisation{
.id = DrvOutput::parse(valueAt(json, "id")),
.outPath = valueAt(json, "outPath"), .outPath = valueAt(json, "outPath"),
.signatures = signatures, .signatures = signatures,
.dependentRealisations = dependentRealisations, .dependentRealisations = dependentRealisations,
}; };
} }
void adl_serializer<UnkeyedRealisation>::to_json(json & json, const UnkeyedRealisation & r) void adl_serializer<Realisation>::to_json(json & json, const Realisation & r)
{ {
auto jsonDependentRealisations = nlohmann::json::object(); auto jsonDependentRealisations = nlohmann::json::object();
for (auto & [depId, depOutPath] : r.dependentRealisations) for (auto & [depId, depOutPath] : r.dependentRealisations)
jsonDependentRealisations.emplace(depId.to_string(), depOutPath); jsonDependentRealisations.emplace(depId.to_string(), depOutPath);
json = { json = {
{"id", r.id.to_string()},
{"outPath", r.outPath}, {"outPath", r.outPath},
{"signatures", r.signatures}, {"signatures", r.signatures},
{"dependentRealisations", jsonDependentRealisations}, {"dependentRealisations", jsonDependentRealisations},
}; };
} }
Realisation adl_serializer<Realisation>::from_json(const json & json0)
{
auto json = getObject(json0);
return Realisation{
static_cast<UnkeyedRealisation>(json0),
DrvOutput::parse(valueAt(json, "id")),
};
}
void adl_serializer<Realisation>::to_json(json & json, const Realisation & r)
{
json = static_cast<const UnkeyedRealisation &>(r);
json["id"] = r.id.to_string();
}
} // namespace nlohmann } // namespace nlohmann

16
src/libstore/remote-store.cc
View file

@ -501,7 +501,7 @@ void RemoteStore::registerDrvOutput(const Realisation & info)
} }
void RemoteStore::queryRealisationUncached( void RemoteStore::queryRealisationUncached(
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept
{ {
try { try {
auto conn(getConnection()); auto conn(getConnection());
@ -515,21 +515,21 @@ void RemoteStore::queryRealisationUncached(
conn->to << id.to_string(); conn->to << id.to_string();
conn.processStderr(); conn.processStderr();
auto real = [&]() -> std::shared_ptr<const UnkeyedRealisation> { auto real = [&]() -> std::shared_ptr<const Realisation> {
if (GET_PROTOCOL_MINOR(conn->protoVersion) < 31) { if (GET_PROTOCOL_MINOR(conn->protoVersion) < 31) {
auto outPaths = WorkerProto::Serialise<std::set<StorePath>>::read(*this, *conn); auto outPaths = WorkerProto::Serialise<std::set<StorePath>>::read(*this, *conn);
if (outPaths.empty()) if (outPaths.empty())
return nullptr; return nullptr;
return std::make_shared<const UnkeyedRealisation>(UnkeyedRealisation{.outPath = *outPaths.begin()}); return std::make_shared<const Realisation>(Realisation{.id = id, .outPath = *outPaths.begin()});
} else { } else {
auto realisations = WorkerProto::Serialise<std::set<Realisation>>::read(*this, *conn); auto realisations = WorkerProto::Serialise<std::set<Realisation>>::read(*this, *conn);
if (realisations.empty()) if (realisations.empty())
return nullptr; return nullptr;
return std::make_shared<const UnkeyedRealisation>(*realisations.begin()); return std::make_shared<const Realisation>(*realisations.begin());
} }
}(); }();
callback(std::shared_ptr<const UnkeyedRealisation>(real)); callback(std::shared_ptr<const Realisation>(real));
} catch (...) { } catch (...) {
return callback.rethrow(); return callback.rethrow();
} }
@ -626,15 +626,13 @@ std::vector<KeyedBuildResult> RemoteStore::buildPathsWithResults(
auto realisation = queryRealisation(outputId); auto realisation = queryRealisation(outputId);
if (!realisation) if (!realisation)
throw MissingRealisation(outputId); throw MissingRealisation(outputId);
success.builtOutputs.emplace(output, Realisation{*realisation, outputId}); success.builtOutputs.emplace(output, *realisation);
} else { } else {
success.builtOutputs.emplace( success.builtOutputs.emplace(
output, output,
Realisation{ Realisation{
UnkeyedRealisation{ .id = outputId,
.outPath = outputPath, .outPath = outputPath,
},
outputId,
}); });
} }
} }

4
src/libstore/restricted-store.cc
View file

@ -107,7 +107,7 @@ struct RestrictedStore : public virtual IndirectRootStore, public virtual GcStor
void registerDrvOutput(const Realisation & info) override; void registerDrvOutput(const Realisation & info) override;
void queryRealisationUncached( void queryRealisationUncached(
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept override; const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
void void
buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override; buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override;
@ -244,7 +244,7 @@ void RestrictedStore::registerDrvOutput(const Realisation & info)
} }
void RestrictedStore::queryRealisationUncached( void RestrictedStore::queryRealisationUncached(
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept
// XXX: This should probably be allowed if the realisation corresponds to // XXX: This should probably be allowed if the realisation corresponds to
// an allowed derivation // an allowed derivation
{ {

20
src/libstore/store-api.cc
View file

@ -598,8 +598,7 @@ void Store::queryPathInfo(const StorePath & storePath, Callback<ref<const ValidP
}}); }});
} }
void Store::queryRealisation( void Store::queryRealisation(const DrvOutput & id, Callback<std::shared_ptr<const Realisation>> callback) noexcept
const DrvOutput & id, Callback<std::shared_ptr<const UnkeyedRealisation>> callback) noexcept
{ {
try { try {
@ -625,20 +624,20 @@ void Store::queryRealisation(
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback)); auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));
queryRealisationUncached(id, {[this, id, callbackPtr](std::future<std::shared_ptr<const UnkeyedRealisation>> fut) { queryRealisationUncached(id, {[this, id, callbackPtr](std::future<std::shared_ptr<const Realisation>> fut) {
try { try {
auto info = fut.get(); auto info = fut.get();
if (diskCache) { if (diskCache) {
if (info) if (info)
diskCache->upsertRealisation( diskCache->upsertRealisation(
config.getReference().render(/*FIXME withParams=*/false), {*info, id}); config.getReference().render(/*FIXME withParams=*/false), *info);
else else
diskCache->upsertAbsentRealisation( diskCache->upsertAbsentRealisation(
config.getReference().render(/*FIXME withParams=*/false), id); config.getReference().render(/*FIXME withParams=*/false), id);
} }
(*callbackPtr)(std::shared_ptr<const UnkeyedRealisation>(info)); (*callbackPtr)(std::shared_ptr<const Realisation>(info));
} catch (...) { } catch (...) {
callbackPtr->rethrow(); callbackPtr->rethrow();
@ -646,9 +645,9 @@ void Store::queryRealisation(
}}); }});
} }
std::shared_ptr<const UnkeyedRealisation> Store::queryRealisation(const DrvOutput & id) std::shared_ptr<const Realisation> Store::queryRealisation(const DrvOutput & id)
{ {
using RealPtr = std::shared_ptr<const UnkeyedRealisation>; using RealPtr = std::shared_ptr<const Realisation>;
std::promise<RealPtr> promise; std::promise<RealPtr> promise;
queryRealisation(id, {[&](std::future<RealPtr> result) { queryRealisation(id, {[&](std::future<RealPtr> result) {
@ -911,12 +910,11 @@ std::map<StorePath, StorePath> copyPaths(
std::set<Realisation> toplevelRealisations; std::set<Realisation> toplevelRealisations;
for (auto & path : paths) { for (auto & path : paths) {
storePaths.insert(path.path()); storePaths.insert(path.path());
if (auto * realisation = std::get_if<Realisation>(&path.raw)) { if (auto realisation = std::get_if<Realisation>(&path.raw)) {
experimentalFeatureSettings.require(Xp::CaDerivations); experimentalFeatureSettings.require(Xp::CaDerivations);
toplevelRealisations.insert(*realisation); toplevelRealisations.insert(*realisation);
} }
} }
auto pathsMap = copyPaths(srcStore, dstStore, storePaths, repair, checkSigs, substitute); auto pathsMap = copyPaths(srcStore, dstStore, storePaths, repair, checkSigs, substitute);
try { try {
@ -933,7 +931,7 @@ std::map<StorePath, StorePath> copyPaths(
"dependency of '%s' but isn't registered", "dependency of '%s' but isn't registered",
drvOutput.to_string(), drvOutput.to_string(),
current.id.to_string()); current.id.to_string());
children.insert({*currentChild, drvOutput}); children.insert(*currentChild);
} }
return children; return children;
}, },
@ -1201,7 +1199,7 @@ void Store::signRealisation(Realisation & realisation)
for (auto & secretKeyFile : secretKeyFiles.get()) { for (auto & secretKeyFile : secretKeyFiles.get()) {
SecretKey secretKey(readFile(secretKeyFile)); SecretKey secretKey(readFile(secretKeyFile));
LocalSigner signer(std::move(secretKey)); LocalSigner signer(std::move(secretKey));
realisation.sign(realisation.id, signer); realisation.sign(signer);
} }
} }

7
src/libstore/unix/build/derivation-builder.cc
View file

@ -1830,12 +1830,7 @@ SingleDrvOutputs DerivationBuilderImpl::registerOutputs()
for (auto & [outputName, newInfo] : infos) { for (auto & [outputName, newInfo] : infos) {
auto oldinfo = get(initialOutputs, outputName); auto oldinfo = get(initialOutputs, outputName);
assert(oldinfo); assert(oldinfo);
auto thisRealisation = Realisation{ auto thisRealisation = Realisation{.id = DrvOutput{oldinfo->outputHash, outputName}, .outPath = newInfo.path};
{
.outPath = newInfo.path,
},
DrvOutput{oldinfo->outputHash, outputName},
};
if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations) && !drv.type().isImpure()) { if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations) && !drv.type().isImpure()) {
store.signRealisation(thisRealisation); store.signRealisation(thisRealisation);
store.registerDrvOutput(thisRealisation); store.registerDrvOutput(thisRealisation);

19
src/libutil/include/nix/util/hash.hh
View file

@ -222,22 +222,3 @@ public:
}; };
} // namespace nix } // namespace nix
template<>
struct std::hash<nix::Hash>
{
std::size_t operator()(const nix::Hash & hash) const noexcept
{
assert(hash.hashSize > sizeof(size_t));
return *reinterpret_cast<const std::size_t *>(&hash.hash);
}
};
namespace nix {
inline std::size_t hash_value(const Hash & hash)
{
return std::hash<Hash>{}(hash);
}
} // namespace nix