Added phase 3 methods and test for remove bulk

src/cache_manager/CacheManager.h

@@ -3,10 +3,10 @@
 
 #include <map>
 
-#include "object_store/ObjectStore.h"
 #include <vector>
 #include <functional>
 #include <algorithm>
+#include "object_store/ObjectStore.h"
 #include "cache_manager/EvictionPolicy.h"
 #include "object_store/FullBladeObjectStore.h"
 #include "common/Exception.h"
@@ -28,6 +28,8 @@ class CacheManager {
     void put(ObjectID oid, T obj);
     void prefetch(ObjectID oid);
     void remove(ObjectID oid);
+    void removeBulk(ObjectID first, ObjectID last);
+    void prefetchBulk(ObjectID first, ObjectID last);
 
  private:
     void evict_vector(const std::vector<ObjectID>& to_remove);
@@ -184,6 +186,36 @@ void CacheManager<T>::remove(ObjectID oid) {
     policy->remove(oid);
 }
 
+/**
+ * Prefetches a range of objects. 
+ * @param first the first ObjectID to prefetch
+ * @param last the last ObjectID to prefetch
+ */
+template<class T>
+void CacheManager<T>::prefetchBulk(ObjectID first, ObjectID last) {
+    if (first > last) {
+        throw cirrus::Exception("Last ObjectID to prefetch must be leq first.");
+    }
+    for (int oid = first; oid <= last; oid++) {
+        prefetch(oid);
+    }
+}
+
+/**
+ * Removes a range of objects from the cache.
+ * @param first the first continuous ObjectID to be removed from the cache
+ * @param last the last ObjectID to be removed
+ */
+template<class T>
+void CacheManager<T>::removeBulk(ObjectID first, ObjectID last) {
+    if (first > last) {
+        throw cirrus::Exception("Last ObjectID to remove must be leq first.");
+    }
+    for (int oid = first; oid <= last; oid++) {
+        remove(oid);
+    }
+}
+
 /**
  * Removes the cache entry corresponding to oid from the cache.
  * Throws an error if it is not present.

src/object_store/FullBladeObjectStore.h

@@ -44,7 +44,7 @@ class FullBladeObjectStoreTempl : public ObjectStore<T> {
             const ObjectID& id) override;
     typename ObjectStore<T>::ObjectStorePutFuture put_async(const ObjectID& id,
             const T& obj) override;
-
+    void removeBulk(ObjectID first, ObjectID last) override;
     void printStats() const noexcept override;
 
  private:
@@ -208,6 +208,21 @@ bool FullBladeObjectStoreTempl<T>::remove(ObjectID id) {
     return client->remove(id);
 }
 
+/**
+ * Removes a range of items from the store. 
+ * @param first the first in a range of continuous ObjectIDs to be removed
+ * @param last the last in a range of continuous ObjectIDs to be removed
+ */
+template<class T>
+void FullBladeObjectStoreTempl<T>::removeBulk(ObjectID first, ObjectID last) {
+    if (first > last) {
+        throw cirrus::Exception("First ObjectID to remove must be leq last.");
+    }
+    for (int oid = first; oid <= last; oid++) {
+        client->remove(oid);
+    }
+}
+
 template<class T>
 void FullBladeObjectStoreTempl<T>::printStats() const noexcept {
 }

src/object_store/ObjectStore.h

@@ -90,6 +90,8 @@ class ObjectStore {
 
     virtual ObjectStoreGetFuture get_async(const ObjectID& id);
     virtual ObjectStorePutFuture put_async(const ObjectID& id, const T& obj);
+
+    virtual void removeBulk(ObjectID first, ObjectID last);
 };
 
 template<class T>
@@ -106,6 +108,11 @@ typename ObjectStore<T>::ObjectStorePutFuture ObjectStore<T>::put_async(
     return ObjectStorePutFuture();
 }
 
+template<class T>
+void ObjectStore<T>::removeBulk(ObjectID first, ObjectID last) {
+    return;
+}
+
 /**
  * Constructor for an ObjectStoreputFuture.
  * @param client_future the client_future that will be used for all

tests/object_store/test_fullblade_store.cpp

@@ -12,7 +12,7 @@
 #include "common/Exception.h"
 #include "utils/Time.h"
 #include "utils/Stats.h"
-#include "client/RDMAClient.h"
+#include "client/TCPClient.h"
 
 // TODO(Tyler): Remove hardcoded IP and PORT
 static const uint64_t GB = (1024*1024*1024);
@@ -27,7 +27,7 @@ static const uint32_t SIZE = 1;
   * works properly.
   */
 void test_sync() {
-    cirrus::RDMAClient client;
+    cirrus::TCPClient client;
     cirrus::ostore::FullBladeObjectStoreTempl<cirrus::Dummy<SIZE>> store(IP,
                       PORT,
                       &client,
@@ -54,7 +54,7 @@ void test_sync() {
   * Also record the latencies distributions
   */
 void test_sync(int N) {
-    cirrus::RDMAClient client;
+    cirrus::TCPClient client;
     cirrus::ostore::FullBladeObjectStoreTempl<cirrus::Dummy<SIZE>> store(IP,
                 PORT,
                 &client,
@@ -96,7 +96,7 @@ void test_sync(int N) {
   * get an ID that has never been put. Should throw a cirrus::NoSuchIDException.
   */
 void test_nonexistent_get() {
-    cirrus::RDMAClient client;
+    cirrus::TCPClient client;
     cirrus::ostore::FullBladeObjectStoreTempl<int> store(IP, PORT, &client,
             cirrus::serializer_simple<int>,
             cirrus::deserializer_simple<int, sizeof(int)>);
@@ -113,7 +113,7 @@ void test_nonexistent_get() {
  * Tests a simple asynchronous put and get.
  */
 void test_async() {
-    cirrus::RDMAClient client;
+    cirrus::TCPClient client;
     cirrus::ostore::FullBladeObjectStoreTempl<int> store(IP, PORT, &client,
             cirrus::serializer_simple<int>,
             cirrus::deserializer_simple<int, sizeof(int)>);
@@ -136,7 +136,7 @@ void test_async() {
  * @param N the number of puts and gets to perform.
  */
 void test_async_N(int N) {
-    cirrus::RDMAClient client;
+    cirrus::TCPClient client;
     cirrus::ostore::FullBladeObjectStoreTempl<int> store(IP, PORT, &client,
             cirrus::serializer_simple<int>,
             cirrus::deserializer_simple<int, sizeof(int)>);
@@ -167,6 +167,22 @@ void test_async_N(int N) {
     }
 }
 
+/**
+ * Tests that remove_bulk correctly removes items from the store.
+ */
+void test_remove_bulk() {
+    cirrus::TCPClient client;
+    cirrus::ostore::FullBladeObjectStoreTempl<int> store(IP, PORT, &client,
+            cirrus::serializer_simple<int>,
+            cirrus::deserializer_simple<int, sizeof(int)>);
+    for (int i = 0; i < 10; i++) {
+        store.put(i, i);
+    }
+
+    store.removeBulk(0, 9);
+    // Should fail
+    store.get(9);
+}
 auto main() -> int {
     std::cout << "Starting synchronous tests." << std::endl;
     test_sync(10);
@@ -183,5 +199,13 @@ auto main() -> int {
     } catch (const cirrus::NoSuchIDException& e) {
     }
 
+    try {
+        test_remove_bulk();
+        std::cout << "Exception not thrown in remove bulk test." << std::endl;
+        return -1;
+    } catch (const cirrus::NoSuchIDException& e) {
+    }
+
+    std::cout << "Test successful." << std::endl;
     return 0;
 }