Added BlockStore::numBlocks()

implementations/inmemory/InMemoryBlockStore.cpp

@@ -43,5 +43,9 @@ void InMemoryBlockStore::remove(unique_ptr<Block> block) {
   assert(1==numRemoved);
 }
 
+uint64_t InMemoryBlockStore::numBlocks() const {
+  return _blocks.size();
+}
+
 }
 }

implementations/inmemory/InMemoryBlockStore.h

@@ -19,6 +19,7 @@ public:
   std::unique_ptr<Block> create(const Key &key, size_t size) override;
   std::unique_ptr<Block> load(const Key &key) override;
   void remove(std::unique_ptr<Block> block) override;
+  uint64_t numBlocks() const override;
 
 private:
   std::map<std::string, InMemoryBlock> _blocks;

implementations/ondisk/OnDiskBlockStore.cpp

@@ -34,5 +34,9 @@ void OnDiskBlockStore::remove(unique_ptr<Block> block) {
   OnDiskBlock::RemoveFromDisk(_rootdir, key);
 }
 
+uint64_t OnDiskBlockStore::numBlocks() const {
+  return std::distance(bf::directory_iterator(_rootdir), bf::directory_iterator());
+}
+
 }
 }

implementations/ondisk/OnDiskBlockStore.h

@@ -19,6 +19,7 @@ public:
   std::unique_ptr<Block> create(const Key &key, size_t size) override;
   std::unique_ptr<Block> load(const Key &key) override;
   void remove(std::unique_ptr<Block> block) override;
+  uint64_t numBlocks() const override;
 
 private:
   const boost::filesystem::path _rootdir;

implementations/testfake/FakeBlockStore.cpp

@@ -55,5 +55,9 @@ void FakeBlockStore::updateData(const Key &key, const Data &data) {
   std::memcpy(stored_data.data(), data.data(), data.size());
 }
 
+uint64_t FakeBlockStore::numBlocks() const {
+  return _blocks.size();
+}
+
 }
 }

implementations/testfake/FakeBlockStore.h

@@ -34,6 +34,7 @@ public:
   std::unique_ptr<Block> create(const Key &key, size_t size) override;
   std::unique_ptr<Block> load(const Key &key) override;
   void remove(std::unique_ptr<Block> block) override;
+  uint64_t numBlocks() const override;
 
   void updateData(const Key &key, const Data &data);
 

interface/BlockStore.h

@@ -20,6 +20,8 @@ public:
   // Return nullptr if block with this key doesn't exists
   virtual std::unique_ptr<Block> load(const Key &key) = 0;
   virtual void remove(std::unique_ptr<Block> block) = 0;
+  virtual uint64_t numBlocks() const = 0;
+  //TODO Test numBlocks
 };
 
 }

test/interface/helpers/BlockStoreWithRandomKeysTest.cpp

@@ -25,6 +25,7 @@ public:
   }
   MOCK_METHOD1(do_load, Block*(const Key &));
   void remove(unique_ptr<Block> block) {}
+  MOCK_CONST_METHOD0(numBlocks, uint64_t());
 };
 
 class BlockMock: public Block {