Skip to content

Remove more obsolete daemon operations #14995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 3 commits into from
Jan 14, 2026
Merged

Remove more obsolete daemon operations #14995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
036738b
Remove WorkerProto::Op::QueryPathHash
edolstra Jan 14, 2026
1729506
Remove WorkerProto::Op::QueryReferences
edolstra Jan 14, 2026
3cb42b5
Remove WorkerProto::Op::{QueryFailedPaths,ClearFailedPaths}
edolstra Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions src/libstore/daemon.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,26 +348,13 @@ static void performOp(
break;
}

case WorkerProto::Op::QueryPathHash: {
auto path = WorkerProto::Serialise<StorePath>::read(*store, rconn);
logger->startWork();
auto hash = store->queryPathInfo(path)->narHash;
logger->stopWork();
conn.to << hash.to_string(HashFormat::Base16, false);
break;
}

case WorkerProto::Op::QueryReferences:
case WorkerProto::Op::QueryReferrers:
case WorkerProto::Op::QueryValidDerivers:
case WorkerProto::Op::QueryDerivationOutputs: {
auto path = WorkerProto::Serialise<StorePath>::read(*store, rconn);
logger->startWork();
StorePathSet paths;
if (op == WorkerProto::Op::QueryReferences)
for (auto & i : store->queryPathInfo(path)->references)
paths.insert(i);
else if (op == WorkerProto::Op::QueryReferrers)
if (op == WorkerProto::Op::QueryReferrers)
store->queryReferrers(path, paths);
else if (op == WorkerProto::Op::QueryValidDerivers)
paths = store->queryValidDerivers(path);
Expand Down Expand Up @@ -1001,10 +988,6 @@ static void performOp(
break;
}

case WorkerProto::Op::QueryFailedPaths:
case WorkerProto::Op::ClearFailedPaths:
throw Error("Removed operation %1%", op);

default:
throw Error("invalid operation %1%", op);
}
Expand Down
10 changes: 5 additions & 5 deletions src/libstore/include/nix/store/worker-protocol.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ struct WorkerProto

enum struct WorkerProto::Op : uint64_t {
IsValidPath = 1,
// HasSubstitutes = 3, // removed
QueryPathHash = 4, // obsolete
QueryReferences = 5, // obsolete
// HasSubstitutes = 3, // removed
// QueryPathHash = 4, // removed
// QueryReferences = 5, // removed
QueryReferrers = 6,
AddToStore = 7,
AddTextToStore = 8, // obsolete since 1.25, Nix 3.0. Use WorkerProto::Op::AddToStore
Expand All @@ -161,8 +161,8 @@ enum struct WorkerProto::Op : uint64_t {
QuerySubstitutablePathInfo = 21,
QueryDerivationOutputs = 22, // obsolete
QueryAllValidPaths = 23,
QueryFailedPaths = 24,
ClearFailedPaths = 25,
// QueryFailedPaths = 24, // removed
// ClearFailedPaths = 25, // removed
QueryPathInfo = 26,
// ImportPaths = 27, // removed
QueryDerivationOutputNames = 28, // obsolete
Expand Down
Loading