kv/KeyValueDB: simplify iterator overloads

get_wholespace_iterator() and get_iterator().  This gets rid of
the goofy _get_iterator() indirection and avoids colliding on names w/
virtual methods.

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

diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h
index 6219b7f52b1c90fe126d3264d2eb18ace3b809aa..6ee9ee34f645f33b36260cb3a1cd74df599789ed 100644 (file)
--- a/src/kv/KeyValueDB.h
+++ b/src/kv/KeyValueDB.h
@@ -316,12 +316,11 @@ private:
   };
 public:
 
-  WholeSpaceIterator get_iterator() {
-    return _get_iterator();
-  }
-
-  Iterator get_iterator(const std::string &prefix) {
-    return std::make_shared<PrefixIteratorImpl>(prefix, get_iterator());
+  virtual WholeSpaceIterator get_wholespace_iterator() = 0;
+  virtual Iterator get_iterator(const std::string &prefix) {
+    return std::make_shared<PrefixIteratorImpl>(
+      prefix,
+      get_wholespace_iterator());
   }
 
   virtual uint64_t get_estimated_size(std::map<std::string,uint64_t> &extra) = 0;
@@ -388,8 +387,6 @@ protected:
   /// List of matching prefixes and merge operators
   std::vector<std::pair<std::string,
                        std::shared_ptr<MergeOperator> > > merge_ops;
-
-  virtual WholeSpaceIterator _get_iterator() = 0;
 };
 
 #endif

diff --git a/src/kv/KineticStore.h b/src/kv/KineticStore.h
index 8496b76144ece7288f2aac6918e942917637cece..b7500b5bef27aa531f824aa82cdfad8345804465 100644 (file)
--- a/src/kv/KineticStore.h
+++ b/src/kv/KineticStore.h
@@ -149,8 +149,7 @@ public:
   }
 
 
-protected:
-  WholeSpaceIterator _get_iterator() {
+  WholeSpaceIterator get_wholespace_iterator() {
     return std::make_shared<KineticWholeSpaceIteratorImpl>(kinetic_conn.get());
   }
 };

diff --git a/src/kv/LevelDBStore.h b/src/kv/LevelDBStore.h
index 5a3ced9e4c9b9d565f435274c668b70d2d11e118..e32bf5c2305b3642e35b80f01acb5d1485f687b1 100644 (file)
--- a/src/kv/LevelDBStore.h
+++ b/src/kv/LevelDBStore.h
@@ -402,8 +402,7 @@ err:
   }
 
 
-protected:
-  WholeSpaceIterator _get_iterator() override {
+  WholeSpaceIterator get_wholespace_iterator() override {
     return std::make_shared<LevelDBWholeSpaceIteratorImpl>(
        db->NewIterator(leveldb::ReadOptions()));
   }

diff --git a/src/kv/MemDB.h b/src/kv/MemDB.h
index cb2a16b9ba9d98ffb9b30ecd72d4b6b6ca59981d..7486821ae562786e7922145db55020ef58eade59 100644 (file)
--- a/src/kv/MemDB.h
+++ b/src/kv/MemDB.h
@@ -201,9 +201,7 @@ public:
     return 0;
   }
 
-protected:
-
-  WholeSpaceIterator _get_iterator() override {
+  WholeSpaceIterator get_wholespace_iterator() override {
     return std::shared_ptr<KeyValueDB::WholeSpaceIteratorImpl>(
       new MDBWholeSpaceIteratorImpl(&m_map, &m_lock, &iterator_seq_no, m_using_btree));
   }

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index bc0de79e23cbb5a4a53b7994b918ea46dd030c14..d662581b6c9cdad9db3d15905c42bc464e60dca6 100644 (file)
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -1005,7 +1005,7 @@ string RocksDBStore::past_prefix(const string &prefix)
   return limit;
 }
 
-RocksDBStore::WholeSpaceIterator RocksDBStore::_get_iterator()
+RocksDBStore::WholeSpaceIterator RocksDBStore::get_wholespace_iterator()
 {
   return std::make_shared<RocksDBWholeSpaceIteratorImpl>(
         db->NewIterator(rocksdb::ReadOptions()));

diff --git a/src/kv/RocksDBStore.h b/src/kv/RocksDBStore.h
index 029ecf784794108d1e7089ec26d39a2c51553e57..d8c1bee19fb4b10176909346d4765994ca3edbfa 100644 (file)
--- a/src/kv/RocksDBStore.h
+++ b/src/kv/RocksDBStore.h
@@ -450,8 +450,7 @@ err:
     return 0;
   }
 
-protected:
-  WholeSpaceIterator _get_iterator() override;
+  WholeSpaceIterator get_wholespace_iterator() override;
 };
 
 

diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h
index 00e56a9d8fcdb8654e40132ff339611047d8e291..8569fc23940ecb6f16c83d6942cbcb646011e238 100644 (file)
--- a/src/mon/MonitorDBStore.h
+++ b/src/mon/MonitorDBStore.h
@@ -484,7 +484,7 @@ class MonitorDBStore
   Synchronizer get_synchronizer(pair<string,string> &key,
                                set<string> &prefixes) {
     KeyValueDB::WholeSpaceIterator iter;
-    iter = db->get_iterator();
+    iter = db->get_wholespace_iterator();
 
     if (!key.first.empty() && !key.second.empty())
       iter->upper_bound(key.first, key.second);
@@ -505,7 +505,7 @@ class MonitorDBStore
 
   KeyValueDB::WholeSpaceIterator get_iterator() {
     KeyValueDB::WholeSpaceIterator iter;
-    iter = db->get_iterator();
+    iter = db->get_wholespace_iterator();
     iter->seek_to_first();
     return iter;
   }

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 45c053c500a7b2b39671b1c454c066177687636d..496c37c075f2b6112351644360ba06c5621e20b9 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -11513,7 +11513,7 @@ void BlueStore::generate_db_histogram(Formatter *f)
 
   utime_t start = ceph_clock_now();
 
-  KeyValueDB::WholeSpaceIterator iter = db->get_iterator();
+  KeyValueDB::WholeSpaceIterator iter = db->get_wholespace_iterator();
   iter->seek_to_first();
   while (iter->valid()) {
     dout(30) << __func__ << " Key: " << iter->key() << dendl;

diff --git a/src/test/ObjectMap/KeyValueDBMemory.cc b/src/test/ObjectMap/KeyValueDBMemory.cc
index 1a095e3e1a149f7bd37105ab9280ee2d787d723c..bf6570b1dd40ea13649ff42c8a0ce531dc73cd81 100644 (file)
--- a/src/test/ObjectMap/KeyValueDBMemory.cc
+++ b/src/test/ObjectMap/KeyValueDBMemory.cc
@@ -235,7 +235,7 @@ int KeyValueDBMemory::rm_range_keys(const string &prefix, const string &start, c
   return 0;
 }
 
-KeyValueDB::WholeSpaceIterator KeyValueDBMemory::_get_iterator() {
+KeyValueDB::WholeSpaceIterator KeyValueDBMemory::get_wholespace_iterator() {
   return ceph::shared_ptr<KeyValueDB::WholeSpaceIteratorImpl>(
     new WholeSpaceMemIterator(this)
   );

diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h
index 089fb038f79fe8e23a308304dc453f55ad70dcd0..ccafe6d1531b77b0d316c1c2980e72ce3106922d 100644 (file)
--- a/src/test/ObjectMap/KeyValueDBMemory.h
+++ b/src/test/ObjectMap/KeyValueDBMemory.h
@@ -184,6 +184,6 @@ private:
 
   friend class WholeSpaceMemIterator;
 
-protected:
-  WholeSpaceIterator _get_iterator() override;
+public:
+  WholeSpaceIterator get_wholespace_iterator() override;
 };

diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index cd8e28a5213ba669f57ff511923221c21be1c6ae..e35f085fcafd7e4109f48ff000abe1a33154111d 100644 (file)
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -45,7 +45,7 @@ public:
   void TearDown() override { }
 
   ::testing::AssertionResult validate_db_clear(KeyValueDB *store) {
-    KeyValueDB::WholeSpaceIterator it = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator it = store->get_wholespace_iterator();
     it->seek_to_first();
     while (it->valid()) {
       pair<string,string> k = it->raw_key();
@@ -61,7 +61,7 @@ public:
   }
 
   ::testing::AssertionResult validate_db_match() {
-    KeyValueDB::WholeSpaceIterator it = db->get_iterator();
+    KeyValueDB::WholeSpaceIterator it = db->get_wholespace_iterator();
     it->seek_to_first();
     while (it->valid()) {
       pair<string, string> k = it->raw_key();
@@ -198,7 +198,7 @@ public:
   }
 
   void clear(KeyValueDB *store) {
-    KeyValueDB::WholeSpaceIterator it = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator it = store->get_wholespace_iterator();
     it->seek_to_first();
     KeyValueDB::Transaction t = store->get_transaction();
     while (it->valid()) {
@@ -244,7 +244,7 @@ public:
   }
 
   void print_db(KeyValueDB *store) {
-    KeyValueDB::WholeSpaceIterator it = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator it = store->get_wholespace_iterator();
     it->seek_to_first();
     print_iterator(it);
   }
@@ -310,7 +310,7 @@ public:
     store->submit_transaction_sync(tx);
 
     deque<string> key_deque;
-    KeyValueDB::WholeSpaceIterator iter = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator iter = store->get_wholespace_iterator();
     iter->seek_to_first();
 
     // check for prefix1
@@ -341,7 +341,7 @@ public:
     tx->rmkeys_by_prefix(prefix1);
     store->submit_transaction_sync(tx);
 
-    iter = store->get_iterator();
+    iter = store->get_wholespace_iterator();
     iter->seek_to_first();
 
     // check for prefix2
@@ -373,7 +373,7 @@ public:
     tx->rmkeys_by_prefix(prefix3);
     store->submit_transaction_sync(tx);
 
-    iter = store->get_iterator();
+    iter = store->get_wholespace_iterator();
     iter->seek_to_first();
 
     // check for prefix1
@@ -444,7 +444,7 @@ public:
     ASSERT_FALSE(iter->valid());
 
     // make sure those keys were removed from the store
-    KeyValueDB::WholeSpaceIterator tmp_it = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator tmp_it = store->get_wholespace_iterator();
     tmp_it->seek_to_first();
     ASSERT_TRUE(tmp_it->valid());
 
@@ -513,7 +513,7 @@ TEST_F(RmKeysTest, RmKeysByPrefixMockDB)
 TEST_F(RmKeysTest, RmKeysWhileIteratingLevelDB)
 {
   SCOPED_TRACE("LevelDB -- WholeSpaceIterator");
-  RmKeysWhileIteratingSnapshot(db.get(), db->get_iterator());
+  RmKeysWhileIteratingSnapshot(db.get(), db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
@@ -721,7 +721,7 @@ public:
                                  "zzz", _gen_val_str("zzz")));
 
     // check those values were really changed in the store
-    KeyValueDB::WholeSpaceIterator tmp_iter = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator tmp_iter = store->get_wholespace_iterator();
     tmp_iter->seek_to_first();
     ASSERT_TRUE(tmp_iter->valid());
     ASSERT_TRUE(validate_iterator(tmp_iter, prefix1,
@@ -738,28 +738,28 @@ public:
 TEST_F(SetKeysTest, DISABLED_SetKeysWhileIteratingLevelDB)
 {
   SCOPED_TRACE("LevelDB: SetKeysWhileIteratingLevelDB");
-  SetKeysWhileIterating(db.get(), db->get_iterator());
+  SetKeysWhileIterating(db.get(), db->get_wholespace_iterator());
   ASSERT_TRUE(HasFatalFailure());
 }
 
 TEST_F(SetKeysTest, SetKeysWhileIteratingMockDB)
 {
   SCOPED_TRACE("Mock DB: SetKeysWhileIteratingMockDB");
-  SetKeysWhileIterating(mock.get(), mock->get_iterator());
+  SetKeysWhileIterating(mock.get(), mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SetKeysTest, DISABLED_UpdateValuesWhileIteratingLevelDB)
 {
   SCOPED_TRACE("LevelDB: UpdateValuesWhileIteratingLevelDB");
-  UpdateValuesWhileIterating(db.get(), db->get_iterator());
+  UpdateValuesWhileIterating(db.get(), db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SetKeysTest, UpdateValuesWhileIteratingMockDB)
 {
   SCOPED_TRACE("MockDB: UpdateValuesWhileIteratingMockDB");
-  UpdateValuesWhileIterating(mock.get(), mock->get_iterator());
+  UpdateValuesWhileIterating(mock.get(), mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
@@ -1149,84 +1149,84 @@ public:
 TEST_F(BoundsTest, LowerBoundWithEmptyKeyOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Lower Bound, Empty Key, Whole-Space Iterator");
-  LowerBoundWithEmptyKeyOnWholeSpaceIterator(db->get_iterator());
+  LowerBoundWithEmptyKeyOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, LowerBoundWithEmptyKeyOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Lower Bound, Empty Key, Whole-Space Iterator");
-  LowerBoundWithEmptyKeyOnWholeSpaceIterator(mock->get_iterator());
+  LowerBoundWithEmptyKeyOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, LowerBoundWithEmptyPrefixOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Lower Bound, Empty Prefix, Whole-Space Iterator");
-  LowerBoundWithEmptyPrefixOnWholeSpaceIterator(db->get_iterator());
+  LowerBoundWithEmptyPrefixOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, LowerBoundWithEmptyPrefixOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Lower Bound, Empty Prefix, Whole-Space Iterator");
-  LowerBoundWithEmptyPrefixOnWholeSpaceIterator(mock->get_iterator());
+  LowerBoundWithEmptyPrefixOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, LowerBoundOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Lower Bound, Whole-Space Iterator");
-  LowerBoundOnWholeSpaceIterator(db->get_iterator());
+  LowerBoundOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, LowerBoundOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Lower Bound, Whole-Space Iterator");
-  LowerBoundOnWholeSpaceIterator(mock->get_iterator());
+  LowerBoundOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundWithEmptyKeyOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Upper Bound, Empty Key, Whole-Space Iterator");
-  UpperBoundWithEmptyKeyOnWholeSpaceIterator(db->get_iterator());
+  UpperBoundWithEmptyKeyOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundWithEmptyKeyOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Upper Bound, Empty Key, Whole-Space Iterator");
-  UpperBoundWithEmptyKeyOnWholeSpaceIterator(mock->get_iterator());
+  UpperBoundWithEmptyKeyOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundWithEmptyPrefixOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Upper Bound, Empty Prefix, Whole-Space Iterator");
-  UpperBoundWithEmptyPrefixOnWholeSpaceIterator(db->get_iterator());
+  UpperBoundWithEmptyPrefixOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundWithEmptyPrefixOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Upper Bound, Empty Prefix, Whole-Space Iterator");
-  UpperBoundWithEmptyPrefixOnWholeSpaceIterator(mock->get_iterator());
+  UpperBoundWithEmptyPrefixOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundOnWholeSpaceIteratorLevelDB)
 {
   SCOPED_TRACE("LevelDB: Upper Bound, Whole-Space Iterator");
-  UpperBoundOnWholeSpaceIterator(db->get_iterator());
+  UpperBoundOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(BoundsTest, UpperBoundOnWholeSpaceIteratorMockDB)
 {
   SCOPED_TRACE("MockDB: Upper Bound, Whole-Space Iterator");
-  UpperBoundOnWholeSpaceIterator(mock->get_iterator());
+  UpperBoundOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
@@ -1458,49 +1458,49 @@ public:
 
 TEST_F(SeeksTest, SeekToFirstOnWholeSpaceIteratorLevelDB) {
   SCOPED_TRACE("LevelDB: Seek To First, Whole Space Iterator");
-  SeekToFirstOnWholeSpaceIterator(db->get_iterator());
+  SeekToFirstOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToFirstOnWholeSpaceIteratorMockDB) {
   SCOPED_TRACE("MockDB: Seek To First, Whole Space Iterator");
-  SeekToFirstOnWholeSpaceIterator(mock->get_iterator());
+  SeekToFirstOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToFirstWithPrefixOnWholeSpaceIteratorLevelDB) {
   SCOPED_TRACE("LevelDB: Seek To First, With Prefix, Whole Space Iterator");
-  SeekToFirstWithPrefixOnWholeSpaceIterator(db->get_iterator());
+  SeekToFirstWithPrefixOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToFirstWithPrefixOnWholeSpaceIteratorMockDB) {
   SCOPED_TRACE("MockDB: Seek To First, With Prefix, Whole Space Iterator");
-  SeekToFirstWithPrefixOnWholeSpaceIterator(mock->get_iterator());
+  SeekToFirstWithPrefixOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToLastOnWholeSpaceIteratorLevelDB) {
   SCOPED_TRACE("LevelDB: Seek To Last, Whole Space Iterator");
-  SeekToLastOnWholeSpaceIterator(db->get_iterator());
+  SeekToLastOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToLastOnWholeSpaceIteratorMockDB) {
   SCOPED_TRACE("MockDB: Seek To Last, Whole Space Iterator");
-  SeekToLastOnWholeSpaceIterator(mock->get_iterator());
+  SeekToLastOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToLastWithPrefixOnWholeSpaceIteratorLevelDB) {
   SCOPED_TRACE("LevelDB: Seek To Last, With Prefix, Whole Space Iterator");
-  SeekToLastWithPrefixOnWholeSpaceIterator(db->get_iterator());
+  SeekToLastWithPrefixOnWholeSpaceIterator(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(SeeksTest, SeekToLastWithPrefixOnWholeSpaceIteratorMockDB) {
   SCOPED_TRACE("MockDB: Seek To Last, With Prefix, Whole Space Iterator");
-  SeekToLastWithPrefixOnWholeSpaceIterator(mock->get_iterator());
+  SeekToLastWithPrefixOnWholeSpaceIterator(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
@@ -1565,26 +1565,26 @@ public:
 TEST_F(KeySpaceIteration, ForwardIterationLevelDB)
 {
   SCOPED_TRACE("LevelDB: Forward Iteration, Whole Space Iterator");
-  ForwardIteration(db->get_iterator());
+  ForwardIteration(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(KeySpaceIteration, ForwardIterationMockDB) {
   SCOPED_TRACE("MockDB: Forward Iteration, Whole Space Iterator");
-  ForwardIteration(mock->get_iterator());
+  ForwardIteration(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(KeySpaceIteration, BackwardIterationLevelDB)
 {
   SCOPED_TRACE("LevelDB: Backward Iteration, Whole Space Iterator");
-  BackwardIteration(db->get_iterator());
+  BackwardIteration(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(KeySpaceIteration, BackwardIterationMockDB) {
   SCOPED_TRACE("MockDB: Backward Iteration, Whole Space Iterator");
-  BackwardIteration(mock->get_iterator());
+  BackwardIteration(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
@@ -1656,84 +1656,84 @@ public:
 TEST_F(EmptyStore, SeekToFirstLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Seek To First");
-  SeekToFirst(db->get_iterator());
+  SeekToFirst(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToFirstMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Seek To First");
-  SeekToFirst(mock->get_iterator());
+  SeekToFirst(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToFirstWithPrefixLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Seek To First With Prefix");
-  SeekToFirstWithPrefix(db->get_iterator());
+  SeekToFirstWithPrefix(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToFirstWithPrefixMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Seek To First With Prefix");
-  SeekToFirstWithPrefix(mock->get_iterator());
+  SeekToFirstWithPrefix(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToLastLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Seek To Last");
-  SeekToLast(db->get_iterator());
+  SeekToLast(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToLastMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Seek To Last");
-  SeekToLast(mock->get_iterator());
+  SeekToLast(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToLastWithPrefixLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Seek To Last With Prefix");
-  SeekToLastWithPrefix(db->get_iterator());
+  SeekToLastWithPrefix(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, SeekToLastWithPrefixMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Seek To Last With Prefix");
-  SeekToLastWithPrefix(mock->get_iterator());
+  SeekToLastWithPrefix(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, LowerBoundLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Lower Bound");
-  LowerBound(db->get_iterator());
+  LowerBound(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, LowerBoundMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Lower Bound");
-  LowerBound(mock->get_iterator());
+  LowerBound(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, UpperBoundLevelDB)
 {
   SCOPED_TRACE("LevelDB: Empty Store, Upper Bound");
-  UpperBound(db->get_iterator());
+  UpperBound(db->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 
 TEST_F(EmptyStore, UpperBoundMockDB)
 {
   SCOPED_TRACE("MockDB: Empty Store, Upper Bound");
-  UpperBound(mock->get_iterator());
+  UpperBound(mock->get_wholespace_iterator());
   ASSERT_FALSE(HasFatalFailure());
 }
 

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
index bc888d7c051f383964dd7cf35d794b3404874def..210827a0895df706d44abbbfec6218a2a1429579 100644 (file)
--- a/src/tools/ceph_kvstore_tool.cc
+++ b/src/tools/ceph_kvstore_tool.cc
@@ -70,7 +70,7 @@ class StoreTool
   uint32_t traverse(const string &prefix,
                     const bool do_crc,
                     ostream *out) {
-    KeyValueDB::WholeSpaceIterator iter = db->get_iterator();
+    KeyValueDB::WholeSpaceIterator iter = db->get_wholespace_iterator();
 
     if (prefix.empty())
       iter->seek_to_first();
@@ -111,7 +111,7 @@ class StoreTool
 
   bool exists(const string &prefix) {
     assert(!prefix.empty());
-    KeyValueDB::WholeSpaceIterator iter = db->get_iterator();
+    KeyValueDB::WholeSpaceIterator iter = db->get_wholespace_iterator();
     iter->seek_to_first(prefix);
     return (iter->valid() && (iter->raw_key().first == prefix));
   }
@@ -204,7 +204,7 @@ class StoreTool
       return err;
     other.reset(other_ptr);
 
-    KeyValueDB::WholeSpaceIterator it = db->get_iterator();
+    KeyValueDB::WholeSpaceIterator it = db->get_wholespace_iterator();
     it->seek_to_first();
     uint64_t total_keys = 0;
     uint64_t total_size = 0;

diff --git a/src/tools/ceph_osdomap_tool.cc b/src/tools/ceph_osdomap_tool.cc
index 52fa7ae710c64159e52b77242b8c73c53820615d..4232ab40b41081e908e6e8244ef5a0130d072fae 100644 (file)
--- a/src/tools/ceph_osdomap_tool.cc
+++ b/src/tools/ceph_osdomap_tool.cc
@@ -129,13 +129,13 @@ int main(int argc, char **argv) {
   std::cout << "legacy: " << (omap.state.legacy ? "true" : "false") << std::endl;
 
   if (cmd == "dump-raw-keys") {
-    KeyValueDB::WholeSpaceIterator i = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator i = store->get_wholespace_iterator();
     for (i->seek_to_first(); i->valid(); i->next()) {
       std::cout << i->raw_key() << std::endl;
     }
     return 0;
   } else if (cmd == "dump-raw-key-vals") {
-    KeyValueDB::WholeSpaceIterator i = store->get_iterator();
+    KeyValueDB::WholeSpaceIterator i = store->get_wholespace_iterator();
     for (i->seek_to_first(); i->valid(); i->next()) {
       std::cout << i->raw_key() << std::endl;
       i->value().hexdump(std::cout);