From e0c10955dbc828a085f07c082bca7f9707f1a5df Mon Sep 17 00:00:00 2001
From: zqq <zhangqiquan1@huawei.com>
Date: Wed, 26 Oct 2022 15:09:49 +0800
Subject: [PATCH 1/3] fix code review

Signed-off-by: zqq <zhangqiquan1@huawei.com>
---
 .../common/include/auto_launch.h              |  2 +-
 .../common/include/db_dfx_adapter.h           |  2 +-
 .../distributeddb/common/src/data_value.cpp   |  4 +-
 .../common/src/notification_chain.cpp         |  2 +-
 .../include/communicator_aggregator.h         | 14 +--
 .../communicator/include/frame_combiner.h     |  8 +-
 .../communicator/include/frame_retainer.h     | 10 +-
 .../communicator/include/iadapter.h           |  2 +-
 .../include/icommunicator_aggregator.h        |  2 +-
 .../communicator/include/parse_result.h       |  2 +-
 .../include/send_task_scheduler.h             | 14 +--
 .../communicator/src/communicator.cpp         |  2 +-
 .../communicator/src/communicator.h           | 12 +--
 .../src/communicator_aggregator.cpp           | 22 ++---
 .../communicator/src/communicator_linker.cpp  | 47 ++++-----
 .../communicator/src/communicator_linker.h    | 12 +--
 .../communicator/src/frame_combiner.cpp       | 16 +--
 .../communicator/src/frame_retainer.cpp       | 11 ++-
 .../communicator/src/network_adapter.cpp      |  8 +-
 .../communicator/src/protocol_proto.cpp       | 97 +++++++++----------
 .../communicator/src/protocol_proto.h         | 30 +++---
 .../communicator/src/serial_buffer.cpp        |  4 +-
 .../distributeddb/include/query_expression.h  |  4 +-
 .../include/iprocess_communicator.h           |  4 +-
 .../src/sqlite/sqlite_single_ver_result_set.h |  2 +-
 .../syncer/src/generic_syncer.cpp             |  6 +-
 .../distributeddb/syncer/src/isync_engine.h   |  4 +-
 .../src/query_sync_water_mark_helper.cpp      | 34 +++----
 .../distributeddb/syncer/src/sync_engine.cpp  | 40 ++++----
 .../distributeddb/syncer/src/sync_engine.h    |  2 +-
 .../common/syncer/virtual_communicator.cpp    |  2 +-
 31 files changed, 207 insertions(+), 214 deletions(-)

diff --git a/frameworks/libs/distributeddb/common/include/auto_launch.h b/frameworks/libs/distributeddb/common/include/auto_launch.h
index a2794eb9620..f120eaf50be 100644
--- a/frameworks/libs/distributeddb/common/include/auto_launch.h
+++ b/frameworks/libs/distributeddb/common/include/auto_launch.h
@@ -40,7 +40,7 @@ enum class AutoLaunchItemState {
 };
 
 enum class DBType {
-    DB_KV = 0,
+    DB_KV = 1,
     DB_RELATION,
     DB_INVALID,
 };
diff --git a/frameworks/libs/distributeddb/common/include/db_dfx_adapter.h b/frameworks/libs/distributeddb/common/include/db_dfx_adapter.h
index cc4f40cd065..b1b67e048c2 100644
--- a/frameworks/libs/distributeddb/common/include/db_dfx_adapter.h
+++ b/frameworks/libs/distributeddb/common/include/db_dfx_adapter.h
@@ -33,7 +33,7 @@ struct ReportTask {
     std::string storeId;
     int errCode = 0;
 };
-class DBDfxAdapter {
+class DBDfxAdapter final {
 public:
     static void Dump(int fd, const std::vector<std::u16string> &args);
 
diff --git a/frameworks/libs/distributeddb/common/src/data_value.cpp b/frameworks/libs/distributeddb/common/src/data_value.cpp
index d5f7ae772e7..99fc897dcbb 100644
--- a/frameworks/libs/distributeddb/common/src/data_value.cpp
+++ b/frameworks/libs/distributeddb/common/src/data_value.cpp
@@ -84,9 +84,7 @@ int Blob::WriteBlob(const uint8_t *ptrArray, const uint32_t &size)
 
 std::vector<uint8_t> Blob::ToVector() const
 {
-    std::vector<uint8_t> vec;
-    vec.insert(vec.end(), ptr_, ptr_ + size_);
-    return vec;
+    return std::vector<uint8_t>(ptr_, ptr_ + size_);
 }
 
 DataValue::DataValue() : type_(StorageType::STORAGE_TYPE_NULL)
diff --git a/frameworks/libs/distributeddb/common/src/notification_chain.cpp b/frameworks/libs/distributeddb/common/src/notification_chain.cpp
index 237fcf9d38a..02a83c3f6a6 100644
--- a/frameworks/libs/distributeddb/common/src/notification_chain.cpp
+++ b/frameworks/libs/distributeddb/common/src/notification_chain.cpp
@@ -186,7 +186,7 @@ int NotificationChain::ListenerChain::UnRegisterListener(Listener *listener, boo
 void NotificationChain::ListenerChain::BackupListenerSet(std::set<Listener *> &backupSet) const
 {
     for (auto listener : listenerSet_) {
-        listener->IncObjRef(listener);
+        RefObject::IncObjRef(listener);
         backupSet.insert(listener);
     }
 }
diff --git a/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h b/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
index 30ca55f93cf..dbea7c5488c 100644
--- a/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
+++ b/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
@@ -16,20 +16,20 @@
 #ifndef COMMUNICATORAGGREGATOR_H
 #define COMMUNICATORAGGREGATOR_H
 
+#include <atomic>
+#include <condition_variable>
+#include <cstdint>
 #include <map>
 #include <mutex>
 #include <string>
-#include <atomic>
 #include <thread>
-#include <cstdint>
-#include <condition_variable>
-#include "iadapter.h"
-#include "parse_result.h"
-#include "icommunicator.h"
 #include "frame_combiner.h"
 #include "frame_retainer.h"
-#include "send_task_scheduler.h"
+#include "iadapter.h"
+#include "icommunicator.h"
 #include "icommunicator_aggregator.h"
+#include "parse_result.h"
+#include "send_task_scheduler.h"
 
 namespace DistributedDB {
 // Forward Declarations
diff --git a/frameworks/libs/distributeddb/communicator/include/frame_combiner.h b/frameworks/libs/distributeddb/communicator/include/frame_combiner.h
index 33124c497c4..d1ec81f8267 100644
--- a/frameworks/libs/distributeddb/communicator/include/frame_combiner.h
+++ b/frameworks/libs/distributeddb/communicator/include/frame_combiner.h
@@ -16,20 +16,20 @@
 #ifndef FRAME_COMBINER_H
 #define FRAME_COMBINER_H
 
+#include <cstdint>
 #include <map>
 #include <mutex>
-#include <cstdint>
-#include "semaphore_utils.h"
+#include "combine_status.h"
 #include "macro_utils.h"
 #include "parse_result.h"
-#include "combine_status.h"
 #include "runtime_context.h"
+#include "semaphore_utils.h"
 
 namespace DistributedDB {
 class SerialBuffer; // Forward Declarations
 
 struct CombineWork {
-    SerialBuffer *buffer;
+    SerialBuffer *buffer = nullptr;
     CombineStatus status;
     ParseResult frameInfo;
 };
diff --git a/frameworks/libs/distributeddb/communicator/include/frame_retainer.h b/frameworks/libs/distributeddb/communicator/include/frame_retainer.h
index 259007369b3..a0b14408708 100644
--- a/frameworks/libs/distributeddb/communicator/include/frame_retainer.h
+++ b/frameworks/libs/distributeddb/communicator/include/frame_retainer.h
@@ -27,16 +27,16 @@ namespace DistributedDB {
 class SerialBuffer; // Forward Declarations
 
 struct FrameInfo {
-    SerialBuffer *buffer;
+    SerialBuffer *buffer = nullptr;
     std::string srcTarget;
     LabelType commLabel;
-    uint32_t frameId;
+    uint32_t frameId = 0u;
 };
 
 struct RetainWork {
-    SerialBuffer *buffer;
-    uint32_t frameId;
-    uint32_t remainTime; // in second
+    SerialBuffer *buffer = nullptr;
+    uint32_t frameId = 0u;
+    uint32_t remainTime = 0u; // in second
 };
 
 class FrameRetainer {
diff --git a/frameworks/libs/distributeddb/communicator/include/iadapter.h b/frameworks/libs/distributeddb/communicator/include/iadapter.h
index f238114ca4b..d68916fa6cb 100644
--- a/frameworks/libs/distributeddb/communicator/include/iadapter.h
+++ b/frameworks/libs/distributeddb/communicator/include/iadapter.h
@@ -16,10 +16,10 @@
 #ifndef IADAPTER_H
 #define IADAPTER_H
 
-#include <string>
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <string>
 #include "communicator_type_define.h"
 #include "iprocess_communicator.h"
 
diff --git a/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h b/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
index ee5c59dfda2..06ae9e7c1e9 100644
--- a/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
+++ b/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
@@ -17,9 +17,9 @@
 #define ICOMMUNICATORAGGREGATOR_H
 
 #include <cstdint>
+#include "communicator_type_define.h"
 #include "iadapter.h"
 #include "ref_object.h"
-#include "communicator_type_define.h"
 
 namespace DistributedDB {
 class ICommunicator; // Forward Declaration
diff --git a/frameworks/libs/distributeddb/communicator/include/parse_result.h b/frameworks/libs/distributeddb/communicator/include/parse_result.h
index 0e1278821a1..99d0cebd613 100644
--- a/frameworks/libs/distributeddb/communicator/include/parse_result.h
+++ b/frameworks/libs/distributeddb/communicator/include/parse_result.h
@@ -16,8 +16,8 @@
 #ifndef PARSE_RESULT_H
 #define PARSE_RESULT_H
 
-#include <set>
 #include <cstdint>
+#include <set>
 #include "communicator_type_define.h"
 
 namespace DistributedDB {
diff --git a/frameworks/libs/distributeddb/communicator/include/send_task_scheduler.h b/frameworks/libs/distributeddb/communicator/include/send_task_scheduler.h
index 8c1e3e12ec3..0725474062a 100644
--- a/frameworks/libs/distributeddb/communicator/include/send_task_scheduler.h
+++ b/frameworks/libs/distributeddb/communicator/include/send_task_scheduler.h
@@ -16,14 +16,14 @@
 #ifndef SEND_TASK_SCHEDULER_H
 #define SEND_TASK_SCHEDULER_H
 
-#include <map>
+#include <cstdint>
 #include <list>
+#include <map>
 #include <mutex>
-#include <vector>
 #include <string>
-#include <cstdint>
-#include "macro_utils.h"
+#include <vector>
 #include "communicator_type_define.h"
+#include "macro_utils.h"
 
 namespace DistributedDB {
 enum class TargetPolicy {
@@ -34,14 +34,14 @@ enum class TargetPolicy {
 class SerialBuffer; // Forward Declaration
 
 struct SendTask {
-    SerialBuffer *buffer;
+    SerialBuffer *buffer = nullptr;
     std::string dstTarget;
     OnSendEnd onEnd;
 };
 
 struct SendTaskInfo {
-    bool delayFlag;
-    Priority taskPrio;
+    bool delayFlag = false;
+    Priority taskPrio = Priority::LOW;
 };
 
 using TaskListByTarget = std::map<std::string, std::list<SendTask>>;
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator.cpp b/frameworks/libs/distributeddb/communicator/src/communicator.cpp
index e5c97f41267..e9ac8cf7bce 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/communicator.cpp
@@ -116,7 +116,7 @@ int Communicator::SendMessage(const std::string &dstTarget, const Message *inMsg
     }
     int error = E_OK;
     // if error is not E_OK , null pointer will be returned
-    SerialBuffer *buffer = ProtocolProto::ToSerialBuffer(inMsg, error, extendHandle, false);
+    SerialBuffer *buffer = ProtocolProto::ToSerialBuffer(inMsg, extendHandle, false, error);
     extendHandle = nullptr;
     if (error != E_OK) {
         LOGE("[Comm][Send] Serial fail, label=%s, error=%d.", VEC_TO_STR(commLabel_), error);
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator.h b/frameworks/libs/distributeddb/communicator/src/communicator.h
index c1f2ce39d4a..fd9436ddfa6 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator.h
+++ b/frameworks/libs/distributeddb/communicator/src/communicator.h
@@ -16,16 +16,16 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
-#include <set>
-#include <mutex>
 #include <chrono>
-#include <string>
+#include <condition_variable>
 #include <cstdint>
 #include <functional>
-#include <condition_variable>
-#include "serial_buffer.h"
-#include "icommunicator.h"
+#include <mutex>
+#include <set>
+#include <string>
 #include "communicator_aggregator.h"
+#include "icommunicator.h"
+#include "serial_buffer.h"
 
 namespace DistributedDB {
 class Communicator : public ICommunicator {
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp b/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
index 7c9151c9fc2..3009fd471b8 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
@@ -16,12 +16,11 @@
 #include "communicator_aggregator.h"
 
 #include <sstream>
-
-#include "hash.h"
 #include "communicator.h"
 #include "communicator_linker.h"
 #include "db_common.h"
 #include "endian_convert.h"
+#include "hash.h"
 #include "log_print.h"
 #include "protocol_proto.h"
 
@@ -318,7 +317,7 @@ int CommunicatorAggregator::CreateSendTask(const std::string &dstTarget, SerialB
     std::lock_guard<std::mutex> wakingLockGuard(wakingMutex_);
     wakingSignal_ = true;
     wakingCv_.notify_one();
-    LOGI("[CommAggr][Create] Exit ok, thread=%s, frameId=%u", GetThreadId().c_str(), info.frameId); // Delete In Future
+    LOGI("[CommAggr][Create] Exit ok, thread=%s, frameId=%u", GetThreadId().c_str(), info.frameId);
     return E_OK;
 }
 
@@ -343,9 +342,9 @@ void CommunicatorAggregator::SendDataRoutine()
     while (!shutdown_) {
         if (scheduler_.GetNoDelayTaskCount() == 0) {
             std::unique_lock<std::mutex> wakingUniqueLock(wakingMutex_);
-            LOGI("[CommAggr][Routine] Send done and sleep."); // Delete In Future
+            LOGI("[CommAggr][Routine] Send done and sleep.");
             wakingCv_.wait(wakingUniqueLock, [this] { return this->wakingSignal_; });
-            LOGI("[CommAggr][Routine] Send continue."); // Delete In Future
+            LOGI("[CommAggr][Routine] Send continue.");
             wakingSignal_ = false;
             continue;
         }
@@ -392,8 +391,8 @@ void CommunicatorAggregator::SendPacketsAndDisposeTask(const SendTask &inTask,
     bool taskNeedFinalize = true;
     int errCode = E_OK;
     for (auto &entry : eachPacket) {
-        LOGI("[CommAggr][SendPackets] DoSendBytes, dstTarget=%s{private}, extendHeadLength=%u, totalLength=%u.",
-            inTask.dstTarget.c_str(), entry.second.first, entry.second.second);
+        LOGI("[CommAggr][SendPackets] DoSendBytes, dstTarget=%s{private}, extendHeadLength=%" PRIu32
+            ", totalLength=%" PRIu32 ".", inTask.dstTarget.c_str(), entry.second.first, entry.second.second);
         ProtocolProto::DisplayPacketInformation(entry.first + entry.second.first, entry.second.second);
         errCode = adapterHandle_->SendBytes(inTask.dstTarget, entry.first, entry.second.second);
         if (errCode == -E_WAIT_RETRY) {
@@ -479,7 +478,7 @@ void CommunicatorAggregator::NotifySendableToAllCommunicator()
 void CommunicatorAggregator::OnBytesReceive(const std::string &srcTarget, const uint8_t *bytes, uint32_t length,
     const std::string &userId)
 {
-    ProtocolProto::DisplayPacketInformation(bytes, length); // For debug, delete in the future
+    ProtocolProto::DisplayPacketInformation(bytes, length);
     ParseResult packetResult;
     int errCode = ProtocolProto::CheckAndParsePacket(srcTarget, bytes, length, packetResult);
     if (errCode != E_OK) {
@@ -536,10 +535,7 @@ void CommunicatorAggregator::OnTargetChange(const std::string &target, bool isCo
             LOGE("[CommAggr][OnTarget] TargetOnline fail, target=%s{private}, errCode=%d.", target.c_str(), errCode);
         }
     } else {
-        int errCode = commLinker_->TargetOffline(target, relatedLabels);
-        if (errCode != E_OK) {
-            LOGE("[CommAggr][OnTarget] TargetOffline fail, target=%s{private}, errCode=%d.", target.c_str(), errCode);
-        }
+        commLinker_->TargetOffline(target, relatedLabels);
     }
     // All related communicator online or offline this target, no matter TargetOnline or TargetOffline fail or not
     std::lock_guard<std::mutex> commMapLockGuard(commMapMutex_);
@@ -782,7 +778,7 @@ void CommunicatorAggregator::GenerateLocalSourceId()
     // The localSourceId is std::atomic<uint64_t>, so there is no concurrency risk
     uint64_t identityHash = Hash::HashFunc(identity);
     if (identityHash != localSourceId_) {
-        LOGI("[CommAggr][GenSrcId] identity=%s{private}, localSourceId=%llu.", identity.c_str(), ULL(identityHash));
+        LOGI("[CommAggr][GenSrcId] identity=%s{private}, localSourceId=%" PRIu64, identity.c_str(), ULL(identityHash));
     }
     localSourceId_ = identityHash;
 }
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp b/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
index 59a1b77950d..ff9bb80e4a3 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
@@ -14,12 +14,12 @@
  */
 
 #include "communicator_linker.h"
-#include "hash.h"
+#include "communicator_aggregator.h"
 #include "db_errno.h"
+#include "hash.h"
 #include "log_print.h"
-#include "protocol_proto.h"
 #include "platform_specific.h"
-#include "communicator_aggregator.h"
+#include "protocol_proto.h"
 
 namespace DistributedDB {
 namespace {
@@ -51,7 +51,7 @@ void CommunicatorLinker::Initialize()
     }
     std::string curTimeStr = std::to_string(curTime);
     localDistinctValue_ = Hash::HashFunc(curTimeStr);
-    LOGI("[Linker][Init] curTime=%llu, distinct=%llu.", ULL(curTime), ULL(localDistinctValue_));
+    LOGI("[Linker][Init] curTime=%" PRIu64 ", distinct=%" PRIu64 ".", ULL(curTime), ULL(localDistinctValue_));
 }
 
 // Create async task to send out label_exchange and waiting for label_exchange_ack.
@@ -73,7 +73,7 @@ int CommunicatorLinker::TargetOnline(const std::string &inTarget, std::set<Label
 
 // Clear all labels related to this target. Let no longer waiting for ack of this target.
 // The caller should notify all related communicator about this target offline.
-int CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<LabelType> &outRelatedLabels)
+void CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<LabelType> &outRelatedLabels)
 {
     std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
     outRelatedLabels = targetMapOnlineLabels_[inTarget];
@@ -83,7 +83,6 @@ int CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<Labe
     // the distinctValue of this remote target may be changed, and the sequenceId may start from zero
     targetDistinctValue_.erase(inTarget);
     topRecvLabelSeq_.erase(inTarget);
-    return E_OK;
 }
 
 // Add local label. Create async task to send out label_exchange and waiting for label_exchange_ack.
@@ -151,8 +150,8 @@ int CommunicatorLinker::ReceiveLabelExchange(const std::string &inTarget, const
         } else if (inSequenceId < topRecvLabelSeq_[inTarget]) {
             // inSequenceId can be equal to topRecvLabelSeq, in this case, the ack of this sequence send to this target
             // may be lost, this target resend LabelExchange, and we should resend ack to this target
-            LOGW("[Linker][RecvLabel] inSequenceId=%llu smaller than topRecvLabelSeq=%llu. Frame Ignored.",
-                ULL(inSequenceId), ULL(topRecvLabelSeq_[inTarget]));
+            LOGW("[Linker][RecvLabel] inSequenceId=%" PRIu64 " smaller than topRecvLabelSeq=%" PRIu64
+                ". Frame Ignored.", ULL(inSequenceId), ULL(topRecvLabelSeq_[inTarget]));
             return -E_OUT_OF_DATE;
         } else {
             // Update top sequenceId of received LabelExchange
@@ -192,11 +191,11 @@ int CommunicatorLinker::ReceiveLabelExchangeAck(const std::string &inTarget, uin
     // This two judge is for detecting case that local device process restart so incSequenceId_ restart from 0
     // The remote device may send an ack cause by previous process, which may destroy the functionality of this process
     if (waitAckSeq_.count(inTarget) == 0) {
-        LOGW("[Linker][RecvAck] Not waiting any ack now, inSequenceId=%llu", ULL(inSequenceId));
+        LOGW("[Linker][RecvAck] Not waiting any ack now, inSequenceId=%" PRIu64 "", ULL(inSequenceId));
         return -E_NOT_FOUND;
     }
     if (waitAckSeq_[inTarget] < inSequenceId) {
-        LOGW("[Linker][RecvAck] Not waiting this ack now, inSequenceId=%llu, waitAckSeq_=%llu",
+        LOGW("[Linker][RecvAck] Not waiting this ack now, inSequenceId=%" PRIu64 ", waitAckSeq_=%" PRIu64,
             ULL(inSequenceId), ULL(waitAckSeq_[inTarget]));
         return -E_NOT_FOUND;
     }
@@ -205,7 +204,7 @@ int CommunicatorLinker::ReceiveLabelExchangeAck(const std::string &inTarget, uin
         // Firstly receive LabelExchangeAck from this target
         recvAckSeq_[inTarget] = inSequenceId;
     } else if (inSequenceId <= recvAckSeq_[inTarget]) {
-        LOGW("[Linker][RecvAck] inSequenceId=%llu not greater than recvAckSeq_=%llu. Frame Ignored.",
+        LOGW("[Linker][RecvAck] inSequenceId=%" PRIu64 " not greater than recvAckSeq_=%" PRIu64 ". Frame Ignored.",
             ULL(inSequenceId), ULL(recvAckSeq_[inTarget]));
         return -E_OUT_OF_DATE;
     } else {
@@ -237,12 +236,13 @@ void CommunicatorLinker::SuspendByOnceTimer(const std::function<void(void)> &inA
     RuntimeContext *context = RuntimeContext::GetInstance();
     int errCode = context->SetTimer(static_cast<int>(inCountDown), [inAction](TimerId inTimerId)->int{
         // Note: inAction should be captured by value (must not by reference)
-        LOGI("[Linker][Suspend] Timer Due : inTimerId=%llu.", ULL(inTimerId));
+        LOGI("[Linker][Suspend] Timer Due : inTimerId=%" PRIu64 ".", ULL(inTimerId));
         inAction();
         return -E_END_TIMER;
     }, nullptr, thisTimerId);
     if (errCode == E_OK) {
-        LOGI("[Linker][Suspend] SetTimer Success : thisTimerId=%llu, wait=%u(ms).", ULL(thisTimerId), inCountDown);
+        LOGI("[Linker][Suspend] SetTimer Success : thisTimerId=%" PRIu64 ", wait=%u(ms).",
+            ULL(thisTimerId), inCountDown);
     } else {
         LOGI("[Linker][Suspend] SetTimer Fail Raise Thread Instead : errCode=%d, wait=%u(ms).", errCode, inCountDown);
         std::thread timerThread([inAction, inCountDown]() {
@@ -269,7 +269,7 @@ void CommunicatorLinker::DetectDistinctValueChange(const std::string &inTarget,
     }
 
     // DistinctValue change detected !!! This must be caused by malfunctioning of underlayer communication component.
-    LOGE("[Linker][Detect] ######## DISTINCT VALUE CHANGE DETECTED : %llu VS %llu ########",
+    LOGE("[Linker][Detect] ######## DISTINCT VALUE CHANGE DETECTED : %" PRIu64 " VS %" PRIu64 " ########",
         ULL(inDistinctValue), ULL(targetDistinctValue_[inTarget]));
     targetDistinctValue_[inTarget] = inDistinctValue;
     // The process of remote target must have undergone a quit and restart, the remote sequenceId will start from zero.
@@ -311,8 +311,8 @@ int CommunicatorLinker::TriggerLabelExchangeEvent(const std::string &toTarget)
             waitAckSeq_[toTarget] = sequenceId;
         } else if (waitAckSeq_[toTarget] > sequenceId) {
             // New LabelExchangeEvent had been trigger for this target, so this event can be abort
-            LOGI("[Linker][TriggerLabel] Detect newSeqId=%llu than thisSeqId=%llu be triggered for target=%s{private}",
-                ULL(waitAckSeq_[toTarget]), ULL(sequenceId), toTarget.c_str());
+            LOGI("[Linker][TriggerLabel] Detect newSeqId=%" PRIu64 " than thisSeqId=%" PRIu64
+                " be triggered for target=%s{private}", ULL(waitAckSeq_[toTarget]), ULL(sequenceId), toTarget.c_str());
             delete buffer;
             buffer = nullptr;
             return E_OK;
@@ -379,9 +379,10 @@ void CommunicatorLinker::SendLabelExchange(const std::string &toTarget, SerialBu
             noNeedToSend = true;
         }
         if (noNeedToSend) { // ATTENTION: This Log should be inside the protection of entireInfoLockGuard!!!
-            LOGI("[Linker][SendLabel] NoNeedSend:target=%s{private}, thisSeqId=%llu, waitAckSeq=%llu, recvAckSeq=%llu,"
-                "retrans=%u.", toTarget.c_str(), ULL(inSequenceId), ULL(waitAckSeq_[toTarget]),
-                ULL((recvAckSeq_.count(toTarget) != 0) ? recvAckSeq_[toTarget] : ~ULL(0)), inRetransmitCount);
+            LOGI("[Linker][SendLabel] NoNeedSend:target=%s{private}, thisSeqId=%" PRIu64 ", waitAckSeq=%" PRIu64
+                ", recvAckSeq=%" PRIu64 ",retrans=%u.", toTarget.c_str(), ULL(inSequenceId),
+                ULL(waitAckSeq_[toTarget]), ULL((recvAckSeq_.count(toTarget) != 0) ? recvAckSeq_[toTarget] : ~ULL(0)),
+                inRetransmitCount);
         } // ~0 indicate no ack ever recv
     }
     if (noNeedToSend) {
@@ -403,7 +404,8 @@ void CommunicatorLinker::SendLabelExchange(const std::string &toTarget, SerialBu
                 SendLabelExchange(toTarget, cloneBuffer, inSequenceId, inRetransmitCount + 1); // Do retransmission
             }, GetDynamicTimeLapseForWaitingAck(inRetransmitCount));
         } else {
-            LOGE("[Linker][SendLabel] CloneFail: target=%s{private}, SeqId=%llu.", toTarget.c_str(), ULL(inSequenceId));
+            LOGE("[Linker][SendLabel] CloneFail: target=%s{private}, SeqId=%" PRIu64 ".",
+            toTarget.c_str(), ULL(inSequenceId));
         }
     } else {
         // Send fail, go on to retry send
@@ -436,8 +438,9 @@ void CommunicatorLinker::SendLabelExchangeAck(const std::string &toTarget, Seria
             noNeedToSend = true;
         }
         if (noNeedToSend) { // ATTENTION: This Log should be inside the protection of entireInfoLockGuard!!!
-            LOGI("[Linker][SendAck] NoNeedSend:target=%s{private}, thisSeqId=%llu, topRecLabelSeq=%llu, thisAckId=%llu,"
-                "ackTriggerId=%llu.", toTarget.c_str(), ULL(inSequenceId), // ~0 indacate no label ever recv
+            LOGI("[Linker][SendAck] NoNeedSend:target=%s{private}, thisSeqId=%" PRIu64 ", topRecLabelSeq=%" PRIu64
+                ", thisAckId=%" PRIu64 ",ackTriggerId=%" PRIu64 ".",
+                toTarget.c_str(), ULL(inSequenceId), // ~0 indacate no label ever recv
                 ULL((topRecvLabelSeq_.count(toTarget) != 0) ? topRecvLabelSeq_[toTarget] : ~ULL(0)),
                 ULL(inAckTriggerId), ULL(ackTriggerId_[toTarget]));
         }
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator_linker.h b/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
index d8d0740f5b1..3d0d701d312 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
+++ b/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
@@ -16,17 +16,17 @@
 #ifndef COMMUNICATOR_LINKER_H
 #define COMMUNICATOR_LINKER_H
 
-#include <set>
+#include <atomic>
+#include <cstdlib>
+#include <functional>
 #include <map>
 #include <mutex>
-#include <atomic>
+#include <set>
 #include <string>
 #include <vector>
-#include <cstdlib>
-#include <functional>
+#include "communicator_type_define.h"
 #include "ref_object.h"
 #include "serial_buffer.h"
-#include "communicator_type_define.h"
 
 namespace DistributedDB {
 class CommunicatorAggregator; // Forward Declaration
@@ -46,7 +46,7 @@ public:
 
     // Clear all labels related to this target. Let no longer waiting for ack of this target.
     // The caller should notify all related communicator about this target offline.
-    int TargetOffline(const std::string &inTarget, std::set<LabelType> &outRelatedLabels);
+    void TargetOffline(const std::string &inTarget, std::set<LabelType> &outRelatedLabels);
 
     // Add local label. Create async task to send out label_exchange and waiting for label_exchange_ack.
     // If waiting timeout, pass the send&wait task to overrall timing retry task.
diff --git a/frameworks/libs/distributeddb/communicator/src/frame_combiner.cpp b/frameworks/libs/distributeddb/communicator/src/frame_combiner.cpp
index bbca2164878..f61d37250e4 100644
--- a/frameworks/libs/distributeddb/communicator/src/frame_combiner.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/frame_combiner.cpp
@@ -75,7 +75,7 @@ SerialBuffer *FrameCombiner::AssembleFrameFragment(const uint8_t *bytes, uint32_
 
         if (combineWorkPool_[sourceId][frameId].status.IsCombineDone()) {
             // We can parse the combined frame here, or outside this class.
-            LOGI("[Combiner][Assemble] Combine done, sourceId=%llu, frameId=%u.", ULL(sourceId), frameId);
+            LOGI("[Combiner][Assemble] Combine done, sourceId=%" PRIu64 ", frameId=%" PRIu32, ULL(sourceId), frameId);
             SerialBuffer *outFrame = combineWorkPool_[sourceId][frameId].buffer;
             outFrameInfo = combineWorkPool_[sourceId][frameId].frameInfo;
             outErrorNo = E_OK;
@@ -107,8 +107,8 @@ void FrameCombiner::PeriodicalSurveillance()
         std::set<uint32_t> frameToAbort;
         for (auto &eachFrame : eachSource.second) {
             if (!eachFrame.second.status.CheckProgress()) {
-                LOGW("[Combiner][Surveil] Source=%llu, frame=%u has no progress, this combine work will be aborted.",
-                    ULL(eachSource.first), eachFrame.first);
+                LOGW("[Combiner][Surveil] Source=%" PRIu64 ", frame=%" PRIu32
+                    " has no progress, this combine work will be aborted.", ULL(eachSource.first), eachFrame.first);
                 // Free this combine work first
                 delete eachFrame.second.buffer;
                 eachFrame.second.buffer = nullptr;
@@ -205,7 +205,7 @@ void FrameCombiner::AbortCombineWorkBySource(uint64_t inSourceId)
         }
     }
     // Do Abort!
-    LOGW("[Combiner][AbortWork] Abort Incomplete CombineWork, sourceId=%llu, frameId=%u.",
+    LOGW("[Combiner][AbortWork] Abort Incomplete CombineWork, sourceId=%" PRIu64 ", frameId=%" PRIu32 ".",
         ULL(inSourceId), toBeAbortFrameId);
     delete combineWorkPool_[inSourceId][toBeAbortFrameId].buffer;
     combineWorkPool_[inSourceId][toBeAbortFrameId].buffer = nullptr;
@@ -215,22 +215,22 @@ void FrameCombiner::AbortCombineWorkBySource(uint64_t inSourceId)
 bool FrameCombiner::CheckPacketWithOriWork(const ParseResult &inPacketInfo, const CombineWork &inWork)
 {
     if (inPacketInfo.GetFrameLen() != inWork.frameInfo.GetFrameLen()) {
-        LOGE("[Combiner][CheckPacket] FrameLen mismatch %u vs %u.", inPacketInfo.GetFrameLen(),
+        LOGE("[Combiner][CheckPacket] FrameLen mismatch %" PRIu32 " vs %" PRIu32 ".", inPacketInfo.GetFrameLen(),
             inWork.frameInfo.GetFrameLen());
         return false;
     }
     if (inPacketInfo.GetFragCount() != inWork.frameInfo.GetFragCount()) {
-        LOGE("[Combiner][CheckPacket] FragCount mismatch %u vs %u.", inPacketInfo.GetFragCount(),
+        LOGE("[Combiner][CheckPacket] FragCount mismatch %" PRIu32 " vs %" PRIu32 ".", inPacketInfo.GetFragCount(),
             inWork.frameInfo.GetFragCount());
         return false;
     }
     if (inPacketInfo.GetFragNo() >= inPacketInfo.GetFragCount()) {
-        LOGE("[Combiner][CheckPacket] FragNo=%u illegal vs FragCount=%u.", inPacketInfo.GetFragNo(),
+        LOGE("[Combiner][CheckPacket] FragNo=%" PRIu32 " illegal vs FragCount=%" PRIu32 ".", inPacketInfo.GetFragNo(),
             inPacketInfo.GetFragCount());
         return false;
     }
     if (inWork.status.IsFragNoAlreadyExist(inPacketInfo.GetFragNo())) {
-        LOGE("[Combiner][CheckPacket] FragNo=%u already exist.", inPacketInfo.GetFragNo());
+        LOGE("[Combiner][CheckPacket] FragNo=%" PRIu32 " already exist.", inPacketInfo.GetFragNo());
         return false;
     }
     return true;
diff --git a/frameworks/libs/distributeddb/communicator/src/frame_retainer.cpp b/frameworks/libs/distributeddb/communicator/src/frame_retainer.cpp
index e8d6db64e77..9262e0cbb01 100644
--- a/frameworks/libs/distributeddb/communicator/src/frame_retainer.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/frame_retainer.cpp
@@ -28,8 +28,8 @@ const int SURVAIL_PERIOD_IN_MILLISECOND = 1000; // Period is 1 s
 inline void LogRetainInfo(const std::string &logPrefix, const LabelType &label, const std::string &target,
     uint64_t order, const RetainWork &work)
 {
-    LOGI("%s : Label=%s, target=%s{private}, retainOrder=%llu, frameId=%u, remainTime=%u, frameSize=%u.",
-        logPrefix.c_str(), VEC_TO_STR(label), target.c_str(), ULL(order),
+    LOGI("%s : Label=%s, target=%s{private}, retainOrder=%" PRIu64 ", frameId=%" PRIu32 ", remainTime=%" PRIu32
+        ", frameSize=%" PRIu32 ".", logPrefix.c_str(), VEC_TO_STR(label), target.c_str(), ULL(order),
         work.frameId, work.remainTime, work.buffer->GetSize());
 }
 }
@@ -119,8 +119,8 @@ void FrameRetainer::RetainFrame(const FrameInfo &inFrame)
     // Discard obsolete frames until totalSize under capacity.
     DiscardObsoleteFramesIfNeed();
     // Display the final statistics
-    LOGI("[Retainer][Retain] Order=%llu. Statistics: TOTAL_BYTE=%u, TOTAL_FRAME=%u.", ULL(incRetainOrder_ - 1),
-        totalSizeByByte_, totalRetainFrames_);
+    LOGI("[Retainer][Retain] Order=%" PRIu64 ". Statistics: TOTAL_BYTE=%" PRIu32 ", TOTAL_FRAME=%" PRIu32 ".",
+        ULL(incRetainOrder_ - 1), totalSizeByByte_, totalRetainFrames_);
 }
 
 std::list<FrameInfo> FrameRetainer::FetchFramesForSpecificCommunicator(const LabelType &inCommLabel)
@@ -198,7 +198,8 @@ void FrameRetainer::DiscardObsoleteFramesIfNeed()
     // Discard obsolete frames until totalSize under capacity.
     while (totalSizeByByte_ > MAX_CAPACITY) {
         if (discardOrder.empty()) { // Unlikely to happen
-            LOGE("[Retainer][Discard] Internal Error: Byte=%u, Frames=%u.", totalSizeByByte_, totalRetainFrames_);
+            LOGE("[Retainer][Discard] Internal Error: Byte=%" PRIu32 ", Frames=%" PRIu32 ".",
+                totalSizeByByte_, totalRetainFrames_);
             return;
         }
         auto iter = discardOrder.begin();
diff --git a/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp b/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
index 061fe1a521d..cb32822ffa5 100644
--- a/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
@@ -146,7 +146,7 @@ uint32_t NetworkAdapter::GetMtuSize()
     std::lock_guard<std::mutex> mtuSizeLockGuard(mtuSizeMutex_);
     if (!isMtuSizeValid_) {
         mtuSize_ = processCommunicator_->GetMtuSize();
-        LOGI("[NAdapt][GetMtu] mtuSize=%u.", mtuSize_);
+        LOGD("[NAdapt][GetMtu] mtuSize=%" PRIu32 ".", mtuSize_);
         mtuSize_ = CheckAndAdjustMtuSize(mtuSize_);
         isMtuSizeValid_ = true;
     }
@@ -166,7 +166,7 @@ uint32_t NetworkAdapter::GetMtuSize(const std::string &target)
         DeviceInfos devInfo;
         devInfo.identifier = target;
         uint32_t oriMtuSize = processCommunicator_->GetMtuSize(devInfo);
-        LOGI("[NAdapt][GetMtu] mtuSize=%u of target=%s{private}.", oriMtuSize, target.c_str());
+        LOGD("[NAdapt][GetMtu] mtuSize=%" PRIu32 " of target=%s{private}.", oriMtuSize, target.c_str());
         devMapMtuSize_[target] = CheckAndAdjustMtuSize(oriMtuSize);
     }
     return devMapMtuSize_[target];
@@ -176,7 +176,7 @@ uint32_t NetworkAdapter::GetMtuSize(const std::string &target)
 uint32_t NetworkAdapter::GetTimeout()
 {
     uint32_t timeout = processCommunicator_->GetTimeout();
-    LOGI("[NAdapt][GetTimeout] timeout_=%u ms.", timeout);
+    LOGD("[NAdapt][GetTimeout] timeout_=%" PRIu32 " ms.", timeout);
     return CheckAndAdjustTimeout(timeout);
 }
 
@@ -185,7 +185,7 @@ uint32_t NetworkAdapter::GetTimeout(const std::string &target)
     DeviceInfos devInfos;
     devInfos.identifier = target;
     uint32_t timeout = processCommunicator_->GetTimeout(devInfos);
-    LOGI("[NAdapt][GetTimeout] timeout=%u ms of target=%s{private}.", timeout, target.c_str());
+    LOGD("[NAdapt][GetTimeout] timeout=%" PRIu32 " ms of target=%s{private}.", timeout, target.c_str());
     return CheckAndAdjustTimeout(timeout);
 }
 
diff --git a/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp b/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
index ed79435483b..ba1a22bf330 100644
--- a/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
@@ -14,16 +14,16 @@
  */
 
 #include "protocol_proto.h"
-#include <new>
 #include <iterator>
-#include "hash.h"
-#include "securec.h"
-#include "version.h"
+#include <new>
 #include "db_common.h"
-#include "log_print.h"
-#include "macro_utils.h"
 #include "endian_convert.h"
+#include "hash.h"
 #include "header_converter.h"
+#include "log_print.h"
+#include "macro_utils.h"
+#include "securec.h"
+#include "version.h"
 
 namespace DistributedDB {
 namespace {
@@ -44,9 +44,9 @@ const uint32_t SEQUENCE_ID_LEN = sizeof(uint64_t);
 // Note: COMM_LABEL_LENGTH is defined in communicator_type_define.h
 const uint32_t COMM_LABEL_COUNT_LEN = sizeof(uint64_t);
 // Local func to set and get frame Type from packet Type field
-void SetFrameType(uint8_t &inPacketType, FrameType inFrameType)
+void SetFrameType(FrameType inFrameType, uint8_t &inPacketType)
 {
-    inPacketType &= 0x0F; // Use 0x0F to clear high for bits
+    inPacketType &= 0x0F; // Use 0x0F to clear high four bits
     inPacketType |= (static_cast<uint8_t>(inFrameType) << 4); // frame type is on high 4 bits
 }
 FrameType GetFrameType(uint8_t inPacketType)
@@ -79,8 +79,8 @@ uint32_t ProtocolProto::GetCommLayerFrameHeaderLength()
     return length;
 }
 
-SerialBuffer *ProtocolProto::ToSerialBuffer(const Message *inMsg, int &outErrorNo,
-    std::shared_ptr<ExtendHeaderHandle> &extendHandle, bool onlyMsgHeader)
+SerialBuffer *ProtocolProto::ToSerialBuffer(const Message *inMsg,
+    std::shared_ptr<ExtendHeaderHandle> &extendHandle, bool onlyMsgHeader, int &outErrorNo)
 {
     if (inMsg == nullptr) {
         outErrorNo = -E_INVALID_ARGS;
@@ -186,7 +186,7 @@ SerialBuffer *ProtocolProto::BuildFeedbackMessageFrame(const Message *inMsg, con
     int &outErrorNo)
 {
     std::shared_ptr<ExtendHeaderHandle> extendHandle = nullptr;
-    SerialBuffer *buffer = ToSerialBuffer(inMsg, outErrorNo, extendHandle, true);
+    SerialBuffer *buffer = ToSerialBuffer(inMsg, extendHandle, true, outErrorNo);
     if (buffer == nullptr) {
         // outErrorNo had already been set in ToSerialBuffer
         return nullptr;
@@ -305,14 +305,14 @@ int ProtocolProto::AnalyzeSplitStructure(const ParseResult &inResult, uint32_t &
 
     // Firstly: Check frameLen
     if (frameLen <= sizeof(CommPhyHeader) || frameLen > MAX_FRAME_LEN) {
-        LOGE("[Proto][ParsePhyOpt] FrameLen=%u illegal.", frameLen);
+        LOGE("[Proto][ParsePhyOpt] FrameLen=%" PRIu32 " illegal.", frameLen);
         return -E_PARSE_FAIL;
     }
 
     // Secondly: Check fragCount and fragNo
     uint32_t lengthBeSplit = frameLen - sizeof(CommPhyHeader);
     if (fragCount == 0 || fragCount < MIN_FRAGMENT_COUNT || fragCount > lengthBeSplit || fragNo >= fragCount) {
-        LOGE("[Proto][ParsePhyOpt] FragCount=%u or fragNo=%u illegal.", fragCount, fragNo);
+        LOGE("[Proto][ParsePhyOpt] FragCount=%" PRIu32 " or fragNo=%" PRIu32 " illegal.", fragCount, fragNo);
         return -E_PARSE_FAIL;
     }
 
@@ -322,10 +322,11 @@ int ProtocolProto::AnalyzeSplitStructure(const ParseResult &inResult, uint32_t &
     outFragLen = quotient;
     outLastFragLen = quotient + remainder;
     uint32_t thisFragLen = ((fragNo != fragCount - 1) ? outFragLen : outLastFragLen); // subtract by 1 for index
-    if (sizeof(CommPhyHeader) + sizeof(CommPhyOptHeader) + thisFragLen +
-        inResult.GetPaddingLen() != inResult.GetPacketLen()) {
-        LOGE("[Proto][ParsePhyOpt] Length Error: FrameLen=%u, FragCount=%u, fragNo=%u, PaddingLen=%u, PacketLen=%u",
-            frameLen, fragCount, fragNo, inResult.GetPaddingLen(), inResult.GetPacketLen());
+    if ((sizeof(CommPhyHeader) + sizeof(CommPhyOptHeader) + thisFragLen +
+        inResult.GetPaddingLen()) != inResult.GetPacketLen()) {
+        LOGE("[Proto][ParsePhyOpt] Length Error: FrameLen=%" PRIu32 ", FragCount=%" PRIu32 ", fragNo=%" PRIu32
+            ", PaddingLen=%" PRIu32 ", PacketLen=%" PRIu32, frameLen, fragCount, fragNo, inResult.GetPaddingLen(),
+            inResult.GetPacketLen());
         return -E_PARSE_FAIL;
     }
 
@@ -405,7 +406,7 @@ int ProtocolProto::SetDivergeHeader(SerialBuffer *inBuff, const LabelType &inCom
 }
 
 namespace {
-void FillPhyHeaderLenInfo(CommPhyHeader &header, uint32_t packetLen, uint64_t sum, uint8_t type, uint8_t paddingLen)
+void FillPhyHeaderLenInfo(uint32_t packetLen, uint64_t sum, uint8_t type, uint8_t paddingLen, CommPhyHeader &header)
 {
     header.packetLen = packetLen;
     header.checkSum = sum;
@@ -430,7 +431,7 @@ int ProtocolProto::SetPhyHeader(SerialBuffer *inBuff, const PhyHeaderInfo &inInf
     uint8_t paddingLen = static_cast<uint8_t>(bufferByteLen.second - frameByteLen.second);
     uint8_t packetType = PACKET_TYPE_NOT_FRAGMENTED;
     if (inInfo.frameType != FrameType::INVALID_MAX_FRAME_TYPE) {
-        SetFrameType(packetType, inInfo.frameType);
+        SetFrameType(inInfo.frameType, packetType);
     } else {
         return -E_INVALID_ARGS;
     }
@@ -442,7 +443,7 @@ int ProtocolProto::SetPhyHeader(SerialBuffer *inBuff, const PhyHeaderInfo &inInf
     phyHeader.frameId = inInfo.frameId;
     phyHeader.packetType = 0;
     phyHeader.dbIntVer = DB_GLOBAL_VERSION;
-    FillPhyHeaderLenInfo(phyHeader, packetLen, 0, packetType, paddingLen); // Sum is calculated afterwards
+    FillPhyHeaderLenInfo(packetLen, 0, packetType, paddingLen, phyHeader); // Sum is calculated afterwards
     HeaderConverter::ConvertHostToNet(phyHeader, phyHeader);
 
     errno_t retCode = memcpy_s(headerByteLen.first, headerByteLen.second, &phyHeader, sizeof(CommPhyHeader));
@@ -483,22 +484,19 @@ int ProtocolProto::CheckAndParsePacket(const std::string &srcTarget, const uint8
         errCode = ParseCommPhyOptHeader(bytes, length, outResult);
         if (errCode != E_OK) {
             LOGE("[Proto][ParsePacket] Parse CommPhyOptHeader Fail, errCode=%d.", errCode);
-            return errCode;
         }
     } else if (outResult.GetFrameTypeInfo() != FrameType::APPLICATION_MESSAGE) {
         errCode = ParseCommLayerPayload(bytes, length, outResult);
         if (errCode != E_OK) {
             LOGE("[Proto][ParsePacket] Parse CommLayerPayload Fail, errCode=%d.", errCode);
-            return errCode;
         }
     } else {
         errCode = ParseCommDivergeHeader(bytes, length, outResult);
         if (errCode != E_OK) {
             LOGE("[Proto][ParsePacket] Parse DivergeHeader Fail, errCode=%d.", errCode);
-            return errCode;
         }
     }
-    return E_OK;
+    return errCode;
 }
 
 int ProtocolProto::CheckAndParseFrame(const SerialBuffer *inBuff, ParseResult &outResult)
@@ -548,11 +546,11 @@ void ProtocolProto::DisplayPacketInformation(const uint8_t *bytes, uint32_t leng
             return;
         }
         auto phyOpt = reinterpret_cast<const CommPhyOptHeader *>(bytes + sizeof(CommPhyHeader));
-        LOGI("[Proto][Display] This is %s, frameId=%u, frameLen=%u, fragCount=%u, fragNo=%u.",
-            frameTypeStr[frameType].c_str(), frameId, NetToHost(phyOpt->frameLen),
+        LOGI("[Proto][Display] This is %s, frameId=%" PRIu32 ", frameLen=%" PRIu32 ", fragCount=%" PRIu32
+            ", fragNo=%" PRIu32 ".", frameTypeStr[frameType].c_str(), frameId, NetToHost(phyOpt->frameLen),
             NetToHost(phyOpt->fragCount), NetToHost(phyOpt->fragNo));
     } else {
-        LOGI("[Proto][Display] This is %s, frameId=%u.", frameTypeStr[frameType].c_str(), frameId);
+        LOGI("[Proto][Display] This is %s, frameId=%" PRIu32 ".", frameTypeStr[frameType].c_str(), frameId);
     }
 }
 
@@ -575,7 +573,7 @@ int ProtocolProto::CalculateDataSerializeLength(const Message *inMsg, uint32_t &
 {
     uint32_t messageId = inMsg->GetMessageId();
     if (msgIdMapFunc_.count(messageId) == 0) {
-        LOGE("[Proto][CalcuDataSerialLen] Not registered for messageId=%u.", messageId);
+        LOGE("[Proto][CalcuDataSerialLen] Not registered for messageId=%" PRIu32 ".", messageId);
         return -E_NOT_REGISTER;
     }
 
@@ -584,8 +582,8 @@ int ProtocolProto::CalculateDataSerializeLength(const Message *inMsg, uint32_t &
     uint32_t alignedLen = BYTE_8_ALIGN(serializeLen);
     // Currently not allowed the upper module to send a message without data. Regard serializeLen zero as abnormal.
     if (serializeLen == 0 || alignedLen > MAX_FRAME_LEN - GetLengthBeforeSerializedData()) {
-        LOGE("[Proto][CalcuDataSerialLen] Length too large, msgId=%u, serializeLen=%u, alignedLen=%u.",
-            messageId, serializeLen, alignedLen);
+        LOGE("[Proto][CalcuDataSerialLen] Length too large, msgId=%" PRIu32 ", serializeLen=%" PRIu32
+            ", alignedLen=%" PRIu32 ".", messageId, serializeLen, alignedLen);
         return -E_LENGTH_ERROR;
     }
     // Attention: return the serializeLen nor the alignedLen. Let SerialBuffer to deal with the padding
@@ -597,7 +595,7 @@ int ProtocolProto::SerializeMessage(SerialBuffer *inBuff, const Message *inMsg)
 {
     auto payloadByteLen = inBuff->GetWritableBytesForPayload();
     if (payloadByteLen.second < sizeof(MessageHeader)) { // For equal, only msgHeader case
-        LOGE("[Proto][Serialize] Length error, payload length=%u.", payloadByteLen.second);
+        LOGE("[Proto][Serialize] Length error, payload length=%" PRIu32 ".", payloadByteLen.second);
         return -E_LENGTH_ERROR;
     }
     uint32_t dataLen = payloadByteLen.second - sizeof(MessageHeader);
@@ -636,12 +634,12 @@ int ProtocolProto::DeSerializeMessage(const SerialBuffer *inBuff, Message *inMsg
     }
     uint16_t version = NetToHost(*(reinterpret_cast<const uint16_t *>(payloadByteLen.first)));
     if (!IsSupportMessageVersion(version)) {
-        LOGE("[Proto][DeSerialize] Version=%u not support.", version);
+        LOGE("[Proto][DeSerialize] Version=%" PRIu32 " not support.", version);
         return -E_VERSION_NOT_SUPPORT;
     }
 
     if (payloadByteLen.second < sizeof(MessageHeader)) {
-        LOGE("[Proto][DeSerialize] Length error, payload length=%u.", payloadByteLen.second);
+        LOGE("[Proto][DeSerialize] Length error, payload length=%" PRIu32 ".", payloadByteLen.second);
         return -E_LENGTH_ERROR;
     }
     auto oriMsgHeader = reinterpret_cast<const MessageHeader *>(payloadByteLen.first);
@@ -655,12 +653,12 @@ int ProtocolProto::DeSerializeMessage(const SerialBuffer *inBuff, Message *inMsg
     inMsg->SetErrorNo(messageHdr.errorNo);
     uint32_t dataLen = payloadByteLen.second - sizeof(MessageHeader);
     if (dataLen != messageHdr.dataLen) {
-        LOGE("[Proto][DeSerialize] dataLen=%u, msgDataLen=%u.", dataLen, messageHdr.dataLen);
+        LOGE("[Proto][DeSerialize] dataLen=%" PRIu32 ", msgDataLen=%" PRIu32 ".", dataLen, messageHdr.dataLen);
         return -E_LENGTH_ERROR;
     }
     // It is better to check FeedbackMessage first and check onlyMsgHeader flag later
     if (IsFeedbackErrorMessage(messageHdr.errorNo)) {
-        LOGI("[Proto][DeSerialize] Feedback Message with errorNo=%u.", messageHdr.errorNo);
+        LOGI("[Proto][DeSerialize] Feedback Message with errorNo=%" PRIu32 ".", messageHdr.errorNo);
         return E_OK;
     }
     if (onlyMsgHeader || dataLen == 0) { // Do not need to deserialize data
@@ -668,7 +666,7 @@ int ProtocolProto::DeSerializeMessage(const SerialBuffer *inBuff, Message *inMsg
     }
     uint32_t messageId = inMsg->GetMessageId();
     if (msgIdMapFunc_.count(messageId) == 0) {
-        LOGE("[Proto][DeSerialize] Not register, messageId=%u.", messageId);
+        LOGE("[Proto][DeSerialize] Not register, messageId=%" PRIu32 ".", messageId);
         return -E_NOT_REGISTER;
     }
     TransformFunc function = msgIdMapFunc_[messageId];
@@ -702,11 +700,11 @@ int ProtocolProto::ParseCommPhyHeaderCheckMagicAndVersion(const uint8_t *bytes,
     uint16_t version = NetToHost(*fieldPtr++);
 
     if (magic != MAGIC_CODE) {
-        LOGE("[Proto][ParsePhyCheckVer] MagicCode=%u Error.", magic);
+        LOGE("[Proto][ParsePhyCheckVer] MagicCode=%" PRIu32 " Error.", magic);
         return -E_PARSE_FAIL;
     }
     if (version != PROTOCOL_VERSION) {
-        LOGE("[Proto][ParsePhyCheckVer] Version=%u Error.", version);
+        LOGE("[Proto][ParsePhyCheckVer] Version=%" PRIu32 " Error.", version);
         return -E_VERSION_NOT_SUPPORT;
     }
     return E_OK;
@@ -716,16 +714,16 @@ int ProtocolProto::ParseCommPhyHeaderCheckField(const std::string &srcTarget, co
     const uint8_t *bytes, uint32_t length)
 {
     if (phyHeader.sourceId != Hash::HashFunc(srcTarget)) {
-        LOGE("[Proto][ParsePhyCheck] SourceId Error: inSourceId=%llu, srcTarget=%s{private}, hashId=%llu.",
+        LOGE("[Proto][ParsePhyCheck] SourceId Error: inSourceId=%" PRIu64 ", srcTarget=%s{private}, hashId=%" PRIu64,
             ULL(phyHeader.sourceId), srcTarget.c_str(), ULL(Hash::HashFunc(srcTarget)));
         return -E_PARSE_FAIL;
     }
     if (phyHeader.packetLen != length) {
-        LOGE("[Proto][ParsePhyCheck] PacketLen=%u Mismatch length=%u.", phyHeader.packetLen, length);
+        LOGE("[Proto][ParsePhyCheck] PacketLen=%" PRIu32 " Mismatch length=%" PRIu32 ".", phyHeader.packetLen, length);
         return -E_PARSE_FAIL;
     }
     if (phyHeader.paddingLen > MAX_PADDING_LEN) {
-        LOGE("[Proto][ParsePhyCheck] PaddingLen=%u Error.", phyHeader.paddingLen);
+        LOGE("[Proto][ParsePhyCheck] PaddingLen=%" PRIu32 " Error.", phyHeader.paddingLen);
         return -E_PARSE_FAIL;
     }
     if (sizeof(CommPhyHeader) + phyHeader.paddingLen > phyHeader.packetLen) {
@@ -739,7 +737,7 @@ int ProtocolProto::ParseCommPhyHeaderCheckField(const std::string &srcTarget, co
         return -E_SUM_CALCULATE_FAIL;
     }
     if (phyHeader.checkSum != sumResult) {
-        LOGE("[Proto][ParsePhyCheck] Sum Mismatch, checkSum=%llu, sumResult=%llu.",
+        LOGE("[Proto][ParsePhyCheck] Sum Mismatch, checkSum=%" PRIu64 ", sumResult=%" PRIu64 ".",
             ULL(phyHeader.checkSum), ULL(sumResult));
         return -E_SUM_MISMATCH;
     }
@@ -778,7 +776,7 @@ int ProtocolProto::ParseCommPhyHeader(const std::string &srcTarget, const uint8_
     } // FragmentFlag default is false
     FrameType frameType = GetFrameType(phyHeader.packetType);
     if (frameType == FrameType::INVALID_MAX_FRAME_TYPE) {
-        LOGW("[Proto][ParsePhy] Unrecognized frame, pktType=%u.", phyHeader.packetType);
+        LOGW("[Proto][ParsePhy] Unrecognized frame, pktType=%" PRIu32 ".", phyHeader.packetType);
         return -E_FRAME_TYPE_NOT_SUPPORT;
     }
     inResult.SetFrameTypeInfo(frameType);
@@ -858,7 +856,7 @@ int ProtocolProto::ParseLabelExchange(const uint8_t *bytes, uint32_t length, Par
     auto fieldPtr = reinterpret_cast<const uint64_t *>(bytes + sizeof(CommPhyHeader));
     uint64_t version = NetToHost(*fieldPtr++);
     if (version != PROTOCOL_VERSION) {
-        LOGE("[Proto][ParseLabel] Version=%llu not support.", ULL(version));
+        LOGE("[Proto][ParseLabel] Version=%" PRIu64 " not support.", ULL(version));
         return -E_VERSION_NOT_SUPPORT;
     }
 
@@ -873,13 +871,13 @@ int ProtocolProto::ParseLabelExchange(const uint8_t *bytes, uint32_t length, Par
     inResult.SetLabelExchangeSequenceId(sequenceId);
     uint64_t commLabelCount = NetToHost(*fieldPtr++);
     if (length < commLabelCount || (UINT32_MAX / COMM_LABEL_LENGTH) < commLabelCount) {
-        LOGE("[Proto][ParseLabel] commLabelCount=%llu invalid.", ULL(commLabelCount));
+        LOGE("[Proto][ParseLabel] commLabelCount=%" PRIu64 " invalid.", ULL(commLabelCount));
         return -E_PARSE_FAIL;
     }
     // commLabelCount is expected to be not very large
     if (length < sizeof(CommPhyHeader) + LABEL_VER_LEN + DISTINCT_VALUE_LEN + SEQUENCE_ID_LEN + COMM_LABEL_COUNT_LEN +
         commLabelCount * COMM_LABEL_LENGTH) {
-        LOGE("[Proto][ParseLabel] Length of Bytes Error, commLabelCount=%llu", ULL(commLabelCount));
+        LOGE("[Proto][ParseLabel] Length of Bytes Error, commLabelCount=%" PRIu64, ULL(commLabelCount));
         return -E_LENGTH_ERROR;
     }
 
@@ -908,7 +906,7 @@ int ProtocolProto::ParseLabelExchangeAck(const uint8_t *bytes, uint32_t length,
     auto fieldPtr = reinterpret_cast<const uint64_t *>(bytes + sizeof(CommPhyHeader));
     uint64_t version = NetToHost(*fieldPtr++);
     if (version != PROTOCOL_VERSION) {
-        LOGE("[Proto][ParseLabelAck] Version=%llu not support.", ULL(version));
+        LOGE("[Proto][ParseLabelAck] Version=%" PRIu64 " not support.", ULL(version));
         return -E_VERSION_NOT_SUPPORT;
     }
 
@@ -947,7 +945,7 @@ int ProtocolProto::FrameFragmentation(const uint8_t *splitStartBytes, const Fram
         // Since exception is disabled, we have to check the vector size to assure that memory is truly allocated
         entry.first.resize(pieceTotalLen + fragmentInfo.extendHeadSize); // Note: should use resize other than reserve
         if (entry.first.size() != (pieceTotalLen + fragmentInfo.extendHeadSize)) {
-            LOGE("[Proto][FrameFrag] Resize failed for length=%u", pieceTotalLen);
+            LOGE("[Proto][FrameFrag] Resize failed for length=%" PRIu32, pieceTotalLen);
             return -E_OUT_OF_MEMORY;
         }
 
@@ -956,7 +954,7 @@ int ProtocolProto::FrameFragmentation(const uint8_t *splitStartBytes, const Fram
 
         // The sum value need to be recalculated, and the packet is fragmented.
         // The alignedFragLen is always larger than pieceFragLen
-        FillPhyHeaderLenInfo(pktPhyHeader, pieceTotalLen, 0, PACKET_TYPE_FRAGMENTED, alignedFragLen - pieceFragLen);
+        FillPhyHeaderLenInfo(pieceTotalLen, 0, PACKET_TYPE_FRAGMENTED, alignedFragLen - pieceFragLen, pktPhyHeader);
         HeaderConverter::ConvertHostToNet(pktPhyHeader, pktPhyHeader);
 
         CommPhyOptHeader pktPhyOptHeader = {static_cast<uint32_t>(fragmentInfo.splitLength + sizeof(CommPhyHeader)),
@@ -1081,7 +1079,6 @@ int ProtocolProto::FillExtendHeadDataIfNeed(std::shared_ptr<ExtendHeaderHandle>
             LOGI("[Proto][ToSerial] fill head data failed");
             return -E_FEEDBACK_COMMUNICATOR_NOT_FOUND;
         }
-        return E_OK;
     }
     return E_OK;
 }
diff --git a/frameworks/libs/distributeddb/communicator/src/protocol_proto.h b/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
index 64ce126c1df..c5f7e0918c1 100644
--- a/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
+++ b/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
@@ -18,31 +18,31 @@
 
 #include <cstdint>
 #include <memory>
-#include "message.h"
+#include "communicator_type_define.h"
 #include "frame_header.h"
+#include "iprocess_communicator.h"
+#include "message.h"
+#include "message_transform.h"
 #include "parse_result.h"
 #include "serial_buffer.h"
-#include "message_transform.h"
-#include "communicator_type_define.h"
-#include "iprocess_communicator.h"
 
 namespace DistributedDB {
 struct PhyHeaderInfo {
-    uint64_t sourceId;
-    uint32_t frameId;
-    FrameType frameType;
+    uint64_t sourceId = 0u;
+    uint32_t frameId = 0u;
+    FrameType frameType = FrameType::EMPTY;
 };
 
 struct FrameFragmentInfo {
-    uint8_t *oringinalBytesAddr;
-    uint32_t extendHeadSize;
-    uint32_t splitLength;
-    uint16_t fragCount;
+    uint8_t *oringinalBytesAddr = nullptr;
+    uint32_t extendHeadSize = 0u;
+    uint32_t splitLength = 0u;
+    uint16_t fragCount = 0u;
 };
 
 struct FragmentPacket {
-    uint8_t *ptrPacket;
-    uint32_t leftLength;
+    uint8_t *ptrPacket = nullptr;
+    uint32_t leftLength = 0u;
 };
 
 class ProtocolProto {
@@ -55,8 +55,8 @@ public:
     static uint32_t GetCommLayerFrameHeaderLength();
 
     // For handling application layer message. Return a heap object.
-    static SerialBuffer *ToSerialBuffer(const Message *inMsg, int &outErrorNo,
-        std::shared_ptr<ExtendHeaderHandle> &extendHandle, bool onlyMsgHeader = false);
+    static SerialBuffer *ToSerialBuffer(const Message *inMsg,
+        std::shared_ptr<ExtendHeaderHandle> &extendHandle, bool onlyMsgHeader, int &outErrorNo);
     static Message *ToMessage(const SerialBuffer *inBuff, int &outErrorNo, bool onlyMsgHeader = false);
 
     // For handling communication layer frame. Return a heap object.
diff --git a/frameworks/libs/distributeddb/communicator/src/serial_buffer.cpp b/frameworks/libs/distributeddb/communicator/src/serial_buffer.cpp
index ae75a154a46..1aabac0c67b 100644
--- a/frameworks/libs/distributeddb/communicator/src/serial_buffer.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/serial_buffer.cpp
@@ -15,10 +15,10 @@
 
 #include "serial_buffer.h"
 #include <new>
-#include "securec.h"
-#include "db_errno.h"
 #include "communicator_type_define.h"
+#include "db_errno.h"
 #include "log_print.h"
+#include "securec.h"
 
 namespace DistributedDB {
 SerialBuffer::~SerialBuffer()
diff --git a/frameworks/libs/distributeddb/include/query_expression.h b/frameworks/libs/distributeddb/include/query_expression.h
index 5c931d45035..2467ab6920d 100644
--- a/frameworks/libs/distributeddb/include/query_expression.h
+++ b/frameworks/libs/distributeddb/include/query_expression.h
@@ -16,10 +16,10 @@
 #ifndef DISTRIBUTEDDB_QUERY_EXPRESSION_H
 #define DISTRIBUTEDDB_QUERY_EXPRESSION_H
 
-#include <string>
-#include <vector>
 #include <list>
 #include <set>
+#include <string>
+#include <vector>
 
 #include "types_export.h"
 
diff --git a/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h b/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
index 5abbd3069da..534657876ee 100644
--- a/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
+++ b/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
@@ -16,11 +16,11 @@
 #ifndef IPROCESSCOMMUNICATOR_H
 #define IPROCESSCOMMUNICATOR_H
 
-#include <string>
-#include <vector>
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <string>
+#include <vector>
 #include "store_types.h"
 
 namespace DistributedDB {
diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h
index d4c538304c5..ce54c469fd7 100644
--- a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h
+++ b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_result_set.h
@@ -19,8 +19,8 @@
 #include <mutex>
 #include <vector>
 
-#include "kvdb_windowed_result_set.h"
 #include "ikvdb_raw_cursor.h"
+#include "kvdb_windowed_result_set.h"
 #include "query_object.h"
 
 namespace DistributedDB {
diff --git a/frameworks/libs/distributeddb/syncer/src/generic_syncer.cpp b/frameworks/libs/distributeddb/syncer/src/generic_syncer.cpp
index f4657850967..76899e21958 100644
--- a/frameworks/libs/distributeddb/syncer/src/generic_syncer.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/generic_syncer.cpp
@@ -135,8 +135,8 @@ int GenericSyncer::Initialize(ISyncInterface *syncInterface, bool isNeedActive)
         initialized_ = true;
     }
 
-    // RegConnectCallback may start an auto sync, this function can not in syncerLock_
-    syncEngine_->RegConnectCallback();
+    // StartCommunicator may start an auto sync, this function can not in syncerLock_
+    syncEngine_->StartCommunicator();
     return E_OK;
 }
 
@@ -885,7 +885,7 @@ int GenericSyncer::InitTimeChangedListener()
             Timestamp currentSysTime = TimeHelper::GetSysCurrentTime();
             Timestamp maxItemTime = 0;
             this->syncInterface_->GetMaxTimestamp(maxItemTime);
-            if (static_cast<Timestamp>(orgOffset + currentSysTime) > TimeHelper::BUFFER_VALID_TIME) {
+            if ((orgOffset + currentSysTime) > TimeHelper::BUFFER_VALID_TIME) {
                 orgOffset = static_cast<Timestamp>(TimeHelper::BUFFER_VALID_TIME) -
                     currentSysTime + TimeHelper::MS_TO_100_NS;
             }
diff --git a/frameworks/libs/distributeddb/syncer/src/isync_engine.h b/frameworks/libs/distributeddb/syncer/src/isync_engine.h
index a0fc131cec0..eb0622f1e27 100644
--- a/frameworks/libs/distributeddb/syncer/src/isync_engine.h
+++ b/frameworks/libs/distributeddb/syncer/src/isync_engine.h
@@ -49,8 +49,8 @@ public:
     // Get Online devices
     virtual void GetOnlineDevices(std::vector<std::string> &devices) const = 0;
 
-    // Register the device connect callback, this function must be called after Engine initted
-    virtual void RegConnectCallback() = 0;
+    // Register the device connect callback and active communicator, this function must be called after Engine initted
+    virtual void StartCommunicator() = 0;
 
     // Get the database identifier
     virtual std::string GetLabel() const = 0;
diff --git a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
index c81b662eb74..d98be3e2dc7 100644
--- a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
@@ -513,26 +513,24 @@ int QuerySyncWaterMarkHelper::RemoveLeastUsedQuerySyncItems(const std::vector<Ke
 int QuerySyncWaterMarkHelper::ResetRecvQueryWaterMark(const DeviceID &deviceId, const std::string &tableName)
 {
     // lock prevent other thread modify queryWaterMark at this moment
-    {
-        std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
-        std::string prefixKeyStr = DBConstant::QUERY_SYNC_PREFIX_KEY + DBCommon::TransferHashString(deviceId);
-        if (!tableName.empty()) {
-            std::string hashTableName = DBCommon::TransferHashString(tableName);
-            std::string hexTableName = DBCommon::TransferStringToHex(hashTableName);
-            prefixKeyStr += hexTableName;
-        }
+    std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
+    std::string prefixKeyStr = DBConstant::QUERY_SYNC_PREFIX_KEY + DBCommon::TransferHashString(deviceId);
+    if (!tableName.empty()) {
+        std::string hashTableName = DBCommon::TransferHashString(tableName);
+        std::string hexTableName = DBCommon::TransferStringToHex(hashTableName);
+        prefixKeyStr += hexTableName;
+    }
 
-        // remove in db
-        Key prefixKey;
-        DBCommon::StringToVector(prefixKeyStr, prefixKey);
-        int errCode = storage_->DeleteMetaDataByPrefixKey(prefixKey);
-        if (errCode != E_OK) {
-            LOGE("[META]ResetRecvQueryWaterMark fail errCode:%d", errCode);
-            return errCode;
-        }
-        // clean cache
-        querySyncCache_.RemoveWithPrefixKey(prefixKeyStr);
+    // remove in db
+    Key prefixKey;
+    DBCommon::StringToVector(prefixKeyStr, prefixKey);
+    int errCode = storage_->DeleteMetaDataByPrefixKey(prefixKey);
+    if (errCode != E_OK) {
+        LOGE("[META]ResetRecvQueryWaterMark fail errCode:%d", errCode);
+        return errCode;
     }
+    // clean cache
+    querySyncCache_.RemoveWithPrefixKey(prefixKeyStr);
     return E_OK;
 }
 }  // namespace DistributedDB
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/syncer/src/sync_engine.cpp b/frameworks/libs/distributeddb/syncer/src/sync_engine.cpp
index 221dcbca9c5..9da7672d8c7 100644
--- a/frameworks/libs/distributeddb/syncer/src/sync_engine.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/sync_engine.cpp
@@ -129,14 +129,16 @@ int SyncEngine::Close()
 
     WaitingExecTaskExist();
     ReleaseCommunicators();
-    std::lock_guard<std::mutex> msgLock(queueLock_);
-    while (!msgQueue_.empty()) {
-        Message *inMsg = msgQueue_.front();
-        msgQueue_.pop_front();
-        if (inMsg != nullptr) {
-            queueCacheSize_ -= GetMsgSize(inMsg);
-            delete inMsg;
-            inMsg = nullptr;
+    {
+        std::lock_guard<std::mutex> msgLock(queueLock_);
+        while (!msgQueue_.empty()) {
+            Message *inMsg = msgQueue_.front();
+            msgQueue_.pop_front();
+            if (inMsg != nullptr) {
+                queueCacheSize_ -= GetMsgSize(inMsg);
+                delete inMsg;
+                inMsg = nullptr;
+            }
         }
     }
     // close db, rekey or import scene, need clear all remote query info
@@ -200,18 +202,18 @@ void SyncEngine::BroadCastDataChanged() const
     }
 }
 
-void SyncEngine::RegConnectCallback()
+void SyncEngine::StartCommunicator()
 {
     if (communicator_ == nullptr) {
-        LOGE("[SyncEngine][RegConnCB] communicator is not set!");
+        LOGE("[SyncEngine][StartCommunicator] communicator is not set!");
         return;
     }
-    LOGD("[SyncEngine] RegOnConnectCallback");
+    LOGD("[SyncEngine][StartCommunicator] RegOnConnectCallback");
     int errCode = communicator_->RegOnConnectCallback(
         std::bind(&DeviceManager::OnDeviceConnectCallback, deviceManager_,
             std::placeholders::_1, std::placeholders::_2), nullptr);
     if (errCode != E_OK) {
-        LOGE("[SyncEngine][RegConnCB] register failed, auto sync can not use! err %d", errCode);
+        LOGE("[SyncEngine][StartCommunicator] register failed, auto sync can not use! err %d", errCode);
         return;
     }
     communicator_->Activate();
@@ -361,14 +363,12 @@ MSG_CALLBACK_OUT_NOT_DEL:
 
 void SyncEngine::RemoteDataChangedTask(ISyncTaskContext *context, const ICommunicator *communicator, Message *inMsg)
 {
-    do {
-        std::string deviceId = context->GetDeviceId();
-        if (onRemoteDataChanged_ && deviceManager_->IsDeviceOnline(deviceId)) {
-            onRemoteDataChanged_(deviceId);
-        } else {
-            LOGE("[SyncEngine] onRemoteDataChanged is null!");
-        }
-    } while (false);
+    std::string deviceId = context->GetDeviceId();
+    if (onRemoteDataChanged_ && deviceManager_->IsDeviceOnline(deviceId)) {
+        onRemoteDataChanged_(deviceId);
+    } else {
+        LOGE("[SyncEngine] onRemoteDataChanged is null!");
+    }
     delete inMsg;
     inMsg = nullptr;
     ScheduleTaskOut(context, communicator);
diff --git a/frameworks/libs/distributeddb/syncer/src/sync_engine.h b/frameworks/libs/distributeddb/syncer/src/sync_engine.h
index a7f8fad203a..1dd8d2a668f 100644
--- a/frameworks/libs/distributeddb/syncer/src/sync_engine.h
+++ b/frameworks/libs/distributeddb/syncer/src/sync_engine.h
@@ -58,7 +58,7 @@ public:
     void GetOnlineDevices(std::vector<std::string> &devices) const override;
 
     // Register the device connect callback, this function must be called after Engine inited
-    void RegConnectCallback() override;
+    void StartCommunicator() override;
 
     // Get the queue cache memory size
     int GetQueueCacheSize() const;
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
index d6a625f42b5..f3dc31a4b91 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
@@ -201,7 +201,7 @@ int VirtualCommunicator::TranslateMsg(const Message *inMsg, Message *&outMsg)
 {
     int errCode = E_OK;
     std::shared_ptr<ExtendHeaderHandle> extendHandle = nullptr;
-    auto buffer = ProtocolProto::ToSerialBuffer(inMsg, errCode, extendHandle);
+    auto buffer = ProtocolProto::ToSerialBuffer(inMsg, extendHandle, false, errCode);
     if (errCode != E_OK) {
         return errCode;
     }
-- 
Gitee


From 1ffde0f378f28ed87058581c9f6b3f488e7b1abf Mon Sep 17 00:00:00 2001
From: zqq <zhangqiquan1@huawei.com>
Date: Sat, 29 Oct 2022 10:43:38 +0800
Subject: [PATCH 2/3] fix issue

Signed-off-by: zqq <zhangqiquan1@huawei.com>
---
 .../common/include/performance_analysis.h     |  2 +-
 .../common/include/semaphore_utils.h          |  2 -
 .../common/src/runtime_context_impl.cpp       |  3 +-
 .../communicator/src/communicator_linker.cpp  |  2 +-
 .../communicator/src/network_adapter.cpp      |  2 +-
 .../include/iprocess_communicator.h           |  7 ---
 .../storage/src/sync_able_engine.cpp          | 15 ------
 .../storage/src/sync_able_engine.h            |  1 -
 .../distributeddb/syncer/include/isyncer.h    |  6 +--
 .../syncer/src/remote_executor.cpp            | 47 +++++++------------
 .../syncer/src/single_ver_data_sync.cpp       |  2 +-
 .../distributeddb/syncer/src/syncer_proxy.cpp |  2 +-
 12 files changed, 25 insertions(+), 66 deletions(-)

diff --git a/frameworks/libs/distributeddb/common/include/performance_analysis.h b/frameworks/libs/distributeddb/common/include/performance_analysis.h
index 51a84dfe921..412534b584c 100644
--- a/frameworks/libs/distributeddb/common/include/performance_analysis.h
+++ b/frameworks/libs/distributeddb/common/include/performance_analysis.h
@@ -69,7 +69,6 @@ struct SingleStatistics {
 
 class PerformanceAnalysis {
 public:
-    explicit PerformanceAnalysis(uint32_t step);
     ~PerformanceAnalysis();
 
     static PerformanceAnalysis *GetInstance(int stepNum = 20);
@@ -93,6 +92,7 @@ public:
     void SetFileName(const std::string &fileName);
 
 private:
+    explicit PerformanceAnalysis(uint32_t step);
 
     bool IsStepValid(uint32_t step) const;
 
diff --git a/frameworks/libs/distributeddb/common/include/semaphore_utils.h b/frameworks/libs/distributeddb/common/include/semaphore_utils.h
index 9cdb3f561dc..c5e96e24a22 100644
--- a/frameworks/libs/distributeddb/common/include/semaphore_utils.h
+++ b/frameworks/libs/distributeddb/common/include/semaphore_utils.h
@@ -16,8 +16,6 @@
 #ifndef SEMAPHORE_UTILS_H
 #define SEMAPHORE_UTILS_H
 
-#include <cstdio>
-#include <cstdlib>
 #include <mutex>
 #include <condition_variable>
 #include "macro_utils.h"
diff --git a/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp b/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
index 0fba976541a..24340cf4093 100644
--- a/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
+++ b/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
@@ -392,9 +392,8 @@ int RuntimeContextImpl::RunPermissionCheck(const PermissionCheckParam &param, ui
     }
     if (checkResult) {
         return E_OK;
-    } else {
-        return -E_NOT_PERMIT;
     }
+    return -E_NOT_PERMIT;
 }
 
 int RuntimeContextImpl::EnableKvStoreAutoLaunch(const KvDBProperties &properties, AutoLaunchNotifier notifier,
diff --git a/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp b/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
index ff9bb80e4a3..7f95f621dde 100644
--- a/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
@@ -363,7 +363,7 @@ void CommunicatorLinker::SendLabelExchange(const std::string &toTarget, SerialBu
     uint32_t inRetransmitCount)
 {
     // Check whether have the need to send
-    bool noNeedToSend = ((inRetransmitCount <= RETRANSMIT_LIMIT) ? false : true);
+    bool noNeedToSend = inRetransmitCount > RETRANSMIT_LIMIT;
     {
         std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
         if (remoteOnlineTarget_.count(toTarget) == 0) {
diff --git a/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp b/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
index cb32822ffa5..5077c8cd3b8 100644
--- a/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/network_adapter.cpp
@@ -47,7 +47,7 @@ NetworkAdapter::~NetworkAdapter()
 
 int NetworkAdapter::StartAdapter()
 {
-    LOGI("[NAdapt][Start] Enter, ProcessLabel=%s.", processLabel_.c_str());
+    LOGI("[NAdapt][Start] Enter, ProcessLabel=%s.", STR_MASK(DBCommon::TransferStringToHex(processLabel_)));
     if (processLabel_.empty()) {
         return -E_INVALID_ARGS;
     }
diff --git a/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h b/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
index 534657876ee..e500a78fac0 100644
--- a/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
+++ b/frameworks/libs/distributeddb/interfaces/include/iprocess_communicator.h
@@ -53,9 +53,6 @@ public:
     // return not OK if fill data failed
     virtual DBStatus FillHeadData(uint8_t *data, uint32_t headSize, uint32_t totalLen)
     {
-        (void)data;
-        (void)headSize;
-        (void)totalLen;
         return OK;
     };
 };
@@ -148,7 +145,6 @@ public:
 
     virtual std::shared_ptr<ExtendHeaderHandle> GetExtendHeaderHandle(const ExtendInfo &paramInfo)
     {
-        (void)paramInfo;
         return nullptr;
     }
     // called after OnDataReceive
@@ -158,9 +154,6 @@ public:
     virtual DBStatus CheckAndGetDataHeadInfo(const uint8_t *data, uint32_t totalLen, uint32_t &headLength,
         std::vector<std::string> &userId)
     {
-        (void)data;
-        (void)totalLen;
-        (void)userId;
         headLength = 0;
         return OK;
     }
diff --git a/frameworks/libs/distributeddb/storage/src/sync_able_engine.cpp b/frameworks/libs/distributeddb/storage/src/sync_able_engine.cpp
index fc34669a02d..e0702704890 100644
--- a/frameworks/libs/distributeddb/storage/src/sync_able_engine.cpp
+++ b/frameworks/libs/distributeddb/storage/src/sync_able_engine.cpp
@@ -228,21 +228,6 @@ void SyncAbleEngine::ReSetSyncModuleActive()
     isSyncNeedActive_ = true;
 }
 
-void SyncAbleEngine::TriggerSync(int notifyEvent)
-{
-    if (!started_) {
-        StartSyncer();
-    }
-    if (started_) {
-        int errCode = RuntimeContext::GetInstance()->ScheduleTask([this, notifyEvent] {
-            syncer_.LocalDataChanged(notifyEvent);
-        });
-        if (errCode != E_OK) {
-            LOGE("[TriggerSync] SyncAbleEngine TriggerSync LocalDataChanged retCode:%d", errCode);
-        }
-    }
-}
-
 int SyncAbleEngine::GetLocalIdentity(std::string &outTarget)
 {
     if (!started_) {
diff --git a/frameworks/libs/distributeddb/storage/src/sync_able_engine.h b/frameworks/libs/distributeddb/storage/src/sync_able_engine.h
index 609a55d4c9d..d80e8a1710d 100644
--- a/frameworks/libs/distributeddb/storage/src/sync_able_engine.h
+++ b/frameworks/libs/distributeddb/storage/src/sync_able_engine.h
@@ -27,7 +27,6 @@ class SyncAbleEngine final {
 public:
     explicit SyncAbleEngine(ISyncInterface *store);
     ~SyncAbleEngine();
-    void TriggerSync(int notifyEvent);
 
     // Start a sync action.
     int Sync(const ISyncer::SyncParma &parm, uint64_t connectionId);
diff --git a/frameworks/libs/distributeddb/syncer/include/isyncer.h b/frameworks/libs/distributeddb/syncer/include/isyncer.h
index 15ea8ae4c76..010a0d58fc2 100644
--- a/frameworks/libs/distributeddb/syncer/include/isyncer.h
+++ b/frameworks/libs/distributeddb/syncer/include/isyncer.h
@@ -32,7 +32,6 @@ namespace DistributedDB {
 struct SyncerBasicInfo {
     bool isSyncActive = false;
     bool isAutoSync = false;
-    bool isClearHistoryData = false;
 };
 class ISyncer {
 public:
@@ -50,10 +49,7 @@ public:
     virtual ~ISyncer() {};
 
     // Init the Syncer modules
-    virtual int Initialize(ISyncInterface *syncInterface, bool isNeedActive)
-    {
-        return -E_NOT_SUPPORT;
-    }
+    virtual int Initialize(ISyncInterface *syncInterface, bool isNeedActive) = 0;
 
     // Close
     virtual int Close(bool isClosedOperation) = 0;
diff --git a/frameworks/libs/distributeddb/syncer/src/remote_executor.cpp b/frameworks/libs/distributeddb/syncer/src/remote_executor.cpp
index cac8600fb7b..f9461835a36 100644
--- a/frameworks/libs/distributeddb/syncer/src/remote_executor.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/remote_executor.cpp
@@ -175,36 +175,25 @@ int RemoteExecutor::ReceiveRemoteExecutorRequest(const std::string &targetDev, M
         }
         workingThreadsCount_++;
     }
-    RefObject::IncObjRef(this);
-    int errCode = RuntimeContext::GetInstance()->ScheduleTask([this]() {
-        bool empty = true;
-        do {
-            std::pair<std::string, Message *> entry;
-            {
-                std::lock_guard<std::mutex> autoLock(msgQueueLock_);
-                empty = searchMessageQueue_.empty();
-                if (empty) {
-                    workingThreadsCount_--;
-                    continue;
-                }
-                entry = searchMessageQueue_.front();
-                searchMessageQueue_.pop();
+    bool empty = true;
+    do {
+        std::pair<std::string, Message *> entry;
+        {
+            std::lock_guard<std::mutex> autoLock(msgQueueLock_);
+            empty = searchMessageQueue_.empty();
+            if (empty) {
+                workingThreadsCount_--;
+                continue;
             }
-            ParseOneRequestMessage(entry.first, entry.second);
-            delete entry.second;
-            entry.second = nullptr;
-        } while (!empty);
-        clearCV_.notify_one();
-        RefObject::DecObjRef(this);
-    });
-    if (errCode != E_OK) {
-        workingThreadsCount_--;
-        clearCV_.notify_one();
-        RefObject::DecObjRef(this);
-    } else {
-        errCode = -E_NOT_NEED_DELETE_MSG;
-    }
-    return errCode;
+            entry = searchMessageQueue_.front();
+            searchMessageQueue_.pop();
+        }
+        ParseOneRequestMessage(entry.first, entry.second);
+        delete entry.second;
+        entry.second = nullptr;
+    } while (!empty);
+    clearCV_.notify_one();
+    return -E_NOT_NEED_DELETE_MSG;
 }
 
 void RemoteExecutor::ParseOneRequestMessage(const std::string &device, Message *inMsg)
diff --git a/frameworks/libs/distributeddb/syncer/src/single_ver_data_sync.cpp b/frameworks/libs/distributeddb/syncer/src/single_ver_data_sync.cpp
index 291518d1f41..86983a1d0d1 100644
--- a/frameworks/libs/distributeddb/syncer/src/single_ver_data_sync.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/single_ver_data_sync.cpp
@@ -320,7 +320,6 @@ int SingleVerDataSync::GetDataWithPerformanceRecord(SingleVerSyncTaskContext *co
 int SingleVerDataSync::GetUnsyncData(SingleVerSyncTaskContext *context, std::vector<SendDataItem> &outData,
     size_t packetSize)
 {
-    int errCode;
     WaterMark startMark = 0;
     SyncType curType = (context->IsQuerySync()) ? SyncType::QUERY_SYNC_TYPE : SyncType::MANUAL_FULL_SYNC_TYPE;
     GetLocalWaterMark(curType, context->GetQuerySyncId(), context, startMark);
@@ -334,6 +333,7 @@ int SingleVerDataSync::GetUnsyncData(SingleVerSyncTaskContext *context, std::vec
         storage_->ReleaseContinueToken(token);
     }
     DataSizeSpecInfo syncDataSizeInfo = GetDataSizeSpecInfo(packetSize);
+    int errCode;
     if (curType != SyncType::QUERY_SYNC_TYPE) {
         errCode = storage_->GetSyncData(startMark, endMark, outData, token, syncDataSizeInfo);
     } else {
diff --git a/frameworks/libs/distributeddb/syncer/src/syncer_proxy.cpp b/frameworks/libs/distributeddb/syncer/src/syncer_proxy.cpp
index e9c4f237bbe..dc4afdc59cd 100644
--- a/frameworks/libs/distributeddb/syncer/src/syncer_proxy.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/syncer_proxy.cpp
@@ -210,7 +210,7 @@ void SyncerProxy::Dump(int fd)
 SyncerBasicInfo SyncerProxy::DumpSyncerBasicInfo()
 {
     if (syncer_ == nullptr) {
-        return SyncerBasicInfo { false, false, false };
+        return SyncerBasicInfo { false, false };
     }
     return syncer_->DumpSyncerBasicInfo();
 }
-- 
Gitee


From 82b7d8168f8fbdded7458900221c33c4854d087a Mon Sep 17 00:00:00 2001
From: zqq <zhangqiquan1@huawei.com>
Date: Sat, 29 Oct 2022 16:10:44 +0800
Subject: [PATCH 3/3] fix rvo issue

Signed-off-by: zqq <zhangqiquan1@huawei.com>
---
 .../common/include/performance_analysis.h     |  4 +--
 .../src/query_sync_water_mark_helper.cpp      | 30 ++++++++-----------
 .../syncer/src/query_sync_water_mark_helper.h |  5 ++--
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/frameworks/libs/distributeddb/common/include/performance_analysis.h b/frameworks/libs/distributeddb/common/include/performance_analysis.h
index 412534b584c..286fe4ac35a 100644
--- a/frameworks/libs/distributeddb/common/include/performance_analysis.h
+++ b/frameworks/libs/distributeddb/common/include/performance_analysis.h
@@ -69,8 +69,6 @@ struct SingleStatistics {
 
 class PerformanceAnalysis {
 public:
-    ~PerformanceAnalysis();
-
     static PerformanceAnalysis *GetInstance(int stepNum = 20);
 
     void Initialization();
@@ -94,6 +92,8 @@ public:
 private:
     explicit PerformanceAnalysis(uint32_t step);
 
+    ~PerformanceAnalysis();
+
     bool IsStepValid(uint32_t step) const;
 
     bool IsOpen() const;
diff --git a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
index d98be3e2dc7..b4ac54b303c 100644
--- a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
+++ b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.cpp
@@ -121,8 +121,7 @@ int QuerySyncWaterMarkHelper::GetQueryWaterMarkInCacheAndDb(const std::string &c
 int QuerySyncWaterMarkHelper::GetQueryWaterMark(const std::string &queryIdentify, const std::string &deviceId,
     QueryWaterMark &queryWaterMark)
 {
-    std::string cacheKey;
-    GetHashQuerySyncDeviceId(deviceId, queryIdentify, cacheKey);
+    std::string cacheKey = GetHashQuerySyncDeviceId(deviceId, queryIdentify);
     std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
     return GetQueryWaterMarkInCacheAndDb(cacheKey, queryWaterMark);
 }
@@ -130,8 +129,7 @@ int QuerySyncWaterMarkHelper::GetQueryWaterMark(const std::string &queryIdentify
 int QuerySyncWaterMarkHelper::SetRecvQueryWaterMark(const std::string &queryIdentify,
     const std::string &deviceId, const WaterMark &waterMark)
 {
-    std::string cacheKey;
-    GetHashQuerySyncDeviceId(deviceId, queryIdentify, cacheKey);
+    std::string cacheKey = GetHashQuerySyncDeviceId(deviceId, queryIdentify);
     std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
     return SetRecvQueryWaterMarkWithoutLock(cacheKey, waterMark);
 }
@@ -139,8 +137,7 @@ int QuerySyncWaterMarkHelper::SetRecvQueryWaterMark(const std::string &queryIden
 int QuerySyncWaterMarkHelper::SetLastQueryTime(const std::string &queryIdentify,
     const std::string &deviceId, const Timestamp &timestamp)
 {
-    std::string cacheKey;
-    GetHashQuerySyncDeviceId(deviceId, queryIdentify, cacheKey);
+    std::string cacheKey = GetHashQuerySyncDeviceId(deviceId, queryIdentify);
     std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
     QueryWaterMark queryWaterMark;
     int errCode = GetQueryWaterMarkInCacheAndDb(cacheKey, queryWaterMark);
@@ -166,8 +163,7 @@ int QuerySyncWaterMarkHelper::SetRecvQueryWaterMarkWithoutLock(const std::string
 int QuerySyncWaterMarkHelper::SetSendQueryWaterMark(const std::string &queryIdentify,
     const std::string &deviceId, const WaterMark &waterMark)
 {
-    std::string cacheKey;
-    GetHashQuerySyncDeviceId(deviceId, queryIdentify, cacheKey);
+    std::string cacheKey = GetHashQuerySyncDeviceId(deviceId, queryIdentify);
     QueryWaterMark queryWaterMark;
     std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
     int errCode = GetQueryWaterMarkInCacheAndDb(cacheKey, queryWaterMark);
@@ -288,10 +284,10 @@ uint64_t QuerySyncWaterMarkHelper::CalculateQueryWaterMarkSize(const QueryWaterM
     return length;
 }
 
-void QuerySyncWaterMarkHelper::GetHashQuerySyncDeviceId(const DeviceID &deviceId,
-    const DeviceID &queryId, DeviceID &hashQuerySyncId)
+DeviceID QuerySyncWaterMarkHelper::GetHashQuerySyncDeviceId(const DeviceID &deviceId, const DeviceID &queryId)
 {
     std::lock_guard<std::mutex> autoLock(queryWaterMarkLock_);
+    DeviceID hashQuerySyncId;
     if (deviceIdToHashQuerySyncIdMap_[deviceId].count(queryId) == 0) {
         // do not modify this
         hashQuerySyncId = DBConstant::QUERY_SYNC_PREFIX_KEY + DBCommon::TransferHashString(deviceId) + queryId;
@@ -299,19 +295,18 @@ void QuerySyncWaterMarkHelper::GetHashQuerySyncDeviceId(const DeviceID &deviceId
     } else {
         hashQuerySyncId = deviceIdToHashQuerySyncIdMap_[deviceId][queryId];
     }
+    return hashQuerySyncId;
 }
 
 int QuerySyncWaterMarkHelper::GetDeleteSyncWaterMark(const std::string &deviceId, DeleteWaterMark &deleteWaterMark)
 {
-    std::string hashId;
-    GetHashDeleteSyncDeviceId(deviceId, hashId);
+    std::string hashId = GetHashDeleteSyncDeviceId(deviceId);
     return GetDeleteWaterMarkFromCache(hashId, deleteWaterMark);
 }
 
 int QuerySyncWaterMarkHelper::SetSendDeleteSyncWaterMark(const DeviceID &deviceId, const WaterMark &waterMark)
 {
-    std::string hashId;
-    GetHashDeleteSyncDeviceId(deviceId, hashId);
+    std::string hashId = GetHashDeleteSyncDeviceId(deviceId);
     DeleteWaterMark deleteWaterMark;
     GetDeleteWaterMarkFromCache(hashId, deleteWaterMark);
     deleteWaterMark.sendWaterMark = waterMark;
@@ -321,8 +316,7 @@ int QuerySyncWaterMarkHelper::SetSendDeleteSyncWaterMark(const DeviceID &deviceI
 
 int QuerySyncWaterMarkHelper::SetRecvDeleteSyncWaterMark(const DeviceID &deviceId, const WaterMark &waterMark)
 {
-    std::string hashId;
-    GetHashDeleteSyncDeviceId(deviceId, hashId);
+    std::string hashId = GetHashDeleteSyncDeviceId(deviceId);
     DeleteWaterMark deleteWaterMark;
     GetDeleteWaterMarkFromCache(hashId, deleteWaterMark);
     deleteWaterMark.recvWaterMark = waterMark;
@@ -402,8 +396,9 @@ int QuerySyncWaterMarkHelper::SaveDeleteWaterMarkToDB(const DeviceID &hashDevice
     return errCode;
 }
 
-void QuerySyncWaterMarkHelper::GetHashDeleteSyncDeviceId(const DeviceID &deviceId, DeviceID &hashDeleteSyncId)
+DeviceID QuerySyncWaterMarkHelper::GetHashDeleteSyncDeviceId(const DeviceID &deviceId)
 {
+    DeviceID hashDeleteSyncId;
     std::lock_guard<std::mutex> autoLock(deleteSyncLock_);
     if (deviceIdToHashDeleteSyncIdMap_.count(deviceId) == 0) {
         hashDeleteSyncId = DBConstant::DELETE_SYNC_PREFIX_KEY + DBCommon::TransferHashString(deviceId);
@@ -411,6 +406,7 @@ void QuerySyncWaterMarkHelper::GetHashDeleteSyncDeviceId(const DeviceID &deviceI
     } else {
         hashDeleteSyncId = deviceIdToHashDeleteSyncIdMap_[deviceId];
     }
+    return hashDeleteSyncId;
 }
 
 int QuerySyncWaterMarkHelper::SerializeDeleteWaterMark(const DeleteWaterMark &deleteWaterMark,
diff --git a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.h b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.h
index aef8c9930e6..ab36f91eee8 100644
--- a/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.h
+++ b/frameworks/libs/distributeddb/syncer/src/query_sync_water_mark_helper.h
@@ -107,8 +107,7 @@ private:
 
     // get the querySync hashId in cache_ or generate one and then put it in to cache_
     // the hashId is made up of "QUERY_SYNC_PREFIX_KEY" + hash(deviceId) + queryId
-    void GetHashQuerySyncDeviceId(const DeviceID &deviceId,
-        const DeviceID &queryId, DeviceID &hashQuerySyncId);
+    DeviceID GetHashQuerySyncDeviceId(const DeviceID &deviceId, const DeviceID &queryId);
 
     // put queryWaterMark to lru cache_ and then save to db
     int UpdateCacheAndSave(const std::string &cacheKey, QueryWaterMark &queryWaterMark);
@@ -119,7 +118,7 @@ private:
 
     // get the deleteSync hashId in cache_ or generate one and then put it in to cache_
     // the hashId is made up of "DELETE_SYNC_PREFIX_KEY" + hash(deviceId)
-    void GetHashDeleteSyncDeviceId(const DeviceID &deviceId, DeviceID &hashDeleteSyncId);
+    DeviceID GetHashDeleteSyncDeviceId(const DeviceID &deviceId);
 
     int SaveDeleteWaterMarkToDB(const DeviceID &hashDeviceId, const DeleteWaterMark &deleteWaterMark);
 
-- 
Gitee