From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 18 Nov 2015 20:03:55 +0000 (-0700)
Subject: Do not _require_ anchor/updateCollapsed() re-implementation.
X-Git-Tag: SQUID_4_0_3~12^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30025039fda9eb37583242262ec6b92209da94c0;p=thirdparty%2Fsquid.git

Do not _require_ anchor/updateCollapsed() re-implementation.

Also do not override Controlled methods that Disk is not going to
provide because doing so will complicate changing or deleting those
methods later as we revise the APIs.
---

diff --git a/src/store/Disk.h b/src/store/Disk.h
index 4e7f94cf19..8445418d38 100644
--- a/src/store/Disk.h
+++ b/src/store/Disk.h
@@ -45,22 +45,15 @@ public:
 
     /* Controlled API */
     virtual void create() override;
-    virtual void init() override = 0;
     virtual StoreEntry *get(const cache_key *) override;
     virtual uint64_t maxSize() const override { return max_size; }
     virtual uint64_t minSize() const override;
-    virtual uint64_t currentSize() const override = 0;
-    virtual uint64_t currentCount() const override = 0;
     virtual int64_t maxObjectSize() const override;
     virtual void getStats(StoreInfoStats &stats) const override;
     virtual void stat(StoreEntry &) const override;
     virtual void reference(StoreEntry &e) override;
     virtual bool dereference(StoreEntry &e) override;
     virtual void maintain() override;
-    virtual bool anchorCollapsed(StoreEntry &e, bool &inSync) override = 0;
-    virtual bool updateCollapsed(StoreEntry &e) override = 0;
-    virtual void markForUnlink(StoreEntry &) override = 0;
-    virtual void unlink(StoreEntry &) override = 0;
 
     /// configure the maximum object size for this storage area.
     /// May be any size up to the total storage area.
diff --git a/src/tests/stub_SwapDir.cc b/src/tests/stub_SwapDir.cc
index 0515d347d3..d7f309290a 100644
--- a/src/tests/stub_SwapDir.cc
+++ b/src/tests/stub_SwapDir.cc
@@ -9,7 +9,7 @@
 #include "squid.h"
 #include "store/Disk.h"
 
-#define STUB_API "SwapDir.cc"
+#define STUB_API "store/Disk.cc"
 #include "tests/STUB.h"
 
 // SwapDir::SwapDir(char const *) STUB
@@ -17,7 +17,6 @@
 void SwapDir::create() STUB
 void SwapDir::dump(StoreEntry &) const STUB
 bool SwapDir::doubleCheck(StoreEntry &) STUB_RETVAL(false)
-void SwapDir::unlink(StoreEntry &) STUB
 void SwapDir::getStats(StoreInfoStats &) const STUB
 void SwapDir::stat(StoreEntry &) const STUB
 void SwapDir::statfs(StoreEntry &)const STUB