]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/HashIndex: drop unused lower_bound arg
authorSage Weil <sage@redhat.com>
Mon, 13 Jul 2015 15:57:32 +0000 (11:57 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Aug 2015 14:15:59 +0000 (10:15 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/HashIndex.cc
src/os/HashIndex.h

index e18695ca428580f4e16596c773b71deef4a578e4..6c451eb224db19d6fce2e1be4a82efd2740e220f 100644 (file)
@@ -761,7 +761,6 @@ uint32_t HashIndex::hash_prefix_to_hash(string prefix) {
 }
 
 int HashIndex::get_path_contents_by_hash(const vector<string> &path,
-                                        const string *lower_bound,
                                         const ghobject_t *next_object,
                                         set<string> *hash_prefixes,
                                         set<pair<string, ghobject_t> > *objects) {
@@ -781,8 +780,6 @@ int HashIndex::get_path_contents_by_hash(const vector<string> &path,
        i != rev_objects.end();
        ++i) {
     string hash_prefix = get_path_str(i->second);
-    if (lower_bound && hash_prefix < *lower_bound)
-      continue;
     if (next_object && i->second < *next_object)
       continue;
     hash_prefixes->insert(hash_prefix);
@@ -795,8 +792,6 @@ int HashIndex::get_path_contents_by_hash(const vector<string> &path,
        i != subdirs.end();
        ++i) {
     string candidate = cur_prefix + *i;
-    if (lower_bound && candidate < lower_bound->substr(0, candidate.size()))
-      continue;
     if (next_object &&
         (next_object->is_max() ||
         candidate < get_path_str(*next_object).substr(0, candidate.size())))
@@ -817,7 +812,6 @@ int HashIndex::list_by_hash(const vector<string> &path,
   set<string> hash_prefixes;
   set<pair<string, ghobject_t> > objects;
   int r = get_path_contents_by_hash(path,
-                                   NULL,
                                    next,
                                    &hash_prefixes,
                                    &objects);
index 7c52ca5f30cd5294457292d7325a6d52fceea3b5..ee3de278006c327f24aac831cb394874ecbb4bb5 100644 (file)
@@ -352,7 +352,6 @@ private:
   /// Get path contents by hash
   int get_path_contents_by_hash(
     const vector<string> &path,            /// [in] Path to list
-    const string *lower_bound,             /// [in] list > *lower_bound
     const ghobject_t *next_object,          /// [in] list > *next_object
     set<string> *hash_prefixes,            /// [out] prefixes in dir
     set<pair<string, ghobject_t> > *objects /// [out] objects