All you need is make_string.

11 files changed, 18 insertions, 20 deletions

diff --git a/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp
index 677723f591e..fbc2b6d348f 100644
--- a/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp
+++ b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp
@@ -142,7 +142,7 @@ MapBucketDatabase::update(const Entry& newEntry)
     assert(newEntry.valid());
     LOG_BUCKET_OPERATION_NO_LOCK(
             newEntry.getBucketId(),
-            vespalib::make_vespa_string(
+            vespalib::make_string(
                     "bucketdb insert of %s", newEntry.toString().c_str()));
 
     Entry* found = find(0, 0, newEntry.getBucketId(), true);
diff --git a/storage/src/vespa/storage/common/bucketoperationlogger.cpp b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
index b80f6fb0562..d6df7f928e2 100644
--- a/storage/src/vespa/storage/common/bucketoperationlogger.cpp
+++ b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
@@ -201,7 +201,7 @@ void logBucketDbInsert(uint64_t key, const bucketdb::StorageBucketInfo& entry)
 {
     LOG_BUCKET_OPERATION_NO_LOCK(
             document::BucketId(document::BucketId::keyToBucketId(key)),
-            vespalib::make_vespa_string(
+            vespalib::make_string(
                     "bucketdb insert Bucket(crc=%x, docs=%u, size=%u, "
                     "metacount=%u, usedfilesize=%u, ready=%s, "
                     "active=%s, lastModified=%zu) disk=%u",
@@ -308,7 +308,7 @@ logBucketDbInsert(uint64_t key, const BucketInfo& entry)
 {
     document::BucketId bucket(document::BucketId::keyToBucketId(key));
     LOG_BUCKET_OPERATION_NO_LOCK(
-            bucket, vespalib::make_vespa_string(
+            bucket, vespalib::make_string(
                     "bucketdb insert of %s", entry.toString().c_str()));
     // Do some sanity checking of the inserted entry
     checkAllConsistentNodesImpliesTrusted(bucket, entry);
diff --git a/storage/src/vespa/storage/common/bucketoperationlogger.h b/storage/src/vespa/storage/common/bucketoperationlogger.h
index 5d0d09b5cb5..dce9334a9cf 100644
--- a/storage/src/vespa/storage/common/bucketoperationlogger.h
+++ b/storage/src/vespa/storage/common/bucketoperationlogger.h
@@ -1,13 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <string>
-#include <map>
-#include <list>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/document/bucket/bucketid.h>
-#include <vespa/vespalib/util/vstringfmt.h>
+#include <map>
+#include <list>
 
 /**
  * Enable this to log most slotfile operations (such as all mutations) as
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index 0335d679652..67942d3d447 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -693,7 +693,7 @@ BucketDBUpdater::NodeRemover::setCopiesInEntry(
     LOG(debug, "Changed %s", e->toString().c_str());
     LOG_BUCKET_OPERATION_NO_LOCK(
             e.getBucketId(),
-            vespalib::make_vespa_string("updated bucketdb entry to %s",
+            vespalib::make_string("updated bucketdb entry to %s",
                                         e->toString().c_str()));
 }
 
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
index 5c69c4576f0..a75a56b63c9 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
@@ -108,7 +108,7 @@ SplitOperation::onReceive(DistributorMessageSender&, const api::StorageReply::SP
                      | DatabaseUpdate::RESET_TRUSTED));
 
             LOG_BUCKET_OPERATION_NO_LOCK(
-                    sinfo.first, vespalib::make_vespa_string(
+                    sinfo.first, vespalib::make_string(
                         "Split from bucket %s: %s",
                         getBucketId().toString().c_str(),
                         copy.toString().c_str()));
@@ -140,13 +140,13 @@ SplitOperation::onReceive(DistributorMessageSender&, const api::StorageReply::SP
 #ifdef ENABLE_BUCKET_OPERATION_LOGGING
     if (_ok) {
         LOG_BUCKET_OPERATION_NO_LOCK(
-                getBucketId(), vespalib::make_vespa_string(
+                getBucketId(), vespalib::make_string(
                         "Split OK on node %d: %s. Finished: %s",
                         node, ost.str().c_str(),
                         _tracker.finished() ? "yes" : "no"));
     } else {
         LOG_BUCKET_OPERATION_NO_LOCK(
-                getBucketId(), vespalib::make_vespa_string(
+                getBucketId(), vespalib::make_string(
                         "Split FAILED on node %d: %s. Finished: %s",
                         node, rep.getResult().toString().c_str(),
                         _tracker.finished() ? "yes" : "no"));
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index 2039c1b5177..bd14ded3710 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -425,7 +425,7 @@ PendingClusterState::insertInfo(
 
     LOG_BUCKET_OPERATION_NO_LOCK(
             _entries[range.first].bucketId,
-            vespalib::make_vespa_string("insertInfo: %s",
+            vespalib::make_string("insertInfo: %s",
                                         info.toString().c_str()));
 }
 
diff --git a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
index 5002c203154..a35a19b4f71 100644
--- a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
+++ b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
@@ -297,7 +297,7 @@ PersistenceMessageTrackerImpl::handleCreateBucketReply(
         _manager.removeNodeFromDB(reply.getBucketId(), node);
         LOG_BUCKET_OPERATION_NO_LOCK(
                 reply.getBucketId(),
-                vespalib::make_vespa_string(
+                vespalib::make_string(
                     "Deleted bucket on node %u due to failing create bucket %s",
                     node, reply.getResult().toString().c_str()));
     }
diff --git a/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp b/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
index 1c79bd83286..c492dd4b55e 100644
--- a/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
+++ b/storage/src/vespa/storage/persistence/bucketownershipnotifier.cpp
@@ -89,7 +89,7 @@ BucketOwnershipNotifier::logNotification(const document::BucketId& bucket,
         newInfo.toString().c_str());
     LOG_BUCKET_OPERATION_NO_LOCK(
             bucket,
-            vespalib::make_vespa_string(
+            vespalib::make_string(
                     "Sending notify to distributor %u "
                     "(ownership changed away from %u)",
                     currentOwnerIndex, sourceIndex));
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index e5525e1fd17..e7fa4eadda0 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -781,7 +781,7 @@ FileStorHandlerImpl::remapMessage(
                     targetDisk = targets[idx]->diskIndex;
 #if defined(ENABLE_BUCKET_OPERATION_LOGGING)
                     {
-                        vespalib::string desc = vespalib::make_vespa_string(
+                        vespalib::string desc = vespalib::make_string(
                                 "Remapping %s from %s to %s, targetDisk = %u",
                                 cmd.toString().c_str(), source.toString().c_str(),
                                 targets[idx]->bid.toString().c_str(), targetDisk);
@@ -829,7 +829,7 @@ FileStorHandlerImpl::remapMessage(
                 targetDisk = targets[0]->diskIndex;
 #ifdef ENABLE_BUCKET_OPERATION_LOGGING
                 {
-                    vespalib::string desc = vespalib::make_vespa_string(
+                    vespalib::string desc = vespalib::make_string(
                             "Remapping %s from %s to %s, targetDisk = %u",
                             cmd.toString().c_str(), source.toString().c_str(),
                             targets[0]->bid.toString().c_str(), targetDisk);
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 47575229fb3..1e74c957b01 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -271,7 +271,7 @@ FileStorManager::handlePersistenceMessage(
 
         LOG_BUCKET_OPERATION_NO_LOCK(
                 getStorageMessageBucketId(*msg),
-                vespalib::make_vespa_string("Attempting to queue %s to disk %u",
+                vespalib::make_string("Attempting to queue %s to disk %u",
                                             msg->toString().c_str(), disk));
 
 
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index fa8231d5353..4755795526a 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -567,7 +567,7 @@ PersistenceThread::handleSplitBucket(api::SplitBucketCommand& cmd)
 #ifdef ENABLE_BUCKET_OPERATION_LOGGING
     {
         vespalib::string desc(
-                vespalib::make_vespa_string(
+                vespalib::make_string(
                         "split(%s -> %s, %s)",
                         cmd.getBucketId().toString().c_str(),
                         target1.toString().c_str(),
@@ -743,7 +743,7 @@ PersistenceThread::handleJoinBuckets(api::JoinBucketsCommand& cmd)
 #ifdef ENABLE_BUCKET_OPERATION_LOGGING
     {
         vespalib::string desc(
-                vespalib::make_vespa_string(
+                vespalib::make_string(
                         "join(%s, %s -> %s)",
                         firstBucket.toString().c_str(),
                         secondBucket.toString().c_str(),
@@ -1149,7 +1149,7 @@ PersistenceThread::flushAllReplies(
             }
             LOG_BUCKET_OPERATION(
                     bucketId,
-                    vespalib::make_vespa_string(
+                    vespalib::make_string(
                             "flushing %zu operations (%zu puts, %zu removes, "
                             "%zu other)",
                             replies.size(), nputs, nremoves, nother));