aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libstore/binary-cache-store.cc19
-rw-r--r--src/libstore/binary-cache-store.hh3
-rw-r--r--src/libstore/build/local-derivation-goal.cc7
-rw-r--r--src/libstore/dummy-store.cc5
-rw-r--r--src/libstore/legacy-ssh-store.cc3
-rw-r--r--src/libstore/local-store.cc27
-rw-r--r--src/libstore/local-store.hh3
-rw-r--r--src/libstore/remote-store.cc51
-rw-r--r--src/libstore/remote-store.hh3
-rw-r--r--src/libstore/store-api.cc32
-rw-r--r--src/libstore/store-api.hh3
11 files changed, 61 insertions, 95 deletions
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index 88b8db972..85ca36667 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -442,21 +442,16 @@ StorePath BinaryCacheStore::addTextToStore(
})->path;
}
-void BinaryCacheStore::queryRealisationUncached(const DrvOutput & id,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept
+std::shared_ptr<const Realisation> BinaryCacheStore::queryRealisationUncached(const DrvOutput & id)
{
auto outputInfoFilePath = realisationsPrefix + "/" + id.to_string() + ".doi";
- try {
- auto data = getFile(outputInfoFilePath);
- if (!data) return callback({});
-
- auto realisation = Realisation::fromJSON(
- nlohmann::json::parse(*data), outputInfoFilePath);
- return callback(std::make_shared<const Realisation>(realisation));
- } catch (...) {
- callback.rethrow();
- }
+ auto data = getFile(outputInfoFilePath);
+ if (!data) return {};
+
+ auto realisation = Realisation::fromJSON(
+ nlohmann::json::parse(*data), outputInfoFilePath);
+ return std::make_shared<const Realisation>(realisation);
}
void BinaryCacheStore::registerDrvOutput(const Realisation& info) {
diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index b6fbcfbc8..510965d12 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -134,8 +134,7 @@ public:
void registerDrvOutput(const Realisation & info) override;
- void queryRealisationUncached(const DrvOutput &,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput &) override;
void narFromPath(const StorePath & path, Sink & sink) override;
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index 1b014605d..5b365accd 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -1353,14 +1353,13 @@ struct RestrictedStore : public virtual RestrictedStoreConfig, public virtual In
// corresponds to an allowed derivation
{ throw Error("registerDrvOutput"); }
- void queryRealisationUncached(const DrvOutput & id,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput & id) override
// XXX: This should probably be allowed if the realisation corresponds to
// an allowed derivation
{
if (!goal.isAllowed(id))
- callback(nullptr);
- next->queryRealisation(id, std::move(callback));
+ return nullptr;
+ return next->queryRealisation(id);
}
void buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index f1c2b43b1..ae2b91370 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -67,9 +67,8 @@ struct DummyStore : public virtual DummyStoreConfig, public virtual Store
void narFromPath(const StorePath & path, Sink & sink) override
{ unsupported("narFromPath"); }
- void queryRealisationUncached(const DrvOutput &,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override
- { callback(nullptr); }
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput &) override
+ { return nullptr; }
virtual ref<FSAccessor> getFSAccessor() override
{ unsupported("getFSAccessor"); }
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 5044876cb..23ccfb178 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -407,8 +407,7 @@ public:
return std::nullopt;
}
- void queryRealisationUncached(const DrvOutput &,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput &) override
// TODO: Implement
{ unsupported("queryRealisation"); }
};
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index ee401d7fc..a27e43989 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1856,24 +1856,17 @@ std::optional<const Realisation> LocalStore::queryRealisation_(
return { res };
}
-void LocalStore::queryRealisationUncached(const DrvOutput & id,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept
+std::shared_ptr<const Realisation> LocalStore::queryRealisationUncached(const DrvOutput & id)
{
- try {
- auto maybeRealisation
- = retrySQLite<std::optional<const Realisation>>([&]() {
- auto state(_state.lock());
- return queryRealisation_(*state, id);
- });
- if (maybeRealisation)
- callback(
- std::make_shared<const Realisation>(maybeRealisation.value()));
- else
- callback(nullptr);
-
- } catch (...) {
- callback.rethrow();
- }
+ auto maybeRealisation
+ = retrySQLite<std::optional<const Realisation>>([&]() {
+ auto state(_state.lock());
+ return queryRealisation_(*state, id);
+ });
+ if (maybeRealisation)
+ return std::make_shared<const Realisation>(maybeRealisation.value());
+ else
+ return nullptr;
}
ContentAddress LocalStore::hashCAPath(
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index daf50989c..14f024ca9 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -294,8 +294,7 @@ public:
std::optional<const Realisation> queryRealisation_(State & state, const DrvOutput & id);
std::optional<std::pair<int64_t, Realisation>> queryRealisationCore_(State & state, const DrvOutput & id);
- void queryRealisationUncached(const DrvOutput&,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput&) override;
std::optional<std::string> getVersion() override;
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 94c426c02..1d3fa93c1 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -612,39 +612,32 @@ void RemoteStore::registerDrvOutput(const Realisation & info)
conn.processStderr();
}
-void RemoteStore::queryRealisationUncached(const DrvOutput & id,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept
+std::shared_ptr<const Realisation> RemoteStore::queryRealisationUncached(const DrvOutput & id)
{
- try {
- auto conn(getConnection());
-
- if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 27) {
- warn("the daemon is too old to support content-addressed derivations, please upgrade it to 2.4");
- return callback(nullptr);
- }
+ auto conn(getConnection());
- conn->to << WorkerProto::Op::QueryRealisation;
- conn->to << id.to_string();
- conn.processStderr();
+ if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 27) {
+ warn("the daemon is too old to support content-addressed derivations, please upgrade it to 2.4");
+ return nullptr;
+ }
- auto real = [&]() -> std::shared_ptr<const Realisation> {
- if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 31) {
- auto outPaths = WorkerProto::Serialise<std::set<StorePath>>::read(
- *this, *conn);
- if (outPaths.empty())
- return nullptr;
- return std::make_shared<const Realisation>(Realisation { .id = id, .outPath = *outPaths.begin() });
- } else {
- auto realisations = WorkerProto::Serialise<std::set<Realisation>>::read(
- *this, *conn);
- if (realisations.empty())
- return nullptr;
- return std::make_shared<const Realisation>(*realisations.begin());
- }
- }();
+ conn->to << WorkerProto::Op::QueryRealisation;
+ conn->to << id.to_string();
+ conn.processStderr();
- callback(std::shared_ptr<const Realisation>(real));
- } catch (...) { return callback.rethrow(); }
+ if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 31) {
+ auto outPaths = WorkerProto::Serialise<std::set<StorePath>>::read(
+ *this, *conn);
+ if (outPaths.empty())
+ return nullptr;
+ return std::make_shared<const Realisation>(Realisation { .id = id, .outPath = *outPaths.begin() });
+ } else {
+ auto realisations = WorkerProto::Serialise<std::set<Realisation>>::read(
+ *this, *conn);
+ if (realisations.empty())
+ return nullptr;
+ return std::make_shared<const Realisation>(*realisations.begin());
+ }
}
void RemoteStore::copyDrvsFromEvalStore(
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 7ce47bee2..b1b7f93e9 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -108,8 +108,7 @@ public:
void registerDrvOutput(const Realisation & info) override;
- void queryRealisationUncached(const DrvOutput &,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
+ std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput &) override;
void buildPaths(const std::vector<DerivedPath> & paths, BuildMode buildMode, std::shared_ptr<Store> evalStore) override;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 553f9587a..7ebab3933 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -743,29 +743,21 @@ void Store::queryRealisation(const DrvOutput & id,
return callback.rethrow();
}
- auto callbackPtr
- = std::make_shared<decltype(callback)>(std::move(callback));
-
- queryRealisationUncached(
- id,
- { [this, id, callbackPtr](
- std::future<std::shared_ptr<const Realisation>> fut) {
- try {
- auto info = fut.get();
+ try {
+ auto info = queryRealisationUncached(id);
- if (diskCache) {
- if (info)
- diskCache->upsertRealisation(getUri(), *info);
- else
- diskCache->upsertAbsentRealisation(getUri(), id);
- }
+ if (diskCache) {
+ if (info)
+ diskCache->upsertRealisation(getUri(), *info);
+ else
+ diskCache->upsertAbsentRealisation(getUri(), id);
+ }
- (*callbackPtr)(std::shared_ptr<const Realisation>(info));
+ callback(std::shared_ptr<const Realisation>(info));
- } catch (...) {
- callbackPtr->rethrow();
- }
- } });
+ } catch (...) {
+ callback.rethrow();
+ }
}
std::shared_ptr<const Realisation> Store::queryRealisation(const DrvOutput & id)
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 8cdfff576..1aab3c8a3 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -402,8 +402,7 @@ public:
protected:
virtual std::shared_ptr<const ValidPathInfo> queryPathInfoUncached(const StorePath & path) = 0;
- virtual void queryRealisationUncached(const DrvOutput &,
- Callback<std::shared_ptr<const Realisation>> callback) noexcept = 0;
+ virtual std::shared_ptr<const Realisation> queryRealisationUncached(const DrvOutput &) = 0;
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:56:55 +0000