From: Sage Weil Date: Thu, 17 Nov 2016 17:26:21 +0000 (-0600) Subject: kv: remove snapshot iterator X-Git-Tag: v11.1.0~212^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8af1cf305596aad8b14a0cbca7c4a17215a733b;p=ceph.git kv: remove snapshot iterator There are no users. Signed-off-by: Sage Weil --- diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h index 11942c9e08d..cb44f113b79 100644 --- a/src/kv/KeyValueDB.h +++ b/src/kv/KeyValueDB.h @@ -268,14 +268,6 @@ public: return std::make_shared(prefix, get_iterator()); } - WholeSpaceIterator get_snapshot_iterator() { - return _get_snapshot_iterator(); - } - - Iterator get_snapshot_iterator(const std::string &prefix) { - return std::make_shared(prefix, get_snapshot_iterator()); - } - virtual uint64_t get_estimated_size(std::map &extra) = 0; virtual int get_statfs(struct store_statfs_t *buf) { return -EOPNOTSUPP; @@ -326,7 +318,6 @@ protected: std::shared_ptr > > 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 496cb4c0b9e..f52df90c2b4 100644 --- a/src/kv/KineticStore.h +++ b/src/kv/KineticStore.h @@ -149,12 +149,6 @@ protected: WholeSpaceIterator _get_iterator() { return std::make_shared(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 766ed1960e9..69f03ce75d7 100644 --- 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( - db.get(), snapshot, - db->NewIterator(options)); - } - }; #endif diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc index 33811c89b60..7ef18fc25ec 100644 --- 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 29f128544b6..715b0a12762 100644 --- a/src/kv/MemDB.h +++ b/src/kv/MemDB.h @@ -199,8 +199,6 @@ protected: return std::shared_ptr( 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 0ab97cdc7dd..3cacb1331a8 100644 --- 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( - db, snapshot, db->NewIterator(options)); -} - -RocksDBStore::RocksDBSnapshotIteratorImpl::~RocksDBSnapshotIteratorImpl() -{ - db->ReleaseSnapshot(snapshot); -} diff --git a/src/kv/RocksDBStore.h b/src/kv/RocksDBStore.h index 783ca7609fa..2ec5e10064c 100644 --- 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 a99641f72f2..690f6945c30 100644 --- 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( - new WholeSpaceSnapshotMemIterator(snap_db) - ); -} diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h index 0712fa0344a..d0ee9dc59d5 100644 --- 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 e3ab7daa88c..63e032b477b 100644 --- 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: