From a3a2f00069f9e5dec274859a0540a2047f5c3e15 Mon Sep 17 00:00:00 2001
From: caihaoting <caihaoting1@huawei.com>
Date: Fri, 16 May 2025 14:52:57 +0800
Subject: [PATCH] synchronize hilog modify

Signed-off-by: caihaoting <caihaoting1@huawei.com>
---
 .../distributeddb/common/src/log_print.cpp    | 14 +++++-----
 .../src/common/src/rd_log_print.cpp           | 26 +++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/frameworks/libs/distributeddb/common/src/log_print.cpp b/frameworks/libs/distributeddb/common/src/log_print.cpp
index 92a014de32a..372ea9b8ffb 100644
--- a/frameworks/libs/distributeddb/common/src/log_print.cpp
+++ b/frameworks/libs/distributeddb/common/src/log_print.cpp
@@ -36,26 +36,26 @@ public:
             return;
         }
 #ifdef DB_DEBUG_ENV
-        const std::string format = "%s";
+#define FORMAT "%s"
 #else
-        const std::string format = "%{public}s";
+#define FORMAT "%{public}s"
 #endif
         OHOS::HiviewDFX::HiLogLabel label = { LOG_CORE, 0xD001630, tag.c_str() }; // log module id.
         switch (level) {
             case Level::LEVEL_DEBUG:
-                (void)OHOS::HiviewDFX::HiLog::Debug(label, format.c_str(), msg.c_str());
+                (void)HILOG_IMPL(label.type, LOG_DEBUG, label.domain, label.tag, FORMAT, msg.c_str());
                 break;
             case Level::LEVEL_INFO:
-                (void)OHOS::HiviewDFX::HiLog::Info(label, format.c_str(), msg.c_str());
+                (void)HILOG_IMPL(label.type, LOG_INFO, label.domain, label.tag, FORMAT, msg.c_str());
                 break;
             case Level::LEVEL_WARN:
-                (void)OHOS::HiviewDFX::HiLog::Warn(label, format.c_str(), msg.c_str());
+                (void)HILOG_IMPL(label.type, LOG_WARN, label.domain, label.tag, FORMAT, msg.c_str());
                 break;
             case Level::LEVEL_ERROR:
-                (void)OHOS::HiviewDFX::HiLog::Error(label, format.c_str(), msg.c_str());
+                (void)HILOG_IMPL(label.type, LOG_ERROR, label.domain, label.tag, FORMAT, msg.c_str());
                 break;
             case Level::LEVEL_FATAL:
-                (void)OHOS::HiviewDFX::HiLog::Fatal(label, format.c_str(), msg.c_str());
+                (void)HILOG_IMPL(label.type, LOG_FATAL, label.domain, label.tag, FORMAT, msg.c_str());
                 break;
             default:
                 break;
diff --git a/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/rd_log_print.cpp b/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/rd_log_print.cpp
index 993880acdac..17ffec94f74 100644
--- a/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/rd_log_print.cpp
+++ b/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/rd_log_print.cpp
@@ -25,23 +25,27 @@ void PrintLog(RdLogPrint::Level level, const char *tag, const std::string &msg)
     if (msg.empty()) {
         return;
     }
-    const std::string format = "%{public}s";
+#ifdef DB_DEBUG_ENV
+#define FORMAT "%s"
+#else
+#define FORMAT "%{public}s"
+#endif
     OHOS::HiviewDFX::HiLogLabel label = { LOG_CORE, 0xD001631, tag }; // 0xD001631 is identity of the log
     switch (level) {
-        case RdLogPrint::Level::LEVEL_DEBUG:
-            (void)OHOS::HiviewDFX::HiLog::Debug(label, format.c_str(), msg.c_str());
+        case LogPrint::Level::LEVEL_DEBUG:
+            (void)HILOG_IMPL(label.type, LOG_DEBUG, label.domain, label.tag, FORMAT, msg.c_str());
             break;
-        case RdLogPrint::Level::LEVEL_INFO:
-            (void)OHOS::HiviewDFX::HiLog::Info(label, format.c_str(), msg.c_str());
+        case LogPrint::Level::LEVEL_INFO:
+            (void)HILOG_IMPL(label.type, LOG_INFO, label.domain, label.tag, FORMAT, msg.c_str());
             break;
-        case RdLogPrint::Level::LEVEL_WARN:
-            (void)OHOS::HiviewDFX::HiLog::Warn(label, format.c_str(), msg.c_str());
+        case LogPrint::Level::LEVEL_WARN:
+            (void)HILOG_IMPL(label.type, LOG_WARN, label.domain, label.tag, FORMAT, msg.c_str());
             break;
-        case RdLogPrint::Level::LEVEL_ERROR:
-            (void)OHOS::HiviewDFX::HiLog::Error(label, format.c_str(), msg.c_str());
+        case LogPrint::Level::LEVEL_ERROR:
+            (void)HILOG_IMPL(label.type, LOG_ERROR, label.domain, label.tag, FORMAT, msg.c_str());
             break;
-        case RdLogPrint::Level::LEVEL_FATAL:
-            (void)OHOS::HiviewDFX::HiLog::Fatal(label, format.c_str(), msg.c_str());
+        case LogPrint::Level::LEVEL_FATAL:
+            (void)HILOG_IMPL(label.type, LOG_FATAL, label.domain, label.tag, FORMAT, msg.c_str());
             break;
         default:
             break;
-- 
Gitee