kv: remove snapshot iterator

There are no users.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h
index 11942c9e08d29c80c9b746f7ffde94eea61e1643..cb44f113b798eb1bef1db4cade5013f4f6b1dfe8 100644 (file)
--- a/src/kv/KeyValueDB.h
+++ b/src/kv/KeyValueDB.h
@@ -268,14 +268,6 @@ public:
     return std::make_shared<IteratorImpl>(prefix, get_iterator());
   }
 
-  WholeSpaceIterator get_snapshot_iterator() {
-    return _get_snapshot_iterator();
-  }
-
-  Iterator get_snapshot_iterator(const std::string &prefix) {
-    return std::make_shared<IteratorImpl>(prefix, get_snapshot_iterator());
-  }
-
   virtual uint64_t get_estimated_size(std::map<std::string,uint64_t> &extra) = 0;
   virtual int get_statfs(struct store_statfs_t *buf) {
     return -EOPNOTSUPP;
@@ -326,7 +318,6 @@ protected:
                        std::shared_ptr<MergeOperator> > > merge_ops;
 
   virtual WholeSpaceIterator _get_iterator() = 0;
-  virtual WholeSpaceIterator _get_snapshot_iterator() = 0;
 };
 
 #endif

diff --git a/src/kv/KineticStore.h b/src/kv/KineticStore.h
index 496cb4c0b9e204565e7bf2a4c2931e8a6560d802..f52df90c2b4e163c518c9b5a8968c9095fb9f900 100644 (file)
--- a/src/kv/KineticStore.h
+++ b/src/kv/KineticStore.h
@@ -149,12 +149,6 @@ protected:
   WholeSpaceIterator _get_iterator() {
     return std::make_shared<KineticWholeSpaceIteratorImpl>(kinetic_conn.get());
   }
-
-  // TODO: remove snapshots from interface
-  WholeSpaceIterator _get_snapshot_iterator() {
-    return _get_iterator();
-  }
-
 };
 
 #endif

diff --git a/src/kv/LevelDBStore.h b/src/kv/LevelDBStore.h
index 766ed1960e9ee2d77748b14044584ddbd610f129..69f03ce75d78b6688ac7505e0409c9f33751109b 100644 (file)
--- a/src/kv/LevelDBStore.h
+++ b/src/kv/LevelDBStore.h
@@ -308,20 +308,6 @@ public:
     }
   };
 
-  class LevelDBSnapshotIteratorImpl : public LevelDBWholeSpaceIteratorImpl {
-    leveldb::DB *db;
-    const leveldb::Snapshot *snapshot;
-  public:
-    LevelDBSnapshotIteratorImpl(leveldb::DB *db, const leveldb::Snapshot *s,
-                               leveldb::Iterator *iter) :
-      LevelDBWholeSpaceIteratorImpl(iter), db(db), snapshot(s) { }
-
-    ~LevelDBSnapshotIteratorImpl() {
-      assert(snapshot != NULL);
-      db->ReleaseSnapshot(snapshot);
-    }
-  };
-
   /// Utility
   static string combine_strings(const string &prefix, const string &value);
   static int split_key(leveldb::Slice in, string *prefix, string *key);
@@ -405,18 +391,6 @@ protected:
        db->NewIterator(leveldb::ReadOptions()));
   }
 
-  WholeSpaceIterator _get_snapshot_iterator() {
-    const leveldb::Snapshot *snapshot;
-    leveldb::ReadOptions options;
-
-    snapshot = db->GetSnapshot();
-    options.snapshot = snapshot;
-
-    return std::make_shared<LevelDBSnapshotIteratorImpl>(
-        db.get(), snapshot,
-       db->NewIterator(options));
-  }
-
 };
 
 #endif

diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc
index 33811c89b6071713593ed159ac41da71770de809..7ef18fc25ecf6e2d25510b03c9977217c5e9d9bc 100644 (file)
--- a/src/kv/MemDB.cc
+++ b/src/kv/MemDB.cc
@@ -552,11 +552,6 @@ MemDB::MDBWholeSpaceIteratorImpl::~MDBWholeSpaceIteratorImpl()
   free_last();
 }
 
-KeyValueDB::WholeSpaceIterator MemDB::_get_snapshot_iterator()
-{
-  assert(0);
-}
-
 int MemDB::MDBWholeSpaceIteratorImpl::upper_bound(const std::string &prefix,
     const std::string &after) {
 

diff --git a/src/kv/MemDB.h b/src/kv/MemDB.h
index 29f128544b6e77e8e71105b2e3243549c65bbfac..715b0a127629eabee34fb8cd6f77d404cb157453 100644 (file)
--- a/src/kv/MemDB.h
+++ b/src/kv/MemDB.h
@@ -199,8 +199,6 @@ protected:
     return std::shared_ptr<KeyValueDB::WholeSpaceIteratorImpl>(
       new MDBWholeSpaceIteratorImpl(&m_map, &m_lock, &iterator_seq_no, m_using_btree));
   }
-
-  WholeSpaceIterator _get_snapshot_iterator();
 };
 
 #endif

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index 0ab97cdc7dd7dd031c650e0f6b9b50321ec312cc..3cacb1331a8cbcdfe6299a741e529892023c43ba 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -813,19 +813,3 @@ RocksDBStore::WholeSpaceIterator RocksDBStore::_get_iterator()
         db->NewIterator(rocksdb::ReadOptions()));
 }
 
-RocksDBStore::WholeSpaceIterator RocksDBStore::_get_snapshot_iterator()
-{
-  const rocksdb::Snapshot *snapshot;
-  rocksdb::ReadOptions options;
-
-  snapshot = db->GetSnapshot();
-  options.snapshot = snapshot;
-
-  return std::make_shared<RocksDBSnapshotIteratorImpl>(
-          db, snapshot, db->NewIterator(options));
-}
-
-RocksDBStore::RocksDBSnapshotIteratorImpl::~RocksDBSnapshotIteratorImpl()
-{
-  db->ReleaseSnapshot(snapshot);
-}

diff --git a/src/kv/RocksDBStore.h b/src/kv/RocksDBStore.h
index 783ca7609fa4f9bf23ed311b96c81d9265912f7f..2ec5e10064c2807626beb40ea9435bb1e637273d 100644 (file)
--- a/src/kv/RocksDBStore.h
+++ b/src/kv/RocksDBStore.h
@@ -302,17 +302,6 @@ public:
     int status();
   };
 
-  class RocksDBSnapshotIteratorImpl : public RocksDBWholeSpaceIteratorImpl {
-    rocksdb::DB *db;
-    const rocksdb::Snapshot *snapshot;
-  public:
-    RocksDBSnapshotIteratorImpl(rocksdb::DB *db, const rocksdb::Snapshot *s,
-                               rocksdb::Iterator *iter) :
-      RocksDBWholeSpaceIteratorImpl(iter), db(db), snapshot(s) { }
-
-    ~RocksDBSnapshotIteratorImpl();
-  };
-
   /// Utility
   static string combine_strings(const string &prefix, const string &value);
   static int split_key(rocksdb::Slice in, string *prefix, string *key);
@@ -394,9 +383,6 @@ err:
 
 protected:
   WholeSpaceIterator _get_iterator();
-
-  WholeSpaceIterator _get_snapshot_iterator();
-
 };
 
 

diff --git a/src/test/ObjectMap/KeyValueDBMemory.cc b/src/test/ObjectMap/KeyValueDBMemory.cc
index a99641f72f2cc071325cd177b13f703a08f187ec..690f6945c30074e511d80446346c65bcc2517d20 100644 (file)
--- a/src/test/ObjectMap/KeyValueDBMemory.cc
+++ b/src/test/ObjectMap/KeyValueDBMemory.cc
@@ -245,9 +245,3 @@ public:
   }
 };
 
-KeyValueDB::WholeSpaceIterator KeyValueDBMemory::_get_snapshot_iterator() {
-  KeyValueDBMemory *snap_db = new KeyValueDBMemory(this);
-  return ceph::shared_ptr<KeyValueDB::WholeSpaceIteratorImpl>(
-    new WholeSpaceSnapshotMemIterator(snap_db)
-  );
-}

diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h
index 0712fa0344a4fa7d4a496a9a15416501341ee313..d0ee9dc59d5353850940ca3abe86ccbb7e6d313b 100644 (file)
--- a/src/test/ObjectMap/KeyValueDBMemory.h
+++ b/src/test/ObjectMap/KeyValueDBMemory.h
@@ -166,5 +166,4 @@ private:
 
 protected:
   WholeSpaceIterator _get_iterator();
-  WholeSpaceIterator _get_snapshot_iterator();
 };

diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index e3ab7daa88cdc35d48fe08a2ad35f2b949c84cb4..63e032b477b758f7bb21a26f6b35a6ea43ee11ff 100644 (file)
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -198,7 +198,7 @@ public:
   }
 
   void clear(KeyValueDB *store) {
-    KeyValueDB::WholeSpaceIterator it = store->get_snapshot_iterator();
+    KeyValueDB::WholeSpaceIterator it = store->get_iterator();
     it->seek_to_first();
     KeyValueDB::Transaction t = store->get_transaction();
     while (it->valid()) {
@@ -523,20 +523,6 @@ TEST_F(RmKeysTest, RmKeysWhileIteratingMockDB)
            << "over the mock store without using snapshots" << std::endl;
 }
 
-TEST_F(RmKeysTest, RmKeysWhileIteratingSnapshotLevelDB)
-{
-  SCOPED_TRACE("LevelDB -- WholeSpaceSnapshotIterator");
-  RmKeysWhileIteratingSnapshot(db.get(), db->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
-TEST_F(RmKeysTest, RmKeysWhileIteratingSnapshotMockDB)
-{
-  SCOPED_TRACE("Mock DB -- WholeSpaceSnapshotIterator");
-  RmKeysWhileIteratingSnapshot(mock.get(), mock->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
 // ------- Set Keys / Update Values -------
 class SetKeysTest : public IteratorTest
 {
@@ -763,20 +749,6 @@ TEST_F(SetKeysTest, SetKeysWhileIteratingMockDB)
   ASSERT_FALSE(HasFatalFailure());
 }
 
-TEST_F(SetKeysTest, SetKeysWhileIteratingSnapshotLevelDB)
-{
-  SCOPED_TRACE("LevelDB: SetKeysWhileIteratingSnapshotLevelDB");
-  SetKeysWhileIteratingSnapshot(db.get(), db->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
-TEST_F(SetKeysTest, SetKeysWhileIteratingSnapshotMockDB)
-{
-  SCOPED_TRACE("MockDB: SetKeysWhileIteratingSnapshotMockDB");
-  SetKeysWhileIteratingSnapshot(mock.get(), mock->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
 TEST_F(SetKeysTest, DISABLED_UpdateValuesWhileIteratingLevelDB)
 {
   SCOPED_TRACE("LevelDB: UpdateValuesWhileIteratingLevelDB");
@@ -791,21 +763,6 @@ TEST_F(SetKeysTest, UpdateValuesWhileIteratingMockDB)
   ASSERT_FALSE(HasFatalFailure());
 }
 
-TEST_F(SetKeysTest, UpdateValuesWhileIteratingSnapshotLevelDB)
-{
-  SCOPED_TRACE("LevelDB: UpdateValuesWhileIteratingSnapshotLevelDB");
-  UpdateValuesWhileIteratingSnapshot(db.get(), db->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
-TEST_F(SetKeysTest, UpdateValuesWhileIteratingSnapshotMockDB)
-{
-  SCOPED_TRACE("MockDB: UpdateValuesWhileIteratingSnapshotMockDB");
-  UpdateValuesWhileIteratingSnapshot(mock.get(), mock->get_snapshot_iterator());
-  ASSERT_FALSE(HasFatalFailure());
-}
-
-
 class BoundsTest : public IteratorTest
 {
 public: