use fmt as short name for google::protobuf for formatting functions

Author: marc

c-deps/libroach/ccl/key_manager.cc

@@ -9,8 +9,7 @@
 #include "key_manager.h"
 #include <cryptopp/modes.h>
 #include <google/protobuf/stubs/stringprintf.h>
-
-using google::protobuf::StringPrintf;
+#include "../fmt.h"
 
 static std::string kFilenamePlain = "plain";
 
@@ -34,7 +33,7 @@ static rocksdb::Status KeyFromFile(rocksdb::Env* env, const std::string& path, E
   // Check that the length is valid for AES.
   auto key_length = contents.size();
   if (key_length != 16 && key_length != 24 && key_length != 32) {
-    return rocksdb::Status::InvalidArgument(StringPrintf(
+    return rocksdb::Status::InvalidArgument(fmt::StringPrintf(
         "key in file %s is %llu bytes long, AES keys can be 16, 24, or 32 bytes", path.c_str(), key_length));
   }
 

c-deps/libroach/db.cc

@@ -31,6 +31,7 @@
 #include "encoding.h"
 #include "env_switching.h"
 #include "eventlistener.h"
+#include "fmt.h"
 #include "keys.h"
 #include "protos/roachpb/data.pb.h"
 #include "protos/roachpb/internal.pb.h"
@@ -372,11 +373,11 @@ DBStatus ToDBStatus(const rocksdb::Status& status) {
   return ToDBString(status.ToString());
 }
 
-DBStatus FmtStatus(const char* fmt, ...) {
+DBStatus FmtStatus(const char* fmt_str, ...) {
   va_list ap;
-  va_start(ap, fmt);
+  va_start(ap, fmt_str);
   std::string str;
-  google::protobuf::StringAppendV(&str, fmt, ap);
+  fmt::StringAppendV(&str, fmt_str, ap);
   va_end(ap);
   return ToDBString(str);
 }
@@ -1342,17 +1343,17 @@ DBString DBEngine::GetUserProperties() {
     auto ts_min = userprops.find("crdb.ts.min");
     if (ts_min != userprops.end() && !ts_min->second.empty()) {
       if (!DecodeHLCTimestamp(rocksdb::Slice(ts_min->second), sst->mutable_ts_min())) {
-        google::protobuf::SStringPrintf(all.mutable_error(), "unable to decode crdb.ts.min value '%s' in table %s",
-                                        rocksdb::Slice(ts_min->second).ToString(true).c_str(), sst->path().c_str());
+        fmt::SStringPrintf(all.mutable_error(), "unable to decode crdb.ts.min value '%s' in table %s",
+                           rocksdb::Slice(ts_min->second).ToString(true).c_str(), sst->path().c_str());
         break;
       }
     }
 
     auto ts_max = userprops.find("crdb.ts.max");
     if (ts_max != userprops.end() && !ts_max->second.empty()) {
       if (!DecodeHLCTimestamp(rocksdb::Slice(ts_max->second), sst->mutable_ts_max())) {
-        google::protobuf::SStringPrintf(all.mutable_error(), "unable to decode crdb.ts.max value '%s' in table %s",
-                                        rocksdb::Slice(ts_max->second).ToString(true).c_str(), sst->path().c_str());
+        fmt::SStringPrintf(all.mutable_error(), "unable to decode crdb.ts.max value '%s' in table %s",
+                           rocksdb::Slice(ts_max->second).ToString(true).c_str(), sst->path().c_str());
         break;
       }
     }
@@ -1744,7 +1745,7 @@ DBStatus DBCompact(DBEngine* db) {
   return ToDBStatus(db->rep->CompactRange(options, NULL, NULL));
 }
 
-DBStatus DBApproximateDiskBytes(DBEngine* db, DBKey start, DBKey end, uint64_t *size) {
+DBStatus DBApproximateDiskBytes(DBEngine* db, DBKey start, DBKey end, uint64_t* size) {
   const std::string start_key(EncodeKey(start));
   const std::string end_key(EncodeKey(end));
   const rocksdb::Range r(start_key, end_key);

c-deps/libroach/fmt.h

@@ -0,0 +1,19 @@
+// Copyright 2017 The Cockroach Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+// implied.  See the License for the specific language governing
+// permissions and limitations under the License.
+
+#pragma once
+
+#include <google/protobuf/stubs/stringprintf.h>
+
+namespace fmt = google::protobuf;

c-deps/libroach/testutils.cc

@@ -16,8 +16,7 @@
 #include <gtest/gtest.h>
 #include <rocksdb/status.h>
 #include <string>
-
-using google::protobuf::StringPrintf;
+#include "fmt.h"
 
 namespace testutils {
 
@@ -27,18 +26,18 @@ rocksdb::Status compareErrorMessage(rocksdb::Status status, const char* err_msg)
     if (status.ok()) {
       return rocksdb::Status::OK();
     }
-    return rocksdb::Status::InvalidArgument(StringPrintf("expected success, got error \"%s\"", status.getState()));
+    return rocksdb::Status::InvalidArgument(fmt::StringPrintf("expected success, got error \"%s\"", status.getState()));
   }
 
   // Expected failure.
   if (status.ok()) {
-    return rocksdb::Status::InvalidArgument(StringPrintf("expected error \"%s\", got success", err_msg));
+    return rocksdb::Status::InvalidArgument(fmt::StringPrintf("expected error \"%s\", got success", err_msg));
   }
   if (strcmp(err_msg, status.getState()) == 0) {
     return rocksdb::Status::OK();
   }
   return rocksdb::Status::InvalidArgument(
-      StringPrintf("expected error \"%s\", got \"%s\"", err_msg, status.getState()));
+      fmt::StringPrintf("expected error \"%s\", got \"%s\"", err_msg, status.getState()));
 }
 
 rocksdb::Status compareErrorMessage(rocksdb::Status status, std::string err_msg) {