Remove function getBucketName

The connection may call getBucket() and pick out the name
directly

Change-Id: I710fe06063eccc0a16dc72988be38e3a1585d732
Reviewed-on: http://review.couchbase.org/103570
Tested-by: Build Bot <[email protected]>
Reviewed-by: Ben Huddleston <[email protected]>

Author: trondn

daemon/buckets.h

@@ -184,18 +184,6 @@ class Bucket {
     DcpIface* bucketDcp{nullptr};
 };
 
-/**
- * Get the name of the associated bucket. Note that this function must
- * only be called while the current connection is being served (otherwise
- * a race may occur causing the data to be returned to be modified).
- *
- * The client should not try to modify (or release) the returned pointer
- * as it points into the static area of the bucket array. The entry
- * is valid as long as the current connection is being served (unless it
- * tries to switch bucket/delete bucket, then it is invalidated).
- */
-extern const char* getBucketName(const Connection* c);
-
 /**
  * All of the buckets are stored in the following array. Index 0 is reserved
  * for the "no bucket" where all connections start off (unless there is a

daemon/mcaudit.cc

@@ -178,7 +178,7 @@ void audit_dcp_open(const Connection* c) {
         LOG_INFO("Open DCP stream with admin credentials");
     } else {
         auto root = create_memcached_audit_object(c);
-        cJSON_AddStringToObject(root.get(), "bucket", getBucketName(c));
+        cJSON_AddStringToObject(root.get(), "bucket", c->getBucket().name);
 
         do_audit(c, MEMCACHED_AUDIT_OPENED_DCP_CONNECTION, root,
                  "Failed to send DCP open connection "

daemon/memcached.cc

@@ -108,10 +108,6 @@
 static std::mutex buckets_lock;
 std::array<Bucket, COUCHBASE_MAX_NUM_BUCKETS + 1> all_buckets;
 
-const char* getBucketName(const Connection* c) {
-    return all_buckets[c->getBucketIndex()].name;
-}
-
 void bucketsForEach(std::function<bool(Bucket&, void*)> fn, void *arg) {
     std::lock_guard<std::mutex> all_bucket_lock(buckets_lock);
     for (Bucket& bucket : all_buckets) {