From 33ebae75ca4a7fd81585928b36a1cc18995f8212 Mon Sep 17 00:00:00 2001
From: Ben Radford <benradf@users.noreply.github.com>
Date: Wed, 26 Jul 2023 13:29:31 +0100
Subject: [PATCH] Reuse deletion logic for optimiseStore and rename method.

---
 src/libstore/gc.cc                  | 2 +-
 src/libstore/local-overlay-store.cc | 7 ++++---
 src/libstore/local-overlay-store.hh | 2 +-
 src/libstore/local-store.cc         | 2 +-
 src/libstore/local-store.hh         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index ea2868c58..a909d063b 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -653,7 +653,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
         results.paths.insert(path);
 
         uint64_t bytesFreed;
-        deleteGCPath(realPath, bytesFreed);
+        deleteStorePath(realPath, bytesFreed);
 
         results.bytesFreed += bytesFreed;
 
diff --git a/src/libstore/local-overlay-store.cc b/src/libstore/local-overlay-store.cc
index 38c40fbad..8b89f68bc 100644
--- a/src/libstore/local-overlay-store.cc
+++ b/src/libstore/local-overlay-store.cc
@@ -176,7 +176,7 @@ void LocalOverlayStore::registerValidPaths(const ValidPathInfos & infos)
 }
 
 
-void LocalOverlayStore::deleteGCPath(const Path & path, uint64_t & bytesFreed)
+void LocalOverlayStore::deleteStorePath(const Path & path, uint64_t & bytesFreed)
 {
     auto mergedDir = realStoreDir.get() + "/";
     if (path.substr(0, mergedDir.length()) != mergedDir) {
@@ -198,7 +198,7 @@ void LocalOverlayStore::deleteGCPath(const Path & path, uint64_t & bytesFreed)
         } else {
             // Path does not exist in lower store.
             // So we can delete via overlayfs and not need to remount.
-            LocalStore::deleteGCPath(path, bytesFreed);
+            LocalStore::deleteStorePath(path, bytesFreed);
         }
     }
 }
@@ -217,8 +217,9 @@ void LocalOverlayStore::optimiseStore()
 
     for (auto & path : paths) {
         if (lowerStore->isValidPath(path)) {
+            uint64_t bytesFreed = 0;
             // Deduplicate store path
-            deletePath(toUpperPath(path));
+            deleteStorePath(Store::toRealPath(path), bytesFreed);
         }
         done++;
         act.progress(done, paths.size());
diff --git a/src/libstore/local-overlay-store.hh b/src/libstore/local-overlay-store.hh
index ffb310b7b..d45f6bfc5 100644
--- a/src/libstore/local-overlay-store.hh
+++ b/src/libstore/local-overlay-store.hh
@@ -118,7 +118,7 @@ private:
     void queryRealisationUncached(const DrvOutput&,
         Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
 
-    void deleteGCPath(const Path & path, uint64_t & bytesFreed) override;
+    void deleteStorePath(const Path & path, uint64_t & bytesFreed) override;
 
     void optimiseStore() override;
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 21acb3c38..2c18867f5 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -457,7 +457,7 @@ AutoCloseFD LocalStore::openGCLock()
 }
 
 
-void LocalStore::deleteGCPath(const Path & path, uint64_t & bytesFreed)
+void LocalStore::deleteStorePath(const Path & path, uint64_t & bytesFreed)
 {
     deletePath(path, bytesFreed);
 }
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 9a44722d4..9146f27a5 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -235,7 +235,7 @@ public:
      * The default implementation simply calls `deletePath`, but it can be
      * overridden by stores that wish to provide their own deletion behaviour.
      */
-    virtual void deleteGCPath(const Path & path, uint64_t & bytesFreed);
+    virtual void deleteStorePath(const Path & path, uint64_t & bytesFreed);
 
     /**
      * Optimise the disk space usage of the Nix store by hard-linking