recover some unnecessary opperation

Signed-off-by: Lloyd-Pottiger <[email protected]>
pingcap · Mar 24, 2022 · b5578b6 · b5578b6
1 parent 2dd8d90
commit b5578b6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp b/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp
@@ -35,7 +35,7 @@ void RegionsHierarchy::reload()
     if (!data_source->isModified())
         return;
 
-    LOG_FMT_DEBUG(log, "Reloading regions hierarchy");
+    LOG_DEBUG(log, "Reloading regions hierarchy");
 
     const size_t initial_size = 10000;
     const size_t max_size = 15000000;

diff --git a/dbms/src/Dictionaries/Embedded/RegionsNames.cpp b/dbms/src/Dictionaries/Embedded/RegionsNames.cpp
@@ -48,7 +48,7 @@ std::string RegionsNames::dumpSupportedLanguagesNames()
 void RegionsNames::reload()
 {
     Poco::Logger * log = &Poco::Logger::get("RegionsNames");
-    LOG_FMT_DEBUG(log, "Reloading regions names");
+    LOG_DEBUG(log, "Reloading regions names");
 
     RegionID max_region_id = 0;
     for (size_t language_id = 0; language_id < SUPPORTED_LANGUAGES_COUNT; ++language_id)

diff --git a/dbms/src/Flash/DiagnosticsService.cpp b/dbms/src/Flash/DiagnosticsService.cpp
@@ -53,12 +53,12 @@ try
 }
 catch (const Exception & e)
 {
-    LOG_FMT_ERROR(log, "{}", e.displayText());
+    LOG_ERROR(log, e.displayText());
     return grpc::Status(grpc::StatusCode::INTERNAL, "internal error");
 }
 catch (const std::exception & e)
 {
-    LOG_FMT_ERROR(log, "{}", e.what());
+    LOG_ERROR(log, e.what());
     return grpc::Status(grpc::StatusCode::INTERNAL, "internal error");
 }
 

diff --git a/dbms/src/Flash/Mpp/ExchangeReceiver.cpp b/dbms/src/Flash/Mpp/ExchangeReceiver.cpp
@@ -452,7 +452,7 @@ void ExchangeReceiverBase<RPCContext>::readLoop(const Request & req)
                     meet_error = true;
                     auto local_state = getState();
                     local_err_msg = "receiver's state is " + getReceiverStateStr(local_state) + ", exit from readLoop";
-                    LOG_FMT_WARNING(log, "{}", local_err_msg);
+                    LOG_FMT_WARNING(log, local_err_msg);
                     break;
                 }
             }

diff --git a/dbms/src/Flash/Mpp/MPPTunnel.cpp b/dbms/src/Flash/Mpp/MPPTunnel.cpp
@@ -190,7 +190,7 @@ void MPPTunnelBase<Writer>::sendJob(bool need_lock)
         err_msg = "fatal error in sendJob()";
     }
     if (!err_msg.empty())
-        LOG_FMT_ERROR(log, "{}", err_msg);
+        LOG_FMT_ERROR(log, err_msg);
     consumerFinish(err_msg, need_lock);
     if (is_async)
         writer->writeDone(grpc::Status::OK);
@@ -256,7 +256,7 @@ void MPPTunnelBase<Writer>::connect(Writer * writer_)
         connected = true;
         cv_for_connected_or_finished.notify_all();
     }
-    LOG_FMT_DEBUG(log, "connected");
+    LOG_DEBUG(log, "connected");
 }
 
 template <typename Writer>

diff --git a/dbms/src/Interpreters/ExternalLoader.cpp b/dbms/src/Interpreters/ExternalLoader.cpp
@@ -293,7 +293,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
                     name = config->getString(key + "." + config_settings.external_name);
                     if (name.empty())
                     {
-                        LOG_FMT_WARNING(log, "{}: {} name cannot be empty", config_path, key);
+                        LOG_FMT_WARNING(log, "{}: {} name cannot be empty", config_path, config_settings.external_name);
                         continue;
                     }
 

diff --git a/dbms/src/Interpreters/SharedQueries.h b/dbms/src/Interpreters/SharedQueries.h
@@ -115,7 +115,7 @@ class SharedQueries
                 query.connected_clients++;
                 String msg = "SharedQueries: more clients than they claimed! expected " + toString(clients) + ", got "
                     + toString(query.connected_clients);
-                LOG_FMT_WARNING(log, "{}", msg);
+                LOG_WARNING(log, msg);
                 throw Exception(msg, ErrorCodes::TIFLASH_BAD_REQUEST);
             }
             query.connected_clients++;