os/CollectionIndex: use const ref for end

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

diff --git a/src/os/CollectionIndex.h b/src/os/CollectionIndex.h
index eeab2cb0a8e6ced902cd5b5bb82df7a25ecf25ca..2f832477b29f42a229feff0b2d2b27f188b0c653 100644 (file)
--- a/src/os/CollectionIndex.h
+++ b/src/os/CollectionIndex.h
@@ -166,7 +166,7 @@ protected:
   /// List contents of collection by hash
   virtual int collection_list_partial(
     const ghobject_t &start, ///< [in] object at which to start
-    const ghobject_t end,    ///< [in] list only objects < end
+    const ghobject_t &end,    ///< [in] list only objects < end
     int max_count,          ///< [in] return at most max_count objects
     snapid_t seq,           ///< [in] list only objects with snap >= seq
     vector<ghobject_t> *ls,  ///< [out] Listed objects

diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc
index 1e0e1e41fbdae890a764966c3e850c98d854dcfa..d5494a90df7b3159d9e8790fd53cdc1068aab969 100644 (file)
--- a/src/os/HashIndex.cc
+++ b/src/os/HashIndex.cc
@@ -326,7 +326,7 @@ int HashIndex::_collection_list(vector<ghobject_t> *ls) {
 }
 
 int HashIndex::_collection_list_partial(const ghobject_t &start,
-                                       const ghobject_t end,
+                                       const ghobject_t &end,
                                        int max_count,
                                        snapid_t seq,
                                        vector<ghobject_t> *ls,

diff --git a/src/os/HashIndex.h b/src/os/HashIndex.h
index afe2364748b188fb4e3346f07c739612a1f48450..b94cb50524808b08ab3076a78da4813685d32eb5 100644 (file)
--- a/src/os/HashIndex.h
+++ b/src/os/HashIndex.h
@@ -193,7 +193,7 @@ protected:
 
   int _collection_list_partial(
     const ghobject_t &start,
-    ghobject_t end,
+    const ghobject_t &end,
     int max_count,
     snapid_t seq,
     vector<ghobject_t> *ls,

diff --git a/src/os/LFNIndex.cc b/src/os/LFNIndex.cc
index 7687a66af3274c12f49423d9719d37f919a94051..f0f5affc02531bebd836fa8719a4b73fe16c18f8 100644 (file)
--- a/src/os/LFNIndex.cc
+++ b/src/os/LFNIndex.cc
@@ -155,7 +155,7 @@ int LFNIndex::pre_hash_collection(uint32_t pg_num, uint64_t expected_num_objs)
 
 
 int LFNIndex::collection_list_partial(const ghobject_t &start,
-                                     const ghobject_t end,
+                                     const ghobject_t &end,
                                      int max_count,
                                      snapid_t seq,
                                      vector<ghobject_t> *ls,

diff --git a/src/os/LFNIndex.h b/src/os/LFNIndex.h
index 000e0ae34234713949be0d897a73511c02bd7ea2..684d3ca08cc484527fe5b0b645e69128d613e085 100644 (file)
--- a/src/os/LFNIndex.h
+++ b/src/os/LFNIndex.h
@@ -192,7 +192,7 @@ public:
   /// @see CollectionIndex
   int collection_list_partial(
     const ghobject_t &start,
-    const ghobject_t end,
+    const ghobject_t &end,
     int max_count,
     snapid_t seq,
     vector<ghobject_t> *ls,
@@ -268,7 +268,7 @@ protected:
   /// @see CollectionIndex
   virtual int _collection_list_partial(
     const ghobject_t &start,
-    const ghobject_t end,
+    const ghobject_t &end,
     int max_count,
     snapid_t seq,
     vector<ghobject_t> *ls,

diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc
index 7ed0866ffcaa8a4f7755c4ac698e7f6eb66b9b52..49b592adb53ed5c1b45c8140859f1f272dc3fd76 100644 (file)
--- a/src/test/os/TestLFNIndex.cc
+++ b/src/test/os/TestLFNIndex.cc
@@ -75,15 +75,11 @@ protected:
                      int *exists                
                      ) { return 0; }
 
-  virtual int _collection_list(
-                              vector<ghobject_t> *ls
-                              ) { return 0; }
-
   virtual int _collection_list_partial(
                                       const ghobject_t &start,
+                                      const ghobject_t &end,
                                       int min_count,
                                       int max_count,
-                                      snapid_t seq,
                                       vector<ghobject_t> *ls,
                                       ghobject_t *next
                                       ) { return 0; }