From c4128f136c80c97a999bbeff14d2b6ed705fe46c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 13 Jul 2015 11:57:32 -0400 Subject: [PATCH] os/HashIndex: drop unused lower_bound arg Signed-off-by: Sage Weil --- src/os/HashIndex.cc | 6 ------ src/os/HashIndex.h | 1 - 2 files changed, 7 deletions(-) diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc index e18695ca42858..6c451eb224db1 100644 --- a/src/os/HashIndex.cc +++ b/src/os/HashIndex.cc @@ -761,7 +761,6 @@ uint32_t HashIndex::hash_prefix_to_hash(string prefix) { } int HashIndex::get_path_contents_by_hash(const vector &path, - const string *lower_bound, const ghobject_t *next_object, set *hash_prefixes, set > *objects) { @@ -781,8 +780,6 @@ int HashIndex::get_path_contents_by_hash(const vector &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 &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 &path, set hash_prefixes; set > objects; int r = get_path_contents_by_hash(path, - NULL, next, &hash_prefixes, &objects); diff --git a/src/os/HashIndex.h b/src/os/HashIndex.h index 7c52ca5f30cd5..ee3de278006c3 100644 --- a/src/os/HashIndex.h +++ b/src/os/HashIndex.h @@ -352,7 +352,6 @@ private: /// Get path contents by hash int get_path_contents_by_hash( const vector &path, /// [in] Path to list - const string *lower_bound, /// [in] list > *lower_bound const ghobject_t *next_object, /// [in] list > *next_object set *hash_prefixes, /// [out] prefixes in dir set > *objects /// [out] objects -- 2.39.5