Convert UDSRemoteStore

src/libstore/uds-remote-store.cc

@@ -1,6 +1,7 @@
 #include "uds-remote-store.hh"
 #include "unix-domain-socket.hh"
 #include "worker-protocol.hh"
+#include "store-registration.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -20,13 +21,13 @@ namespace nix {
 UDSRemoteStoreConfig::UDSRemoteStoreConfig(
     std::string_view scheme,
     std::string_view authority,
-    const Params & params)
+    const StoreReference::Params & params)
     : StoreConfig(params)
     , LocalFSStoreConfig(params)
     , RemoteStoreConfig(params)
     , path{authority.empty() ? settings.nixDaemonSocketFile : authority}
 {
-    if (scheme != UDSRemoteStoreConfig::scheme) {
+    if (uriSchemes().count(std::string{scheme}) == 0) {
         throw UsageError("Scheme must be 'unix'");
     }
 }
@@ -40,23 +41,14 @@ std::string UDSRemoteStoreConfig::doc()
 }
 
 
-// A bit gross that we now pass empty string but this is knowing that
-// empty string will later default to the same nixDaemonSocketFile. Why
-// don't we just wire it all through? I believe there are cases where it
-// will live reload so we want to continue to account for that.
-UDSRemoteStore::UDSRemoteStore(const Params & params)
-    : UDSRemoteStore(scheme, "", params)
-{}
-
-
-UDSRemoteStore::UDSRemoteStore(std::string_view scheme, std::string_view authority, const Params & params)
-    : StoreConfig(params)
-    , LocalFSStoreConfig(params)
-    , RemoteStoreConfig(params)
-    , UDSRemoteStoreConfig(scheme, authority, params)
-    , Store(params)
-    , LocalFSStore(params)
-    , RemoteStore(params)
+UDSRemoteStore::UDSRemoteStore(const Config & config)
+    : Store::Config{config}
+    , LocalFSStore::Config{config}
+    , RemoteStore::Config{config}
+    , UDSRemoteStore::Config{config}
+    , Store(static_cast<const Store::Config &>(*this))
+    , LocalFSStore(static_cast<const LocalFSStore::Config &>(*this))
+    , RemoteStore(static_cast<const RemoteStore::Config &>(*this))
 {
 }
 
@@ -69,7 +61,7 @@ std::string UDSRemoteStore::getUri()
           //
           // unix:// with no path also works. Change what we return?
           "daemon"
-        : std::string(scheme) + "://" + path;
+        : std::string(*uriSchemes().begin()) + "://" + path;
 }
 
 
@@ -106,6 +98,6 @@ void UDSRemoteStore::addIndirectRoot(const Path & path)
 }
 
 
-static RegisterStoreImplementation<UDSRemoteStore, UDSRemoteStoreConfig> regUDSRemoteStore;
+static RegisterStoreImplementation<UDSRemoteStore> regUDSRemoteStore;
 
 }

src/libstore/uds-remote-store.hh

@@ -8,21 +8,25 @@
 namespace nix {
 
 struct UDSRemoteStoreConfig :
-    virtual LocalFSStoreConfig,
-    virtual RemoteStoreConfig
+    virtual LocalFSStore::Config,
+    virtual RemoteStore::Config
 {
-    // TODO(fzakaria): Delete this constructor once moved over to the factory pattern
-    // outlined in https://github.com/NixOS/nix/issues/10766
-    using LocalFSStoreConfig::LocalFSStoreConfig;
-    using RemoteStoreConfig::RemoteStoreConfig;
+    struct Descriptions :
+        virtual LocalFSStore::Config::Descriptions,
+        virtual RemoteStore::Config::Descriptions
+    {
+        Descriptions();
+    };
+
+    static const Descriptions descriptions;
 
     /**
      * @param authority is the socket path.
      */
     UDSRemoteStoreConfig(
         std::string_view scheme,
         std::string_view authority,
-        const Params & params);
+        const StoreReference::Params & params);
 
     const std::string name() override { return "Local Daemon Store"; }
 
@@ -36,20 +40,20 @@ struct UDSRemoteStoreConfig :
      */
     Path path;
 
-private:
-    static constexpr char const * scheme = "unix";
-
-public:
     static std::set<std::string> uriSchemes()
-    { return {scheme}; }
+    { return {"unix"}; }
+
+    ref<Store> openStore() const override;
 };
 
 struct UDSRemoteStore :
     virtual UDSRemoteStoreConfig,
     virtual IndirectRootStore,
     virtual RemoteStore
 {
-    UDSRemoteStore(const UDSRemoteStoreConfig &);
+    using Config = UDSRemoteStoreConfig;
+
+    UDSRemoteStore(const Config &);
 
     std::string getUri() override;