Zipper - Rename get_bi() to get_key()

Provides consistency, and get_bi() wasn't a useful name.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 72d88d64a43603774c4173dd523983c5ae76cc74..4b8b3e0282a71990f2f6373b9a9f4ab9e277293e 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -1257,7 +1257,7 @@ bool verify_bucket_permission(const DoutPrefixProvider* dpp, struct req_state *
 
   return verify_bucket_permission(dpp, 
                                   &ps,
-                                  s->bucket->get_bi(),
+                                  s->bucket->get_key(),
                                   s->user_acl.get(),
                                   s->bucket_acl.get(),
                                   s->iam_policy,
@@ -1271,14 +1271,14 @@ bool verify_bucket_permission(const DoutPrefixProvider* dpp, struct req_state *
 int verify_bucket_owner_or_policy(struct req_state* const s,
                                  const uint64_t op)
 {
-  auto usr_policy_res = eval_user_policies(s->iam_user_policies, s->env, boost::none, op, ARN(s->bucket->get_bi()));
+  auto usr_policy_res = eval_user_policies(s->iam_user_policies, s->env, boost::none, op, ARN(s->bucket->get_key()));
   if (usr_policy_res == Effect::Deny) {
     return -EACCES;
   }
 
   auto e = eval_or_pass(s->iam_policy,
                        s->env, *s->auth.identity,
-                       op, ARN(s->bucket->get_bi()));
+                       op, ARN(s->bucket->get_key()));
   if (e == Effect::Deny) {
     return -EACCES;
   }
@@ -1482,7 +1482,7 @@ bool verify_object_permission(const DoutPrefixProvider* dpp, struct req_state *s
 
   return verify_object_permission(dpp,
                                   &ps,
-                                  rgw_obj(s->bucket->get_bi(), s->object->get_key()),
+                                  rgw_obj(s->bucket->get_key(), s->object->get_key()),
                                   s->user_acl.get(),
                                   s->bucket_acl.get(),
                                   s->object_acl.get(),

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 2213fb8ac69c8231d7a42d5a279cb8b1e20f6d19..42d35f746e3fb36b1da4ce855836830bd2702795 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -4936,7 +4936,7 @@ string RGWBucketPipeSyncStatusManager::obj_status_oid(const rgw_bucket_sync_pipe
                                                       const rgw_zone_id& source_zone,
                                                       const rgw::sal::RGWObject* obj)
 {
-  string prefix = object_status_oid_prefix + "." + source_zone.id + ":" + obj->get_bucket()->get_key();
+  string prefix = object_status_oid_prefix + "." + source_zone.id + ":" + obj->get_bucket()->get_key().get_key();
   if (sync_pipe.source_bucket_info.bucket !=
       sync_pipe.dest_bucket_info.bucket) {
     prefix += string("/") + sync_pipe.dest_bucket_info.bucket.get_key();

diff --git a/src/rgw/rgw_notify.cc b/src/rgw/rgw_notify.cc
index 0df44ef547d3ba9c1d31981ed37c19c3c77959df..1901bb3b7256081e80f243239bad8a29b85af0ca 100644 (file)
--- a/src/rgw/rgw_notify.cc
+++ b/src/rgw/rgw_notify.cc
@@ -28,7 +28,7 @@ void populate_record_from_request(const req_state *s,
   // configurationId is filled from notification configuration
   record.bucket_name = s->bucket_name;
   record.bucket_ownerIdentity = s->bucket_owner.get_id().id;
-  record.bucket_arn = to_string(rgw::ARN(s->bucket->get_bi()));
+  record.bucket_arn = to_string(rgw::ARN(s->bucket->get_key()));
   record.object_key = obj->get_name();
   record.object_size = obj->get_obj_size();
   record.object_etag = etag;
@@ -69,7 +69,7 @@ int publish(const req_state* s,
         EventType event_type,
         rgw::sal::RGWRadosStore* store) {
     RGWUserPubSub ps_user(store, s->user->get_id());
-    RGWUserPubSub::Bucket ps_bucket(&ps_user, s->bucket->get_bi());
+    RGWUserPubSub::Bucket ps_bucket(&ps_user, s->bucket->get_key());
     rgw_pubsub_bucket_topics bucket_topics;
     auto rc = ps_bucket.get_topics(&bucket_topics);
     if (rc < 0) {

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ef5b292a2432115b8829c756ea89515ce2830d43..e1119c113a084236a9dc9ed8a12893d468295c32 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -440,7 +440,7 @@ static int get_multipart_info(rgw::sal::RGWRadosStore *store, struct req_state *
   bufferlist header;
 
   rgw_obj meta_obj;
-  meta_obj.init_ns(s->bucket->get_bi(), meta_oid, mp_ns);
+  meta_obj.init_ns(s->bucket->get_key(), meta_oid, mp_ns);
   meta_obj.set_in_extra_data(true);
 
   return get_multipart_info(store, s, meta_obj, policy, attrs, upload_info);
@@ -612,7 +612,7 @@ int rgw_build_bucket_policies(rgw::sal::RGWRadosStore* store, struct req_state*
     s->bucket_attrs = s->bucket->get_attrs().attrs;
     ret = read_bucket_policy(store, s, s->bucket->get_info(),
                             s->bucket->get_attrs().attrs,
-                            s->bucket_acl.get(), s->bucket->get_bi());
+                            s->bucket_acl.get(), s->bucket->get_key());
     acct_acl_user = {
       s->bucket->get_info().owner,
       s->bucket_acl->get_owner().get_display_name(),
@@ -756,7 +756,7 @@ int rgw_build_object_policies(rgw::sal::RGWRadosStore *store, struct req_state *
       s->object->set_prefetch_data(s->obj_ctx);
     }
     ret = read_obj_policy(store, s, s->bucket->get_info(), s->bucket_attrs,
-                         s->object_acl.get(), nullptr, s->iam_policy, s->bucket->get_bi(),
+                         s->object_acl.get(), nullptr, s->iam_policy, s->bucket->get_key(),
                           s->object->get_key());
   }
 
@@ -1298,7 +1298,7 @@ void RGWDeleteBucketReplication::execute()
     int ret = store->getRados()->put_bucket_instance_info(s->bucket->get_info(), false, real_time(),
                                                           &s->bucket_attrs);
     if (ret < 0) {
-      ldpp_dout(this, 0) << "ERROR: put_bucket_instance_info (bucket=" << s->bucket->get_key() << ") returned ret=" << ret << dendl;
+      ldpp_dout(this, 0) << "ERROR: put_bucket_instance_info (bucket=" << s->bucket << ") returned ret=" << ret << dendl;
       return ret;
     }
 
@@ -1696,7 +1696,7 @@ static int iterate_user_manifest_parts(CephContext * const cct,
         len_count += end_ofs - start_ofs;
 
         if (cb) {
-          r = cb(bucket->get_bi(), ent, bucket_acl, bucket_policy, start_ofs, end_ofs,
+          r = cb(bucket->get_key(), ent, bucket_acl, bucket_policy, start_ofs, end_ofs,
                 cb_param, false /* swift_slo */);
           if (r < 0) {
             return r;
@@ -1857,7 +1857,7 @@ int RGWGetObj::handle_user_manifest(const char *prefix)
       return r;
     }
     bucket_acl = &_bucket_acl;
-    r = read_bucket_policy(store, s, ubucket->get_info(), bucket_attrs, bucket_acl, ubucket->get_bi());
+    r = read_bucket_policy(store, s, ubucket->get_info(), bucket_attrs, bucket_acl, ubucket->get_key());
     if (r < 0) {
       ldpp_dout(this, 0) << "failed to read bucket policy" << dendl;
       return r;
@@ -2005,7 +2005,7 @@ int RGWGetObj::handle_slo_manifest(bufferlist& bl)
         policies[bucket_name] = make_pair(bucket_acl, _bucket_policy);
       }
     } else {
-      bucket = s->bucket->get_bi();
+      bucket = s->bucket->get_key();
       bucket_acl = s->bucket_acl.get();
       bucket_policy = s->iam_policy.get_ptr();
     }
@@ -2780,7 +2780,7 @@ void RGWStatBucket::execute()
     return;
   }
 
-  op_ret = store->get_bucket(s->user, s->bucket->get_bi(), &bucket);
+  op_ret = store->get_bucket(s->user, s->bucket->get_key(), &bucket);
   if (op_ret) {
     return;
   }
@@ -3238,11 +3238,11 @@ void RGWCreateBucket::execute()
     }
   }
 
-  op_ret = store->ctl()->bucket->link_bucket(s->user->get_id(), s->bucket->get_bi(),
+  op_ret = store->ctl()->bucket->link_bucket(s->user->get_id(), s->bucket->get_key(),
                                           s->bucket->get_creation_time(), s->yield, false);
   if (op_ret && !existed && op_ret != -EEXIST) {
     /* if it exists (or previously existed), don't remove it! */
-    op_ret = store->ctl()->bucket->unlink_bucket(s->user->get_id(), s->bucket->get_bi(), s->yield);
+    op_ret = store->ctl()->bucket->unlink_bucket(s->user->get_id(), s->bucket->get_key(), s->yield);
     if (op_ret < 0) {
       ldpp_dout(this, 0) << "WARNING: failed to unlink bucket: ret=" << op_ret
                       << dendl;
@@ -4594,12 +4594,12 @@ int RGWDeleteObj::verify_permission()
   if (s->iam_policy || ! s->iam_user_policies.empty()) {
     if (s->bucket->get_info().obj_lock_enabled() && bypass_governance_mode) {
       auto r = eval_user_policies(s->iam_user_policies, s->env, boost::none,
-                                               rgw::IAM::s3BypassGovernanceRetention, ARN(s->bucket->get_bi(), s->object->get_name()));
+                                               rgw::IAM::s3BypassGovernanceRetention, ARN(s->bucket->get_key(), s->object->get_name()));
       if (r == Effect::Deny) {
         bypass_perm = false;
       } else if (r == Effect::Pass && s->iam_policy) {
         r = s->iam_policy->eval(s->env, *s->auth.identity, rgw::IAM::s3BypassGovernanceRetention,
-                                     ARN(s->bucket->get_bi(), s->object->get_name()));
+                                     ARN(s->bucket->get_key(), s->object->get_name()));
         if (r == Effect::Deny) {
           bypass_perm = false;
         }
@@ -4610,7 +4610,7 @@ int RGWDeleteObj::verify_permission()
                                               s->object->get_instance().empty() ?
                                               rgw::IAM::s3DeleteObject :
                                               rgw::IAM::s3DeleteObjectVersion,
-                                              ARN(s->bucket->get_bi(), s->object->get_name()));
+                                              ARN(s->bucket->get_key(), s->object->get_name()));
     if (usr_policy_res == Effect::Deny) {
       return -EACCES;
     }
@@ -4621,7 +4621,7 @@ int RGWDeleteObj::verify_permission()
                                 s->object->get_instance().empty() ?
                                 rgw::IAM::s3DeleteObject :
                                 rgw::IAM::s3DeleteObjectVersion,
-                                ARN(s->bucket->get_bi(), s->object->get_name()));
+                                ARN(s->bucket->get_key(), s->object->get_name()));
     }
     if (r == Effect::Allow)
       return 0;
@@ -4886,7 +4886,7 @@ int RGWCopyObj::verify_permission()
 
     /* check source object permissions */
     op_ret = read_obj_policy(store, s, src_bucket->get_info(), src_bucket->get_attrs().attrs, &src_acl, &src_placement.storage_class,
-                            src_policy, src_bucket->get_bi(), src_object->get_key());
+                            src_policy, src_bucket->get_key(), src_object->get_key());
     if (op_ret < 0) {
       return op_ret;
     }
@@ -4954,7 +4954,7 @@ int RGWCopyObj::verify_permission()
   /* check dest bucket permissions */
   op_ret = read_bucket_policy(store, s, dest_bucket->get_info(),
                              dest_bucket->get_attrs().attrs,
-                              &dest_bucket_policy, dest_bucket->get_bi());
+                              &dest_bucket_policy, dest_bucket->get_key());
   if (op_ret < 0) {
     return op_ret;
   }
@@ -5760,7 +5760,7 @@ void RGWInitMultipart::execute()
     RGWMPObj mp(s->object->get_name(), upload_id);
     tmp_obj_name = mp.get_meta();
 
-    obj.init_ns(s->bucket->get_bi(), tmp_obj_name, mp_ns);
+    obj.init_ns(s->bucket->get_key(), tmp_obj_name, mp_ns);
     // the meta object will be indexed with 0 size, we c
     obj.set_in_extra_data(true);
     obj.index_hash_source = s->object->get_name();
@@ -5907,7 +5907,7 @@ void RGWCompleteMultipart::execute()
 
   iter = parts->parts.begin();
 
-  meta_obj.init_ns(s->bucket->get_bi(), meta_oid, mp_ns);
+  meta_obj.init_ns(s->bucket->get_key(), meta_oid, mp_ns);
   meta_obj.set_in_extra_data(true);
   meta_obj.index_hash_source = s->object->get_name();
 
@@ -5991,7 +5991,7 @@ void RGWCompleteMultipart::execute()
       /* update manifest for part */
       string oid = mp.get_part(obj_iter->second.num);
       rgw_obj src_obj;
-      src_obj.init_ns(s->bucket->get_bi(), oid, mp_ns);
+      src_obj.init_ns(s->bucket->get_key(), oid, mp_ns);
 
       if (obj_part.manifest.empty()) {
         ldpp_dout(this, 0) << "ERROR: empty manifest for object part: obj="
@@ -6060,7 +6060,7 @@ void RGWCompleteMultipart::execute()
     attrs[RGW_ATTR_COMPRESSION] = tmp;
   }
 
-  target_obj.init(s->bucket->get_bi(), s->object->get_name());
+  target_obj.init(s->bucket->get_key(), s->object->get_name());
   if (versioned_object) {
     if (!version_id.empty()) {
       target_obj.key.set_instance(version_id);
@@ -6307,7 +6307,7 @@ int RGWDeleteMultiObj::verify_permission()
                                               s->object->get_instance().empty() ?
                                               rgw::IAM::s3DeleteObject :
                                               rgw::IAM::s3DeleteObjectVersion,
-                                              ARN(s->bucket->get_bi()));
+                                              ARN(s->bucket->get_key()));
     if (usr_policy_res == Effect::Deny) {
       return -EACCES;
     }
@@ -6318,7 +6318,7 @@ int RGWDeleteMultiObj::verify_permission()
                                 s->object->get_instance().empty() ?
                                 rgw::IAM::s3DeleteObject :
                                 rgw::IAM::s3DeleteObjectVersion,
-                                ARN(s->bucket->get_bi()));
+                                ARN(s->bucket->get_key()));
     }
     if (r == Effect::Allow)
       return 0;

diff --git a/src/rgw/rgw_putobj_processor.cc b/src/rgw/rgw_putobj_processor.cc
index e3bc25ef09d3cad5cf1534752fa8fba2b7ee6cd0..498581298edcf11503cfd6f5c421574d73a5056f 100644 (file)
--- a/src/rgw/rgw_putobj_processor.cc
+++ b/src/rgw/rgw_putobj_processor.cc
@@ -473,7 +473,7 @@ int MultipartObjectProcessor::complete(size_t accounted_size,
   encode(info, bl);
 
   rgw_obj meta_obj;
-  meta_obj.init_ns(bucket->get_bi(), mp.get_meta(), RGW_OBJ_NS_MULTIPART);
+  meta_obj.init_ns(bucket->get_key(), mp.get_meta(), RGW_OBJ_NS_MULTIPART);
   meta_obj.set_in_extra_data(true);
 
   rgw_raw_obj raw_meta_obj;

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 07bc831fccd8ca2c5bff140b9287748eb12ea5ad..32966c57737eed45afc1715f6f8b2403938d3edf 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4154,7 +4154,7 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx,
   bool remote_dest;
 
   append_rand_alpha(cct, dest_obj->get_oid(), shadow_oid, 32);
-  shadow_obj.init_ns(dest_obj->get_bucket()->get_bi(), shadow_oid, shadow_ns);
+  shadow_obj.init_ns(dest_obj->get_bucket()->get_key(), shadow_oid, shadow_ns);
 
   auto& zonegroup = svc.zone->get_zonegroup();
 
@@ -4335,7 +4335,7 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx,
     manifest = *astate->manifest;
     const rgw_bucket_placement& tail_placement = manifest.get_tail_placement();
     if (tail_placement.bucket.name.empty()) {
-      manifest.set_tail_placement(tail_placement.placement_rule, src_obj->get_bucket()->get_bi());
+      manifest.set_tail_placement(tail_placement.placement_rule, src_obj->get_bucket()->get_key());
     }
     string ref_tag;
     for (; miter != astate->manifest->obj_end(); ++miter) {

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 951b4000df95bc907b367d5bdf1d92617698ab46..adf6be66d0f0d8d351be4c34b7b73097373dfa6b 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2663,7 +2663,7 @@ int RGWPutObj_ObjStore_S3::get_encrypt_filter(
   if (!multipart_upload_id.empty()) {
     RGWMPObj mp(s->object->get_name(), multipart_upload_id);
     rgw_obj obj;
-    obj.init_ns(s->bucket->get_bi(), mp.get_meta(), RGW_OBJ_NS_MULTIPART);
+    obj.init_ns(s->bucket->get_key(), mp.get_meta(), RGW_OBJ_NS_MULTIPART);
     obj.set_in_extra_data(true);
     map<string, bufferlist> xattrs;
     res = get_obj_attrs(store, s, obj, xattrs);
@@ -4949,7 +4949,7 @@ bool RGWHandler_REST_S3Website::web_dir() const {
     subdir_name.pop_back();
   }
 
-  rgw_obj obj(s->bucket->get_bi(), subdir_name);
+  rgw_obj obj(s->bucket->get_key(), subdir_name);
 
   RGWObjectCtx& obj_ctx = *static_cast<RGWObjectCtx *>(s->obj_ctx);
   obj_ctx.set_atomic(obj);

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index e74ccd5bf4dfd875486c60ab976b6a44cb65bee1..f6471f710790e64acef6f282b36f6df9cc9b2207 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -858,7 +858,7 @@ int RGWPutObj_ObjStore_SWIFT::update_slo_segment_size(rgw_slo_entry& entry) {
     }
     bucket = bucket_info.bucket;
   } else {
-    bucket = s->bucket->get_bi();
+    bucket = s->bucket->get_key();
   }
 
   /* fetch the stored size of the seg (or error if not valid) */

diff --git a/src/rgw/rgw_sal.cc b/src/rgw/rgw_sal.cc
index a47037b8b0c0268d13ed83369e53a5481688855b..a7f865bceaea60388c159e43b29e9efa4afadd0e 100644 (file)
--- a/src/rgw/rgw_sal.cc
+++ b/src/rgw/rgw_sal.cc
@@ -294,7 +294,7 @@ int RGWRadosBucket::check_empty(optional_yield y)
 
 int RGWRadosBucket::check_quota(RGWQuotaInfo& user_quota, RGWQuotaInfo& bucket_quota, uint64_t obj_size, bool check_size_only)
 {
-    return store->getRados()->check_quota(owner->get_user(), get_bi(),
+    return store->getRados()->check_quota(owner->get_user(), get_key(),
                                          user_quota, bucket_quota, obj_size, check_size_only);
 }
 
@@ -380,7 +380,7 @@ int RGWObject::range_to_ofs(uint64_t obj_size, int64_t &ofs, int64_t &end)
 
 int RGWRadosObject::get_obj_state(RGWObjectCtx *rctx, RGWBucket& bucket, RGWObjState **state, optional_yield y, bool follow_olh)
 {
-  rgw_obj obj(bucket.get_bi(), key.name);
+  rgw_obj obj(bucket.get_key(), key.name);
 
   return store->getRados()->get_obj_state(rctx, bucket.get_info(), obj, state, follow_olh, y);
 }
@@ -811,7 +811,7 @@ int RGWRadosStore::create_bucket(RGWUser& u, const rgw_bucket& b,
     }
   } else {
 
-    ret = getRados()->create_bucket(u.get_info(), bucket->get_bi(),
+    ret = getRados()->create_bucket(u.get_info(), bucket->get_key(),
                                    zid, placement_rule, swift_ver_location,
                                    pquota_info, attrs,
                                    info, pobjv, &ep_objv, creation_time,

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index 96a9d29fd070069735152316ca1bc2fe4ccb371e..a9df09a298e755101901921bb1af1b75cd57a98a 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -197,7 +197,6 @@ class RGWBucket {
     ceph::real_time& get_modification_time() { return mtime; }
     obj_version& get_version() { return bucket_version; }
     void set_version(obj_version &ver) { bucket_version = ver; }
-    std::string get_key() { return info.bucket.get_key(); }
     bool versioned() { return info.versioned(); }
     bool versioning_enabled() { return info.versioning_enabled(); }
 
@@ -209,7 +208,7 @@ class RGWBucket {
     virtual std::unique_ptr<RGWBucket> clone() = 0;
 
     /* dang - This is temporary, until the API is completed */
-    rgw_bucket& get_bi() { return info.bucket; }
+    rgw_bucket& get_key() { return info.bucket; }
     RGWBucketInfo& get_info() { return info; }
 
     friend inline ostream& operator<<(ostream& out, const RGWBucket& b) {
@@ -377,7 +376,7 @@ class RGWObject {
     void set_obj_size(uint64_t s) { obj_size = s; }
     virtual void set_name(const string& n) { key = n; }
     virtual void set_key(const rgw_obj_key& k) { key = k; }
-    virtual rgw_obj get_obj(void) const { return rgw_obj(bucket->get_bi(), key); }
+    virtual rgw_obj get_obj(void) const { return rgw_obj(bucket->get_key(), key); }
     virtual void gen_rand_obj_instance_name() = 0;
 
     /* dang - This is temporary, until the API is completed */

diff --git a/src/rgw/rgw_torrent.cc b/src/rgw/rgw_torrent.cc
index 6dc7ab8e04dbc658a0e57aca183acd82fc2298b7..939f37c54217ea16e152513d865d50199ecb08ed 100644 (file)
--- a/src/rgw/rgw_torrent.cc
+++ b/src/rgw/rgw_torrent.cc
@@ -248,7 +248,7 @@ int seed::save_torrent_file()
 {
   int op_ret = 0;
   string key = RGW_OBJ_TORRENT;
-  rgw_obj obj(s->bucket->get_bi(), s->object->get_name());
+  rgw_obj obj(s->bucket->get_key(), s->object->get_name());
 
   rgw_raw_obj raw_obj;
   store->getRados()->obj_to_raw(s->bucket->get_info().placement_rule, obj, &raw_obj);

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index bb665a27e36e58a249477f948d844285e8a2a0c8..edd030ec1732ddff5b8a9df755c442c7077b43a0 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -2041,7 +2041,7 @@ int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg)
       vector<rgw_bucket> bucket_names;
       for (auto iter = m.begin(); iter != m.end(); ++iter) {
        auto& bucket = iter->second;
-        bucket_names.push_back(bucket->get_bi());
+        bucket_names.push_back(bucket->get_key());
 
         marker = iter->first;
       }