diff --git a/data_object/frameworks/innerkitsimpl/include/adaptor/client_adaptor.h b/data_object/frameworks/innerkitsimpl/include/adaptor/client_adaptor.h
index ce1012f3a7b904d8a17d59e3294d3b421df3dd39..94f73271911c1558c14496a1ad533d8692049546 100644
--- a/data_object/frameworks/innerkitsimpl/include/adaptor/client_adaptor.h
+++ b/data_object/frameworks/innerkitsimpl/include/adaptor/client_adaptor.h
@@ -26,11 +26,20 @@ public:
     static sptr<OHOS::DistributedObject::IObjectService> GetObjectService();
     static uint32_t RegisterClientDeathListener(const std::string &appId, sptr<IRemoteObject> remoteObject);
 private:
+    class ServiceDeathRecipient : public IRemoteObject::DeathRecipient {
+    public:
+        ServiceDeathRecipient();
+        virtual ~ServiceDeathRecipient();
+
+        void OnRemoteDied(const wptr<IRemoteObject> &remote) override;
+    };
+
     static constexpr int32_t DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID = 1301;
     static constexpr int32_t GET_SA_RETRY_TIMES = 3;
     static constexpr int32_t RETRY_INTERVAL = 1;
     static std::shared_ptr<ObjectStoreDataServiceProxy> distributedDataMgr_;
     static std::shared_ptr<ObjectStoreDataServiceProxy> GetDistributedDataManager();
+    static std::mutex mutex_;
 };
 
 class ObjectStoreDataServiceProxy  : public IRemoteProxy<OHOS::DistributedObject::IKvStoreDataService> {
diff --git a/data_object/frameworks/innerkitsimpl/include/communicator/process_communicator_impl.h b/data_object/frameworks/innerkitsimpl/include/communicator/process_communicator_impl.h
index 8f8ddaa7f159d03ca7048eae2e529af7e52d7c65..4cb752f30eda3f108cd8257e25c1dde4e94cfc72 100644
--- a/data_object/frameworks/innerkitsimpl/include/communicator/process_communicator_impl.h
+++ b/data_object/frameworks/innerkitsimpl/include/communicator/process_communicator_impl.h
@@ -61,9 +61,6 @@ private:
     mutable std::mutex onDataReceiveMutex_;
 
     static constexpr uint32_t MTU_SIZE = 4096 * 1024;        // the max transmission unit size(4M - 80B)
-    static constexpr uint32_t MTU_SIZE_WATCH = 81920; // the max transmission unit size(80K)
-    static constexpr const char *SMART_WATCH_TYPE = "SMART_WATCH";
-    static constexpr const char *CHILDREN_WATCH_TYPE = "CHILDREN_WATCH";
 };
 } // namespace ObjectStore
 } // namespace OHOS
diff --git a/data_object/frameworks/innerkitsimpl/src/adaptor/client_adaptor.cpp b/data_object/frameworks/innerkitsimpl/src/adaptor/client_adaptor.cpp
index 0398e44b9a0a5433fd5ce4f648cec1d65a8fa376..c2ebec12aa15e53a8cbef38d216ad228d36616dc 100644
--- a/data_object/frameworks/innerkitsimpl/src/adaptor/client_adaptor.cpp
+++ b/data_object/frameworks/innerkitsimpl/src/adaptor/client_adaptor.cpp
@@ -17,18 +17,20 @@
 
 #include <thread>
 
-#include "logger.h"
 #include "iservice_registry.h"
 #include "itypes_util.h"
+#include "logger.h"
 #include "objectstore_errors.h"
 
 namespace OHOS::ObjectStore {
 std::shared_ptr<ObjectStoreDataServiceProxy> ClientAdaptor::distributedDataMgr_ = nullptr;
+std::mutex ClientAdaptor::mutex_;
 
 using KvStoreCode = OHOS::DistributedObject::ObjectStoreService::KvStoreServiceInterfaceCode;
 
 sptr<OHOS::DistributedObject::IObjectService> ClientAdaptor::GetObjectService()
 {
+    std::lock_guard<decltype(mutex_)> lockGuard(mutex_);
     if (distributedDataMgr_ == nullptr) {
         distributedDataMgr_ = GetDistributedDataManager();
     }
@@ -66,6 +68,14 @@ std::shared_ptr<ObjectStoreDataServiceProxy> ClientAdaptor::GetDistributedDataMa
             LOG_ERROR("new ObjectStoreDataServiceProxy fail.");
             return nullptr;
         }
+        sptr<ClientAdaptor::ServiceDeathRecipient> deathRecipientPtr = new (std::nothrow)ServiceDeathRecipient();
+        if (deathRecipientPtr == nullptr) {
+            LOG_ERROR("new deathRecipientPtr fail!");
+            return nullptr;
+        }
+        if (!remoteObject->AddDeathRecipient(deathRecipientPtr)) {
+            LOG_ERROR("Add death recipient fail!");
+        }
         return std::shared_ptr<ObjectStoreDataServiceProxy>(proxy.GetRefPtr(), [holder = proxy](const auto *) {});
     }
 
@@ -73,8 +83,24 @@ std::shared_ptr<ObjectStoreDataServiceProxy> ClientAdaptor::GetDistributedDataMa
     return nullptr;
 }
 
+ClientAdaptor::ServiceDeathRecipient::ServiceDeathRecipient()
+{
+}
+
+ClientAdaptor::ServiceDeathRecipient::~ServiceDeathRecipient()
+{
+}
+
+void ClientAdaptor::ServiceDeathRecipient::OnRemoteDied(const wptr<IRemoteObject> &remote)
+{
+    LOG_WARN("DistributedDataService die!");
+    std::lock_guard<decltype(mutex_)> lockGuard(mutex_);
+    distributedDataMgr_ = nullptr;
+}
+
 uint32_t ClientAdaptor::RegisterClientDeathListener(const std::string &appId, sptr<IRemoteObject> remoteObject)
 {
+    std::lock_guard<decltype(mutex_)> lockGuard(mutex_);
     if (distributedDataMgr_ == nullptr) {
         distributedDataMgr_ = GetDistributedDataManager();
     }
diff --git a/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_storage_engine.cpp b/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_storage_engine.cpp
index d862c4e31655a1431b5b0bc91c816dc53f071739..380dd7f68da1364fd59f7800a4a82dad486ad13a 100644
--- a/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_storage_engine.cpp
+++ b/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_storage_engine.cpp
@@ -149,14 +149,14 @@ uint32_t FlatObjectStorageEngine::GetTable(const std::string &key, std::map<std:
     result.clear();
     DistributedDB::KvStoreResultSet *resultSet = nullptr;
     Key emptyKey;
-    LOG_INFO("start GetEntries");
+    LOG_DEBUG("start GetEntries");
     auto delegate = delegates_.at(key);
     DistributedDB::DBStatus status = delegate->GetEntries(emptyKey, resultSet);
     if (status != DistributedDB::DBStatus::OK || resultSet == nullptr) {
         LOG_INFO("FlatObjectStorageEngine::GetTable %{public}s GetEntries fail", key.c_str());
         return ERR_DB_GET_FAIL;
     }
-    LOG_INFO("end GetEntries");
+    LOG_DEBUG("end GetEntries");
     while (resultSet->IsAfterLast()) {
         DistributedDB::Entry entry;
         status = resultSet->GetEntry(entry);
@@ -191,13 +191,13 @@ uint32_t FlatObjectStorageEngine::UpdateItem(const std::string &key, const std::
         return ERR_DB_NOT_EXIST;
     }
     auto delegate = delegates_.at(key);
-    LOG_INFO("start Put");
+    LOG_DEBUG("start Put");
     auto status = delegate->Put(StringUtils::StrToBytes(itemKey), value);
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR("%{public}s Put fail[%{public}d]", key.c_str(), status);
         return ERR_CLOSE_STORAGE;
     }
-    LOG_INFO("put success");
+    LOG_DEBUG("put success");
     return SUCCESS;
 }
 
@@ -219,13 +219,13 @@ uint32_t FlatObjectStorageEngine::UpdateItems(
         entries.emplace_back(entry);
     }
     auto delegate = delegates_.at(key);
-    LOG_INFO("start PutBatch");
+    LOG_DEBUG("start PutBatch");
     auto status = delegate->PutBatch(entries);
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR("%{public}s PutBatch fail[%{public}d]", key.c_str(), status);
         return ERR_CLOSE_STORAGE;
     }
-    LOG_INFO("put success");
+    LOG_DEBUG("put success");
     return SUCCESS;
 }
 
@@ -239,14 +239,14 @@ uint32_t FlatObjectStorageEngine::DeleteTable(const std::string &key)
         LOG_INFO("FlatObjectStorageEngine::GetTable %{public}s not exist", key.c_str());
         return ERR_DB_NOT_EXIST;
     }
-    LOG_INFO("start DeleteTable %{public}s", key.c_str());
+    LOG_DEBUG("start DeleteTable %{public}s", key.c_str());
     auto status = storeManager_->CloseKvStore(delegates_.at(key));
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR(
             "FlatObjectStorageEngine::CloseKvStore %{public}s CloseKvStore fail[%{public}d]", key.c_str(), status);
         return ERR_CLOSE_STORAGE;
     }
-    LOG_INFO("DeleteTable success");
+    LOG_DEBUG("DeleteTable success");
     delegates_.erase(key);
     return SUCCESS;
 }
@@ -261,13 +261,13 @@ uint32_t FlatObjectStorageEngine::GetItem(const std::string &key, const std::str
         LOG_ERROR("FlatObjectStorageEngine::GetItem %{public}s not exist", key.c_str());
         return ERR_DB_NOT_EXIST;
     }
-    LOG_INFO("start Get %{public}s", key.c_str());
+    LOG_DEBUG("start Get %{public}s", key.c_str());
     DistributedDB::DBStatus status = delegates_.at(key)->Get(StringUtils::StrToBytes(itemKey), value);
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR("FlatObjectStorageEngine::GetItem %{public}s item fail %{public}d", itemKey.c_str(), status);
         return status;
     }
-    LOG_INFO("end Get %{public}s", key.c_str());
+    LOG_DEBUG("end Get %{public}s", key.c_str());
     return SUCCESS;
 }
 
@@ -288,14 +288,14 @@ uint32_t FlatObjectStorageEngine::RegisterObserver(const std::string &key, std::
     }
     auto delegate = delegates_.at(key);
     std::vector<uint8_t> tmpKey;
-    LOG_INFO("start RegisterObserver %{public}s", key.c_str());
+    LOG_DEBUG("start RegisterObserver %{public}s", key.c_str());
     DistributedDB::DBStatus status =
         delegate->RegisterObserver(tmpKey, DistributedDB::ObserverMode::OBSERVER_CHANGES_FOREIGN, watcher.get());
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR("FlatObjectStorageEngine::RegisterObserver watch err %{public}d", status);
         return ERR_REGISTER;
     }
-    LOG_INFO("end RegisterObserver %{public}s", key.c_str());
+    LOG_DEBUG("end RegisterObserver %{public}s", key.c_str());
     observerMap_.insert_or_assign(key, watcher);
     return SUCCESS;
 }
@@ -318,13 +318,13 @@ uint32_t FlatObjectStorageEngine::UnRegisterObserver(const std::string &key)
     }
     auto delegate = delegates_.at(key);
     std::shared_ptr<TableWatcher> watcher = iter->second;
-    LOG_INFO("start UnRegisterObserver %{public}s", key.c_str());
+    LOG_DEBUG("start UnRegisterObserver %{public}s", key.c_str());
     DistributedDB::DBStatus status = delegate->UnRegisterObserver(watcher.get());
     if (status != DistributedDB::DBStatus::OK) {
         LOG_ERROR("FlatObjectStorageEngine::UnRegisterObserver unRegister err %{public}d", status);
         return ERR_UNRIGSTER;
     }
-    LOG_INFO("end UnRegisterObserver %{public}s", key.c_str());
+    LOG_DEBUG("end UnRegisterObserver %{public}s", key.c_str());
     observerMap_.erase(key);
     return SUCCESS;
 }
diff --git a/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_store.cpp b/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_store.cpp
index 26f6e5c72df70dbd8e6170a8a81e940439b4da2a..b9aaf0b1a49af40d18603d85a2b47cf3e645b9af 100644
--- a/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_store.cpp
+++ b/data_object/frameworks/innerkitsimpl/src/adaptor/flat_object_store.cpp
@@ -71,6 +71,7 @@ uint32_t FlatObjectStore::CreateObject(const std::string &sessionId)
                     }
                 }
                 auto result = storageEngine_->UpdateItems(sessionId, data);
+                storageEngine_->NotifyStatus(sessionId, "local", "restored");
                 if (result != SUCCESS) {
                     LOG_ERROR("UpdateItems failed, status = %{public}d", result);
                 }
@@ -376,7 +377,7 @@ uint32_t CacheManager::Save(const std::string &bundleName, const std::string &se
     std::unique_lock<std::mutex> lck(mutex_);
     auto block = std::make_shared<BlockData<std::tuple<bool, int32_t>>>(WAIT_TIME, std::tuple{ true, ERR_DB_GET_FAIL });
     int32_t status = SaveObject(bundleName, sessionId, deviceId, objectData,
-        [&deviceId, block](const std::map<std::string, int32_t> &results) {
+        [deviceId, block](const std::map<std::string, int32_t> &results) {
             LOG_INFO("CacheManager::task callback");
             if (results.count(deviceId) != 0) {
                 block->SetValue({ false, results.at(deviceId) });
diff --git a/data_object/frameworks/innerkitsimpl/src/communicator/process_communicator_impl.cpp b/data_object/frameworks/innerkitsimpl/src/communicator/process_communicator_impl.cpp
index 3139edaa46a4e03bc885ebfce550f0cad2b04980..892c368d4d566e76925590a65771fa025f084f4a 100644
--- a/data_object/frameworks/innerkitsimpl/src/communicator/process_communicator_impl.cpp
+++ b/data_object/frameworks/innerkitsimpl/src/communicator/process_communicator_impl.cpp
@@ -131,13 +131,6 @@ uint32_t ProcessCommunicatorImpl::GetMtuSize()
 
 uint32_t ProcessCommunicatorImpl::GetMtuSize(const DeviceInfos &devInfo)
 {
-    std::vector<DeviceInfo> devInfos = CommunicationProvider::GetInstance().GetDeviceList();
-    for (auto const &entry : devInfos) {
-        bool isWatch = (entry.deviceType == SMART_WATCH_TYPE || entry.deviceType == CHILDREN_WATCH_TYPE);
-        if (entry.deviceId == devInfo.identifier && isWatch) {
-            return MTU_SIZE_WATCH;
-        }
-    }
     return MTU_SIZE;
 }
 
diff --git a/data_object/frameworks/innerkitsimpl/src/communicator/softbus_adapter_standard.cpp b/data_object/frameworks/innerkitsimpl/src/communicator/softbus_adapter_standard.cpp
index f76fa7e3cf78c78adadcb04fd1a8bb5a44db8191..854208a76fc91c1cffb83ad73567060e95018a82 100644
--- a/data_object/frameworks/innerkitsimpl/src/communicator/softbus_adapter_standard.cpp
+++ b/data_object/frameworks/innerkitsimpl/src/communicator/softbus_adapter_standard.cpp
@@ -633,7 +633,7 @@ void AppDataListenerWrap::SetDataHandler(SoftBusAdapter *handler)
 
 int AppDataListenerWrap::OnSessionOpened(int sessionId, int result)
 {
-    LOG_INFO("[SessionOpen] sessionId:%{public}d, result:%{public}d", sessionId, result);
+    LOG_DEBUG("[SessionOpen] sessionId:%{public}d, result:%{public}d", sessionId, result);
     char mySessionName[SESSION_NAME_SIZE_MAX] = "";
     char peerSessionName[SESSION_NAME_SIZE_MAX] = "";
     char peerDevId[DEVICE_ID_SIZE_MAX] = "";
diff --git a/data_share/frameworks/js/napi/common/src/datashare_js_utils.cpp b/data_share/frameworks/js/napi/common/src/datashare_js_utils.cpp
index 2b699f54de9ff9f35f4843d26cd25449a6dd2d78..c94d037c147dc166fa4205559bc0daa5cca79415 100644
--- a/data_share/frameworks/js/napi/common/src/datashare_js_utils.cpp
+++ b/data_share/frameworks/js/napi/common/src/datashare_js_utils.cpp
@@ -662,11 +662,7 @@ bool DataShareJSUtils::UnwrapStringByPropertyName(
 {
     napi_value jsResult = nullptr;
     auto status = napi_get_named_property(env, jsObject, propertyName, &jsResult);
-    if (status != napi_ok) {
-        LOG_ERROR("Convert bundleNameOfOwner failed");
-        return false;
-    }
-    if (jsResult == nullptr) {
+    if ((status != napi_ok) || (jsResult == nullptr)) {
         LOG_ERROR("Convert bundleNameOfOwner failed");
         return false;
     }
diff --git a/data_share/frameworks/js/napi/common/src/datashare_result_set_proxy.cpp b/data_share/frameworks/js/napi/common/src/datashare_result_set_proxy.cpp
index f172543a4f2236188e6e5ca2f91fb2fb1e9d4f07..9b3db78ef9fe0179965ffe5c03fc03a85884b5ae 100644
--- a/data_share/frameworks/js/napi/common/src/datashare_result_set_proxy.cpp
+++ b/data_share/frameworks/js/napi/common/src/datashare_result_set_proxy.cpp
@@ -16,6 +16,8 @@
 #include "datashare_result_set_proxy.h"
 
 #include <functional>
+#include <chrono>
+#include <cinttypes>
 
 #include "datashare_result_set.h"
 #include "datashare_js_utils.h"
@@ -24,6 +26,7 @@
 
 namespace OHOS {
 namespace DataShare {
+using namespace std::chrono;
 constexpr int MAX_INPUT_COUNT = 10;
 static napi_ref __thread ctorRef_ = nullptr;
 napi_value DataShareResultSetProxy::NewInstance(napi_env env, std::shared_ptr<DataShareResultSet> resultSet)
@@ -74,7 +77,7 @@ napi_value DataShareResultSetProxy::GetConstructor(napi_env env)
         NAPI_CALL(env, napi_get_reference_value(env, ctorRef_, &cons));
         return cons;
     }
-    LOG_INFO("Get DataShareResultSet constructor");
+    LOG_DEBUG("Get DataShareResultSet constructor");
     napi_property_descriptor clzDes[] = {
         DECLARE_NAPI_FUNCTION("goToFirstRow", GoToFirstRow),
         DECLARE_NAPI_FUNCTION("goToLastRow", GoToLastRow),
@@ -272,6 +275,9 @@ napi_value DataShareResultSetProxy::GetBlob(napi_env env, napi_callback_info inf
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     NAPI_ASSERT(env, argc > 0, "Invalid argvs!");
     NAPI_CALL(env, napi_get_value_int32(env, args[0], &columnIndex));
+    if (columnIndex == -1) {
+        return DataShareJSUtils::Convert2JSValue(env, blob);
+    }
     std::shared_ptr<DataShareResultSet> innerResultSet = GetInnerResultSet(env, info);
     if (innerResultSet != nullptr) {
         int errCode = innerResultSet->GetBlob(columnIndex, blob);
@@ -293,12 +299,12 @@ napi_value DataShareResultSetProxy::GetString(napi_env env, napi_callback_info i
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     NAPI_ASSERT(env, argc > 0, "Invalid argvs!");
     NAPI_CALL(env, napi_get_value_int32(env, args[0], &columnIndex));
+    if (columnIndex == -1) {
+        return DataShareJSUtils::Convert2JSValue(env, value);
+    }
     std::shared_ptr<DataShareResultSet> innerResultSet = GetInnerResultSet(env, info);
     if (innerResultSet != nullptr) {
-        int errCode = innerResultSet->GetString(columnIndex, value);
-        if (errCode != E_OK) {
-            LOG_ERROR("failed code:%{public}d", errCode);
-        }
+        innerResultSet->GetString(columnIndex, value);
     } else {
         LOG_ERROR("GetInnerResultSet failed.");
     }
@@ -314,6 +320,9 @@ napi_value DataShareResultSetProxy::GetLong(napi_env env, napi_callback_info inf
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     NAPI_ASSERT(env, argc > 0, "Invalid argvs!");
     NAPI_CALL(env, napi_get_value_int32(env, args[0], &columnIndex));
+    if (columnIndex == -1) {
+        return DataShareJSUtils::Convert2JSValue(env, value);
+    }
     std::shared_ptr<DataShareResultSet> innerResultSet = GetInnerResultSet(env, info);
     if (innerResultSet != nullptr) {
         int errCode = innerResultSet->GetLong(columnIndex, value);
@@ -335,6 +344,9 @@ napi_value DataShareResultSetProxy::GetDouble(napi_env env, napi_callback_info i
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     NAPI_ASSERT(env, argc > 0, "Invalid argvs!");
     NAPI_CALL(env, napi_get_value_int32(env, args[0], &columnIndex));
+    if (columnIndex == -1) {
+        return DataShareJSUtils::Convert2JSValue(env, value);
+    }
     std::shared_ptr<DataShareResultSet> innerResultSet = GetInnerResultSet(env, info);
     if (innerResultSet != nullptr) {
         int errCode = innerResultSet->GetDouble(columnIndex, value);
@@ -382,7 +394,10 @@ napi_value DataShareResultSetProxy::GetColumnIndex(napi_env env, napi_callback_i
     if (innerResultSet != nullptr) {
         int errCode = innerResultSet->GetColumnIndex(columnName, columnIndex);
         if (errCode != E_OK) {
-            LOG_ERROR("failed code:%{public}d", errCode);
+            auto time = static_cast<uint64_t>(duration_cast<milliseconds>(
+                system_clock::now().time_since_epoch()).count());
+            LOG_ERROR("failed code:%{public}d columnIndex: %{public}d. times %{public}" PRIu64 ".",
+                errCode, columnIndex, time);
         }
     } else {
         LOG_ERROR("GetInnerResultSet failed.");
@@ -420,6 +435,9 @@ napi_value DataShareResultSetProxy::GetDataType(napi_env env, napi_callback_info
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     NAPI_ASSERT(env, argc > 0, "Invalid argvs!");
     NAPI_CALL(env, napi_get_value_int32(env, args[0], &columnIndex));
+    if (columnIndex == -1) {
+        return DataShareJSUtils::Convert2JSValue(env, int32_t(dataType));
+    }
     std::shared_ptr<DataShareResultSet> innerResultSet = GetInnerResultSet(env, info);
     if (innerResultSet != nullptr) {
         int errCode = innerResultSet->GetDataType(columnIndex, dataType);
diff --git a/data_share/frameworks/js/napi/dataShare/src/async_call.cpp b/data_share/frameworks/js/napi/dataShare/src/async_call.cpp
index 471c686a431b033600eafbd455719607cc70a875..2a6baba9a9a23e265c6258c1024826fac667981a 100644
--- a/data_share/frameworks/js/napi/dataShare/src/async_call.cpp
+++ b/data_share/frameworks/js/napi/dataShare/src/async_call.cpp
@@ -68,7 +68,7 @@ napi_value AsyncCall::Call(napi_env env, Context::ExecAction exec)
     napi_create_async_work(env, nullptr, resource, AsyncCall::OnExecute, AsyncCall::OnComplete, context_, &work);
     context_->work = work;
     context_ = nullptr;
-    napi_queue_async_work(env, work);
+    napi_queue_async_work_with_qos(env, work, napi_qos_user_initiated);
     return promise;
 }
 
diff --git a/data_share/frameworks/js/napi/dataShare/src/napi_datashare_inner_observer.cpp b/data_share/frameworks/js/napi/dataShare/src/napi_datashare_inner_observer.cpp
index 31e074c2d5f8983ab7f86ad8938a4b5f73400e57..068d33300b49597ac18456a5883b955d33bf74cd 100644
--- a/data_share/frameworks/js/napi/dataShare/src/napi_datashare_inner_observer.cpp
+++ b/data_share/frameworks/js/napi/dataShare/src/napi_datashare_inner_observer.cpp
@@ -16,10 +16,13 @@
 #include "napi_datashare_observer.h"
 
 #include <memory>
+#include <chrono>
+#include <cinttypes>
 #include "datashare_log.h"
 
 namespace OHOS {
 namespace DataShare {
+using namespace std::chrono;
 NAPIInnerObserver::NAPIInnerObserver(napi_env env, napi_value callback)
     : env_(env)
 {
@@ -59,7 +62,9 @@ void NAPIInnerObserver::OnComplete(uv_work_t *work, int status)
 
 void NAPIInnerObserver::OnChange()
 {
-    LOG_DEBUG("NAPIInnerObserver Start");
+    auto time =
+            static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+    LOG_INFO("NAPIInnerObserver datashare callback start, times %{public}" PRIu64 ".", time);
     if (ref_ == nullptr) {
         LOG_ERROR("ref_ is nullptr");
         return;
@@ -76,7 +81,8 @@ void NAPIInnerObserver::OnChange()
         return;
     }
     work->data = observerWorker;
-    int ret = uv_queue_work(loop_, work, [](uv_work_t *work) {}, NAPIInnerObserver::OnComplete);
+    int ret = uv_queue_work_with_qos(loop_, work, [](uv_work_t *work) {},
+        NAPIInnerObserver::OnComplete, uv_qos_user_initiated);
     if (ret != 0) {
         LOG_ERROR("uv_queue_work failed");
         delete observerWorker;
diff --git a/data_share/frameworks/native/common/include/datashare_string_utils.h b/data_share/frameworks/native/common/include/datashare_string_utils.h
index 82b377282255798c769504cfcd8a9ced0723c3d9..c7bb1d932c04be61a15ce00a3672bf69e3854ca2 100644
--- a/data_share/frameworks/native/common/include/datashare_string_utils.h
+++ b/data_share/frameworks/native/common/include/datashare_string_utils.h
@@ -24,9 +24,7 @@ namespace OHOS {
 namespace DataShare {
 class DataShareStringUtils {
 public:
-    static std::string SurroundWithQuote(std::string value, std::string quote);
-    static std::string SurroundWithFunction(std::string function, std::string separator,
-        std::vector<std::string> array);
+    static std::string Anonymous(const std::string &name);
 
 private:
     DataShareStringUtils();
diff --git a/data_share/frameworks/native/common/src/datashare_result_set.cpp b/data_share/frameworks/native/common/src/datashare_result_set.cpp
index f4d425ef6b7dbd27e4a1777c4dfa42dc90adb237..d65ecd83050c88ca6a4bba41a047bccf11955e5e 100644
--- a/data_share/frameworks/native/common/src/datashare_result_set.cpp
+++ b/data_share/frameworks/native/common/src/datashare_result_set.cpp
@@ -114,7 +114,6 @@ int DataShareResultSet::GetDataType(int columnIndex, DataType &dataType)
     AppDataFwk::SharedBlock::CellUnit *cellUnit =
         sharedBlock_->GetCellUnit(static_cast<uint32_t>(rowPos_) - startRowPos_, static_cast<uint32_t>(columnIndex));
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
     dataType = (DataType)cellUnit->type;
@@ -170,7 +169,6 @@ int DataShareResultSet::GetBlob(int columnIndex, std::vector<uint8_t> &value)
 
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
 
@@ -207,7 +205,6 @@ int DataShareResultSet::GetString(int columnIndex, std::string &value)
     }
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
     int type = cellUnit->type;
@@ -244,7 +241,6 @@ int DataShareResultSet::GetInt(int columnIndex, int &value)
     }
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
     value = (int)cellUnit->cell.longValue;
@@ -259,7 +255,6 @@ int DataShareResultSet::GetLong(int columnIndex, int64_t &value)
     }
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
 
@@ -296,7 +291,6 @@ int DataShareResultSet::GetDouble(int columnIndex, double &value)
     }
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
     int type = cellUnit->type;
@@ -332,7 +326,6 @@ int DataShareResultSet::IsColumnNull(int columnIndex, bool &isNull)
     }
     AppDataFwk::SharedBlock::CellUnit *cellUnit = sharedBlock_->GetCellUnit(rowPos_ - startRowPos_, columnIndex);
     if (!cellUnit) {
-        LOG_ERROR("cellUnit is null!");
         return E_ERROR;
     }
     if (cellUnit->type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL) {
diff --git a/data_share/frameworks/native/common/src/datashare_string_utils.cpp b/data_share/frameworks/native/common/src/datashare_string_utils.cpp
index 1db79753e9d0903dfb102f83695842901981d46c..9dc847b5bf1c91712c72000714c7a755098a640c 100644
--- a/data_share/frameworks/native/common/src/datashare_string_utils.cpp
+++ b/data_share/frameworks/native/common/src/datashare_string_utils.cpp
@@ -17,32 +17,15 @@
 
 namespace OHOS {
 namespace DataShare {
-std::string DataShareStringUtils::SurroundWithQuote(std::string value, std::string quote)
+constexpr int32_t END_SIZE = 6;
+constexpr const char *DEFAULT_ANONYMOUS = "******";
+std::string DataShareStringUtils::Anonymous(const std::string &name)
 {
-    if (value.empty()) {
-        return value;
+    if (name.length() <= END_SIZE) {
+        return DEFAULT_ANONYMOUS;
     }
-    std::string str = quote + value + quote;
-    return str;
-}
 
-// Join array members as parameters of a function call.
-std::string DataShareStringUtils::SurroundWithFunction(std::string function, std::string separator,
-    std::vector<std::string> array)
-{
-    std::string builder(function);
-    builder += "(";
-    bool isFirst = true;
-    for (auto text : array) {
-        if (!isFirst) {
-            builder = builder + " " + separator + " ";
-        } else {
-            isFirst = false;
-        }
-        builder += text;
-    }
-    builder += ")";
-    return builder;
+    return (DEFAULT_ANONYMOUS + name.substr(name.length() - END_SIZE, END_SIZE));
 }
 
 DataShareStringUtils::DataShareStringUtils() {}
diff --git a/data_share/frameworks/native/consumer/controller/service/src/general_controller_service_impl.cpp b/data_share/frameworks/native/consumer/controller/service/src/general_controller_service_impl.cpp
index 200428da066932b0e647b58b2fc198d82349217b..d03ff73fde8b3f9591559181929ae39230226843 100644
--- a/data_share/frameworks/native/consumer/controller/service/src/general_controller_service_impl.cpp
+++ b/data_share/frameworks/native/consumer/controller/service/src/general_controller_service_impl.cpp
@@ -17,6 +17,7 @@
 
 #include "dataobs_mgr_client.h"
 #include "datashare_log.h"
+#include "datashare_string_utils.h"
 
 namespace OHOS {
 namespace DataShare {
@@ -72,9 +73,8 @@ void GeneralControllerServiceImpl::RegisterObserver(const Uri &uri,
         return;
     }
     ErrCode ret = obsMgrClient->RegisterObserver(uri, dataObserver);
-    if (ret != ERR_OK) {
-        LOG_ERROR("RegisterObserver failed");
-    }
+    LOG_INFO("Register observer ret: %{public}d, uri: %{public}s", ret,
+        DataShareStringUtils::Anonymous(uri.ToString()).c_str());
 }
 
 void GeneralControllerServiceImpl::UnregisterObserver(const Uri &uri,
@@ -86,9 +86,8 @@ void GeneralControllerServiceImpl::UnregisterObserver(const Uri &uri,
         return;
     }
     ErrCode ret = obsMgrClient->UnregisterObserver(uri, dataObserver);
-    if (ret != ERR_OK) {
-        LOG_ERROR("UnregisterObserver failed");
-    }
+    LOG_INFO("Unregister observer ret: %{public}d, uri: %{public}s", ret,
+        DataShareStringUtils::Anonymous(uri.ToString()).c_str());
 }
 
 void GeneralControllerServiceImpl::NotifyChange(const Uri &uri)
diff --git a/data_share/frameworks/native/consumer/src/datashare_helper.cpp b/data_share/frameworks/native/consumer/src/datashare_helper.cpp
index b545f568511e21df0c1e8bc72842d7509c663a6b..e820e543419125959506c740e7620a32465f1623 100644
--- a/data_share/frameworks/native/consumer/src/datashare_helper.cpp
+++ b/data_share/frameworks/native/consumer/src/datashare_helper.cpp
@@ -163,7 +163,7 @@ std::shared_ptr<DataShareHelper> DataShareHelper::CreateExtHelper(Uri &uri, cons
 void DataShareHelper::RegisterObserverExt(const Uri &uri, std::shared_ptr<DataShareObserver> dataObserver,
     bool isDescendants)
 {
-    LOG_INFO("Start");
+    LOG_DEBUG("Start");
     if (dataObserver == nullptr) {
         LOG_ERROR("dataObserver is nullptr");
         return;
@@ -193,7 +193,7 @@ void DataShareHelper::RegisterObserverExt(const Uri &uri, std::shared_ptr<DataSh
  */
 void DataShareHelper::UnregisterObserverExt(const Uri &uri, std::shared_ptr<DataShareObserver> dataObserver)
 {
-    LOG_INFO("Start");
+    LOG_DEBUG("Start");
     if (dataObserver == nullptr) {
         LOG_ERROR("dataObserver is nullptr");
         return;
@@ -229,7 +229,7 @@ void DataShareHelper::UnregisterObserverExt(const Uri &uri, std::shared_ptr<Data
  */
 void DataShareHelper::NotifyChangeExt(const DataShareObserver::ChangeInfo &changeInfo)
 {
-    LOG_INFO("Start");
+    LOG_DEBUG("Start");
 
     auto obsMgrClient = OHOS::AAFwk::DataObsMgrClient::GetInstance();
     if (obsMgrClient == nullptr) {
diff --git a/data_share/frameworks/native/provider/include/js_datashare_ext_ability.h b/data_share/frameworks/native/provider/include/js_datashare_ext_ability.h
index 6b4d84a9862b6450d43d9fff6deff900d5c5f044..e82150836d02e8a77ebc0fcfe86d88fd5057c114 100644
--- a/data_share/frameworks/native/provider/include/js_datashare_ext_ability.h
+++ b/data_share/frameworks/native/provider/include/js_datashare_ext_ability.h
@@ -316,6 +316,7 @@ private:
         bool isAsync = true);
     napi_value CallObjectMethod(
         const char *name, napi_value const *argv, size_t argc, std::shared_ptr<AsyncContext> asyncContext);
+    void SaveNewCallingInfo(napi_env &env);
     void GetSrcPath(std::string &srcPath);
     napi_value MakePredicates(napi_env env, const DataSharePredicates &predicates);
     static napi_value AsyncCallback(napi_env env, napi_callback_info info);
@@ -328,6 +329,7 @@ private:
     static std::string UnWrapProperty(napi_env env, napi_value info, const std::string &key);
     int32_t InitAsyncCallParams(size_t argc, napi_env &env, napi_value *args);
 
+    static constexpr int ACTIVE_INVOKER = 1;
     JsRuntime& jsRuntime_;
     std::unique_ptr<NativeReference> jsObj_;
     bool isRecvReply_ = false;
diff --git a/data_share/frameworks/native/provider/src/datashare_ext_ability.cpp b/data_share/frameworks/native/provider/src/datashare_ext_ability.cpp
index 637d62dba918821b93afd14d9ad6c6f303153806..c78aa36267757682f8eebc5e31568ba7bb576cd5 100644
--- a/data_share/frameworks/native/provider/src/datashare_ext_ability.cpp
+++ b/data_share/frameworks/native/provider/src/datashare_ext_ability.cpp
@@ -43,7 +43,7 @@ DataShareExtAbility* DataShareExtAbility::Create(const std::unique_ptr<Runtime>&
         return creator_(runtime);
     }
 
-    LOG_INFO("DataShareExtAbility::Create runtime");
+    LOG_DEBUG("DataShareExtAbility::Create runtime");
     switch (runtime->GetLanguage()) {
         case Runtime::Language::JS:
             return JsDataShareExtAbility::Create(runtime);
diff --git a/data_share/frameworks/native/provider/src/datashare_stub.cpp b/data_share/frameworks/native/provider/src/datashare_stub.cpp
index baf4391b70b12bc3db00bbb4d5a513770801c77a..cc667447ea8ad84ed3c602dbf11fb311bb7c7e1c 100644
--- a/data_share/frameworks/native/provider/src/datashare_stub.cpp
+++ b/data_share/frameworks/native/provider/src/datashare_stub.cpp
@@ -74,7 +74,7 @@ int DataShareStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessagePa
         return (this->*(itFunc->second))(data, reply);
     }
 
-    LOG_INFO("remote request unhandled: %{public}d", code);
+    LOG_DEBUG("remote request unhandled: %{public}d", code);
     return IPCObjectStub::OnRemoteRequest(code, data, reply, option);
 }
 
diff --git a/data_share/frameworks/native/provider/src/datashare_stub_impl.cpp b/data_share/frameworks/native/provider/src/datashare_stub_impl.cpp
index 57c9af57deb78477ac5773505281a1e2a27c7445..3cf33416da99287762517ff15d8173d0a4021d10 100644
--- a/data_share/frameworks/native/provider/src/datashare_stub_impl.cpp
+++ b/data_share/frameworks/native/provider/src/datashare_stub_impl.cpp
@@ -45,12 +45,15 @@ bool DataShareStubImpl::CheckCallingPermission(const std::string &permission)
 
 std::vector<std::string> DataShareStubImpl::GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     std::vector<std::string> ret;
     std::function<void()> syncTaskFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         ret = extension->GetFileTypes(uri, mimeTypeFilter);
     };
     std::function<bool()> getRetFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() -> bool {
@@ -67,12 +70,15 @@ std::vector<std::string> DataShareStubImpl::GetFileTypes(const Uri &uri, const s
 
 int DataShareStubImpl::OpenFile(const Uri &uri, const std::string &mode)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     int ret = -1;
     std::function<void()> syncTaskFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         ret = extension->OpenFile(uri, mode);
     };
     std::function<bool()> getRetFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() -> bool {
@@ -89,12 +95,15 @@ int DataShareStubImpl::OpenFile(const Uri &uri, const std::string &mode)
 
 int DataShareStubImpl::OpenRawFile(const Uri &uri, const std::string &mode)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     int ret = -1;
     std::function<void()> syncTaskFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         ret = extension->OpenRawFile(uri, mode);
     };
     uvQueue_->SyncCall(syncTaskFunc);
@@ -222,6 +231,7 @@ std::shared_ptr<DataShareResultSet> DataShareStubImpl::Query(const Uri &uri,
     }
 
     std::function<void()> syncTaskFunc = [=, &columns, &resultSet, &businessError, &extension]() {
+        extension->SetCallingInfo(info);
         resultSet = extension->Query(uri, predicates, columns, businessError);
     };
     std::function<bool()> getRetFunc = [=, &resultSet, &businessError,
@@ -230,7 +240,6 @@ std::shared_ptr<DataShareResultSet> DataShareStubImpl::Query(const Uri &uri,
         if (extension == nullptr) {
             return false;
         }
-        extension->SetCallingInfo(info);
         extension->GetResultSet(resultSet);
         extension->GetBusinessError(businessError);
         return (extension->GetRecvReply() != false);
@@ -242,12 +251,15 @@ std::shared_ptr<DataShareResultSet> DataShareStubImpl::Query(const Uri &uri,
 
 std::string DataShareStubImpl::GetType(const Uri &uri)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     std::string ret = "";
     std::function<void()> syncTaskFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         ret = extension->GetType(uri);
     };
     std::function<bool()> getRetFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() -> bool {
@@ -264,6 +276,8 @@ std::string DataShareStubImpl::GetType(const Uri &uri)
 
 int DataShareStubImpl::BatchInsert(const Uri &uri, const std::vector<DataShareValuesBucket> &values)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     auto client = sptr<DataShareStubImpl>(this);
     auto extension = client->GetOwner();
     if (extension == nullptr) {
@@ -281,6 +295,7 @@ int DataShareStubImpl::BatchInsert(const Uri &uri, const std::vector<DataShareVa
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         ret = extension->BatchInsert(uri, values);
     };
     std::function<bool()> getRetFunc = [=, &ret, client = sptr<DataShareStubImpl>(this)]() -> bool {
@@ -330,12 +345,15 @@ bool DataShareStubImpl::NotifyChange(const Uri &uri)
 
 Uri DataShareStubImpl::NormalizeUri(const Uri &uri)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     Uri urivalue("");
     std::function<void()> syncTaskFunc = [=, &urivalue, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         urivalue = extension->NormalizeUri(uri);
     };
     std::function<bool()> getRetFunc = [=, &urivalue, client = sptr<DataShareStubImpl>(this)]() -> bool {
@@ -355,12 +373,15 @@ Uri DataShareStubImpl::NormalizeUri(const Uri &uri)
 
 Uri DataShareStubImpl::DenormalizeUri(const Uri &uri)
 {
+    CallingInfo info;
+    GetCallingInfo(info);
     Uri urivalue("");
     std::function<void()> syncTaskFunc = [=, &urivalue, client = sptr<DataShareStubImpl>(this)]() {
         auto extension = client->GetOwner();
         if (extension == nullptr) {
             return;
         }
+        extension->SetCallingInfo(info);
         urivalue = extension->DenormalizeUri(uri);
     };
     std::function<bool()> getRetFunc = [=, &urivalue, client = sptr<DataShareStubImpl>(this)]() -> bool {
diff --git a/data_share/frameworks/native/provider/src/datashare_uv_queue.cpp b/data_share/frameworks/native/provider/src/datashare_uv_queue.cpp
index 4995d8313d36bb1e10184d8559fe7d1875cce6a5..683805c8bcfea001e09f9bdc7b43db01fc5e1459 100644
--- a/data_share/frameworks/native/provider/src/datashare_uv_queue.cpp
+++ b/data_share/frameworks/native/provider/src/datashare_uv_queue.cpp
@@ -15,10 +15,12 @@
 
 #include "datashare_uv_queue.h"
 #include <thread>
+#include <chrono>
 #include "datashare_log.h"
 
 namespace OHOS {
 namespace DataShare {
+using namespace std::chrono;
 constexpr int WAIT_TIME = 3;
 constexpr int SLEEP_TIME = 1;
 constexpr int TRY_TIMES = 2000;
@@ -75,7 +77,9 @@ void DataShareUvQueue::SyncCall(NapiVoidFunc func, NapiBoolFunc retFunc)
             return;
         }
         if (uvEntry->condition.wait_for(lock, std::chrono::seconds(WAIT_TIME), [uvEntry] { return uvEntry->done; })) {
-            LOG_INFO("function ended successfully");
+            auto time = static_cast<uint64_t>(duration_cast<milliseconds>(
+                system_clock::now().time_since_epoch()).count());
+            LOG_INFO("function ended successfully. times %{public}" PRIu64 ".", time);
         }
         if (!uvEntry->done && !uv_cancel((uv_req_t*)&work)) {
             LOG_ERROR("uv_cancel failed.");
diff --git a/data_share/frameworks/native/provider/src/js_datashare_ext_ability.cpp b/data_share/frameworks/native/provider/src/js_datashare_ext_ability.cpp
index d6bdc09c8b19cd68209aea08c40a3c87c52b152f..0d22f6cf3c80b2c64b93022d15e2c71fe139abff 100644
--- a/data_share/frameworks/native/provider/src/js_datashare_ext_ability.cpp
+++ b/data_share/frameworks/native/provider/src/js_datashare_ext_ability.cpp
@@ -78,7 +78,7 @@ void JsDataShareExtAbility::Init(const std::shared_ptr<AbilityLocalRecord> &reco
 
     std::string moduleName(Extension::abilityInfo_->moduleName);
     moduleName.append("::").append(abilityInfo_->name);
-    LOG_INFO("module:%{public}s, srcPath:%{public}s.", moduleName.c_str(), srcPath.c_str());
+    LOG_DEBUG("module:%{public}s, srcPath:%{public}s.", moduleName.c_str(), srcPath.c_str());
     HandleScope handleScope(jsRuntime_);
     napi_env env = jsRuntime_.GetNapiEnv();
 
@@ -336,7 +336,11 @@ napi_value JsDataShareExtAbility::CallObjectMethod(const char* name, napi_value
     }
 
     napi_value remoteNapi = nullptr;
+    NAPI_CallingInfo oldCallingInfo;
+    NAPI_RemoteObject_saveOldCallingInfo(env, oldCallingInfo);
+    SaveNewCallingInfo(env);
     napi_status status = napi_call_function(env, obj, method, count, args, &remoteNapi);
+    NAPI_RemoteObject_resetOldCallingInfo(env, oldCallingInfo);
     delete []args;
     if (status != napi_ok) {
         return nullptr;
@@ -344,6 +348,22 @@ napi_value JsDataShareExtAbility::CallObjectMethod(const char* name, napi_value
     return handleEscape.Escape(remoteNapi);
 }
 
+void JsDataShareExtAbility::SaveNewCallingInfo(napi_env &env)
+{
+    auto newCallingInfo = GetCallingInfo();
+    if (newCallingInfo == nullptr) {
+        LOG_ERROR("newCallingInfo is null.");
+        return;
+    }
+    CallingInfo callingInfo {
+        .callingPid = newCallingInfo->callingPid,
+        .callingUid = newCallingInfo->callingUid,
+        .callingTokenId = newCallingInfo->callingTokenId,
+        .activeStatus = ACTIVE_INVOKER,
+    };
+    NAPI_RemoteObject_setNewCallingInfo(env, callingInfo);
+}
+
 int32_t JsDataShareExtAbility::InitAsyncCallParams(size_t argc, napi_env &env, napi_value *args)
 {
     AsyncCallBackPoint *point = new (std::nothrow)AsyncCallBackPoint();
diff --git a/data_share/frameworks/native/provider/src/js_datashare_ext_ability_context.cpp b/data_share/frameworks/native/provider/src/js_datashare_ext_ability_context.cpp
index 646a7a59b8bc2043838d9a23fbf86eca6e99b105..0aa892b01eae84513769fa4cd695385b672dea56 100644
--- a/data_share/frameworks/native/provider/src/js_datashare_ext_ability_context.cpp
+++ b/data_share/frameworks/native/provider/src/js_datashare_ext_ability_context.cpp
@@ -39,7 +39,7 @@ public:
 
     static void Finalizer(napi_env env, void* data, void* hint)
     {
-        LOG_INFO("JsAbilityContext::Finalizer is called");
+        LOG_DEBUG("JsAbilityContext::Finalizer is called");
         std::unique_ptr<JsDataShareExtAbilityContext>(static_cast<JsDataShareExtAbilityContext*>(data));
     }
 private:
@@ -50,7 +50,7 @@ private:
 napi_value CreateJsDataShareExtAbilityContext(napi_env env,
     std::shared_ptr<DataShareExtAbilityContext> context)
 {
-    LOG_INFO("CreateJsDataShareExtAbilityContext begin");
+    LOG_DEBUG("CreateJsDataShareExtAbilityContext begin");
     napi_value objValue = CreateJsExtensionContext(env, context);
     std::unique_ptr<JsDataShareExtAbilityContext> jsContext = std::make_unique<JsDataShareExtAbilityContext>(context);
     napi_wrap(env, objValue, jsContext.release(), JsDataShareExtAbilityContext::Finalizer, nullptr, nullptr);
diff --git a/data_share/frameworks/native/proxy/src/ams_mgr_proxy.cpp b/data_share/frameworks/native/proxy/src/ams_mgr_proxy.cpp
index 5fbb9cccf68933e83e8173ffbe29583368fee971..4007ed1fe1fe5dfd4ff33e14651f3dbd8da0b4de 100644
--- a/data_share/frameworks/native/proxy/src/ams_mgr_proxy.cpp
+++ b/data_share/frameworks/native/proxy/src/ams_mgr_proxy.cpp
@@ -59,7 +59,7 @@ AmsMgrProxy* AmsMgrProxy::GetInstance()
     return proxy;
 }
 
-int AmsMgrProxy::Connect(
+__attribute__ ((no_sanitize("cfi"))) int AmsMgrProxy::Connect(
     const std::string &uri, const sptr<IRemoteObject> &connect, const sptr<IRemoteObject> &callerToken)
 {
     AAFwk::Want want;
diff --git a/data_share/frameworks/native/proxy/src/data_share_manager_impl.cpp b/data_share/frameworks/native/proxy/src/data_share_manager_impl.cpp
index 44fca74eef3f5791b551f2df61ddb9124d44f695..b9d4ff2ecf67a8bb985df498313fc15358169573 100644
--- a/data_share/frameworks/native/proxy/src/data_share_manager_impl.cpp
+++ b/data_share/frameworks/native/proxy/src/data_share_manager_impl.cpp
@@ -80,7 +80,7 @@ void DataShareManagerImpl::LinkToDeath(const sptr<IRemoteObject> remote)
     if (!remote->AddDeathRecipient(deathRecipient)) {
         LOG_ERROR("add death recipient failed");
     }
-    LOG_INFO("link to death success");
+    LOG_DEBUG("link to death success");
 }
 
 sptr<DataShareServiceProxy> DataShareManagerImpl::GetDataShareServiceProxy()
@@ -123,7 +123,6 @@ void DataShareManagerImpl::RegisterClientDeathObserver()
 
 DataShareManagerImpl::DataShareManagerImpl()
 {
-    LOG_INFO("construct");
     pool_ = std::make_shared<ExecutorPool>(MAX_THREADS, MIN_THREADS);
     SetDeathCallback([](std::shared_ptr<DataShareServiceProxy> proxy) {
         LOG_INFO("RecoverObs start");
@@ -134,7 +133,6 @@ DataShareManagerImpl::DataShareManagerImpl()
 
 DataShareManagerImpl::~DataShareManagerImpl()
 {
-    LOG_INFO("destroy");
 }
 
 std::shared_ptr<DataShareServiceProxy> DataShareManagerImpl::GetProxy()
@@ -171,7 +169,7 @@ std::shared_ptr<DataShareServiceProxy> DataShareManagerImpl::GetServiceProxy()
 
 void DataShareManagerImpl::ResetServiceHandle()
 {
-    LOG_INFO("enter");
+    LOG_DEBUG("enter");
     std::lock_guard<std::mutex> lock(mutex_);
     dataMgrService_ = nullptr;
     dataShareService_ = nullptr;
diff --git a/data_share/frameworks/native/proxy/src/data_share_service_proxy.cpp b/data_share/frameworks/native/proxy/src/data_share_service_proxy.cpp
index 694b7fcefa063527024539edc5d879bf6b6c9840..360151335ea8a0cf85a7c30a07381842ed53bd47 100644
--- a/data_share/frameworks/native/proxy/src/data_share_service_proxy.cpp
+++ b/data_share/frameworks/native/proxy/src/data_share_service_proxy.cpp
@@ -26,7 +26,6 @@ using InterfaceCode = OHOS::DistributedShare::DataShare::DataShareServiceInterfa
 DataShareServiceProxy::DataShareServiceProxy(const sptr<IRemoteObject> &object)
     : IRemoteProxy<IDataShareService>(object)
 {
-    LOG_INFO("Construct complete.");
 }
 
 int32_t DataShareServiceProxy::Insert(const Uri &uri, const DataShareValuesBucket &value)
diff --git a/data_share/frameworks/native/proxy/src/idata_share_client_death_observer.cpp b/data_share/frameworks/native/proxy/src/idata_share_client_death_observer.cpp
index d7f9651a1a557a1d729fe8dbb8c369e2cdff3d2f..6b3f3a8ab7949679a0c22f7b45a00e8cc3b2fdee 100644
--- a/data_share/frameworks/native/proxy/src/idata_share_client_death_observer.cpp
+++ b/data_share/frameworks/native/proxy/src/idata_share_client_death_observer.cpp
@@ -20,12 +20,12 @@ namespace OHOS {
 namespace DataShare {
 DataShareClientDeathObserverStub::DataShareClientDeathObserverStub()
 {
-    LOG_INFO("this client death observer");
+    LOG_DEBUG("this client death observer");
 }
 
 DataShareClientDeathObserverStub::~DataShareClientDeathObserverStub()
 {
-    LOG_INFO("destructor this client death observer");
+    LOG_DEBUG("destructor this client death observer");
 }
 }
 }
diff --git a/data_share/frameworks/native/proxy/src/published_data_subscriber_manager.cpp b/data_share/frameworks/native/proxy/src/published_data_subscriber_manager.cpp
index 6ec27fd330db834f486167025b31f1c5e10681dc..24314937175bc6a24fe0b990023c51d996a15f5a 100644
--- a/data_share/frameworks/native/proxy/src/published_data_subscriber_manager.cpp
+++ b/data_share/frameworks/native/proxy/src/published_data_subscriber_manager.cpp
@@ -280,7 +280,7 @@ void PublishedDataSubscriberManager::EmitOnEnable(std::map<Key, std::vector<Obse
 bool PublishedDataSubscriberManager::Init()
 {
     if (serviceCallback_ == nullptr) {
-        LOG_INFO("callback init");
+        LOG_DEBUG("callback init");
         serviceCallback_ = new PublishedDataObserverStub([this](PublishedDataChangeNode &changeNode) {
             Emit(changeNode);
         });
diff --git a/data_share/interfaces/inner_api/BUILD.gn b/data_share/interfaces/inner_api/BUILD.gn
index 689e9b99f33daf6c0ab06da94d3fbccb217d6ede..b1eda91db0a8a6a7e44b5cf0f84d20e04110a2bc 100644
--- a/data_share/interfaces/inner_api/BUILD.gn
+++ b/data_share/interfaces/inner_api/BUILD.gn
@@ -53,6 +53,7 @@ config("datashare_public_config") {
 }
 
 datashare_consumer_sources = [
+  "${datashare_common_native_path}/src/datashare_string_utils.cpp",
   "${datashare_native_consumer_path}/controller/provider/src/ext_special_controller.cpp",
   "${datashare_native_consumer_path}/controller/provider/src/general_controller_provider_impl.cpp",
   "${datashare_native_consumer_path}/controller/service/src/general_controller_service_impl.cpp",
@@ -155,7 +156,7 @@ ohos_shared_library("datashare_provider") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "hilog:libhilog",
-    "ipc:ipc_js",
+    "ipc:ipc_napi",
     "ipc:ipc_single",
     "napi:ace_napi",
     "samgr:samgr_proxy",
diff --git a/data_share/test/native/unittest/datashareproxy_test/proxydatas_with_permission_test.cpp b/data_share/test/native/unittest/datashareproxy_test/proxydatas_with_permission_test.cpp
index b4eece50c14b7aface95ba362f517f5773575313..adabe3e696c83e31ccc8bb6c38085d129fea0951 100644
--- a/data_share/test/native/unittest/datashareproxy_test/proxydatas_with_permission_test.cpp
+++ b/data_share/test/native/unittest/datashareproxy_test/proxydatas_with_permission_test.cpp
@@ -245,6 +245,34 @@ HWTEST_F(ProxyDatasTest, ProxyDatasTest_Publish_Test_002, TestSize.Level0)
     LOG_INFO("ProxyDatasTest_Publish_Test_002::End");
 }
 
+HWTEST_F(ProxyDatasTest, ProxyDatasTest_Publish_Test_003, TestSize.Level0)
+{
+    LOG_INFO("ProxyDatasTest_Publish_Test_003::Start");
+    auto helper = dataShareHelper;
+    Data data;
+    std::vector<uint8_t> buffer= {10, 20, 30};
+    data.datas_.emplace_back("datashareproxy://com.acts.ohos.data.datasharetest/test", SUBSCRIBER_ID, buffer);
+    std::string bundleName = "com.acts.ohos.data.datasharetest";
+    std::vector<OperationResult> results = helper->Publish(data, bundleName);
+    EXPECT_EQ(results.size(), data.datas_.size());
+    for (auto const &result : results) {
+        EXPECT_EQ(result.errCode_, 0);
+    }
+
+    int errCode = 0;
+    auto getData = helper->GetPublishedData(bundleName, errCode);
+    EXPECT_EQ(errCode, 0);
+    EXPECT_EQ(getData.datas_.size(), data.datas_.size());
+    for (auto &publishedDataItem : getData.datas_) {
+        EXPECT_EQ(publishedDataItem.subscriberId_, SUBSCRIBER_ID);
+        bool isAshmem = publishedDataItem.IsAshmem();
+        EXPECT_TRUE(isAshmem);
+        auto value = publishedDataItem.GetData();
+        EXPECT_EQ(std::get<std::vector<uint8_t>>(value)[0], buffer[0]);
+    }
+    LOG_INFO("ProxyDatasTest_Publish_Test_003::End");
+}
+
 HWTEST_F(ProxyDatasTest, ProxyDatasTest_CombinationRdbData_Test_001, TestSize.Level0)
 {
     LOG_INFO("ProxyDatasTest_CombinationRdbData_Test_001::Start");
diff --git a/datamgr_service/conf/config.json b/datamgr_service/conf/config.json
index 55cca51f6d32653af796b05705fb23576c1f24cf..d82bc2104a7ba07962ddedfbd14e474c8e31dba4 100644
--- a/datamgr_service/conf/config.json
+++ b/datamgr_service/conf/config.json
@@ -27,9 +27,7 @@
   "bundleChecker": {
     "checkers": [
       "SystemChecker",
-      "BundleChecker",
-      "PackageChecker",
-      "ExternalChecker"
+      "BundleChecker"
     ],
     "trusts": [
       {
@@ -37,7 +35,8 @@
         "appId": "bundle_manager_service",
         "checker": "SystemChecker"
       }
-    ]
+    ],
+    "distrusts": []
   },
   "networks": {
     "chains": [
@@ -92,4 +91,4 @@
     "backupInternal" : 36000,
     "backupNumber" : 20
   }
-}
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp b/datamgr_service/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp
index 01eb4c444cc7f288a4965d1d7478331712a54a76..864b3c660183d496b18e36fe9693d61728e2eaf6 100644
--- a/datamgr_service/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp
@@ -142,20 +142,6 @@ DBStatus ProcessCommunicatorImpl::SendData(const DeviceInfos &dstDevInfo, const
     return DBStatus::OK;
 }
 
-DeviceType ProcessCommunicatorImpl::GetDeviceType(int32_t deviceType)
-{
-    switch (deviceType) {
-        case 0x06D:  // SMART_WATCH
-        case 0x0A1:  // SMART_WATCH
-            return SMART_WATCH;
-        case 0x085:  // KID_WATCH
-        case 0x0A3:  // KID_WATCH
-            return KID_WATCH;
-        default:
-            return OTHERS;
-    }
-}
-
 uint32_t ProcessCommunicatorImpl::GetMtuSize()
 {
     return MTU_SIZE;
diff --git a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h
index 488361ab52a6a6ee6a2657454ec5a527cbc5a955..09ad9fa6954789ab19a5d9d5d6d65c68c8f63c70 100644
--- a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h
+++ b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h
@@ -40,6 +40,12 @@ public:
     ~SoftBusAdapter();
     static std::shared_ptr<SoftBusAdapter> GetInstance();
 
+    struct ServerSocketInfo {
+        std::string name;      /**< Peer socket name */
+        std::string networkId; /**< Peer network ID */
+        std::string pkgName;   /**< Peer package name */
+    };
+
     // add DataChangeListener to watch data change;
     Status StartWatchDataChange(const AppDataChangeListener *observer, const PipeInfo &pipeInfo);
 
@@ -66,7 +72,7 @@ public:
 
     void OnServerShutdown(int32_t socket);
 
-    bool GetPeerSocketInfo(int32_t socket, PeerSocketInfo &info);
+    bool GetPeerSocketInfo(int32_t socket, ServerSocketInfo &info);
 
     int32_t Broadcast(const PipeInfo &pipeInfo, uint16_t mask);
     void OnBroadcast(const DeviceId &device, uint16_t mask);
@@ -97,7 +103,7 @@ private:
     ExecutorPool::TaskId taskId_ = ExecutorPool::INVALID_TASK_ID;
     Time next_ = INVALID_NEXT;
 
-    ConcurrentMap<int32_t, PeerSocketInfo> peerSocketInfos_;
+    ConcurrentMap<int32_t, ServerSocketInfo> peerSocketInfos_;
     ISocketListener clientListener_{};
     ISocketListener serverListener_{};
     int32_t socket_ = 0;
diff --git a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp
index 32ba0fd659f69210b045d84f7c035d34b159c23f..3915b30a62b49ae1b86f2d9f9a67c58f00813f22 100644
--- a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp
+++ b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp
@@ -52,7 +52,6 @@ public:
     static void OnServerBind(int32_t socket, PeerSocketInfo info);
     static void OnServerShutdown(int32_t socket, ShutdownReason reason);
     static void OnServerBytesReceived(int32_t socket, const void *data, uint32_t dataLen);
-    static std::string GetPipeId(const char *name);
 
 public:
     // notify all listeners when received message
@@ -216,7 +215,7 @@ SoftBusAdapter::Task SoftBusAdapter::GetCloseSessionTask()
                 }
                 auto expireTime = conn->GetExpireTime();
                 if (expireTime <= now) {
-                    ZLOGD("[timeout] close session socket:%{public}d", conn->GetSocket());
+                    ZLOGI("[timeout] close session socket:%{public}d", conn->GetSocket());
                     connToClose.emplace_back(conn);
                 } else {
                     holdConnects.emplace_back(conn);
@@ -277,7 +276,23 @@ uint32_t SoftBusAdapter::GetMtuSize(const DeviceId &deviceId)
 
 uint32_t SoftBusAdapter::GetTimeout(const DeviceId &deviceId)
 {
-    return DEFAULT_TIMEOUT;
+    uint32_t interval = DEFAULT_TIMEOUT;
+    connects_.ComputeIfPresent(deviceId.deviceId, [&interval](auto, auto &connects) {
+        uint32_t time = 0;
+        for (auto conn : connects) {
+            if (conn == nullptr) {
+                continue;
+            }
+            if (time < conn->GetTimeout()) {
+                time = conn->GetTimeout();
+            }
+        }
+        if (time != 0) {
+            interval = time;
+        }
+        return true;
+    });
+    return interval;
 }
 
 std::string SoftBusAdapter::DelConnect(int32_t socket)
@@ -403,19 +418,19 @@ void AppDataListenerWrap::OnServerBind(int32_t socket, PeerSocketInfo info)
     softBusAdapter_->OnBind(socket, info);
     std::string peerDevUuid = DmAdapter::GetInstance().GetUuidByNetworkId(std::string(info.networkId));
 
-    ZLOGD("[OnServerBind] socket:%{public}d, peer name:%{public}s, peer devId:%{public}s", socket, info.name,
+    ZLOGI("[OnServerBind] socket:%{public}d, peer name:%{public}s, peer devId:%{public}s", socket, info.name,
         KvStoreUtils::ToBeAnonymous(peerDevUuid).c_str());
 }
 
 void AppDataListenerWrap::OnServerShutdown(int32_t socket, ShutdownReason reason)
 {
     softBusAdapter_->OnServerShutdown(socket);
-    ZLOGD("Shut down reason:%{public}d socket id:%{public}d", reason, socket);
+    ZLOGI("Shut down reason:%{public}d socket id:%{public}d", reason, socket);
 }
 
 void AppDataListenerWrap::OnServerBytesReceived(int32_t socket, const void *data, uint32_t dataLen)
 {
-    PeerSocketInfo info;
+    SoftBusAdapter::ServerSocketInfo info;
     if (!softBusAdapter_->GetPeerSocketInfo(socket, info)) {
         ZLOGE("Get peer socket info failed, socket id %{public}d", socket);
         return;
@@ -423,9 +438,9 @@ void AppDataListenerWrap::OnServerBytesReceived(int32_t socket, const void *data
     std::string peerDevUuid = DmAdapter::GetInstance().GetUuidByNetworkId(std::string(info.networkId));
 
     ZLOGD("[OnBytesReceived] socket:%{public}d, peer name:%{public}s, peer devId:%{public}s, data len:%{public}u",
-        socket, info.name, KvStoreUtils::ToBeAnonymous(peerDevUuid).c_str(), dataLen);
+        socket, info.name.c_str(), KvStoreUtils::ToBeAnonymous(peerDevUuid).c_str(), dataLen);
 
-    std::string pipeId = GetPipeId(info.name);
+    std::string pipeId = info.name;
     if (pipeId.empty()) {
         ZLOGE("pipId is invalid");
         return;
@@ -434,23 +449,13 @@ void AppDataListenerWrap::OnServerBytesReceived(int32_t socket, const void *data
     NotifyDataListeners(reinterpret_cast<const uint8_t *>(data), dataLen, peerDevUuid, { pipeId, "" });
 }
 
-std::string AppDataListenerWrap::GetPipeId(const char *name)
-{
-    std::string nameStr = name;
-    auto pos = nameStr.find('_');
-    if (pos != std::string::npos) {
-        return nameStr.substr(0, pos);
-    }
-    return "";
-}
-
 void AppDataListenerWrap::NotifyDataListeners(const uint8_t *data, const int size, const std::string &deviceId,
     const PipeInfo &pipeInfo)
 {
     softBusAdapter_->NotifyDataListeners(data, size, deviceId, pipeInfo);
 }
 
-bool SoftBusAdapter::GetPeerSocketInfo(int32_t socket, PeerSocketInfo& info)
+bool SoftBusAdapter::GetPeerSocketInfo(int32_t socket, ServerSocketInfo &info)
 {
     auto it = peerSocketInfos_.Find(socket);
     if (it.first) {
@@ -462,7 +467,11 @@ bool SoftBusAdapter::GetPeerSocketInfo(int32_t socket, PeerSocketInfo& info)
 
 void SoftBusAdapter::OnBind(int32_t socket, PeerSocketInfo info)
 {
-    peerSocketInfos_.Insert(socket, info);
+    ServerSocketInfo socketInfo;
+    socketInfo.name = info.name;
+    socketInfo.networkId = info.networkId;
+    socketInfo.pkgName = info.pkgName;
+    peerSocketInfos_.Insert(socket, socketInfo);
 }
 
 void SoftBusAdapter::OnServerShutdown(int32_t socket)
diff --git a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp
index 72b514769ce6f28214947c537f1ba012c4636eba..4a18383f372ad67186ed842e5c319f6a1974d54a 100644
--- a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp
+++ b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp
@@ -56,6 +56,11 @@ uint32_t SoftBusClient::GetMtuSize() const
     return mtu_;
 }
 
+uint32_t SoftBusClient::GetTimeout() const
+{
+    return DEFAULT_TIMEOUT;
+}
+
 Status SoftBusClient::SendData(const DataInfo &dataInfo, const ISocketListener *listener)
 {
     std::lock_guard<std::mutex> lock(mutex_);
@@ -70,7 +75,7 @@ Status SoftBusClient::SendData(const DataInfo &dataInfo, const ISocketListener *
         ZLOGE("send data to socket%{public}d failed, ret:%{public}d.", socket_, ret);
         return Status::ERROR;
     }
-    expireTime_ = std::chrono::steady_clock::now() + SESSION_CLOSE_DELAY;
+    expireTime_ = CalcExpireTime();
     return Status::SUCCESS;
 }
 
@@ -90,8 +95,7 @@ Status SoftBusClient::OpenConnect(const ISocketListener *listener)
     socketInfo.peerName = const_cast<char *>(peerName.c_str());
     std::string networkId = DmAdapter::GetInstance().ToNetworkID(device_.deviceId);
     socketInfo.peerNetworkId = const_cast<char *>(networkId.c_str());
-    std::string clientName = pipe_.pipeId + "_client_" + socketInfo.peerNetworkId;
-    socketInfo.name = const_cast<char *>(clientName.c_str());
+    socketInfo.name = const_cast<char *>(peerName.c_str());
     std::string pkgName = "ohos.distributeddata";
     socketInfo.pkgName = pkgName.data();
     socketInfo.dataType = DATA_TYPE_BYTES;
@@ -160,7 +164,7 @@ int32_t SoftBusClient::GetSocket() const
 
 void SoftBusClient::UpdateExpireTime()
 {
-    auto expireTime = std::chrono::steady_clock::now() + SESSION_CLOSE_DELAY;
+    auto expireTime = CalcExpireTime();
     std::lock_guard<std::mutex> lock(mutex_);
     if (expireTime > expireTime_) {
         expireTime_ = expireTime;
@@ -178,4 +182,10 @@ uint32_t SoftBusClient::GetQoSType() const
 {
     return type_ % QOS_COUNT;
 }
+
+SoftBusClient::Time SoftBusClient::CalcExpireTime() const
+{
+    auto delay = type_ == QOS_BR ? BR_CLOSE_DELAY : HML_CLOSE_DELAY;
+    return std::chrono::steady_clock::now() + delay;
+}
 } // namespace OHOS::AppDistributedKv
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.h b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.h
index a4ba06ce3ffbe3321cf1a1fac35796210b00e58c..acc343e9a7155cd5772033d78bef325d64ed0e1d 100644
--- a/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.h
+++ b/datamgr_service/services/distributeddataservice/adapter/communicator/src/softbus_client.h
@@ -38,11 +38,11 @@ public:
 
     using Time = std::chrono::steady_clock::time_point;
     using Duration = std::chrono::steady_clock::duration;
-    static constexpr Duration P2P_CLOSE_DELAY = std::chrono::seconds(3);
     Status SendData(const DataInfo &dataInfo, const ISocketListener *listener);
     bool operator==(int32_t socket) const;
     bool operator==(const std::string &deviceId) const;
     uint32_t GetMtuSize() const;
+    uint32_t GetTimeout() const;
     Time GetExpireTime() const;
     int32_t GetSocket() const;
     uint32_t GetQoSType() const;
@@ -52,14 +52,14 @@ private:
     Status OpenConnect(const ISocketListener *listener);
     Status Open(int32_t socket, const QosTV qos[], const ISocketListener *listener);
     std::pair<int32_t, uint32_t> GetMtu(int32_t socket);
+    Time CalcExpireTime() const;
 
     static constexpr int32_t INVALID_SOCKET_ID = -1;
-    static constexpr uint32_t DEFAULT_TIMEOUT = 15 * 1000;
-    static constexpr uint32_t WAIT_MAX_TIME = 10;
+    static constexpr uint32_t DEFAULT_TIMEOUT = 30 * 1000;
     static constexpr uint32_t DEFAULT_MTU_SIZE = 4096u;
-    static constexpr uint32_t P2P_SIZE_THRESHOLD = 0x10000u; // 64KB
-    static constexpr Duration SESSION_CLOSE_DELAY = std::chrono::seconds(3);
-    static constexpr Duration SESSION_OPEN_DELAY = std::chrono::seconds(20);
+    static constexpr Duration BR_CLOSE_DELAY = std::chrono::seconds(5);
+    static constexpr Duration HML_CLOSE_DELAY = std::chrono::seconds(3);
+    static constexpr Duration MAX_DELAY = std::chrono::seconds(60 * 60 * 24 * 365);
     static constexpr uint32_t QOS_COUNT = 3;
     static constexpr QosTV QOS_INFOS[QOS_BUTT][QOS_COUNT] = {
         { // BR QOS
@@ -79,8 +79,7 @@ private:
     PipeInfo pipe_;
     DeviceId device_;
     uint32_t mtu_;
-    std::function<int32_t(int32_t)> getConnStatus_;
-    Time expireTime_ = std::chrono::steady_clock::now() + SESSION_OPEN_DELAY;
+    Time expireTime_ = std::chrono::steady_clock::now() + MAX_DELAY;
 
     int32_t socket_ = INVALID_SOCKET_ID;
     int32_t bindState_ = -1;
diff --git a/datamgr_service/services/distributeddataservice/adapter/include/communicator/commu_types.h b/datamgr_service/services/distributeddataservice/adapter/include/communicator/commu_types.h
index b39e02be6ca65fa030cc9f7eee078995b7d4ffb9..8f60d6d01778162761161400699a0d10f9b8687c 100644
--- a/datamgr_service/services/distributeddataservice/adapter/include/communicator/commu_types.h
+++ b/datamgr_service/services/distributeddataservice/adapter/include/communicator/commu_types.h
@@ -28,13 +28,6 @@ struct API_EXPORT DeviceInfo {
     uint32_t deviceType;
 };
 
-enum DeviceType {
-    SMART_WATCH,
-    KID_WATCH,
-    PHONE,
-    OTHERS,
-};
-
 enum RouteType : int32_t {
     INVALID_ROUTE_TYPE = -1,
     ROUTE_TYPE_ALL = 0,
diff --git a/datamgr_service/services/distributeddataservice/adapter/include/communicator/process_communicator_impl.h b/datamgr_service/services/distributeddataservice/adapter/include/communicator/process_communicator_impl.h
index d337052617fb9dff3801eb4464ebcc7e308842d9..217fd5f7f1d81a5de44e8aa5340ec1f79489d716 100644
--- a/datamgr_service/services/distributeddataservice/adapter/include/communicator/process_communicator_impl.h
+++ b/datamgr_service/services/distributeddataservice/adapter/include/communicator/process_communicator_impl.h
@@ -66,7 +66,6 @@ public:
 private:
     void OnMessage(const DeviceInfo &info, const uint8_t *ptr, const int size,
                    const PipeInfo &pipeInfo) const override;
-    static DeviceType GetDeviceType(int32_t deviceType);
 
     std::string thisProcessLabel_;
     OnDeviceChange onDeviceChangeHandler_;
diff --git a/datamgr_service/services/distributeddataservice/app/BUILD.gn b/datamgr_service/services/distributeddataservice/app/BUILD.gn
index 6b1c62a20f97bdf63c2919b7f93f3ea245bd06e6..9435af0660a79372d46cb8bb22f2f10205724fe4 100644
--- a/datamgr_service/services/distributeddataservice/app/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/app/BUILD.gn
@@ -83,6 +83,7 @@ ohos_shared_library("distributeddataservice") {
     debug = false
   }
   sources = [
+    "src/db_info_handle_impl.cpp",
     "src/feature_stub_impl.cpp",
     "src/kvstore_account_observer.cpp",
     "src/kvstore_data_service.cpp",
diff --git a/datamgr_service/services/distributeddataservice/app/distributed_data.cfg b/datamgr_service/services/distributeddataservice/app/distributed_data.cfg
index b9d527d720f2198ec3d74573b8fc67b159d123bc..d5d214a102a1e5791cfe2cd5865cdd539d8d91b3 100644
--- a/datamgr_service/services/distributeddataservice/app/distributed_data.cfg
+++ b/datamgr_service/services/distributeddataservice/app/distributed_data.cfg
@@ -17,7 +17,7 @@
         "name" : "distributeddata",
         "path" : ["/system/bin/sa_main","/system/profile/distributeddata.json"],
         "uid" : "ddms",
-        "gid" : ["system","shell","readproc","ddms","dfs_share"],
+        "gid" : ["system","shell","readproc","ddms","dfs_share","netsys_socket"],
         "writepid":[
             "/dev/cpuset/foreground/tasks",
             "/dev/stune/foreground/tasks",
@@ -37,7 +37,8 @@
             "ohos.permission.CLOUDFILE_SYNC",
             "ohos.permission.PUBLISH_SYSTEM_COMMON_EVENT",
             "ohos.permission.GET_BUNDLE_INFO",
-            "ohos.permission.GET_NETWORK_INFO"
+            "ohos.permission.GET_NETWORK_INFO",
+            "ohos.permission.INTERNET"
         ]
       }
    ]
diff --git a/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.cpp b/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.cpp
index 557c99900c50b0bcac7b067d332ee225030660aa..69c2739e350cd64f97fb15244da9e174875f944d 100644
--- a/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.cpp
+++ b/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.cpp
@@ -44,6 +44,12 @@ bool BundleChecker::SetTrustInfo(const CheckerManager::Trust &trust)
     return true;
 }
 
+bool BundleChecker::SetDistrustInfo(const CheckerManager::Distrust &distrust)
+{
+    distrusts_[distrust.bundleName] = distrust.appId;
+    return true;
+}
+
 std::string BundleChecker::GetAppId(const CheckerManager::StoreInfo &info)
 {
     if (AccessTokenKit::GetTokenTypeFlag(info.tokenId) != TOKEN_HAP) {
@@ -80,5 +86,27 @@ bool BundleChecker::IsValid(const CheckerManager::StoreInfo &info)
 
     return tokenInfo.bundleName == info.bundleName;
 }
+
+bool BundleChecker::IsDistrust(const CheckerManager::StoreInfo &info)
+{
+    if (AccessTokenKit::GetTokenTypeFlag(info.tokenId) != TOKEN_HAP) {
+        return false;
+    }
+    HapTokenInfo tokenInfo;
+    auto result = AccessTokenKit::GetHapTokenInfo(info.tokenId, tokenInfo);
+    if (result != RET_SUCCESS) {
+        ZLOGE("token:0x%{public}x, result:%{public}d", info.tokenId, result);
+        return false;
+    }
+    if (!info.bundleName.empty() && tokenInfo.bundleName != info.bundleName) {
+        ZLOGE("bundlename:%{public}s <-> %{public}s", info.bundleName.c_str(), tokenInfo.bundleName.c_str());
+        return false;
+    }
+    auto it = distrusts_.find(info.bundleName);
+    if (it != distrusts_.end() && (it->second == tokenInfo.appID)) {
+        return true;
+    }
+    return false;
+}
 } // namespace DistributedData
 } // namespace OHOS
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.h b/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.h
index e55a20a56a56e42b06a40eb894811cd4ea7304c6..5392347388110f27a6069f506d2c9c131a7bb726 100644
--- a/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.h
+++ b/datamgr_service/services/distributeddataservice/app/src/checker/bundle_checker.h
@@ -24,12 +24,15 @@ public:
     ~BundleChecker();
     void Initialize() override;
     bool SetTrustInfo(const CheckerManager::Trust &trust) override;
+    bool SetDistrustInfo(const CheckerManager::Distrust &distrust) override;
     std::string GetAppId(const CheckerManager::StoreInfo &info) override;
     bool IsValid(const CheckerManager::StoreInfo &info) override;
+    bool IsDistrust(const CheckerManager::StoreInfo &info) override;
 private:
     static BundleChecker instance_;
     std::map<std::string, std::string> trusts_;
+    std::map<std::string, std::string> distrusts_;
 };
 } // namespace DistributedData
 } // namespace OHOS
-#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_CHECKER_BUNDLE_CHECKER_H
+#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_CHECKER_BUNDLE_CHECKER_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.cpp b/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.cpp
index c653d9576b4338d1e1e065d464d03293546bce90..aff8299e0b4ca9715f2971b98b3c7c10b7dc1559 100644
--- a/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.cpp
+++ b/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.cpp
@@ -40,6 +40,12 @@ bool SystemChecker::SetTrustInfo(const CheckerManager::Trust &trust)
     return true;
 }
 
+bool SystemChecker::SetDistrustInfo(const CheckerManager::Distrust &distrust)
+{
+    distrusts_[distrust.bundleName] = distrust.appId;
+    return true;
+}
+
 std::string SystemChecker::GetAppId(const CheckerManager::StoreInfo &info)
 {
     if (!IsValid(info)) {
@@ -55,5 +61,17 @@ bool SystemChecker::IsValid(const CheckerManager::StoreInfo &info)
     auto type = AccessTokenKit::GetTokenTypeFlag(info.tokenId);
     return (type == TOKEN_NATIVE || type == TOKEN_SHELL);
 }
+
+bool SystemChecker::IsDistrust(const CheckerManager::StoreInfo &info)
+{
+    if (!IsValid(info)) {
+        return false;
+    }
+    auto it = distrusts_.find(info.bundleName);
+    if (it != distrusts_.end()) {
+        return true;
+    }
+    return false;
+}
 } // namespace DistributedData
 } // namespace OHOS
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.h b/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.h
index 1f441908e5892b1bf169befbbd34e8c7e69961d7..f81bcc99557c56a6b4e1038a93f27a2c8abb49fd 100644
--- a/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.h
+++ b/datamgr_service/services/distributeddataservice/app/src/checker/system_checker.h
@@ -25,12 +25,15 @@ public:
     ~SystemChecker();
     void Initialize() override;
     bool SetTrustInfo(const CheckerManager::Trust &trust) override;
+    bool SetDistrustInfo(const CheckerManager::Distrust &distrust) override;
     std::string GetAppId(const CheckerManager::StoreInfo &info) override;
     bool IsValid(const CheckerManager::StoreInfo &info) override;
+    bool IsDistrust(const CheckerManager::StoreInfo &info) override;
 private:
     std::map<std::string, std::string> trusts_;
+    std::map<std::string, std::string> distrusts_;
     static SystemChecker instance_;
 };
 } // namespace DistributedData
 } // namespace OHOS
-#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_SYSTEM_CHECKER_H
+#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_SYSTEM_CHECKER_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.cpp b/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..014471b2aa61b7a2eb1658dc722b5f72b81a5ee6
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.cpp
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "db_info_handle_impl.h"
+namespace OHOS::DistributedKv {
+bool DBInfoHandleImpl::IsSupport()
+{
+    return true;
+}
+bool DBInfoHandleImpl::IsNeedAutoSync(const std::string& userId, const std::string& appId,
+    const std::string& storeId, const DistributedDB::DeviceInfos& devInfo)
+{
+    return true;
+}
+}
diff --git a/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.h b/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.h
new file mode 100644
index 0000000000000000000000000000000000000000..b764db1fb8c5c95c4f0d49c465ba5c099f5fe393
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/app/src/db_info_handle_impl.h
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#ifndef DISTRIBUTEDDATAMGR_DB_INFO_HANDLE_IMPL_H
+#define DISTRIBUTEDDATAMGR_DB_INFO_HANDLE_IMPL_H
+
+#include "db_info_handle.h"
+namespace OHOS::DistributedKv {
+using namespace DistributedDB;
+class DBInfoHandleImpl : public DBInfoHandle {
+public:
+    // return true if you can notify with RuntimeConfig::NotifyDBInfo
+    bool IsSupport() override;
+    // check is need auto sync when remote db is open
+    // return true if data has changed
+    bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const DeviceInfos &devInfo) override;
+};
+}
+#endif //DISTRIBUTEDDATAMGR_DB_INFO_HANDLE_IMPL_H
diff --git a/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.cpp b/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.cpp
index 9e31afef1e72fe7d8ffa13c485aeee8959c4baa0..45409734eb65867b5e0c41a6f112f7321bb2bcae 100644
--- a/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.cpp
+++ b/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.cpp
@@ -28,6 +28,7 @@
 #include "communicator_context.h"
 #include "config_factory.h"
 #include "crypto_manager.h"
+#include "db_info_handle_impl.h"
 #include "device_manager_adapter.h"
 #include "device_matrix.h"
 #include "dump/dump_manager.h"
@@ -71,7 +72,7 @@ using DBConfig = DistributedDB::RuntimeConfig;
 REGISTER_SYSTEM_ABILITY_BY_ID(KvStoreDataService, DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID, true);
 
 KvStoreDataService::KvStoreDataService(bool runOnCreate)
-    : SystemAbility(runOnCreate), mutex_(), clients_()
+    : SystemAbility(runOnCreate), clients_()
 {
     ZLOGI("begin.");
     if (executors_ == nullptr) {
@@ -83,7 +84,7 @@ KvStoreDataService::KvStoreDataService(bool runOnCreate)
 }
 
 KvStoreDataService::KvStoreDataService(int32_t systemAbilityId, bool runOnCreate)
-    : SystemAbility(systemAbilityId, runOnCreate), mutex_(), clients_()
+    : SystemAbility(systemAbilityId, runOnCreate), clients_()
 {
     ZLOGI("begin");
     if (executors_ == nullptr) {
@@ -97,7 +98,7 @@ KvStoreDataService::KvStoreDataService(int32_t systemAbilityId, bool runOnCreate
 KvStoreDataService::~KvStoreDataService()
 {
     ZLOGI("begin.");
-    clients_.clear();
+    clients_.Clear();
     features_.Clear();
 }
 
@@ -133,6 +134,7 @@ void KvStoreDataService::Initialize()
         return Upgrade::GetInstance().GetEncryptedUuidByMeta(meta);
     };
     DBConfig::SetTranslateToDeviceIdCallback(translateCall);
+    DistributedDB::RuntimeConfig::SetDBInfoHandle(std::make_shared<DBInfoHandleImpl>());
 }
 
 sptr<IRemoteObject> KvStoreDataService::GetFeatureInterface(const std::string &name)
@@ -192,22 +194,27 @@ Status KvStoreDataService::RegisterClientDeathObserver(const AppId &appId, sptr<
         ZLOGW("check bundleName:%{public}s uid:%{public}d failed.", appId.appId.c_str(), info.uid);
         return Status::PERMISSION_DENIED;
     }
-
-    std::lock_guard<decltype(mutex_)> lg(mutex_);
-    auto iter = clients_.find(info.tokenId);
-    // Ignore register with same tokenId and pid
-    if (iter != clients_.end() && IPCSkeleton::GetCallingPid() == iter->second.GetPid()) {
-        ZLOGW("bundleName:%{public}s, uid:%{public}d, pid:%{public}d has already registered.",
-            appId.appId.c_str(), info.uid, IPCSkeleton::GetCallingPid());
-        return Status::SUCCESS;
-    }
-
-    clients_.erase(info.tokenId);
-    auto it = clients_.emplace(std::piecewise_construct, std::forward_as_tuple(info.tokenId),
+    KvStoreClientDeathObserverImpl kvStoreClientDeathObserver(*this);
+    auto inserted = clients_.Emplace(
+        [&info, &appId, &kvStoreClientDeathObserver](decltype(clients_)::map_type &entries) {
+            auto it = entries.find(info.tokenId);
+            if (it == entries.end()) {
+                return true;
+            }
+            if (IPCSkeleton::GetCallingPid() == it->second.GetPid()) {
+                ZLOGW("bundleName:%{public}s, uid:%{public}d, pid:%{public}d has already registered.",
+                    appId.appId.c_str(), info.uid, IPCSkeleton::GetCallingPid());
+                return false;
+            }
+            kvStoreClientDeathObserver = std::move(it->second);
+            entries.erase(it);
+            return true;
+        },
+        std::piecewise_construct, std::forward_as_tuple(info.tokenId),
         std::forward_as_tuple(appId, *this, std::move(observer)));
-    ZLOGI("bundleName:%{public}s, uid:%{public}d, pid:%{public}d inserted:%{public}s.",
-        appId.appId.c_str(), info.uid, IPCSkeleton::GetCallingPid(), it.second ? "success" : "failed");
-    return it.second ? Status::SUCCESS : Status::ERROR;
+    ZLOGI("bundleName:%{public}s, uid:%{public}d, pid:%{public}d, inserted:%{public}s.", appId.appId.c_str(), info.uid,
+        IPCSkeleton::GetCallingPid(), inserted ? "success" : "failed");
+    return Status::SUCCESS;
 }
 
 Status KvStoreDataService::AppExit(pid_t uid, pid_t pid, uint32_t token, const AppId &appId)
@@ -216,8 +223,11 @@ Status KvStoreDataService::AppExit(pid_t uid, pid_t pid, uint32_t token, const A
     // memory of parameter appId locates in a member of clientDeathObserverMap_ and will be freed after
     // clientDeathObserverMap_ erase, so we have to take a copy if we want to use this parameter after erase operation.
     AppId appIdTmp = appId;
-    std::lock_guard<decltype(mutex_)> lg(mutex_);
-    clients_.erase(token);
+    KvStoreClientDeathObserverImpl impl(*this);
+    clients_.ComputeIfPresent(token, [&impl](auto &, auto &value) {
+        impl = std::move(value);
+        return false;
+    });
     return Status::SUCCESS;
 }
 
@@ -540,7 +550,7 @@ KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreClientDeathObserverIm
     : appId_(appId), dataService_(service), observerProxy_(std::move(observer)),
       deathRecipient_(new KvStoreDeathRecipient(*this))
 {
-    ZLOGI("KvStoreClientDeathObserverImpl");
+    ZLOGD("KvStoreClientDeathObserverImpl");
     uid_ = IPCSkeleton::GetCallingUid();
     pid_ = IPCSkeleton::GetCallingPid();
     token_ = IPCSkeleton::GetCallingTokenID();
@@ -551,6 +561,33 @@ KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreClientDeathObserverIm
         ZLOGW("observerProxy_ is nullptr");
     }
 }
+KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreClientDeathObserverImpl(KvStoreDataService &service)
+    : dataService_(service)
+{
+    Reset();
+}
+
+KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreClientDeathObserverImpl(
+    KvStoreDataService::KvStoreClientDeathObserverImpl &&impl)
+    : dataService_(impl.dataService_)
+{
+    uid_ = impl.uid_;
+    pid_ = impl.pid_;
+    token_ = impl.token_;
+    appId_.appId = std::move(impl.appId_.appId);
+    impl.Reset();
+}
+
+KvStoreDataService::KvStoreClientDeathObserverImpl &KvStoreDataService::KvStoreClientDeathObserverImpl::operator=(
+    KvStoreDataService::KvStoreClientDeathObserverImpl &&impl)
+{
+    uid_ = impl.uid_;
+    pid_ = impl.pid_;
+    token_ = impl.token_;
+    appId_.appId = std::move(impl.appId_.appId);
+    impl.Reset();
+    return *this;
+}
 
 KvStoreDataService::KvStoreClientDeathObserverImpl::~KvStoreClientDeathObserverImpl()
 {
@@ -559,6 +596,9 @@ KvStoreDataService::KvStoreClientDeathObserverImpl::~KvStoreClientDeathObserverI
         ZLOGI("remove death recipient");
         observerProxy_->RemoveDeathRecipient(deathRecipient_);
     }
+    if (uid_ == INVALID_UID || pid_ == INVALID_PID || token_ == INVALID_TOKEN || !appId_.IsValid()) {
+        return;
+    }
     dataService_.features_.ForEachCopies([this](const auto &, sptr<DistributedData::FeatureStubImpl> &value) {
         value->OnAppExit(uid_, pid_, token_, appId_);
         return false;
@@ -576,6 +616,14 @@ pid_t KvStoreDataService::KvStoreClientDeathObserverImpl::GetPid() const
     return pid_;
 }
 
+void KvStoreDataService::KvStoreClientDeathObserverImpl::Reset()
+{
+    uid_ = INVALID_UID;
+    pid_ = INVALID_PID;
+    token_ = INVALID_TOKEN;
+    appId_.appId = "";
+}
+
 KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreDeathRecipient::KvStoreDeathRecipient(
     KvStoreClientDeathObserverImpl &kvStoreClientDeathObserverImpl)
     : kvStoreClientDeathObserverImpl_(kvStoreClientDeathObserverImpl)
@@ -585,7 +633,7 @@ KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreDeathRecipient::KvSto
 
 KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreDeathRecipient::~KvStoreDeathRecipient()
 {
-    ZLOGI("KvStore Client Death Observer");
+    ZLOGD("~KvStore Client Death Observer");
 }
 
 void KvStoreDataService::KvStoreClientDeathObserverImpl::KvStoreDeathRecipient::OnRemoteDied(
diff --git a/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.h b/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.h
index 09f7784e26f57fdfef855da459ac9d5ff13212c3..1f7d001ac08ecac9ab7b7e83578548008b15586f 100644
--- a/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.h
+++ b/datamgr_service/services/distributeddataservice/app/src/kvstore_data_service.h
@@ -121,6 +121,9 @@ private:
     class KvStoreClientDeathObserverImpl {
     public:
         KvStoreClientDeathObserverImpl(const AppId &appId, KvStoreDataService &service, sptr<IRemoteObject> observer);
+        explicit KvStoreClientDeathObserverImpl(KvStoreDataService &service);
+        explicit KvStoreClientDeathObserverImpl(KvStoreClientDeathObserverImpl &&impl);
+        KvStoreClientDeathObserverImpl &operator=(KvStoreClientDeathObserverImpl &&impl);
 
         virtual ~KvStoreClientDeathObserverImpl();
 
@@ -137,6 +140,7 @@ private:
             KvStoreClientDeathObserverImpl &kvStoreClientDeathObserverImpl_;
         };
         void NotifyClientDie();
+        void Reset();
         pid_t uid_;
         pid_t pid_;
         uint32_t token_;
@@ -166,8 +170,7 @@ private:
 
     static constexpr int TEN_SEC = 10;
 
-    std::mutex mutex_;
-    std::map<uint32_t, KvStoreClientDeathObserverImpl> clients_;
+    ConcurrentMap<uint32_t, KvStoreClientDeathObserverImpl> clients_;
     std::shared_ptr<KvStoreAccountObserver> accountEventObserver_;
 
     std::shared_ptr<Security> security_;
@@ -180,6 +183,9 @@ private:
     static constexpr char FORMAT_BLANK_SPACE = ' ';
     static constexpr int32_t PRINTF_COUNT_2 = 2;
     static constexpr int MAXIMUM_PARAMETER_LIMIT = 3;
+    static constexpr pid_t INVALID_UID = -1;
+    static constexpr pid_t INVALID_PID = -1;
+    static constexpr uint32_t INVALID_TOKEN = 0;
 };
 }
 #endif  // KVSTORE_DATASERVICE_H
diff --git a/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
index 8111325aa53f00196b7640fba6621a0a43fae473..aa1ececae0e2146e6fe72e3079a4c889f049365a 100644
--- a/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
+++ b/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
@@ -32,10 +32,13 @@
 #include "log_print.h"
 #include "matrix_event.h"
 #include "metadata/meta_data_manager.h"
+#include "metadata/version_meta_data.h"
+#include "runtime_config.h"
 #include "utils/anonymous.h"
 #include "utils/block_integer.h"
 #include "utils/crypto.h"
 #include "utils/ref_count.h"
+#include "utils/converter.h"
 
 namespace OHOS {
 namespace DistributedKv {
@@ -47,6 +50,7 @@ using namespace DistributedDB;
 using namespace OHOS::AppDistributedKv;
 
 KvStoreMetaManager::MetaDeviceChangeListenerImpl KvStoreMetaManager::listener_;
+KvStoreMetaManager::DBInfoDeviceChangeListenerImpl KvStoreMetaManager::dbInfoListener_;
 
 KvStoreMetaManager::KvStoreMetaManager()
     : metaDelegate_(nullptr), metaDBDirectory_(DirectoryManager::GetInstance().GetMetaStorePath()),
@@ -80,14 +84,21 @@ void KvStoreMetaManager::InitMetaListener()
     InitMetaData();
     auto status = DmAdapter::GetInstance().StartWatchDeviceChange(&listener_, { "metaMgr" });
     if (status != AppDistributedKv::Status::SUCCESS) {
-        ZLOGW("register failed.");
+        ZLOGW("register metaMgr failed: %{public}d.", status);
         return;
     }
-    ZLOGI("register meta device change success.");
+    status = DmAdapter::GetInstance().StartWatchDeviceChange(&dbInfoListener_, { "notifyDbInfos" });
+    if (status != AppDistributedKv::Status::SUCCESS) {
+        ZLOGW("register notifyDbInfos failed: %{public}d.", status);
+        return;
+    }
+    ZLOGI("register metaMgr and notifyDbInfos device change success.");
+
     SubscribeMetaKvStore();
     SyncMeta();
     InitBroadcast();
     InitDeviceOnline();
+    NotifyAllAutoSyncDBInfo();
 }
 
 void KvStoreMetaManager::InitBroadcast()
@@ -171,9 +182,34 @@ void KvStoreMetaManager::InitMetaData()
         MetaDataManager::GetInstance().SaveMeta(data.GetKey(), data, true))) {
         ZLOGE("save meta fail");
     }
+    UpdateMetaData();
+    SetSyncer();
     ZLOGI("end.");
 }
 
+void KvStoreMetaManager::UpdateMetaData()
+{
+    VersionMetaData versionMeta;
+    if (!MetaDataManager::GetInstance().LoadMeta(versionMeta.GetKey(), versionMeta, true)
+        || versionMeta.version < META_VERSION) {
+        std::vector<StoreMetaData> metaDataList;
+        std::string prefix = StoreMetaData::GetPrefix({ DmAdapter::GetInstance().GetLocalDevice().uuid });
+        MetaDataManager::GetInstance().LoadMeta(prefix, metaDataList);
+        for (auto metaData : metaDataList) {
+            MetaDataManager::GetInstance().SaveMeta(metaData.GetKey(), metaData, true);
+            if (CheckerManager::GetInstance().IsDistrust(Converter::ConvertToStoreInfo(metaData)) ||
+                (metaData.storeType >= StoreMetaData::StoreType::STORE_RELATIONAL_BEGIN
+                 && metaData.storeType <= StoreMetaData::StoreType::STORE_RELATIONAL_END)) {
+                MetaDataManager::GetInstance().DelMeta(metaData.GetKey());
+            }
+        }
+    }
+    if (versionMeta.version != VersionMetaData::CURRENT_VERSION) {
+        versionMeta.version = VersionMetaData::CURRENT_VERSION;
+        MetaDataManager::GetInstance().SaveMeta(versionMeta.GetKey(), versionMeta, true);
+    }
+}
+
 void KvStoreMetaManager::InitMetaParameter()
 {
     ZLOGI("start.");
@@ -213,8 +249,13 @@ KvStoreMetaManager::NbDelegate KvStoreMetaManager::GetMetaKvStore()
     std::lock_guard<decltype(mutex_)> lock(mutex_);
     if (metaDelegate_ == nullptr) {
         metaDelegate_ = CreateMetaKvStore();
+        auto fullName = GetBackupPath();
+        auto backup = [fullName](const auto &store) -> int32_t {
+            DistributedDB::CipherPassword password;
+            return store->Export(fullName, password);
+        };
+        MetaDataManager::GetInstance().Initialize(metaDelegate_, backup);
     }
-    ConfigMetaDataManager();
     return metaDelegate_;
 }
 
@@ -261,13 +302,8 @@ KvStoreMetaManager::NbDelegate KvStoreMetaManager::CreateMetaKvStore()
     return NbDelegate(delegate, release);
 }
 
-void KvStoreMetaManager::ConfigMetaDataManager()
+void KvStoreMetaManager::SetSyncer()
 {
-    auto fullName = GetBackupPath();
-    auto backup = [fullName](const auto &store) -> int32_t {
-        DistributedDB::CipherPassword password;
-        return store->Export(fullName, password);
-    };
     auto syncer = [this](const auto &store, int32_t status) {
         DeviceMatrix::GetInstance().OnChanged(DeviceMatrix::META_STORE_MASK);
         auto size = DmAdapter::GetInstance().GetOnlineSize();
@@ -284,7 +320,7 @@ void KvStoreMetaManager::ConfigMetaDataManager()
                 executors_->Reset(delaySyncTaskId_, std::chrono::milliseconds(DELAY_SYNC));
         }
     };
-    MetaDataManager::GetInstance().Initialize(metaDelegate_, backup, syncer);
+    MetaDataManager::GetInstance().SetSyncer(syncer);
 }
 
 std::function<void()> KvStoreMetaManager::SyncTask(const NbDelegate &store, int32_t status)
@@ -370,6 +406,9 @@ void KvStoreMetaManager::KvStoreMetaObserver::OnChange(const DistributedDB::KvSt
     HandleChanges(CHANGE_FLAG::INSERT, data.GetEntriesInserted());
     HandleChanges(CHANGE_FLAG::UPDATE, data.GetEntriesUpdated());
     HandleChanges(CHANGE_FLAG::DELETE, data.GetEntriesDeleted());
+    KvStoreMetaManager::GetInstance().OnDataChange(CHANGE_FLAG::INSERT, data.GetEntriesInserted());
+    KvStoreMetaManager::GetInstance().OnDataChange(CHANGE_FLAG::UPDATE, data.GetEntriesUpdated());
+    KvStoreMetaManager::GetInstance().OnDataChange(CHANGE_FLAG::DELETE, data.GetEntriesDeleted());
 }
 
 void KvStoreMetaManager::KvStoreMetaObserver::HandleChanges(CHANGE_FLAG flag,
@@ -423,5 +462,101 @@ void KvStoreMetaManager::BindExecutor(std::shared_ptr<ExecutorPool> executors)
 {
     executors_ = executors;
 }
+
+void KvStoreMetaManager::OnDataChange(CHANGE_FLAG flag, const std::list<DistributedDB::Entry>& changedData)
+{
+    for (const auto& entry : changedData) {
+        std::string key(entry.key.begin(), entry.key.end());
+        if (key.find(StoreMetaData::GetKey({})) != 0) {
+            continue;
+        }
+        StoreMetaData metaData;
+        metaData.Unmarshall({ entry.value.begin(), entry.value.end() });
+        if (!metaData.isAutoSync) {
+            continue;
+        }
+        std::vector<DistributedDB::DBInfo> dbInfos;
+        AddDbInfo(metaData, dbInfos, flag == CHANGE_FLAG::DELETE);
+        DistributedDB::RuntimeConfig::NotifyDBInfos({ metaData.deviceId }, dbInfos);
+    }
+}
+
+void KvStoreMetaManager::GetDbInfosByDeviceId(const std::string& deviceId, std::vector<DistributedDB::DBInfo>& dbInfos)
+{
+    std::vector<StoreMetaData> metaData;
+    if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ deviceId }), metaData)) {
+        ZLOGW("load meta failed, deviceId:%{public}s", Anonymous::Change(deviceId).c_str());
+        return;
+    }
+    for (auto const& data : metaData) {
+        if (data.isAutoSync) {
+            AddDbInfo(data, dbInfos);
+        }
+    }
+}
+
+void KvStoreMetaManager::AddDbInfo(const StoreMetaData& metaData, std::vector<DistributedDB::DBInfo>& dbInfos,
+    bool isDeleted)
+{
+    DistributedDB::DBInfo dbInfo;
+    dbInfo.appId = metaData.deviceId;
+    dbInfo.userId = metaData.user;
+    dbInfo.storeId = metaData.storeId;
+    dbInfo.isNeedSync = !isDeleted;
+    dbInfo.syncDualTupleMode = true;
+    dbInfos.push_back(dbInfo);
+}
+
+void KvStoreMetaManager::OnDeviceChange(const std::string& deviceId)
+{
+    std::vector<DistributedDB::DBInfo> dbInfos;
+    GetDbInfosByDeviceId(deviceId, dbInfos);
+    DistributedDB::RuntimeConfig::NotifyDBInfos({ deviceId }, dbInfos);
+}
+
+void KvStoreMetaManager::NotifyAllAutoSyncDBInfo()
+{
+    auto deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
+    if (deviceId.empty()) {
+        ZLOGE("local deviceId empty");
+        return;
+    }
+    std::vector<StoreMetaData> metaData;
+    if (!MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ deviceId }), metaData)) {
+        ZLOGE("load meta failed, deviceId:%{public}s", Anonymous::Change(deviceId).c_str());
+        return;
+    }
+    std::vector<DistributedDB::DBInfo> dbInfos;
+    for (auto const& data : metaData) {
+        if (!data.isAutoSync) {
+            continue;
+        }
+        AddDbInfo(data, dbInfos);
+    }
+    if (!dbInfos.empty()) {
+        DistributedDB::RuntimeConfig::NotifyDBInfos({ deviceId }, dbInfos);
+    }
+}
+
+void KvStoreMetaManager::DBInfoDeviceChangeListenerImpl::OnDeviceChanged(const AppDistributedKv::DeviceInfo& info,
+    const DeviceChangeType& type) const
+{
+    if (type != DeviceChangeType::DEVICE_ONLINE) {
+        ZLOGD("offline or onReady ignore, type:%{public}d, deviceId:%{public}s", type,
+            Anonymous::Change(info.uuid).c_str());
+        return;
+    }
+    if (info.uuid == DistributedData::DeviceManagerAdapter::CLOUD_DEVICE_UUID) {
+        ZLOGD("Network change, ignore");
+        return;
+    }
+    KvStoreMetaManager::GetInstance().SyncMeta();
+    KvStoreMetaManager::GetInstance().OnDeviceChange(info.uuid);
+}
+
+AppDistributedKv::ChangeLevelType KvStoreMetaManager::DBInfoDeviceChangeListenerImpl::GetChangeLevelType() const
+{
+    return AppDistributedKv::ChangeLevelType::MIN;
+}
 } // namespace DistributedKv
-} // namespace OHOS
+} // namespace OHOS
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.h b/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.h
index 3bea8a46369a095736cc19db1696fafc2aad9098..a59f4b143e8d409598b063997467f719241c2de4 100644
--- a/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.h
+++ b/datamgr_service/services/distributeddataservice/app/src/kvstore_meta_manager.h
@@ -23,6 +23,7 @@
 #include "kv_store_delegate_manager.h"
 #include "system_ability.h"
 #include "types.h"
+#include "metadata/store_meta_data.h"
 
 namespace OHOS {
 namespace DistributedKv {
@@ -61,20 +62,33 @@ private:
 
     NbDelegate CreateMetaKvStore();
 
-    void ConfigMetaDataManager();
+    void SetSyncer();
 
     KvStoreMetaManager();
 
     void InitMetaData();
 
+    void UpdateMetaData();
+
     void SubscribeMetaKvStore();
 
     void SyncMeta();
 
+    void NotifyAllAutoSyncDBInfo();
+
+    void OnDataChange(CHANGE_FLAG flag, const std::list<DistributedDB::Entry>& changedData);
+
+    void OnDeviceChange(const std::string& deviceId);
+
+    void AddDbInfo(const DistributedData::StoreMetaData& metaData, std::vector<DistributedDB::DBInfo>& dbInfos,
+        bool isDeleted = false);
+
+    void GetDbInfosByDeviceId(const std::string& deviceId, std::vector<DistributedDB::DBInfo>& dbInfos);
+
     std::string GetBackupPath() const;
 
     ExecutorPool::Task GetTask(uint32_t retry);
-    
+
     std::function<void()> SyncTask(const NbDelegate &store, int32_t status);
 
     class KvStoreMetaObserver : public DistributedDB::KvStoreObserver {
@@ -88,6 +102,13 @@ private:
         void HandleChanges(CHANGE_FLAG flag, const std::list<DistributedDB::Entry> &entries);
     };
 
+    class DBInfoDeviceChangeListenerImpl : public AppDistributedKv::AppDeviceChangeListener {
+        void OnDeviceChanged(const AppDistributedKv::DeviceInfo &info,
+            const AppDistributedKv::DeviceChangeType &type) const override;
+
+        AppDistributedKv::ChangeLevelType GetChangeLevelType() const override;
+    };
+
     static constexpr int32_t RETRY_MAX_TIMES = 100;
     static constexpr int32_t RETRY_INTERVAL = 1;
     static constexpr uint8_t COMPRESS_RATE = 10;
@@ -97,11 +118,13 @@ private:
     const std::string label_;
     DistributedDB::KvStoreDelegateManager delegateManager_;
     static MetaDeviceChangeListenerImpl listener_;
+    static DBInfoDeviceChangeListenerImpl dbInfoListener_;
     KvStoreMetaObserver metaObserver_;
     std::mutex mutex_;
     std::shared_ptr<ExecutorPool> executors_;
     TaskId delaySyncTaskId_ = ExecutorPool::INVALID_TASK_ID;
+    static constexpr int32_t META_VERSION = 2;
 };
 }  // namespace DistributedKv
 }  // namespace OHOS
-#endif // KVSTORE_META_MANAGER_H
+#endif // KVSTORE_META_MANAGER_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp b/datamgr_service/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp
index c8515d4a464e1507167120ffbeae8d51ffa013e0..323b62e92db7de0e810cd767f1d537d36672a74a 100644
--- a/datamgr_service/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/app/src/session_manager/route_head_handler_impl.cpp
@@ -15,7 +15,8 @@
 #include "route_head_handler_impl.h"
 
 #define LOG_TAG "RouteHeadHandler"
-
+#include <chrono>
+#include <cinttypes>
 #include "auth_delegate.h"
 #include "device_manager_adapter.h"
 #include "kvstore_meta_manager.h"
@@ -30,6 +31,7 @@
 
 namespace OHOS::DistributedData {
 using namespace OHOS::DistributedKv;
+using namespace std::chrono;
 using DmAdapter = DistributedData::DeviceManagerAdapter;
 constexpr const int ALIGN_WIDTH = 8;
 std::shared_ptr<RouteHeadHandler> RouteHeadHandlerImpl::Create(const ExtendInfo &info)
@@ -92,7 +94,9 @@ DistributedDB::DBStatus RouteHeadHandlerImpl::GetHeadDataSize(uint32_t &headSize
 
     // align message uint width
     headSize = GET_ALIGNED_SIZE(expectSize, ALIGN_WIDTH);
-    ZLOGI("packed size:%{public}u", headSize);
+    auto time =
+        static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+    ZLOGI("packed size:%{public}u times %{public}" PRIu64 ".", headSize, time);
     headSize_ = headSize;
     return DistributedDB::OK;
 }
@@ -188,7 +192,9 @@ bool RouteHeadHandlerImpl::ParseHeadData(
         headSize = 0;
         return false;
     }
-    ZLOGI("unpacked size:%{public}u", headSize);
+    auto time =
+        static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+    ZLOGI("unpacked size:%{public}u times %{public}" PRIu64 ".", headSize, time);
     // flip the local and peer ends
     SessionPoint local { .deviceId = session_.targetDeviceId, .appId = session_.appId };
     SessionPoint peer { .deviceId = session_.sourceDeviceId, .userId = session_.sourceUserId, .appId = session_.appId };
diff --git a/datamgr_service/services/distributeddataservice/app/test/BUILD.gn b/datamgr_service/services/distributeddataservice/app/test/BUILD.gn
index d13ad3869ef1e06b31c01a6913bf2db488a2741a..dba18f091d409daedbdfc65f82c2145e555a5ae8 100644
--- a/datamgr_service/services/distributeddataservice/app/test/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/app/test/BUILD.gn
@@ -67,6 +67,7 @@ config("module_private_config") {
 ohos_unittest("KvStoreDataServiceTest") {
   module_out_path = module_output_path
   sources = [
+    "../src/db_info_handle_impl.cpp",
     "../src/feature_stub_impl.cpp",
     "../src/kvstore_account_observer.cpp",
     "../src/kvstore_data_service.cpp",
@@ -211,6 +212,7 @@ ohos_unittest("KvStoreFlowCtrlManagerTest") {
 ohos_unittest("KvStoreDataServiceClearTest") {
   module_out_path = module_output_path
   sources = [
+    "${data_service_path}/app/src/db_info_handle_impl.cpp",
     "${data_service_path}/app/src/feature_stub_impl.cpp",
     "${data_service_path}/app/src/kvstore_account_observer.cpp",
     "${data_service_path}/app/src/kvstore_data_service.cpp",
diff --git a/datamgr_service/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn b/datamgr_service/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
index d0ecb8236c0dd959860e52859d6215e2a052c05d..5e6a9098a9f09761e880c16f08cc8395930788ee 100644
--- a/datamgr_service/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/app/test/fuzztest/dataservicestub_fuzzer/BUILD.gn
@@ -63,6 +63,7 @@ ohos_fuzztest("DataServiceStubFuzzTest") {
   ]
 
   sources = [
+    "${data_service_path}/app/src/db_info_handle_impl.cpp",
     "${data_service_path}/app/src/feature_stub_impl.cpp",
     "${data_service_path}/app/src/kvstore_account_observer.cpp",
     "${data_service_path}/app/src/kvstore_data_service.cpp",
diff --git a/datamgr_service/services/distributeddataservice/framework/BUILD.gn b/datamgr_service/services/distributeddataservice/framework/BUILD.gn
index 14d7b58522e46be3cd21cd2098cd88a6d7028fc4..aa0df79dd0afd49eaae79fe29e9a51f226cb5a5c 100644
--- a/datamgr_service/services/distributeddataservice/framework/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/framework/BUILD.gn
@@ -80,6 +80,7 @@ ohos_shared_library("distributeddatasvcfwk") {
     "metadata/store_meta_data_local.cpp",
     "metadata/strategy_meta_data.cpp",
     "metadata/user_meta_data.cpp",
+    "metadata/version_meta_data.cpp",
     "serializable/serializable.cpp",
     "snapshot/bind_event.cpp",
     "snapshot/snapshot.cpp",
diff --git a/datamgr_service/services/distributeddataservice/framework/checker/checker_manager.cpp b/datamgr_service/services/distributeddataservice/framework/checker/checker_manager.cpp
index 8dbc1bb39650f35574872abef279e293cf6a9e91..9a384153d39948b269487b78b9f010d2637a0537 100644
--- a/datamgr_service/services/distributeddataservice/framework/checker/checker_manager.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/checker/checker_manager.cpp
@@ -76,6 +76,20 @@ bool CheckerManager::IsValid(const StoreInfo &info)
     return false;
 }
 
+bool CheckerManager::IsDistrust(const StoreInfo &info)
+{
+    for (auto &[name, checker] : checkers_) {
+        if (checker == nullptr) {
+            continue;
+        }
+        if (!checker->IsDistrust(info)) {
+            continue;
+        }
+        return true;
+    }
+    return false;
+}
+
 CheckerManager::Checker *CheckerManager::GetChecker(const std::string &checker)
 {
     auto it = checkers_.find(checker);
diff --git a/datamgr_service/services/distributeddataservice/framework/cloud/cloud_info.cpp b/datamgr_service/services/distributeddataservice/framework/cloud/cloud_info.cpp
index 7df8309f4f2a84a75d9d176a4789df5b52635264..f6f01847176795b8e4737bb619c10a63e5dbcb70 100644
--- a/datamgr_service/services/distributeddataservice/framework/cloud/cloud_info.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/cloud/cloud_info.cpp
@@ -121,6 +121,16 @@ bool CloudInfo::IsOn(const std::string &bundleName, int32_t instanceId)
     return it != apps.end() && it->second.instanceId == instanceId && it->second.cloudSwitch;
 }
 
+bool CloudInfo::IsAllSwitchOff() const
+{
+    for (auto &[bundle, app] : apps) {
+        if (app.cloudSwitch) {
+            return false;
+        }
+    }
+    return true;
+}
+
 std::string CloudInfo::GetPrefix(const std::initializer_list<std::string> &fields)
 {
     return GetKey(INFO_PREFIX, fields).append(Constant::KEY_SEPARATOR);
diff --git a/datamgr_service/services/distributeddataservice/framework/cloud/cloud_server.cpp b/datamgr_service/services/distributeddataservice/framework/cloud/cloud_server.cpp
index ef3a75391d177c3ed7e3d0982bf327098e8246a5..897a567d60db9e2e28f8a718895dec6d492d24af 100644
--- a/datamgr_service/services/distributeddataservice/framework/cloud/cloud_server.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/cloud/cloud_server.cpp
@@ -72,4 +72,8 @@ void CloudServer::Clean(int32_t userId)
 void CloudServer::ReleaseUserInfo(int32_t userId)
 {
 }
+
+void CloudServer::Bind(std::shared_ptr<ExecutorPool> executor)
+{
+}
 } // namespace OHOS::DistributedData
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/cloud/subscription.cpp b/datamgr_service/services/distributeddataservice/framework/cloud/subscription.cpp
index 7bddb52c3744542b623df82347c1a724238b66df..28030d881146285152f98573b4daf1fb798c6938 100644
--- a/datamgr_service/services/distributeddataservice/framework/cloud/subscription.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/cloud/subscription.cpp
@@ -58,6 +58,25 @@ std::string Subscription::GetRelationKey(const std::string &bundleName)
     return GetRelationKey(userId, bundleName);
 }
 
+uint64_t Subscription::GetMinExpireTime() const
+{
+    if (expiresTime.empty()) {
+        return 0;
+    }
+    auto it = expiresTime.begin();
+    uint64_t expire = it->second;
+    it++;
+    for (; it != expiresTime.end(); it++) {
+        if (it->second == 0) {
+            continue;
+        }
+        if (it->second < expire) {
+            expire = it->second;
+        }
+    }
+    return expire;
+}
+
 std::string Subscription::GetKey(int32_t userId)
 {
     return Constant::Join(PREFIX, Constant::KEY_SEPARATOR, { std::to_string(userId) });
diff --git a/datamgr_service/services/distributeddataservice/framework/include/checker/checker_manager.h b/datamgr_service/services/distributeddataservice/framework/include/checker/checker_manager.h
index 95b4022799e862849049197c1b2fc935980f87f2..b54063d7eb9385311b7d2939b7718203170d0108 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/checker/checker_manager.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/checker/checker_manager.h
@@ -29,6 +29,7 @@ public:
         std::string base64Key;
         std::string checker;
     };
+    using Distrust = Trust;
     struct StoreInfo {
         pid_t uid;
         uint32_t tokenId;
@@ -39,8 +40,10 @@ public:
     public:
         virtual void Initialize() = 0;
         virtual bool SetTrustInfo(const Trust &trust) = 0;
+        virtual bool SetDistrustInfo(const Distrust &distrust) = 0;
         virtual std::string GetAppId(const StoreInfo &info) = 0;
         virtual bool IsValid(const StoreInfo &info) = 0;
+        virtual bool IsDistrust(const StoreInfo &info) = 0;
     protected:
         API_EXPORT ~Checker() = default;
     };
@@ -48,6 +51,7 @@ public:
     API_EXPORT void RegisterPlugin(const std::string &checker, std::function<Checker *()> getter);
     API_EXPORT std::string GetAppId(const StoreInfo &info);
     API_EXPORT bool IsValid(const StoreInfo &info);
+    API_EXPORT bool IsDistrust(const StoreInfo &info);
     API_EXPORT void LoadCheckers(std::vector<std::string> &checkers);
     API_EXPORT Checker *GetChecker(const std::string &checker);
 private:
@@ -56,4 +60,4 @@ private:
 };
 } // namespace DistributedData
 } // namespace OHOS
-#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_CHECKER_CHECKER_MANAGER_H
+#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_CHECKER_CHECKER_MANAGER_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_info.h b/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_info.h
index b88e997944ead97181d5d276beaf45d621865683..14cdf141c685a8adbef94436fc51d327cb7c034e 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_info.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_info.h
@@ -46,6 +46,7 @@ public:
     bool IsValid() const;
     bool Exist(const std::string &bundleName, int32_t instanceId = 0);
     bool IsOn(const std::string &bundleName, int32_t instanceId = 0);
+    bool IsAllSwitchOff() const;
     static std::string GetPrefix(const std::initializer_list<std::string> &field);
 
     bool Marshal(json &node) const override;
diff --git a/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_server.h b/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_server.h
index dbf8a4901a52921a7d2daa1e25db0aed698f2c57..ebe4220c03881772e3be41084542c7f868ffcfb7 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_server.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/cloud/cloud_server.h
@@ -20,6 +20,7 @@
 #include "cloud/cloud_info.h"
 #include "cloud/schema_meta.h"
 #include "cloud/sharing_center.h"
+#include "executor_pool.h"
 #include "visibility.h"
 namespace OHOS::DistributedData {
 class API_EXPORT CloudServer {
@@ -37,6 +38,7 @@ public:
     virtual std::shared_ptr<SharingCenter> ConnectSharingCenter(int32_t userId, const std::string &bunleName);
     virtual void Clean(int32_t userId);
     virtual void ReleaseUserInfo(int32_t userId);
+    virtual void Bind(std::shared_ptr<ExecutorPool> executor);
 
 private:
     static CloudServer *instance_;
diff --git a/datamgr_service/services/distributeddataservice/framework/include/cloud/schema_meta.h b/datamgr_service/services/distributeddataservice/framework/include/cloud/schema_meta.h
index cd612cf216daa4d7e6948b48525c60ca8ebaf6b8..7836822c8f303ff9dd8a18008124c399504e06f1 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/cloud/schema_meta.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/cloud/schema_meta.h
@@ -60,7 +60,7 @@ public:
     static constexpr const char *REFERENCE_FIELD = "#_reference";
     static constexpr const char *CLOUD_OWNER = "cloud_owner";
     static constexpr const char *CLOUD_PRIVILEGE = "cloud_privilege";
-    static constexpr const char *SHARING_RESOURCE = "sharing_resource";
+    static constexpr const char *SHARING_RESOURCE = "#_sharing_resource";
     int32_t version = 0;
     std::string bundleName;
     std::vector<Database> databases;
diff --git a/datamgr_service/services/distributeddataservice/framework/include/cloud/subscription.h b/datamgr_service/services/distributeddataservice/framework/include/cloud/subscription.h
index c0e8dec5f5cb3f9342fc58961744a0e4e9469d65..1d81ea3a974d728a48678a3b05ba96d8026b7ec8 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/cloud/subscription.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/cloud/subscription.h
@@ -34,6 +34,7 @@ struct API_EXPORT Subscription final : public Serializable {
     bool Unmarshal(const json &node);
     std::string GetKey();
     std::string GetRelationKey(const std::string &bundleName);
+    uint64_t GetMinExpireTime() const;
     static std::string GetKey(int32_t userId);
     static std::string GetRelationKey(int32_t userId, const std::string &bundleName);
     static std::string GetPrefix(const std::initializer_list<std::string> &fields);
diff --git a/datamgr_service/services/distributeddataservice/framework/include/metadata/meta_data_manager.h b/datamgr_service/services/distributeddataservice/framework/include/metadata/meta_data_manager.h
index 55d0b47f52f1c765459880384e7bdc5b7d52e799..b1588b7052a2df104dcc70d2361fb86550953311 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/metadata/meta_data_manager.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/metadata/meta_data_manager.h
@@ -49,8 +49,10 @@ public:
     using Syncer = std::function<void(const std::shared_ptr<MetaStore> &, int32_t)>;
     using Backup = std::function<int32_t(const std::shared_ptr<MetaStore> &)>;
     using Bytes = std::vector<uint8_t>;
+    using OnComplete = std::function<void(const std::map<std::string, int32_t> &)>;
     API_EXPORT static MetaDataManager &GetInstance();
-    API_EXPORT void Initialize(std::shared_ptr<MetaStore> metaStore, const Backup &backup, const Syncer &syncer);
+    API_EXPORT void Initialize(std::shared_ptr<MetaStore> metaStore, const Backup &backup);
+    API_EXPORT void SetSyncer(const Syncer &syncer);
     API_EXPORT bool SaveMeta(const std::string &key, const Serializable &value, bool isLocal = false);
     API_EXPORT bool LoadMeta(const std::string &key, Serializable &value, bool isLocal = false);
     template<class T>
@@ -72,8 +74,10 @@ public:
 
     API_EXPORT bool DelMeta(const std::string &key, bool isLocal = false);
     API_EXPORT bool Subscribe(std::shared_ptr<Filter> filter, Observer observer);
-    API_EXPORT bool Subscribe(std::string prefix, Observer observer);
+    API_EXPORT bool Subscribe(std::string prefix, Observer observer, bool isLocal = false);
     API_EXPORT bool Unsubscribe(std::string filter);
+    API_EXPORT bool Sync(const std::vector<std::string> &devices, OnComplete complete);
+
 private:
     MetaDataManager();
     ~MetaDataManager();
diff --git a/datamgr_service/services/distributeddataservice/framework/include/metadata/store_meta_data.h b/datamgr_service/services/distributeddataservice/framework/include/metadata/store_meta_data.h
index 6a8a15e4d6d83c50b9773501543a7db2f12b9907..fdcb3d49a4635ca0eba404ba4770cad7d442e2b0 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/metadata/store_meta_data.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/metadata/store_meta_data.h
@@ -26,6 +26,7 @@ struct API_EXPORT StoreMetaData final : public Serializable {
     // UID -> uid, deviceAccountId -> userId, userId -> user
     static constexpr uint32_t FIELD_CHANGED_TAG = 0x03000003;
     static constexpr uint32_t UUID_CHANGED_TAG = 0x03000004;
+    static constexpr const char *KEY_PREFIX = "KvStoreMetaData";
     uint32_t version = CURRENT_VERSION;
     bool isAutoSync = false;
     bool isBackup = false;
@@ -77,9 +78,6 @@ struct API_EXPORT StoreMetaData final : public Serializable {
     API_EXPORT std::string GetStoreAlias() const;
     API_EXPORT static std::string GetKey(const std::initializer_list<std::string> &fields);
     API_EXPORT static std::string GetPrefix(const std::initializer_list<std::string> &fields);
-
-private:
-    static constexpr const char *KEY_PREFIX = "KvStoreMetaData";
 };
 } // namespace OHOS::DistributedData
-#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_METADATA_STORE_META_DATA_H
+#endif // OHOS_DISTRIBUTED_DATA_SERVICES_FRAMEWORK_METADATA_STORE_META_DATA_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/include/metadata/version_meta_data.h b/datamgr_service/services/distributeddataservice/framework/include/metadata/version_meta_data.h
new file mode 100644
index 0000000000000000000000000000000000000000..07080e374ad9a5819c24b3427355c90c1fc617f0
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/include/metadata/version_meta_data.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DISTRIBUTEDDATAMGR_VERSION_META_DATA_H
+#define DISTRIBUTEDDATAMGR_VERSION_META_DATA_H
+#include "serializable/serializable.h"
+
+namespace OHOS::DistributedData {
+class API_EXPORT VersionMetaData final : public Serializable {
+public:
+    static constexpr int32_t CURRENT_VERSION = 2;
+    static constexpr int32_t INVALID_VERSION = -1;
+    int32_t version = INVALID_VERSION;
+
+    API_EXPORT VersionMetaData();
+    API_EXPORT ~VersionMetaData();
+    API_EXPORT bool Marshal(json &node) const override;
+    API_EXPORT bool Unmarshal(const json &node) override;
+    API_EXPORT std::string GetKey() const;
+
+private:
+    static constexpr const char *KEY_PREFIX = "VersionKey";
+};
+} // namespace OHOS::DistributedData
+#endif // DISTRIBUTEDDATAMGR_VERSION_META_DATA_H
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/include/store/general_store.h b/datamgr_service/services/distributeddataservice/framework/include/store/general_store.h
index b8bfd7db2b1a858c37968557cc97b85c10af5694..a3be9f70833ad3e2e4597bb99375217d711b0991 100644
--- a/datamgr_service/services/distributeddataservice/framework/include/store/general_store.h
+++ b/datamgr_service/services/distributeddataservice/framework/include/store/general_store.h
@@ -99,6 +99,8 @@ public:
     virtual int32_t Update(const std::string &table, const std::string &setSql, Values &&values,
         const std::string &whereSql, Values &&conditions) = 0;
 
+    virtual int32_t Replace(const std::string &table, VBucket &&value) = 0;
+
     virtual int32_t Delete(const std::string &table, const std::string &sql, Values &&args) = 0;
 
     virtual std::shared_ptr<Cursor> Query(const std::string &table, const std::string &sql, Values &&args) = 0;
diff --git a/datamgr_service/services/distributeddataservice/framework/metadata/meta_data_manager.cpp b/datamgr_service/services/distributeddataservice/framework/metadata/meta_data_manager.cpp
index 0ae44908ad5bb0b840b7f88f8439a6cb724844b5..1e8cd74fb644910ff228a54eeccd46bc3512f210 100644
--- a/datamgr_service/services/distributeddataservice/framework/metadata/meta_data_manager.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/metadata/meta_data_manager.cpp
@@ -26,7 +26,8 @@ public:
     using Filter = MetaDataManager::Filter;
     using MetaStore = MetaDataManager::MetaStore;
     using Observer = MetaDataManager::Observer;
-    MetaObserver(std::shared_ptr<MetaStore> metaStore, std::shared_ptr<Filter> filter, Observer observer);
+    MetaObserver(std::shared_ptr<MetaStore> metaStore,
+        std::shared_ptr<Filter> filter, Observer observer, bool isLocal = false);
     virtual ~MetaObserver();
 
     // Database change callback
@@ -38,11 +39,13 @@ private:
     Observer observer_;
 };
 
-MetaObserver::MetaObserver(std::shared_ptr<MetaStore> metaStore, std::shared_ptr<Filter> filter, Observer observer)
+MetaObserver::MetaObserver(std::shared_ptr<MetaStore> metaStore,
+    std::shared_ptr<Filter> filter, Observer observer, bool isLocal)
     : metaStore_(std::move(metaStore)), filter_(std::move(filter)), observer_(std::move(observer))
 {
     if (metaStore_ != nullptr) {
-        int mode = DistributedDB::OBSERVER_CHANGES_NATIVE | DistributedDB::OBSERVER_CHANGES_FOREIGN;
+        int mode = isLocal ? DistributedDB::OBSERVER_CHANGES_LOCAL_ONLY
+                           : (DistributedDB::OBSERVER_CHANGES_NATIVE | DistributedDB::OBSERVER_CHANGES_FOREIGN);
         auto status = metaStore_->RegisterObserver(filter_->GetKey(), mode, this);
         if (status != DistributedDB::DBStatus::OK) {
             ZLOGE("register meta observer failed :%{public}d.", status);
@@ -104,7 +107,7 @@ MetaDataManager::~MetaDataManager()
     metaObservers_.Clear();
 }
 
-void MetaDataManager::Initialize(std::shared_ptr<MetaStore> metaStore, const Backup &backup, const Syncer &syncer)
+void MetaDataManager::Initialize(std::shared_ptr<MetaStore> metaStore, const Backup &backup)
 {
     if (metaStore == nullptr) {
         return;
@@ -116,10 +119,17 @@ void MetaDataManager::Initialize(std::shared_ptr<MetaStore> metaStore, const Bac
     }
     metaStore_ = std::move(metaStore);
     backup_ = backup;
-    syncer_ = syncer;
     inited_ = true;
 }
 
+void MetaDataManager::SetSyncer(const Syncer &syncer)
+{
+    if (metaStore_ == nullptr) {
+        return;
+    }
+    syncer_ = syncer;
+}
+
 bool MetaDataManager::SaveMeta(const std::string &key, const Serializable &value, bool isLocal)
 {
     if (!inited_) {
@@ -196,6 +206,25 @@ bool MetaDataManager::DelMeta(const std::string &key, bool isLocal)
     return ((status == DistributedDB::DBStatus::OK) || (status == DistributedDB::DBStatus::NOT_FOUND));
 }
 
+bool MetaDataManager::Sync(const std::vector<std::string> &devices, OnComplete complete)
+{
+    if (!inited_ || devices.empty()) {
+        return false;
+    }
+    auto status = metaStore_->Sync(
+        devices, DistributedDB::SyncMode::SYNC_MODE_PUSH_PULL, [complete](auto &dbResults) {
+        std::map<std::string, int32_t> results;
+        for (auto &[uuid, status] : dbResults) {
+            results.insert_or_assign(uuid, static_cast<int32_t>(status));
+        }
+        complete(results);
+    });
+    if (status != DistributedDB::OK) {
+        ZLOGW("meta data sync error %{public}d.", status);
+    }
+    return status == DistributedDB::OK;
+}
+
 bool MetaDataManager::Subscribe(std::shared_ptr<Filter> filter, Observer observer)
 {
     if (!inited_) {
@@ -208,15 +237,15 @@ bool MetaDataManager::Subscribe(std::shared_ptr<Filter> filter, Observer observe
         });
 }
 
-bool MetaDataManager::Subscribe(std::string prefix, Observer observer)
+bool MetaDataManager::Subscribe(std::string prefix, Observer observer, bool isLocal)
 {
     if (!inited_) {
         return false;
     }
 
     return metaObservers_.ComputeIfAbsent(
-        prefix, [ this, &observer, &prefix ](const std::string &key) -> auto {
-            return std::make_shared<MetaObserver>(metaStore_, std::make_shared<Filter>(prefix), observer);
+        prefix, [ this,  isLocal, &observer, &prefix ](const std::string &key) -> auto {
+            return std::make_shared<MetaObserver>(metaStore_, std::make_shared<Filter>(prefix), observer, isLocal);
         });
 }
 
diff --git a/datamgr_service/services/distributeddataservice/framework/metadata/version_meta_data.cpp b/datamgr_service/services/distributeddataservice/framework/metadata/version_meta_data.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..dfe1738d63f18fd330099b7398a9712f3e96dfa9
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/metadata/version_meta_data.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "metadata/version_meta_data.h"
+
+namespace OHOS::DistributedData {
+VersionMetaData::VersionMetaData()
+{
+}
+
+VersionMetaData::~VersionMetaData()
+{
+}
+
+bool VersionMetaData::Marshal(json &node) const
+{
+    bool ret = true;
+    ret = SetValue(node[GET_NAME(version)], version) && ret;
+    return ret;
+}
+
+bool VersionMetaData::Unmarshal(const json &node)
+{
+    bool ret = true;
+    ret = GetValue(node, GET_NAME(version), version) && ret;
+    return ret;
+}
+
+std::string VersionMetaData::GetKey() const
+{
+    return KEY_PREFIX;
+}
+} // namespace OHOS::DistributedData
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/BUILD.gn b/datamgr_service/services/distributeddataservice/framework/test/BUILD.gn
index ba13118563d60acb0ca051e54f4ee6b8a91e2e58..6ccb44ea451e4dce8686104b261bdb07a08befcd 100644
--- a/datamgr_service/services/distributeddataservice/framework/test/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/framework/test/BUILD.gn
@@ -12,6 +12,7 @@
 # limitations under the License.
 import("//build/ohos_var.gni")
 import("//build/test.gni")
+import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni")
 
 module_output_path = "datamgr_service/distributeddatafwk"
 
@@ -20,8 +21,30 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
+    "${device_manager_path}/interfaces/inner_kits/native_cpp/include",
     "../include/",
     "../../service/bootstrap/include/",
+    "../../service/common/",
+    "../../service/rdb/",
+    "../../../../../relational_store/interfaces/inner_api/rdb/include",
+    "../../../../../relational_store/interfaces/inner_api/common_type/include",
+    "${kv_store_distributeddb_path}/interfaces/include",
+    "${kv_store_distributeddb_path}/include",
+    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include",
+    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include",
+    "${kv_store_common_path}",
+    "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/src",
+    "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include",
+    "${kv_store_path}/interfaces/innerkits/distributeddata/include",
+    "${data_service_path}/adapter/include",
+    "${data_service_path}/framework/include",
+    "${data_service_path}/service/config/include",
+    "${data_service_path}/app/src",
+    "${data_service_path}/adapter/include/account",
+    "${data_service_path}/app/src/security",
+    "${data_service_path}/service/crypto/include",
+    "${data_service_path}/service/matrix/include",
+    "//third_party/json/single_include",
   ]
   ldflags = [ "-Wl,--whole-archive" ]
   defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ]
@@ -96,6 +119,183 @@ ohos_unittest("SerializableTest") {
   ]
 }
 
+ohos_unittest("UtilsTest") {
+  module_out_path = module_output_path
+
+  sources = [ "utils_test.cpp" ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "access_token:libaccesstoken_sdk",
+    "access_token:libnativetoken",
+    "c_utils:utils",
+    "hilog:libhilog",
+    "ipc:ipc_core",
+  ]
+
+  deps = [
+    "${data_service_path}/framework:distributeddatasvcfwk",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
+ohos_unittest("StoreTest") {
+  module_out_path = module_output_path
+
+  sources = [
+    "../../service/rdb/rdb_query.cpp",
+    "store_test.cpp",
+  ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "access_token:libaccesstoken_sdk",
+    "access_token:libnativetoken",
+    "c_utils:utils",
+    "hilog:libhilog",
+    "ipc:ipc_core",
+    "kv_store:distributeddata_inner",
+    "kv_store:distributeddb",
+    "relational_store:native_rdb",
+  ]
+
+  deps = [
+    "${data_service_path}/framework:distributeddatasvcfwk",
+    "${data_service_path}/service:distributeddatasvc",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
+ohos_unittest("AssetLoaderTest") {
+  module_out_path = module_output_path
+  sources = [ "asset_loader_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("BackupRuleManagerTest") {
+  module_out_path = module_output_path
+  sources = [ "backup_rule_manager_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("BindEventTest") {
+  module_out_path = module_output_path
+  sources = [ "bind_event_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("CloudInfoTest") {
+  module_out_path = module_output_path
+  sources = [ "cloud_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("EventTest") {
+  module_out_path = module_output_path
+  sources = [ "event_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("GeneralStoreTest") {
+  module_out_path = module_output_path
+  sources = [ "general_store_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("SubscriptionTest") {
+  module_out_path = module_output_path
+  sources = [ "subscription_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("FeatureTest") {
+  module_out_path = module_output_path
+  sources = [ "feature_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [
+    "${data_service_path}/framework:distributeddatasvcfwk",
+    "${kv_store_path}/interfaces/innerkits/distributeddata:distributeddata_inner",
+  ]
+}
+
+ohos_unittest("MetaDataManagerTest") {
+  module_out_path = module_output_path
+  sources = [ "meta_data_manager_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("StoreMetaDataLocalTest") {
+  module_out_path = module_output_path
+  sources = [ "store_meta_data_local_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("ConstantTest") {
+  module_out_path = module_output_path
+  sources = [ "constant_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("CryptoTest") {
+  module_out_path = module_output_path
+  sources = [ "crypto_test.cpp" ]
+  configs = [ ":module_private_config" ]
+  deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ]
+}
+
+ohos_unittest("ServiceMetaDataTest") {
+  module_out_path = module_output_path
+
+  sources = [
+    "${data_service_path}/app/src/kvstore_meta_manager.cpp",
+    "meta_data_test.cpp",
+  ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "c_utils:utils",
+    "dataclassification:data_transit_mgr",
+    "device_auth:deviceauth_sdk",
+    "hilog:libhilog",
+    "hisysevent:libhisysevent",
+    "hitrace:hitrace_meter",
+    "hitrace:libhitracechain",
+    "ipc:ipc_core",
+    "kv_store:distributeddata_inner",
+    "kv_store:distributeddata_mgr",
+    "kv_store:distributeddb",
+    "safwk:system_ability_fwk",
+    "samgr:samgr_proxy",
+  ]
+
+  deps = [
+    "${data_service_path}/adapter:distributeddata_adapter",
+    "${data_service_path}/adapter/broadcaster:distributeddata_broadcaster_static",
+    "${data_service_path}/adapter/utils:distributeddata_utils_static",
+    "${data_service_path}/app/src/checker:distributeddata_checker_static",
+    "${data_service_path}/framework:distributeddatasvcfwk",
+    "${data_service_path}/service:distributeddatasvc",
+    "${kv_store_distributeddb_path}:distributeddb",
+    "${kv_store_path}/interfaces/innerkits/distributeddata:distributeddata_inner",
+    "${kv_store_path}/interfaces/innerkits/distributeddatamgr:distributeddata_mgr",
+    "//third_party/googletest:gtest_main",
+    "//third_party/openssl:libcrypto_shared",
+  ]
+}
+
 ###############################################################################
 group("unittest") {
   testonly = true
@@ -103,9 +303,24 @@ group("unittest") {
   deps = []
 
   deps += [
+    ":AssetLoaderTest",
+    ":BackupRuleManagerTest",
+    ":BindEventTest",
     ":CheckerManagerTest",
+    ":CloudInfoTest",
+    ":ConstantTest",
+    ":CryptoTest",
     ":EventCenterTest",
+    ":EventTest",
+    ":FeatureTest",
+    ":GeneralStoreTest",
+    ":MetaDataManagerTest",
     ":SerializableTest",
+    ":ServiceMetaDataTest",
+    ":StoreMetaDataLocalTest",
+    ":StoreTest",
+    ":SubscriptionTest",
+    ":UtilsTest",
   ]
 }
 ###############################################################################
diff --git a/datamgr_service/services/distributeddataservice/framework/test/asset_loader_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/asset_loader_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a9ff6e451bc0bce8d7486171d4f87712e9cefdf6
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/asset_loader_test.cpp
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "cloud/asset_loader.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class AssetLoaderTest : public testing::Test {};
+
+/**
+* @tc.name: Download
+* @tc.desc: download.
+* @tc.type: FUNC
+*/
+HWTEST_F(AssetLoaderTest, Download, TestSize.Level1)
+{
+    AssetLoader loader;
+    std::string tableName;
+    std::string gid;
+    Value prefix;
+    VBucket assets;
+    auto ret = loader.Download(tableName, gid, prefix, assets);
+    ASSERT_EQ(ret, E_NOT_SUPPORT);
+}
+
+/**
+* @tc.name: RemoveLocalAssets
+* @tc.desc: remove local assets.
+* @tc.type: FUNC
+*/
+HWTEST_F(AssetLoaderTest, RemoveLocalAssets, TestSize.Level1)
+{
+    AssetLoader loader;
+    std::string tableName;
+    std::string gid;
+    Value prefix;
+    VBucket assets;
+    auto ret = loader.RemoveLocalAssets(tableName, gid, prefix, assets);
+    ASSERT_EQ(ret, E_NOT_SUPPORT);
+}
diff --git a/datamgr_service/services/distributeddataservice/framework/test/backup_rule_manager_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/backup_rule_manager_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0242fe0629cab6c5af473bb71d2203336422ff93
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/backup_rule_manager_test.cpp
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "backuprule/backup_rule_manager.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class BackupRuleManagerTest : public testing::Test {
+public:
+    class TestRule : public BackupRuleManager::BackupRule {
+    public:
+        TestRule()
+        {
+            BackupRuleManager::GetInstance().RegisterPlugin("TestRule", [this]() -> auto {
+                return this;
+            });
+        }
+        bool CanBackup() override
+        {
+            return false;
+        }
+    };
+};
+
+/**
+* @tc.name: BackupRuleManager
+* @tc.desc: backup rule manager.
+* @tc.type: FUNC
+*/
+HWTEST_F(BackupRuleManagerTest, BackupRuleManager, TestSize.Level1)
+{
+    BackupRuleManagerTest::TestRule();
+    std::vector<std::string> rule = { "TestRule" };
+    BackupRuleManager::GetInstance().LoadBackupRules(rule);
+    ASSERT_FALSE(BackupRuleManager::GetInstance().CanBackup());
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/bind_event_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/bind_event_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..309c196a200f1fac832f2248da73267898935f55
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/bind_event_test.cpp
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "snapshot/bind_event.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class BindEventTest : public testing::Test {};
+
+/**
+* @tc.name: GetBindInfo
+* @tc.desc: get bind info.
+* @tc.type: FUNC
+*/
+HWTEST_F(BindEventTest, GetBindInfo, TestSize.Level1)
+{
+    BindEvent::BindEventInfo info;
+    info.tokenId = 100;
+    BindEvent event(BindEvent::BIND_SNAPSHOT, std::move(info));
+    auto ret = event.GetBindInfo().tokenId;
+    ASSERT_EQ(ret, 100);
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/cloud_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/cloud_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2a3a863fb246d8b6ded6acad07d8b2166b630334
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/cloud_test.cpp
@@ -0,0 +1,236 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#define LOG_TAG "CloudInfoTest"
+#include <gtest/gtest.h>
+
+#include "serializable/serializable.h"
+#include "cloud/cloud_info.h"
+#include "cloud/schema_meta.h"
+#include "nlohmann/json.hpp"
+#include "utils/crypto.h"
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+class CloudInfoTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+};
+
+/**
+* @tc.name: GetSchemaPrefix
+* @tc.desc: Get schema prefix.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, GetSchemaPrefix, TestSize.Level0)
+{
+    CloudInfo cloudInfo;
+    auto result = cloudInfo.GetSchemaPrefix("ohos.test.demo");
+    ASSERT_EQ(result, "CLOUD_SCHEMA###0###ohos.test.demo");
+
+    result = cloudInfo.GetSchemaPrefix("");
+    ASSERT_EQ(result, "CLOUD_SCHEMA###0");
+}
+
+/**
+* @tc.name: IsValid
+* @tc.desc: Determine if it is limited.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, IsValid, TestSize.Level0)
+{
+    CloudInfo cloudInfo;
+    auto result = cloudInfo.IsValid();
+    ASSERT_FALSE(result);
+
+    CloudInfo cloudInfo1;
+    cloudInfo1.user = 111;
+    cloudInfo1.id = "test1_id";
+    cloudInfo1.totalSpace = 0;
+    cloudInfo1.remainSpace = 0;
+    cloudInfo1.enableCloud = false;
+
+    Serializable::json node1;
+    cloudInfo1.Marshal(node1);
+    result = cloudInfo1.IsValid();
+    ASSERT_TRUE(result);
+}
+
+/**
+* @tc.name: Exist
+* @tc.desc: Determine if the package exists.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, Exist, TestSize.Level0)
+{
+    CloudInfo cloudInfo;
+    auto result = cloudInfo.Exist("", 1);
+    ASSERT_FALSE(result);
+
+    CloudInfo::AppInfo appInfo;
+    appInfo.bundleName = "test_cloud_bundleName";
+    appInfo.appId = "test_cloud_id";
+    appInfo.version = 0;
+    appInfo.instanceId = 100;
+    appInfo.cloudSwitch = false;
+
+    cloudInfo.user = 111;
+    cloudInfo.id = "test_cloud_id";
+    cloudInfo.totalSpace = 0;
+    cloudInfo.remainSpace = 100;
+    cloudInfo.enableCloud = true;
+    cloudInfo.apps["test_cloud_bundleName"] = std::move(appInfo);
+
+    Serializable::json node1;
+    cloudInfo.Marshal(node1);
+    result = cloudInfo.Exist("test_cloud_bundleName", 100);
+    ASSERT_TRUE(result);
+}
+
+/**
+* @tc.name: Exist
+* @tc.desc: Is it on.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, IsOn, TestSize.Level0)
+{
+    CloudInfo cloudInfo;
+    auto result = cloudInfo.IsOn("ohos.test.demo", 1);
+    ASSERT_FALSE(result);
+
+    CloudInfo::AppInfo appInfo;
+    appInfo.bundleName = "test_cloud_bundleName";
+    appInfo.appId = "test_cloud_id";
+    appInfo.version = 0;
+    appInfo.instanceId = 100;
+    appInfo.cloudSwitch = true;
+
+    cloudInfo.user = 111;
+    cloudInfo.id = "test_cloud_id";
+    cloudInfo.totalSpace = 0;
+    cloudInfo.remainSpace = 100;
+    cloudInfo.enableCloud = true;
+    cloudInfo.apps["test_cloud_bundleName"] = std::move(appInfo);
+
+    Serializable::json node1;
+    cloudInfo.Marshal(node1);
+    result = cloudInfo.IsOn("test_cloud_bundleName", 100);
+    ASSERT_TRUE(result);
+}
+
+/**
+* @tc.name: GetPrefix
+* @tc.desc: Get prefix.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, GetPrefix, TestSize.Level0)
+{
+    const std::initializer_list<std::string> fields;
+    auto result = CloudInfo::GetPrefix(fields);
+    ASSERT_EQ(result, "CLOUD_INFO###");
+}
+
+/**
+* @tc.name: CloudInfoTest
+* @tc.desc: Marshal and Unmarshal of CloudInfo.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, CloudInfoTest, TestSize.Level0)
+{
+    CloudInfo cloudInfo1;
+    cloudInfo1.user = 111;
+    cloudInfo1.id = "test1_id";
+    cloudInfo1.totalSpace = 0;
+    cloudInfo1.remainSpace = 0;
+    cloudInfo1.enableCloud = false;
+
+    Serializable::json node1;
+    cloudInfo1.Marshal(node1);
+    EXPECT_EQ(Serializable::Marshall(cloudInfo1), to_string(node1));
+
+    CloudInfo cloudInfo2;
+    cloudInfo2.Unmarshal(node1);
+    EXPECT_EQ(Serializable::Marshall(cloudInfo1), Serializable::Marshall(cloudInfo1));
+}
+
+/**
+* @tc.name: AppInfoTest
+* @tc.desc: Marshal and Unmarshal of AppInfo.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, AppInfoTest, TestSize.Level0)
+{
+    CloudInfo::AppInfo cloudInfoAppInfo1;
+    cloudInfoAppInfo1.bundleName = "ohos.test.demo";
+    cloudInfoAppInfo1.appId = "test1_id";
+    cloudInfoAppInfo1.version = 0;
+    cloudInfoAppInfo1.instanceId = 0;
+    cloudInfoAppInfo1.cloudSwitch = false;
+
+    Serializable::json node1;
+    cloudInfoAppInfo1.Marshal(node1);
+    EXPECT_EQ(Serializable::Marshall(cloudInfoAppInfo1), to_string(node1));
+
+    CloudInfo::AppInfo cloudInfoAppInfo2;
+    cloudInfoAppInfo2.Unmarshal(node1);
+    EXPECT_EQ(Serializable::Marshall(cloudInfoAppInfo1), Serializable::Marshall(cloudInfoAppInfo2));
+}
+
+/**
+* @tc.name: TableTest
+* @tc.desc: Marshal and Unmarshal of Table.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Anvette
+*/
+HWTEST_F(CloudInfoTest, TableTest, TestSize.Level0)
+{
+    Field field1;
+    field1.colName = "test1_colName";
+    field1.alias = "test1_alias";
+    field1.type = 1;
+    field1.primary = true;
+    field1.nullable = false;
+
+    Table table1;
+    table1.name = "test1_name";
+    table1.sharedTableName = "test1_sharedTableName";
+    table1.alias = "test1_alias";
+    table1.fields.push_back(field1);
+    Serializable::json node1;
+    table1.Marshal(node1);
+    EXPECT_EQ(Serializable::Marshall(table1), to_string(node1));
+
+    Table table2;
+    table2.Unmarshal(node1);
+    EXPECT_EQ(Serializable::Marshall(table1), Serializable::Marshall(table2));
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/constant_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/constant_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a5147d3578d261d51426946ee8075eb51c6502ab
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/constant_test.cpp
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include "utils/constant.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class ConstantTest : public testing::Test {
+};
+
+/**
+* @tc.name: EqualTest
+* @tc.desc: Equal.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(ConstantTest, EqualTest, TestSize.Level1)
+{
+    bool result = Constant::Equal(true, true);
+    ASSERT_TRUE(result);
+
+    result = Constant::Equal(true, false);
+    ASSERT_FALSE(result);
+
+    result = OHOS::DistributedData::Constant::Equal(false, false);
+    ASSERT_TRUE(result);
+}
+
+/**
+* @tc.name: NotEqualTest
+* @tc.desc: NotEqual.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(ConstantTest, NotEqualTest, TestSize.Level1)
+{
+    bool result = Constant::NotEqual(true, true);
+    ASSERT_FALSE(result);
+
+    result = Constant::NotEqual(true, false);
+    ASSERT_TRUE(result);
+
+    result = Constant::NotEqual(false, false);
+    ASSERT_FALSE(result);
+}
diff --git a/datamgr_service/services/distributeddataservice/framework/test/crypto_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/crypto_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a0cb302c74f006ce8277202aa9a7d039e0dd9bcf
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/crypto_test.cpp
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include "utils/crypto.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+using namespace std;
+
+class CryptoTest : public testing::Test {
+};
+
+/**
+* @tc.name: RandomTest
+* @tc.desc: Random.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(CryptoTest, RandomTest, TestSize.Level1)
+{
+    int32_t len = 10;
+    int32_t min = 0;
+    int32_t max = 255;
+
+    vector<uint8_t> randomNumbers = Crypto::Random(len, min, max);
+    ASSERT_EQ(randomNumbers.size(), 10);
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/event_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/event_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f8499fbfdef28262430d097a6ad9331093fb26a6
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/event_test.cpp
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "eventcenter/event.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class EventTest : public testing::Test {};
+
+/**
+* @tc.name: Equals
+* @tc.desc: equals.
+* @tc.type: FUNC
+*/
+HWTEST_F(EventTest, Equals, TestSize.Level1)
+{
+    Event event1(1);
+    Event event2(2);
+    ASSERT_FALSE(event1.Equals(event2));
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/feature_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/feature_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1fdbd16a33a0f6dca634dcce2426dd9219d1ffd5
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/feature_test.cpp
@@ -0,0 +1,257 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include <gtest/gtest.h>
+
+#include "feature/feature_system.h"
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+namespace DistributedDB {
+struct AutoLaunchParam {
+};
+}
+
+class FeatureSystemTest : public testing::Test {
+};
+
+class MockFeature : public FeatureSystem::Feature {
+public:
+    int OnRemoteRequest(uint32_t code, OHOS::MessageParcel& data, OHOS::MessageParcel& reply) override
+    {
+        return E_OK;
+    }
+};
+
+/**
+* @tc.name: GetInstanceTest
+* @tc.desc: getInstance
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, GetInstanceTest, TestSize.Level1)
+{
+    FeatureSystem& featureSystem = FeatureSystem::GetInstance();
+    ASSERT_NE(&featureSystem, nullptr);
+}
+
+/**
+* @tc.name: RegisterCreatorTest And GetCreatorTest
+* @tc.desc: registerCreatorTest And getCreator
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, RegisterCreatorAndGetCreatorTest, TestSize.Level1)
+{
+    FeatureSystem& featureSystem = FeatureSystem::GetInstance();
+    std::string featureName = "MockFeature";
+    FeatureSystem::Creator creator = []() {
+        return std::shared_ptr<FeatureSystem::Feature>();
+    };
+
+    int32_t result = featureSystem.RegisterCreator(featureName, creator);
+    EXPECT_EQ(result, E_OK);
+
+    FeatureSystem::Creator registeredCreator = featureSystem.GetCreator(featureName);
+    EXPECT_NE(registeredCreator, nullptr);
+}
+
+/**
+* @tc.name: RegisterStaticActsTest And GetStaticActsTest
+* @tc.desc: registerStaticActs And getStaticActs
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, GetStaticActsAndetStaticActsTest, TestSize.Level1)
+{
+    FeatureSystem& featureSystem = FeatureSystem::GetInstance();
+    std::string staticActsName = "StaticActs";
+    std::shared_ptr<StaticActs> staticActs = std::make_shared<StaticActs>();
+
+    int32_t result = featureSystem.RegisterStaticActs(staticActsName, staticActs);
+    EXPECT_EQ(result, E_OK);
+
+    const OHOS::ConcurrentMap<std::string, std::shared_ptr<StaticActs>>& staticActsMap = featureSystem.GetStaticActs();
+    auto [success, staticActsPtr] = staticActsMap.Find("StaticActs");
+    EXPECT_NE(staticActsPtr, nullptr);
+}
+
+/**
+* @tc.name: GetFeatureNameTest
+* @tc.desc: getFeatureNameTest
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, GetFeatureNameTest, TestSize.Level1)
+{
+    FeatureSystem& featureSystem = FeatureSystem::GetInstance();
+    std::string featureName1 = "Feature1";
+    std::string featureName2 = "Feature2";
+
+    featureSystem.RegisterCreator(featureName1, []() {
+        return nullptr;
+    });
+    featureSystem.RegisterCreator(featureName2, []() {
+        return nullptr;
+    });
+
+    std::vector<std::string> featureNames = featureSystem.GetFeatureName(FeatureSystem::BIND_LAZY);
+
+    EXPECT_EQ(featureNames[0], featureName1);
+    EXPECT_EQ(featureNames[1], featureName2);
+}
+
+/**
+* @tc.name: OnInitializeTest
+* @tc.desc: onInitializeTest
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, OnInitializeTest, TestSize.Level1)
+{
+    MockFeature feature;
+    int32_t result = feature.OnInitialize();
+    EXPECT_EQ(result, E_OK);
+}
+
+/**
+* @tc.name: OnBindTest
+* @tc.desc: onBind
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, OnBindTest, TestSize.Level1)
+{
+    MockFeature feature;
+    FeatureSystem::Feature::BindInfo bindInfo;
+    bindInfo.selfName = "Feature1";
+    bindInfo.selfTokenId = 123;
+    bindInfo.executors = std::shared_ptr<OHOS::ExecutorPool>();
+    int32_t result = feature.OnBind(bindInfo);
+    EXPECT_EQ(result, E_OK);
+}
+
+/**
+* @tc.name: OnAppExitTest
+* @tc.desc: onAppExitTest
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, OnAppExitTest, TestSize.Level1)
+{
+    MockFeature feature;
+    pid_t uid = 1;
+    pid_t pid = 2;
+    uint32_t tokenId = 3;
+    std::string bundleName = "com.example.app";
+    int32_t result = feature.OnAppExit(uid, pid, tokenId, bundleName);
+    EXPECT_EQ(result, E_OK);
+}
+
+/**
+* @tc.name: FeatureTest001
+* @tc.desc: onAppUninstallTest and onAppUpdate and onAppInstall
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, FeatureTest001, TestSize.Level1)
+{
+    FeatureSystem::Feature::BindInfo bindInfo;
+    std::string bundleName = "com.example.app";
+    int32_t user = 0;
+    int32_t index = 1;
+
+    MockFeature mockFeature;
+
+    int32_t ret = mockFeature.OnAppInstall(bundleName, user, index);
+    EXPECT_EQ(ret, E_OK);
+
+    ret = mockFeature.OnAppUpdate(bundleName, user, index);
+    EXPECT_EQ(ret, E_OK);
+
+    ret = mockFeature.OnAppUninstall(bundleName, user, index);
+    EXPECT_EQ(ret, E_OK);
+}
+
+/**
+* @tc.name: ResolveAutoLaunchTest
+* @tc.desc: resolveAutoLaunch
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, ResolveAutoLaunchTest, TestSize.Level1)
+{
+    FeatureSystem::Feature::BindInfo bindInfo;
+    std::string identifier = "example_identifier";
+    DistributedDB::AutoLaunchParam param;
+
+    MockFeature mockFeature;
+    int32_t ret = mockFeature.ResolveAutoLaunch(identifier, param);
+
+    EXPECT_EQ(ret, E_OK);
+}
+
+/**
+* @tc.name: OnUserChangeTest
+* @tc.desc: onUserChange
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, OnUserChangeTest, TestSize.Level1)
+{
+    FeatureSystem::Feature::BindInfo bindInfo;
+    uint32_t code = 1;
+    std::string user = "example_user";
+    std::string account = "example_account";
+
+    MockFeature mockFeature;
+    int32_t ret = mockFeature.OnUserChange(code, user, account);
+
+    EXPECT_EQ(ret, E_OK);
+}
+
+/**
+* @tc.name: FeatureTest002
+* @tc.desc: online and offline and onReady
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(FeatureSystemTest, FeatureTest002, TestSize.Level1)
+{
+    FeatureSystem::Feature::BindInfo bindInfo;
+    std::string device = "example_device";
+
+    MockFeature mockFeature;
+
+    int32_t ret = mockFeature.Online(device);
+    EXPECT_EQ(ret, E_OK);
+
+    ret = mockFeature.Offline(device);
+    EXPECT_EQ(ret, E_OK);
+
+    ret = mockFeature.OnReady(device);
+    EXPECT_EQ(ret, E_OK);
+}
diff --git a/datamgr_service/services/distributeddataservice/framework/test/general_store_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/general_store_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..401602a4f38d4342a17fd0a9d73a7fcca8fbaac6
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/general_store_test.cpp
@@ -0,0 +1,79 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "store/general_store.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class GeneralStoreTest : public testing::Test {};
+
+/**
+* @tc.name: MixMode
+* @tc.desc: mix mode.
+* @tc.type: FUNC
+*/
+HWTEST_F(GeneralStoreTest, MixMode, TestSize.Level1)
+{
+    uint32_t syncMode = GeneralStore::SyncMode::NEARBY_BEGIN;
+    uint32_t highMode = GeneralStore::HighMode::MANUAL_SYNC_MODE;
+    auto ret = GeneralStore::MixMode(syncMode, highMode);
+    ASSERT_EQ(ret, 0);
+}
+
+/**
+* @tc.name: GetSyncMode
+* @tc.desc: get sync mode.
+* @tc.type: FUNC
+*/
+HWTEST_F(GeneralStoreTest, GetSyncMode, TestSize.Level1)
+{
+    uint32_t syncMode = GeneralStore::SyncMode::NEARBY_PULL;
+    uint32_t highMode = GeneralStore::HighMode::MANUAL_SYNC_MODE;
+    auto mixMode = GeneralStore::MixMode(syncMode, highMode);
+    auto ret = GeneralStore::GetSyncMode(mixMode);
+    ASSERT_EQ(ret, syncMode);
+}
+
+/**
+* @tc.name: GetHighMode
+* @tc.desc: get high mode.
+* @tc.type: FUNC
+*/
+HWTEST_F(GeneralStoreTest, GetHighMode, TestSize.Level1)
+{
+    uint32_t syncMode = GeneralStore::SyncMode::NEARBY_PULL;
+    uint32_t highMode = GeneralStore::HighMode::MANUAL_SYNC_MODE;
+    auto mixMode = GeneralStore::MixMode(syncMode, highMode);
+    auto ret = GeneralStore::GetHighMode(mixMode);
+    ASSERT_EQ(ret, highMode);
+}
+
+/**
+* @tc.name: BindInfo
+* @tc.desc: bind info.
+* @tc.type: FUNC
+*/
+HWTEST_F(GeneralStoreTest, BindInfo, TestSize.Level1)
+{
+    std::shared_ptr<CloudDB> db;
+    std::shared_ptr<AssetLoader> loader;
+    GeneralStore::BindInfo bindInfo(db, loader);
+    ASSERT_EQ(bindInfo.db_, db);
+    ASSERT_EQ(bindInfo.loader_, loader);
+}
+
diff --git a/datamgr_service/services/distributeddataservice/framework/test/meta_data_manager_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/meta_data_manager_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..161b2261e3db03217a997234adc1c1d80ba403c4
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/meta_data_manager_test.cpp
@@ -0,0 +1,58 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include "metadata/meta_data_manager.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class MetaDataManagerTest : public testing::Test {
+};
+
+/**
+* @tc.name: FilterConstructorAndGetKeyTest
+* @tc.desc: FilterConstructor and GetKey.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(MetaDataManagerTest, FilterConstructorAndGetKeyTest, TestSize.Level1)
+{
+    std::string pattern = "test";
+    MetaDataManager::Filter filter(pattern);
+
+    std::vector<uint8_t> key = filter.GetKey();
+    ASSERT_EQ(key.size(), 0);
+}
+
+/**
+* @tc.name: FilterOperatorTest
+* @tc.desc: FilterOperator.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(MetaDataManagerTest, FilterOperatorTest, TestSize.Level1)
+{
+    std::string pattern = "test";
+    MetaDataManager::Filter filter(pattern);
+
+    std::string key = "test_key";
+    ASSERT_TRUE(filter(key));
+
+    key = "another_key";
+    ASSERT_FALSE(filter(key));
+}
diff --git a/datamgr_service/services/distributeddataservice/framework/test/meta_data_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/meta_data_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..742195e0c945d27b039196607c09a2e753ecba98
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/meta_data_test.cpp
@@ -0,0 +1,638 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+#include "utils/constant.h"
+#include <nlohmann/json.hpp>
+#include "bootstrap.h"
+#include "device_manager_adapter.h"
+#include "kvstore_meta_manager.h"
+#include "metadata/appid_meta_data.h"
+#include "metadata/corrupted_meta_data.h"
+#include "metadata/capability_range.h"
+#include "metadata/meta_data.h"
+#include "metadata/meta_data_manager.h"
+#include "metadata/secret_key_meta_data.h"
+#include "metadata/store_meta_data.h"
+#include "metadata/store_meta_data_local.h"
+#include "metadata/strategy_meta_data.h"
+
+using namespace testing::ext;
+using namespace OHOS;
+using namespace OHOS::DistributedKv;
+using namespace OHOS::DistributedData;
+using DmAdapter = OHOS::DistributedData::DeviceManagerAdapter;
+namespace OHOS::Test {
+class ServiceMetaDataTest : public testing::Test {
+public:
+    static constexpr size_t NUM_MIN = 5;
+    static constexpr size_t NUM_MAX = 12;
+    static constexpr uint32_t TEST_CURRENT_VERSION = 0x03000002;
+    static void SetUpTestCase()
+    {
+        auto executors = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
+        Bootstrap::GetInstance().LoadComponents();
+        Bootstrap::GetInstance().LoadDirectory();
+        Bootstrap::GetInstance().LoadCheckers();
+        KvStoreMetaManager::GetInstance().BindExecutor(executors);
+        KvStoreMetaManager::GetInstance().InitMetaParameter();
+        KvStoreMetaManager::GetInstance().InitMetaListener();
+        DmAdapter::GetInstance().Init(executors);
+    }
+    static void TearDownTestCase(void) {};
+    void SetUp() {};
+    void TearDown() {};
+};
+
+/**
+* @tc.name: AppIDMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, AppIDMetaData, TestSize.Level1)
+{
+    AppIDMetaData appIdMetaData("appid", "ohos.test.demo");
+    AppIDMetaData appIdMeta;
+
+    std::string key = appIdMetaData.GetKey();
+    EXPECT_EQ(key, "appid");
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, appIdMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, appIdMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(appIdMetaData.appId, appIdMeta.appId);
+    EXPECT_EQ(appIdMetaData.bundleName, appIdMeta.bundleName);
+    EXPECT_EQ(appIdMetaData.GetKey(), appIdMeta.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, appIdMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, appIdMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(appIdMetaData.appId, appIdMeta.appId);
+    EXPECT_EQ(appIdMetaData.bundleName, appIdMeta.bundleName);
+    EXPECT_EQ(appIdMetaData.GetKey(), appIdMeta.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: corruptedMeta
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, corruptedMeta, TestSize.Level1)
+{
+    CorruptedMetaData corruptedMeta("appid", "ohos.test.demo", "test_store");
+    CorruptedMetaData corruptedMetaData;
+    corruptedMeta.isCorrupted = true;
+    std::string key = corruptedMeta.GetKey();
+    EXPECT_EQ(key, "CorruptedMetaData###appid###ohos.test.demo###test_store");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, corruptedMeta, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, corruptedMetaData, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(corruptedMeta.appId, corruptedMetaData.appId);
+    EXPECT_EQ(corruptedMeta.bundleName, corruptedMetaData.bundleName);
+    EXPECT_EQ(corruptedMeta.storeId, corruptedMetaData.storeId);
+    EXPECT_EQ(corruptedMeta.GetKey(), corruptedMetaData.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, corruptedMeta);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, corruptedMetaData);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(corruptedMeta.appId, corruptedMetaData.appId);
+    EXPECT_EQ(corruptedMeta.bundleName, corruptedMetaData.bundleName);
+    EXPECT_EQ(corruptedMeta.storeId, corruptedMetaData.storeId);
+    EXPECT_EQ(corruptedMeta.GetKey(), corruptedMetaData.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: SecretKeyMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, SecretKeyMetaData001, TestSize.Level1)
+{
+    SecretKeyMetaData secretKeyMeta;
+    SecretKeyMetaData secretKeyMetaData;
+    secretKeyMeta.storeType = 1;
+    std::initializer_list<std::string> fields = {"time", "skey"};
+
+    std::string key = secretKeyMeta.GetKey(fields);
+    EXPECT_EQ(key, "SecretKey###time###skey###SINGLE_KEY");
+    std::string backupkey = secretKeyMeta.GetBackupKey(fields);
+    EXPECT_EQ(backupkey, "BackupSecretKey###time###skey###");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, secretKeyMeta, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, secretKeyMetaData, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(secretKeyMeta.GetKey(fields), secretKeyMetaData.GetKey(fields));
+    EXPECT_EQ(secretKeyMeta.GetBackupKey(fields), secretKeyMetaData.GetBackupKey(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, secretKeyMeta);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, secretKeyMetaData);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(secretKeyMeta.GetKey(fields), secretKeyMetaData.GetKey(fields));
+    EXPECT_EQ(secretKeyMeta.GetBackupKey(fields), secretKeyMetaData.GetBackupKey(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: SecretKeyMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, SecretKeyMetaData002, TestSize.Level1)
+{
+    SecretKeyMetaData secretKeyMeta;
+    SecretKeyMetaData secretKeyMetaData;
+    secretKeyMeta.storeType = 1;
+    std::initializer_list<std::string> fields = {"time", "skey"};
+
+    std::string prefix = secretKeyMeta.GetPrefix(fields);
+    EXPECT_EQ(prefix, "SecretKey###time###skey###");
+    std::string backupprefix = secretKeyMeta.GetBackupPrefix(fields);
+    EXPECT_EQ(backupprefix, "BackupSecretKey###time###skey###");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(prefix, secretKeyMeta, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(prefix, secretKeyMetaData, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(secretKeyMeta.GetPrefix(fields), secretKeyMetaData.GetPrefix(fields));
+    EXPECT_EQ(secretKeyMeta.GetBackupPrefix(fields), secretKeyMetaData.GetBackupPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(prefix, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(prefix, secretKeyMeta);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(prefix, secretKeyMetaData);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(secretKeyMeta.GetPrefix(fields), secretKeyMetaData.GetPrefix(fields));
+    EXPECT_EQ(secretKeyMeta.GetBackupPrefix(fields), secretKeyMetaData.GetBackupPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(prefix);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData001, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    StoreMetaData storeMeta;
+
+    std::string key = storeMetaData.GetKey();
+    EXPECT_EQ(key, "KvStoreMetaData######100###default######test_store");
+    std::string keylocal = storeMetaData.GetKeyLocal();
+    EXPECT_EQ(keylocal, "KvStoreMetaDataLocal######100###default######test_store");
+    std::initializer_list<std::string> fields = {"100", "appid", "test_store"};
+    std::string keyfields = storeMetaData.GetKey(fields);
+    EXPECT_EQ(keyfields, "KvStoreMetaData###100###appid###test_store");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, storeMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, storeMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetKey(), storeMeta.GetKey());
+    EXPECT_EQ(storeMetaData.GetKeyLocal(), storeMeta.GetKeyLocal());
+    EXPECT_EQ(storeMetaData.GetKey(fields), storeMeta.GetKey(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, storeMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, storeMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetKey(), storeMeta.GetKey());
+    EXPECT_EQ(storeMetaData.GetKeyLocal(), storeMeta.GetKeyLocal());
+    EXPECT_EQ(storeMetaData.GetKey(fields), storeMeta.GetKey(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData002, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    StoreMetaData storeMeta;
+
+    std::string secretkey = storeMetaData.GetSecretKey();
+    EXPECT_EQ(secretkey, "SecretKey###100###default######test_store###0###SINGLE_KEY");
+    std::string backupsecretkey = storeMetaData.GetBackupSecretKey();
+    EXPECT_EQ(backupsecretkey, "BackupSecretKey###100###default######test_store###0###");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(secretkey, storeMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(secretkey, storeMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetSecretKey(), storeMeta.GetSecretKey());
+    EXPECT_EQ(storeMetaData.GetBackupSecretKey(), storeMeta.GetBackupSecretKey());
+
+    result = MetaDataManager::GetInstance().DelMeta(secretkey, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(secretkey, storeMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(secretkey, storeMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetSecretKey(), storeMeta.GetSecretKey());
+    EXPECT_EQ(storeMetaData.GetBackupSecretKey(), storeMeta.GetBackupSecretKey());
+
+    result = MetaDataManager::GetInstance().DelMeta(secretkey);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData003, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    StoreMetaData storeMeta;
+
+    auto storealias = storeMetaData.GetStoreAlias();
+    EXPECT_EQ(storealias, "tes***ore");
+    std::string strategykey = storeMetaData.GetStrategyKey();
+    EXPECT_EQ(strategykey, "StrategyMetaData######100###default######test_store");
+    std::initializer_list<std::string> fields = {"100", "appid", "test_store"};
+    std::string prefix = storeMetaData.GetPrefix(fields);
+    EXPECT_EQ(prefix, "KvStoreMetaData###100###appid###test_store###");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(strategykey, storeMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(strategykey, storeMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetStrategyKey(), storeMeta.GetStrategyKey());
+    EXPECT_EQ(storeMetaData.GetStoreAlias(), storeMeta.GetStoreAlias());
+    EXPECT_EQ(storeMetaData.GetPrefix(fields), storeMeta.GetPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(strategykey, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(strategykey, storeMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(strategykey, storeMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetStrategyKey(), storeMeta.GetStrategyKey());
+    EXPECT_EQ(storeMetaData.GetStoreAlias(), storeMeta.GetStoreAlias());
+    EXPECT_EQ(storeMetaData.GetPrefix(fields), storeMeta.GetPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(strategykey);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData004, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    storeMetaData.version = TEST_CURRENT_VERSION;
+    storeMetaData.instanceId = 1;
+    StoreMetaData storeMeta;
+
+    std::string key = storeMetaData.GetKey();
+    EXPECT_EQ(key, "KvStoreMetaData######100###default######test_store###1");
+    std::string keylocal = storeMetaData.GetKeyLocal();
+    EXPECT_EQ(keylocal, "KvStoreMetaDataLocal######100###default######test_store###1");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, storeMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, storeMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetKey(), storeMeta.GetKey());
+    EXPECT_EQ(storeMetaData.GetKeyLocal(), storeMeta.GetKeyLocal());
+
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, storeMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, storeMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetKey(), storeMeta.GetKey());
+    EXPECT_EQ(storeMetaData.GetKeyLocal(), storeMeta.GetKeyLocal());
+
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData005, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    storeMetaData.version = TEST_CURRENT_VERSION;
+    storeMetaData.instanceId = 1;
+    StoreMetaData storeMeta;
+
+    std::string secretkey = storeMetaData.GetSecretKey();
+    EXPECT_EQ(secretkey, "SecretKey###100###default######test_store###SINGLE_KEY");
+    std::string backupsecretkey = storeMetaData.GetBackupSecretKey();
+    EXPECT_EQ(backupsecretkey, "BackupSecretKey###100###default######test_store###");
+    std::string strategykey = storeMetaData.GetStrategyKey();
+    EXPECT_EQ(strategykey, "StrategyMetaData######100###default######test_store###1");
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(secretkey, storeMetaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(secretkey, storeMeta, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetSecretKey(), storeMeta.GetSecretKey());
+    EXPECT_EQ(storeMetaData.GetBackupSecretKey(), storeMeta.GetBackupSecretKey());
+    EXPECT_EQ(storeMetaData.GetStrategyKey(), storeMeta.GetStrategyKey());
+
+    result = MetaDataManager::GetInstance().DelMeta(secretkey, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(secretkey, storeMetaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(secretkey, storeMeta);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(storeMetaData.GetSecretKey(), storeMeta.GetSecretKey());
+    EXPECT_EQ(storeMetaData.GetBackupSecretKey(), storeMeta.GetBackupSecretKey());
+    EXPECT_EQ(storeMetaData.GetStrategyKey(), storeMeta.GetStrategyKey());
+
+    result = MetaDataManager::GetInstance().DelMeta(secretkey);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData006, TestSize.Level1)
+{
+    StoreMetaData storemetaData1("100", "appid", "test_store");
+    StoreMetaData storemetaData2("100", "appid", "test_store");
+    StoreMetaData storemetaData3("10", "appid1", "storeid");
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+    EXPECT_FALSE(storemetaData1 == storemetaData3);
+
+    storemetaData1.isAutoSync = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isAutoSync = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+
+    storemetaData1.isBackup = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isBackup = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+
+    storemetaData1.isDirty = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isDirty = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+
+    storemetaData1.isEncrypt = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isEncrypt = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+
+    storemetaData1.isSearchable = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isSearchable = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+
+    storemetaData1.isNeedCompress = true;
+    EXPECT_FALSE(storemetaData1 == storemetaData2);
+    storemetaData2.isNeedCompress = true;
+    EXPECT_TRUE(storemetaData1 == storemetaData2);
+}
+
+/**
+* @tc.name: StoreMetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StoreMetaData007, TestSize.Level1)
+{
+    StoreMetaData storemetaData1("100", "appid", "test_store");
+    StoreMetaData storemetaData2("100", "appid", "test_store");
+    StoreMetaData storemetaData3("10", "appid1", "storeid");
+    EXPECT_TRUE(storemetaData1 != storemetaData3);
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isAutoSync = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isAutoSync = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isBackup = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isBackup = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isDirty = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isDirty = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isEncrypt = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isEncrypt = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isSearchable = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isSearchable = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+
+    storemetaData1.isNeedCompress = true;
+    EXPECT_TRUE(storemetaData1 != storemetaData2);
+    storemetaData2.isNeedCompress = true;
+    EXPECT_FALSE(storemetaData1 != storemetaData2);
+}
+
+/**
+* @tc.name: StrategyMeta001
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StrategyMeta001, TestSize.Level1)
+{
+    auto deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
+    StrategyMeta strategyMeta(deviceId, "100", "ohos.test.demo", "test_store");
+    std::vector<std::string> local = {"local1"};
+    std::vector<std::string> remote = {"remote1"};
+    strategyMeta.capabilityRange.localLabel = local;
+    strategyMeta.capabilityRange.remoteLabel = remote;
+    strategyMeta.capabilityEnabled = true;
+    auto result = strategyMeta.IsEffect();
+    EXPECT_TRUE(result);
+    StrategyMeta strategyMetaData(deviceId, "200", "ohos.test.test", "test_stores");
+
+    std::string key = strategyMeta.GetKey();
+    EXPECT_EQ(key, "StrategyMetaData######100###default###ohos.test.demo###test_store");
+    std::initializer_list<std::string> fields = { deviceId, "100", "default", "ohos.test.demo", "test_store" };
+    std::string prefix = strategyMeta.GetPrefix(fields);
+    EXPECT_EQ(prefix, "StrategyMetaData######100###default###ohos.test.demo###test_store");
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, strategyMeta, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, strategyMetaData, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(strategyMeta.GetKey(), strategyMetaData.GetKey());
+    EXPECT_EQ(strategyMeta.GetPrefix(fields), strategyMetaData.GetPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, strategyMeta);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, strategyMetaData);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(strategyMeta.GetKey(), strategyMetaData.GetKey());
+    EXPECT_EQ(strategyMeta.GetPrefix(fields), strategyMetaData.GetPrefix(fields));
+
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: StrategyMeta
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, StrategyMeta002, TestSize.Level1)
+{
+    auto deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
+    StrategyMeta strategyMeta(deviceId, "100", "ohos.test.demo", "test_store");
+    std::vector<std::string> local = {"local1"};
+    std::vector<std::string> remote = {"remote1"};
+    strategyMeta.capabilityRange.localLabel = local;
+    strategyMeta.capabilityRange.remoteLabel = remote;
+    strategyMeta.capabilityEnabled = true;
+    auto result = strategyMeta.IsEffect();
+    EXPECT_TRUE(result);
+    strategyMeta.instanceId = 1;
+    StrategyMeta strategyMetaData(deviceId, "200", "ohos.test.test", "test_stores");
+
+    std::string key = strategyMeta.GetKey();
+    EXPECT_EQ(key, "StrategyMetaData######100###default###ohos.test.demo###test_store###1");
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, strategyMeta, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, strategyMetaData, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(strategyMeta.GetKey(), strategyMetaData.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, strategyMeta);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, strategyMetaData);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(strategyMeta.GetKey(), strategyMetaData.GetKey());
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+
+/**
+* @tc.name: MetaData
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(ServiceMetaDataTest, MetaData, TestSize.Level1)
+{
+    StoreMetaData storeMetaData("100", "appid", "test_store");
+    SecretKeyMetaData secretKeyMetaData;
+    MetaData metaData;
+    MetaData metaDataLoad;
+    metaData.storeMetaData = storeMetaData;
+    metaData.secretKeyMetaData = secretKeyMetaData;
+    metaData.storeType = 1;
+    std::initializer_list<std::string> fields = {"time", "skey"};
+    std::string key = metaData.storeMetaData.GetKey();
+    std::string secretkey = metaData.secretKeyMetaData.GetKey(fields);
+
+    auto result = MetaDataManager::GetInstance().SaveMeta(key, metaData, true);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, metaDataLoad, true);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(key, metaDataLoad.storeMetaData.GetKey());
+    EXPECT_EQ(secretkey, metaDataLoad.secretKeyMetaData.GetKey(fields));
+    result = MetaDataManager::GetInstance().DelMeta(key, true);
+    EXPECT_TRUE(result);
+
+    result = MetaDataManager::GetInstance().SaveMeta(key, metaData);
+    EXPECT_TRUE(result);
+    result = MetaDataManager::GetInstance().LoadMeta(key, metaDataLoad);
+    EXPECT_TRUE(result);
+    EXPECT_EQ(key, metaDataLoad.storeMetaData.GetKey());
+    EXPECT_EQ(secretkey, metaDataLoad.secretKeyMetaData.GetKey(fields));
+    result = MetaDataManager::GetInstance().DelMeta(key);
+    EXPECT_TRUE(result);
+}
+} // namespace OHOS::Test
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/serializable_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/serializable_test.cpp
index d12a95f5de18bcf40cc05edd20a96a0af04db5d3..14a00bf91a0266ec90bec59962ead12d0fd43a31 100644
--- a/datamgr_service/services/distributeddataservice/framework/test/serializable_test.cpp
+++ b/datamgr_service/services/distributeddataservice/framework/test/serializable_test.cpp
@@ -301,4 +301,17 @@ HWTEST_F(SerializableTest, SetPointerValue, TestSize.Level2)
     out.Unmarshall(json);
     ASSERT_TRUE(in == out) << in.count;
 }
+
+/**
+* @tc.name: IsJson
+* @tc.desc: is json.
+* @tc.type: FUNC
+*/
+HWTEST_F(SerializableTest, IsJson, TestSize.Level1)
+{
+    std::string str = "test";
+    std::string jsonStr = "\"test\"";
+    ASSERT_FALSE(Serializable::IsJson(str));
+    ASSERT_TRUE(Serializable::IsJson(jsonStr));
+}
 } // namespace OHOS::Test
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/store_meta_data_local_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/store_meta_data_local_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b061380ea42dbf5561ef19d19b73bdf4438f1ef2
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/store_meta_data_local_test.cpp
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#include "metadata/store_meta_data_local.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using OHOS::DistributedData::StoreMetaDataLocal;
+
+class StoreMetaDataLocalTest : public testing::Test {
+};
+
+/**
+* @tc.name: EqualityOperatorTest And InequalityOperatorTest
+* @tc.desc: equalityOperator and inequalityOperator
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(StoreMetaDataLocalTest, EqualityOperatorTest, TestSize.Level1)
+{
+    StoreMetaDataLocal metaData1;
+    metaData1.isAutoSync = true;
+    metaData1.isBackup = true;
+    StoreMetaDataLocal metaData2;
+    metaData2.isAutoSync = true;
+    metaData2.isBackup = false;
+    StoreMetaDataLocal metaData3;
+    metaData3.isAutoSync = true;
+    metaData3.isBackup = true;
+
+    ASSERT_FALSE(metaData1 == metaData2);
+    ASSERT_TRUE(metaData1 == metaData3);
+    ASSERT_FALSE(metaData2 == metaData3);
+
+    ASSERT_TRUE(metaData1 != metaData2);
+    ASSERT_FALSE(metaData1 != metaData3);
+    ASSERT_TRUE(metaData2 != metaData3);
+}
+
+/**
+* @tc.name: GetPrefixTest
+* @tc.desc: getPrefix
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: MengYao
+*/
+HWTEST_F(StoreMetaDataLocalTest, GetPrefixTest, TestSize.Level1)
+{
+    StoreMetaDataLocal metaData;
+    std::string expectedPrefix = "KvStoreMetaDataLocal###field1###field2###";
+    std::initializer_list<std::string> fields{ "field1", "field2" };
+
+    std::string prefix = metaData.GetPrefix(fields);
+
+    ASSERT_EQ(prefix, expectedPrefix);
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/store_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/store_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e1d58814adc66ae1030fa439055af9d1cc9ca8a8
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/store_test.cpp
@@ -0,0 +1,88 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#define LOG_TAG "StoreTest"
+
+#include "access_token.h"
+#include "gtest/gtest.h"
+#include "log_print.h"
+#include "rdb_query.h"
+#include "rdb_types.h"
+#include "store/general_store.h"
+#include "store/general_value.h"
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class GeneralValueTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+};
+class GeneralStoreTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+};
+
+/**
+ * @tc.name: SetQueryNodesTest
+ * @tc.desc: Set and query nodes.
+ * @tc.type: FUNC
+ * @tc.require: AR000F8N0
+ */
+HWTEST_F(GeneralValueTest, SetQueryNodesTest, TestSize.Level2)
+{
+    ZLOGI("GeneralValueTest SetQueryNodesTest begin.");
+    std::string tableName = "test_tableName";
+    QueryNode node;
+    node.op = OHOS::DistributedData::QueryOperation::EQUAL_TO;
+    node.fieldName =  "test_fieldName";
+    node.fieldValue = {"aaa", "bbb", "ccc"};
+    QueryNodes nodes{
+        {node}
+    };
+    OHOS::DistributedRdb::RdbQuery query;
+    query.SetQueryNodes(tableName, std::move(nodes));
+    QueryNodes nodes1 =  query.GetQueryNodes("test_tableName");
+    EXPECT_EQ(nodes1[0].fieldName, "test_fieldName");
+    EXPECT_EQ(nodes1[0].op, OHOS::DistributedData::QueryOperation::EQUAL_TO);
+    EXPECT_EQ(nodes1[0].fieldValue.size(), 3);
+}
+
+/**
+* @tc.name: GetMixModeTest
+* @tc.desc: get mix mode
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author:
+*/
+HWTEST_F(GeneralStoreTest, GetMixModeTest, TestSize.Level2)
+{
+    ZLOGI("GeneralStoreTest GetMixModeTest begin.");
+    auto mode1 = OHOS::DistributedRdb::TIME_FIRST;
+    auto mode2 = GeneralStore::AUTO_SYNC_MODE;
+
+    auto mixMode = GeneralStore::MixMode(mode1, mode2);
+    EXPECT_EQ(mixMode, mode1 | mode2);
+
+    auto syncMode = GeneralStore::GetSyncMode(mixMode);
+    EXPECT_EQ(syncMode, OHOS::DistributedRdb::TIME_FIRST);
+
+    auto highMode = GeneralStore::GetHighMode(mixMode);
+    EXPECT_EQ(highMode, GeneralStore::AUTO_SYNC_MODE);
+}
diff --git a/datamgr_service/services/distributeddataservice/framework/test/subscription_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/subscription_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..39ebac54d2f8dd0cf620fdb52a1a96f9f459ccf0
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/subscription_test.cpp
@@ -0,0 +1,159 @@
+/*
+* Copyright (c) 2023 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include "cloud/subscription.h"
+
+#include <gtest/gtest.h>
+
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class SubscriptionTest : public testing::Test {
+public:
+    const std::map<std::string, std::string> testRelation = { { "testUserId", "testBundleName" } };
+    const std::map<std::string, uint64_t> testExpiresTime = { { "1h", 3600 } };
+};
+
+/**
+* @tc.name: RelationMarshal
+* @tc.desc: relation marshal.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, RelationMarshal, TestSize.Level1)
+{
+    Subscription::Relation relation;
+    relation.id = "testId";
+    relation.bundleName = "testBundleName";
+    relation.relations = testRelation;
+    Subscription::json node;
+    relation.Marshal(node);
+    ASSERT_EQ(node["id"], "testId");
+    ASSERT_EQ(node["bundleName"], "testBundleName");
+    ASSERT_EQ(node["relations"], testRelation);
+}
+
+/**
+* @tc.name: RelationUnmarshal
+* @tc.desc: relation unmarshal.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, RelationUnmarshal, TestSize.Level1)
+{
+    Subscription::json node;
+    node["id"] = "testId";
+    node["bundleName"] = "testBundleName";
+    node["relations"] = testRelation;
+    Subscription::Relation relation;
+    relation.Unmarshal(node);
+    ASSERT_EQ(relation.id, "testId");
+    ASSERT_EQ(relation.bundleName, "testBundleName");
+    ASSERT_EQ(relation.relations, testRelation);
+}
+
+/**
+* @tc.name: Marshal
+* @tc.desc: marshal.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, Marshal, TestSize.Level1)
+{
+    Subscription subscription;
+    subscription.userId = 100;
+    subscription.id = "testId";
+    subscription.expiresTime = testExpiresTime;
+    Subscription::json node;
+    subscription.Marshal(node);
+    ASSERT_EQ(node["userId"], 100);
+    ASSERT_EQ(node["id"], "testId");
+    ASSERT_EQ(node["expiresTime"], testExpiresTime);
+}
+
+/**
+* @tc.name: Unmarshal
+* @tc.desc: unmarshal.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, Unmarshal, TestSize.Level1)
+{
+    Subscription::json node;
+    node["userId"] = 100;
+    node["id"] = "testId";
+    node["expiresTime"] = testExpiresTime;
+    Subscription subscription;
+    subscription.Unmarshal(node);
+    ASSERT_EQ(subscription.userId, 100);
+    ASSERT_EQ(subscription.id, "testId");
+    ASSERT_EQ(subscription.expiresTime, testExpiresTime);
+}
+
+/**
+* @tc.name: GetKey
+* @tc.desc: get key.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, GetKey, TestSize.Level1)
+{
+    Subscription subscription;
+    subscription.userId = 100;
+    std::string key = subscription.GetKey();
+    ASSERT_EQ(key, "CLOUD_SUBSCRIPTION###100");
+}
+
+/**
+* @tc.name: GetRelationKey
+* @tc.desc: get relation key.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, GetRelationKey, TestSize.Level1)
+{
+    Subscription subscription;
+    subscription.userId = 100;
+    std::string relationKey = subscription.GetRelationKey("testBundleName");
+    ASSERT_EQ(relationKey, "CLOUD_RELATION###100###testBundleName");
+}
+
+/**
+* @tc.name: GetKey002
+* @tc.desc: get key.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, GetKey002, TestSize.Level1)
+{
+    std::string key = Subscription::GetKey(100);
+    ASSERT_EQ(key, "CLOUD_SUBSCRIPTION###100");
+}
+
+/**
+* @tc.name: GetRelationKey002
+* @tc.desc: get relation key.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, GetRelationKey002, TestSize.Level1)
+{
+    std::string relationKey = Subscription::GetRelationKey(100, "testBundleName");
+    ASSERT_EQ(relationKey, "CLOUD_RELATION###100###testBundleName");
+}
+
+/**
+* @tc.name: GetPrefix
+* @tc.desc: get prefix.
+* @tc.type: FUNC
+*/
+HWTEST_F(SubscriptionTest, GetPrefix, TestSize.Level1)
+{
+    std::initializer_list<std::string> fields = { "field1", "field2" };
+    std::string prefix = Subscription::GetPrefix(fields);
+    ASSERT_EQ(prefix, "CLOUD_SUBSCRIPTION###field1###field2");
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/framework/test/utils_test.cpp b/datamgr_service/services/distributeddataservice/framework/test/utils_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..435130c1555ab5e6238eca843d001fda7f7d0ca8
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/framework/test/utils_test.cpp
@@ -0,0 +1,141 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+#define LOG_TAG "UtilsTest"
+#include <chrono>
+
+#include "access_token.h"
+#include "gtest/gtest.h"
+#include "ipc_skeleton.h"
+#include "log_print.h"
+#include "utils/block_integer.h"
+#include "utils/converter.h"
+#include "utils/ref_count.h"
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+
+class UtilsTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+};
+
+class BlockIntegerTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+    static uint64_t GetCurrentTime()
+    {
+        return static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::microseconds>
+                (std::chrono::system_clock::now().time_since_epoch()).count());
+    }
+    int intervalTime = 100 * 1000;
+    int testNum = 10;
+};
+
+class RefCountTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+};
+
+/**
+ * @tc.name: StoreMetaDataConvertToStoreInfo
+ * @tc.desc: Storemeta data convert to storeinfo.
+ * @tc.type: FUNC
+ */
+HWTEST_F(UtilsTest, StoreMetaDataConvertToStoreInfo, TestSize.Level2)
+{
+    ZLOGI("UtilsTest StoreMetaDataConvertToStoreInfo begin.");
+    StoreMetaData metaData;
+    metaData.bundleName = "ohos.test.demo1";
+    metaData.storeId = "test_storeId";
+    metaData.uid = OHOS::IPCSkeleton::GetCallingUid();
+    metaData.tokenId = OHOS::IPCSkeleton::GetCallingTokenID();
+    CheckerManager::StoreInfo info = Converter::ConvertToStoreInfo(metaData);
+    EXPECT_EQ(info.uid, metaData.uid);
+    EXPECT_EQ(info.tokenId, metaData.tokenId);
+    EXPECT_EQ(info.bundleName, metaData.bundleName);
+    EXPECT_EQ(info.storeId, metaData.storeId);
+}
+
+
+/**
+* @tc.name: SymbolOverloadingTest
+* @tc.desc: Symbol Overloading
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author:
+*/
+HWTEST_F(BlockIntegerTest, SymbolOverloadingTest, TestSize.Level2)
+{
+    ZLOGI("BlockIntegerTest SymbolOverloading begin.");
+    int interval = intervalTime;
+    BlockInteger blockInteger(interval);
+    blockInteger = testNum;
+    ASSERT_EQ(blockInteger, testNum);
+
+    auto now1 = GetCurrentTime();
+    int val = blockInteger++;
+    auto now2 = GetCurrentTime();
+    ASSERT_EQ(val, 10);
+    ASSERT_EQ(blockInteger, 11);
+    ASSERT_TRUE(now2 - now1 >= interval);
+
+    now1 = GetCurrentTime();
+    val = ++blockInteger;
+    now2 = GetCurrentTime();
+    ASSERT_EQ(val, 12);
+    ASSERT_EQ(blockInteger, 12);
+    ASSERT_TRUE(now2 - now1 >= interval);
+    ASSERT_TRUE(blockInteger < 20);
+}
+
+/**
+* @tc.name: ConstrucTortest
+* @tc.desc:  Create Object.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author:
+*/
+HWTEST_F(RefCountTest, Constructortest, TestSize.Level2)
+{
+    int num = 0;
+    {
+        RefCount refCount([&num]() {
+            num += 10;
+        });
+        ASSERT_TRUE(refCount);
+
+        RefCount refCount1(refCount);
+        ASSERT_TRUE(refCount1);
+
+        RefCount refCount2(std::move(refCount));
+        ASSERT_TRUE(refCount2);
+
+        RefCount refCount3 = refCount1;
+        ASSERT_TRUE(refCount3);
+
+        RefCount refCount4 = std::move(refCount2);
+        ASSERT_TRUE(refCount4);
+        ASSERT_EQ(num, 0);
+    }
+    ASSERT_EQ(num, 10);
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/rust/extension/BUILD.gn b/datamgr_service/services/distributeddataservice/rust/extension/BUILD.gn
index 16b18c0d4b98a409ecd9782e6342cb6f45498a8f..15a75ef1f30df320e789bf3f072102bd377e1d40 100644
--- a/datamgr_service/services/distributeddataservice/rust/extension/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/rust/extension/BUILD.gn
@@ -54,6 +54,7 @@ ohos_shared_library("opencloudextension") {
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "hilog:libhilog",
+    "kv_store:distributeddata_inner",
   ]
   subsystem_name = "distributeddatamgr"
   part_name = "datamgr_service"
diff --git a/datamgr_service/services/distributeddataservice/service/bootstrap/src/bootstrap.cpp b/datamgr_service/services/distributeddataservice/service/bootstrap/src/bootstrap.cpp
index 8f958cf3a47531883641e53cfec1e70dd490a6b2..ab8832b6fc2629c44494e4e758a3863124dfce95 100644
--- a/datamgr_service/services/distributeddataservice/service/bootstrap/src/bootstrap.cpp
+++ b/datamgr_service/services/distributeddataservice/service/bootstrap/src/bootstrap.cpp
@@ -93,6 +93,13 @@ void Bootstrap::LoadCheckers()
         }
         checker->SetTrustInfo(trust);
     }
+    for (const auto &distrust : checkers->distrusts) {
+        auto *checker = CheckerManager::GetInstance().GetChecker(distrust.checker);
+        if (checker == nullptr) {
+            continue;
+        }
+        checker->SetDistrustInfo(distrust);
+    }
 }
 
 void Bootstrap::LoadBackup(std::shared_ptr<ExecutorPool> executors)
diff --git a/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
index b27c27fa9dec5985717bd4a8c11228d2def18c92..960d9ca4678ad62d0f3e0429a8d41a9796c0bc1a 100644
--- a/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
@@ -17,6 +17,8 @@
 
 #include "cloud_service_impl.h"
 
+#include <chrono>
+#include <cinttypes>
 #include "accesstoken_kit.h"
 #include "account/account_delegate.h"
 #include "checker/checker_manager.h"
@@ -74,6 +76,17 @@ CloudServiceImpl::CloudServiceImpl()
     EventCenter::GetInstance().Subscribe(CloudEvent::CLOUD_SHARE, [this](const Event &event) {
         CloudShare(event);
     });
+    MetaDataManager::GetInstance().Subscribe(
+        Subscription::GetPrefix({ "" }), [this](const std::string &key,
+            const std::string &value, int32_t flag) -> auto {
+            if (flag != MetaDataManager::INSERT && flag != MetaDataManager::UPDATE) {
+                return true;
+            }
+            Subscription sub;
+            Subscription::Unmarshall(value, sub);
+            InitSubTask(sub);
+            return true;
+        }, true);
 }
 
 int32_t CloudServiceImpl::EnableCloud(const std::string &id, const std::map<std::string, int32_t> &switches)
@@ -164,7 +177,7 @@ int32_t CloudServiceImpl::DoClean(CloudInfo &cloudInfo, const std::map<std::stri
             meta.user = std::to_string(cloudInfo.user);
             meta.deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
             meta.instanceId = cloudInfo.apps[bundle].instanceId;
-            if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta)) {
+            if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta, true)) {
                 ZLOGE("failed, no store meta bundleName:%{public}s, storeId:%{public}s", meta.bundleName.c_str(),
                     meta.GetStoreAlias().c_str());
                 continue;
@@ -312,6 +325,19 @@ int32_t CloudServiceImpl::OnInitialize()
 {
     DistributedDB::RuntimeConfig::SetCloudTranslate(std::make_shared<DistributedRdb::RdbCloudDataTranslate>());
     Execute(GenTask(0, 0, { WORK_CLOUD_INFO_UPDATE, WORK_SCHEMA_UPDATE, WORK_SUB }));
+    std::vector<int> users;
+    Account::GetInstance()->QueryUsers(users);
+    for (auto user : users) {
+        if (user == DEFAULT_USER) {
+            continue;
+        }
+        Subscription sub;
+        sub.userId = user;
+        if (!MetaDataManager::GetInstance().LoadMeta(sub.GetKey(), sub, true)) {
+            continue;
+        }
+        InitSubTask(sub);
+    }
     return E_OK;
 }
 
@@ -323,6 +349,10 @@ int32_t CloudServiceImpl::OnBind(const BindInfo &info)
 
     executor_ = std::move(info.executors);
     syncManager_.Bind(executor_);
+    auto instance = CloudServer::GetInstance();
+    if (instance != nullptr) {
+        instance->Bind(executor_);
+    }
     return E_OK;
 }
 
@@ -382,7 +412,8 @@ std::pair<int32_t, CloudInfo> CloudServiceImpl::GetCloudInfoFromMeta(int32_t use
     CloudInfo cloudInfo;
     cloudInfo.user = userId;
     if (!MetaDataManager::GetInstance().LoadMeta(cloudInfo.GetKey(), cloudInfo, true)) {
-        ZLOGE("no exist meta, user:%{public}d", cloudInfo.user);
+        auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+        ZLOGE("no exist meta, user:%{public}d times:%{public}" PRIu64 ".", cloudInfo.user, time);
         return { ERROR, cloudInfo };
     }
     return { SUCCESS, cloudInfo };
@@ -392,6 +423,9 @@ std::pair<int32_t, CloudInfo> CloudServiceImpl::GetCloudInfoFromServer(int32_t u
 {
     CloudInfo cloudInfo;
     cloudInfo.user = userId;
+    if (!DmAdapter::GetInstance().IsNetworkAvailable()) {
+        return { ERROR, cloudInfo };
+    }
     auto instance = CloudServer::GetInstance();
     if (instance == nullptr) {
         return { SERVER_UNAVAILABLE, cloudInfo };
@@ -450,6 +484,9 @@ bool CloudServiceImpl::UpdateSchema(int32_t user)
 std::pair<int32_t, SchemaMeta> CloudServiceImpl::GetAppSchemaFromServer(int32_t user, const std::string &bundleName)
 {
     SchemaMeta schemaMeta;
+    if (!DmAdapter::GetInstance().IsNetworkAvailable()) {
+        return { ERROR, schemaMeta };
+    }
     auto instance = CloudServer::GetInstance();
     if (instance == nullptr) {
         return { SERVER_UNAVAILABLE, schemaMeta };
@@ -538,7 +575,7 @@ std::pair<int32_t, CloudInfo> CloudServiceImpl::GetCloudInfo(int32_t userId)
         return { ERROR, cloudInfo };
     }
     std::tie(status, cloudInfo) = GetCloudInfoFromServer(userId);
-    if (status == SUCCESS) {
+    if (status != SUCCESS) {
         return { status, cloudInfo };
     }
     MetaDataManager::GetInstance().SaveMeta(cloudInfo.GetKey(), cloudInfo, true);
@@ -573,6 +610,7 @@ void CloudServiceImpl::CloudShare(const Event &event)
         if (callback) {
             callback(GeneralError::E_ERROR, nullptr);
         }
+        return;
     }
     ZLOGD("Start PreShare, bundleName:%{public}s, storeName:%{public}s, instanceId:%{public}d",
         storeInfo.bundleName.c_str(), Anonymous::Change(storeInfo.storeName).c_str(), storeInfo.instanceId);
@@ -592,7 +630,7 @@ std::pair<int32_t, std::shared_ptr<DistributedData::Cursor>> CloudServiceImpl::P
     meta.user = std::to_string(storeInfo.user);
     meta.deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
     meta.instanceId = storeInfo.instanceId;
-    if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta)) {
+    if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta, true)) {
         ZLOGE("failed, no store meta bundleName:%{public}s, storeId:%{public}s", meta.bundleName.c_str(),
             meta.GetStoreAlias().c_str());
         return { GeneralError::E_ERROR, nullptr };
@@ -962,4 +1000,48 @@ std::shared_ptr<SharingCenter> CloudServiceImpl::GetSharingHandle(const HapInfo
     auto handle = instance->ConnectSharingCenter(hapInfo.user, hapInfo.bundleName);
     return handle;
 }
+
+ExecutorPool::Task CloudServiceImpl::GenSubTask(Task task, int32_t user)
+{
+    return [this, user, work = std::move(task)] () {
+        {
+            std::lock_guard<decltype(mutex_)> lock(mutex_);
+            subTask_ = ExecutorPool::INVALID_TASK_ID;
+        }
+        auto [status, cloudInfo] = GetCloudInfoFromMeta(user);
+        if (status != SUCCESS || !cloudInfo.enableCloud || cloudInfo.IsAllSwitchOff()) {
+            ZLOGW("[sub task] all switch off, status:%{public}d user:%{public}d enableCloud:%{public}d",
+                status, user, cloudInfo.enableCloud);
+            return;
+        }
+        work();
+    };
+}
+
+void CloudServiceImpl::InitSubTask(const Subscription &sub)
+{
+    auto expire = sub.GetMinExpireTime();
+    if (expire == INVALID_SUB_TIME) {
+        return;
+    }
+    auto executor = executor_;
+    if (executor == nullptr) {
+        return;
+    }
+    ZLOGI("Subscription Info, subTask:%{public}" PRIu64", user:%{public}d", subTask_, sub.userId);
+    expire = expire - TIME_BEFORE_SUB; // before 12 hours
+    auto now = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+    Duration delay = expire > now ? milliseconds(expire - now) : milliseconds(0);
+    std::lock_guard<decltype(mutex_)> lock(mutex_);
+    if (subTask_ != ExecutorPool::INVALID_TASK_ID) {
+        if (expire < expireTime_) {
+            subTask_ = executor->Reset(subTask_, delay);
+            expireTime_ = expire > now ? expire : now;
+        }
+        return;
+    }
+    subTask_ = executor->Schedule(delay, GenSubTask(GenTask(0, sub.userId), sub.userId));
+    expireTime_ = expire > now ? expire : now;
+}
+
 } // namespace OHOS::CloudData
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.h b/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.h
index 2e6f30e258dc357333f21596f2ab2832735be54b..10c446d04cab21824b0da53502bdf15d2c38b887 100644
--- a/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.h
+++ b/datamgr_service/services/distributeddataservice/service/cloud/cloud_service_impl.h
@@ -86,6 +86,8 @@ private:
     using Handle = bool (CloudServiceImpl::*)(int32_t);
     using Handles = std::deque<Handle>;
     using Task = ExecutorPool::Task;
+    using TaskId = ExecutorPool::TaskId;
+    using Duration = ExecutorPool::Duration;
 
     struct HapInfo {
         int32_t user;
@@ -96,11 +98,13 @@ private:
     static std::map<std::string, int32_t> ConvertAction(const std::map<std::string, int32_t> &actions);
     static HapInfo GetHapInfo(uint32_t tokenId);
 
+    static constexpr uint64_t INVALID_SUB_TIME = 0;
     static constexpr int32_t RETRY_TIMES = 3;
     static constexpr int32_t RETRY_INTERVAL = 60;
     static constexpr int32_t EXPIRE_INTERVAL = 2 * 24; // 2 day
     static constexpr int32_t WAIT_TIME = 30; // 30 seconds
     static constexpr int32_t DEFAULT_USER = 0;
+    static constexpr int32_t TIME_BEFORE_SUB = 12 * 60 * 60 * 1000; // 12hours, ms
 
     bool UpdateCloudInfo(int32_t user);
     bool UpdateSchema(int32_t user);
@@ -120,6 +124,8 @@ private:
     void CloudShare(const Event &event);
 
     Task GenTask(int32_t retry, int32_t user, Handles handles = { WORK_SUB });
+    Task GenSubTask(Task task, int32_t user);
+    void InitSubTask(const Subscription &sub);
     void Execute(Task task);
     void CleanSubscription(Subscription &sub);
     int32_t DoClean(CloudInfo &cloudInfo, const std::map<std::string, int32_t> &actions);
@@ -132,6 +138,10 @@ private:
     std::shared_ptr<DistributedData::SharingCenter> GetSharingHandle(const HapInfo& hapInfo);
     std::shared_ptr<ExecutorPool> executor_;
     SyncManager syncManager_;
+    std::mutex mutex_;
+    TaskId subTask_ = ExecutorPool::INVALID_TASK_ID;
+    uint64_t expireTime_ = static_cast<uint64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(
+        std::chrono::system_clock::now().time_since_epoch()).count());
 
     static constexpr Handle WORK_CLOUD_INFO_UPDATE = &CloudServiceImpl::UpdateCloudInfo;
     static constexpr Handle WORK_SCHEMA_UPDATE = &CloudServiceImpl::UpdateSchema;
diff --git a/datamgr_service/services/distributeddataservice/service/cloud/sync_manager.cpp b/datamgr_service/services/distributeddataservice/service/cloud/sync_manager.cpp
index 8adae93a692240fc3e90ae19b6a44cfb51343262..d739aae727b8ac318b44c394ff0302ba241e0f9e 100644
--- a/datamgr_service/services/distributeddataservice/service/cloud/sync_manager.cpp
+++ b/datamgr_service/services/distributeddataservice/service/cloud/sync_manager.cpp
@@ -247,7 +247,7 @@ std::function<void(const Event &)> SyncManager::GetSyncHandler(Retryer retryer)
         meta.user = std::to_string(storeInfo.user);
         meta.instanceId = storeInfo.instanceId;
         meta.deviceId = DmAdapter::GetInstance().GetLocalDevice().uuid;
-        if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta)) {
+        if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta, true)) {
             ZLOGE("failed, no store meta bundleName:%{public}s, storeId:%{public}s", meta.bundleName.c_str(),
                 meta.GetStoreAlias().c_str());
             return;
diff --git a/datamgr_service/services/distributeddataservice/service/config/include/model/checker_config.h b/datamgr_service/services/distributeddataservice/service/config/include/model/checker_config.h
index 1cbb8c4476040024ec0af56ddaf484529f652e5e..c4755d8ee54a318368ce8f77ea9ece2bbf8de297 100644
--- a/datamgr_service/services/distributeddataservice/service/config/include/model/checker_config.h
+++ b/datamgr_service/services/distributeddataservice/service/config/include/model/checker_config.h
@@ -25,8 +25,10 @@ public:
         bool Marshal(json &node) const override;
         bool Unmarshal(const json &node) override;
     };
+    using Distrust = Trust;
     std::vector<std::string> checkers;
     std::vector<Trust> trusts;
+    std::vector<Distrust> distrusts;
     bool Marshal(json &node) const override;
     bool Unmarshal(const json &node) override;
 };
diff --git a/datamgr_service/services/distributeddataservice/service/config/src/model/checker_config.cpp b/datamgr_service/services/distributeddataservice/service/config/src/model/checker_config.cpp
index f543df0ab409182b09250417bb8472d165888444..f65f2d0d32dafc604b2a1e19b2cb3abd83b4c85f 100644
--- a/datamgr_service/services/distributeddataservice/service/config/src/model/checker_config.cpp
+++ b/datamgr_service/services/distributeddataservice/service/config/src/model/checker_config.cpp
@@ -40,6 +40,7 @@ bool CheckerConfig::Marshal(json &node) const
 {
     SetValue(node[GET_NAME(checkers)], checkers);
     SetValue(node[GET_NAME(trusts)], trusts);
+    SetValue(node[GET_NAME(distrusts)], distrusts);
     return true;
 }
 
@@ -47,6 +48,7 @@ bool CheckerConfig::Unmarshal(const json &node)
 {
     GetValue(node, GET_NAME(checkers), checkers);
     GetValue(node, GET_NAME(trusts), trusts);
+    GetValue(node, GET_NAME(distrusts), distrusts);
     return true;
 }
 } // namespace DistributedData
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/common/bundle_mgr_proxy.cpp b/datamgr_service/services/distributeddataservice/service/data_share/common/bundle_mgr_proxy.cpp
index 1bd4a9136475e12e3ac375008aa8e3f28ac9b713..7a692802ab682f6d17a4d936ef9e2bb62040b704 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/common/bundle_mgr_proxy.cpp
+++ b/datamgr_service/services/distributeddataservice/service/data_share/common/bundle_mgr_proxy.cpp
@@ -45,7 +45,12 @@ sptr<AppExecFwk::BundleMgrProxy> BundleMgrProxy::GetBundleMgrProxy()
         ZLOGE("deathRecipient alloc failed.");
         return nullptr;
     }
-    proxy_->AddDeathRecipient(deathRecipient_);
+    if (!proxy_->AddDeathRecipient(deathRecipient_)) {
+        ZLOGE("add death recipient failed.");
+        proxy_ = nullptr;
+        deathRecipient_ = nullptr;
+        return nullptr;
+    }
     return iface_cast<AppExecFwk::BundleMgrProxy>(proxy_);
 }
 
@@ -76,10 +81,12 @@ bool BundleMgrProxy::GetBundleInfoFromBMS(
 void BundleMgrProxy::OnProxyDied()
 {
     std::lock_guard<std::mutex> lock(mutex_);
+    ZLOGE("bundleMgr died, proxy=null ? %{public}s.", proxy_ == nullptr ? "true" : "false");
     if (proxy_ != nullptr) {
         proxy_->RemoveDeathRecipient(deathRecipient_);
     }
     proxy_ = nullptr;
+    deathRecipient_ = nullptr;
 }
 
 BundleMgrProxy::~BundleMgrProxy()
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/common/callback_impl.h b/datamgr_service/services/distributeddataservice/service/data_share/common/callback_impl.h
index 451f375fa18526d6ac8afeb9425276ed9ee526ad..28db02518138fce1e4f9c1333263f7bef3445c65 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/common/callback_impl.h
+++ b/datamgr_service/services/distributeddataservice/service/data_share/common/callback_impl.h
@@ -21,21 +21,25 @@
 namespace OHOS::DataShare {
 class CallbackImpl : public AAFwk::AbilityConnectionStub {
 public:
-    explicit CallbackImpl(BlockData<bool> &data) : data_(data) {}
+    explicit CallbackImpl(std::shared_ptr<BlockData<bool>> data) : data_(data) {}
     void OnAbilityConnectDone(
         const AppExecFwk::ElementName &element, const sptr<IRemoteObject> &remoteObject, int resultCode) override
     {
-        bool result = true;
-        data_.SetValue(result);
+        if (data_ == nullptr) {
+            return;
+        }
+        data_->SetValue(true);
     }
     void OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) override
     {
-        bool result = false;
-        data_.SetValue(result);
+        if (data_ == nullptr) {
+            return;
+        }
+        data_->SetValue(false);
     }
 
 private:
-    BlockData<bool> &data_;
+    std::shared_ptr<BlockData<bool>> data_;
 };
 } // namespace OHOS::DataShare
 #endif
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.cpp b/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.cpp
index 2424abf25d9164877a71500155b4296b25e6479d..9f480741b7d1ff3f8af123c3ddd2bc733af41725 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.cpp
+++ b/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.cpp
@@ -22,6 +22,7 @@
 #include "callback_impl.h"
 #include "extension_mgr_proxy.h"
 #include "log_print.h"
+#include "utils/anonymous.h"
 
 namespace OHOS::DataShare {
 bool ExtensionConnectAdaptor::Connect(std::shared_ptr<Context> context)
@@ -34,26 +35,26 @@ bool ExtensionConnectAdaptor::Connect(std::shared_ptr<Context> context)
     return false;
 }
 
-ExtensionConnectAdaptor::ExtensionConnectAdaptor() : data_(1) {}
+ExtensionConnectAdaptor::ExtensionConnectAdaptor() : data_(std::make_shared<BlockData<bool>>(1))
+{
+    callback_ = new (std::nothrow) CallbackImpl(data_);
+}
 
 bool ExtensionConnectAdaptor::DoConnect(std::shared_ptr<Context> context)
 {
-    data_.Clear();
-    callback_ = new (std::nothrow) CallbackImpl(data_);
+    data_->Clear();
     if (callback_ == nullptr) {
-        ZLOGE("new failed");
         return false;
     }
-    ZLOGI("Start connect %{public}s", context->uri.c_str());
     ErrCode ret = ExtensionMgrProxy::GetInstance()->Connect(context->uri, callback_->AsObject(), nullptr);
     if (ret != ERR_OK) {
-        ZLOGE("connect ability failed, ret = %{public}d", ret);
+        ZLOGE("connect ability failed, ret = %{public}d, uri: %{public}s", ret,
+            DistributedData::Anonymous::Change(context->uri).c_str());
         return false;
     }
-    bool result = data_.GetValue();
-    if (result) {
-        ZLOGI("connect ability ended successfully");
-    }
+    bool result = data_->GetValue();
+    ZLOGI("Do connect, result: %{public}d,  uri: %{public}s", result,
+        DistributedData::Anonymous::Change(context->uri).c_str());
     return result;
 }
 
@@ -77,12 +78,10 @@ void ExtensionConnectAdaptor::Disconnect()
         ZLOGE("callback null");
         return;
     }
-    data_.Clear();
-    ZLOGI("Start disconnect");
+    data_->Clear();
     ExtensionMgrProxy::GetInstance()->DisConnect(callback_->AsObject());
-    if (!data_.GetValue()) {
-        ZLOGI("disconnect ability ended successfully");
-    }
+    bool result = data_->GetValue();
+    ZLOGI("Do disconnect, result: %{public}d", result);
     callback_ = nullptr;
 }
 } // namespace OHOS::DataShare
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.h b/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.h
index 6c24367c46f072ea9bb776f9ec46a3bec7df41b4..44eb9e8353c2af4fe92a5bbb3410a5ee03bf2c92 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.h
+++ b/datamgr_service/services/distributeddataservice/service/data_share/common/extension_connect_adaptor.h
@@ -29,7 +29,7 @@ private:
     bool Connect(std::shared_ptr<Context> context);
     void Disconnect();
     bool DoConnect(std::shared_ptr<Context> context);
-    BlockData<bool> data_;
+    std::shared_ptr<BlockData<bool>> data_;
     sptr<AAFwk::IAbilityConnection> callback_ = nullptr;
 };
 } // namespace OHOS::DataShare
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_impl.cpp
index f86c0dfac4170b08e76be7ecffc4e387fff404e6..5a1664050595b30c05c63cc3201cb3a863a71fb3 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_impl.cpp
@@ -55,7 +55,7 @@ int32_t DataShareServiceImpl::Insert(const std::string &uri, const DataShareValu
 {
     ZLOGD("Insert enter.");
     if (!IsSilentProxyEnable(uri)) {
-        ZLOGE("check silent proxy switch disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
+        ZLOGW("silent proxy disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
         return ERROR;
     }
     auto context = std::make_shared<Context>(uri);
@@ -88,7 +88,7 @@ int32_t DataShareServiceImpl::Update(const std::string &uri, const DataSharePred
 {
     ZLOGD("Update enter.");
     if (!IsSilentProxyEnable(uri)) {
-        ZLOGE("check silent proxy switch disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
+        ZLOGW("silent proxy disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
         return ERROR;
     }
     auto context = std::make_shared<Context>(uri);
@@ -104,7 +104,7 @@ int32_t DataShareServiceImpl::Delete(const std::string &uri, const DataSharePred
 {
     ZLOGD("Delete enter.");
     if (!IsSilentProxyEnable(uri)) {
-        ZLOGE("check silent proxy switch disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
+        ZLOGW("silent proxy disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
         return ERROR;
     }
     auto context = std::make_shared<Context>(uri);
@@ -121,7 +121,7 @@ std::shared_ptr<DataShareResultSet> DataShareServiceImpl::Query(const std::strin
 {
     ZLOGD("Query enter.");
     if (!IsSilentProxyEnable(uri)) {
-        ZLOGE("check silent proxy switch disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
+        ZLOGW("silent proxy disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
         return nullptr;
     }
     auto context = std::make_shared<Context>(uri);
@@ -605,7 +605,6 @@ bool DataShareServiceImpl::IsSilentProxyEnable(const std::string &uri)
     int32_t currentUserId = DistributedKv::AccountDelegate::GetInstance()->GetUserByToken(callerTokenId);
     UriInfo uriInfo;
     if (!URIUtils::GetInfoFromURI(uri, uriInfo)) {
-        ZLOGE("Get uriInfo from URI error.");
         return true;
     }
     std::string calledBundleName = uriInfo.bundleName;
@@ -615,7 +614,7 @@ bool DataShareServiceImpl::IsSilentProxyEnable(const std::string &uri)
     }
     auto success = dataShareSilentConfig_.IsSilentProxyEnable(calledTokenId, currentUserId, calledBundleName, uri);
     if (!success) {
-        ZLOGE("check silent proxy switch disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
+        ZLOGW("silent proxy disable, %{public}s", DistributedData::Anonymous::Change(uri).c_str());
     }
     return success;
 }
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.cpp
index ccf44690fb3c8c3918a62e52a1f40ccc6e27e5b9..593ee190089fa08b382fd77751aeb52c72f2f18a 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.cpp
+++ b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.cpp
@@ -17,6 +17,7 @@
 
 #include "data_share_service_stub.h"
 
+#include <cinttypes>
 #include "data_share_obs_proxy.h"
 #include "ipc_skeleton.h"
 #include "ishared_result_set.h"
@@ -320,14 +321,23 @@ int32_t DataShareServiceStub::OnRemoteNotifyConnectDone(MessageParcel &data, Mes
 
 int DataShareServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply)
 {
-    ZLOGD("code:%{public}u, callingPid:%{public}d", code, IPCSkeleton::GetCallingPid());
+    auto callingPid = IPCSkeleton::GetCallingPid();
+    ZLOGD("code:%{public}u, callingPid:%{public}d", code, callingPid);
     if (!CheckInterfaceToken(data)) {
         return DATA_SHARE_ERROR;
     }
+    int res = -1;
     if (code < DATA_SHARE_SERVICE_CMD_MAX) {
-        return (this->*HANDLERS[code])(data, reply);
-    }
-    return -1;
+        auto start = std::chrono::steady_clock::now();
+        res = (this->*HANDLERS[code])(data, reply);
+        auto finish = std::chrono::steady_clock::now();
+        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(finish - start);
+        if (duration >= TIME_THRESHOLD) {
+            ZLOGW("over time, code:%{public}u callingPid:%{public}d, cost:%{public}" PRIi64 "ms",
+                code, callingPid, duration.count());
+        }
+    }
+    return res;
 }
 
 int32_t DataShareServiceStub::OnRemoteNotifyObserver(MessageParcel &data, MessageParcel &reply)
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.h b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.h
index b9fa67dfba342bbab49953f84a6267bb3df412ba..e350eb1ce04d88e956d7876f2df29394157ec75f 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.h
+++ b/datamgr_service/services/distributeddataservice/service/data_share/data_share_service_stub.h
@@ -26,6 +26,7 @@ public:
     int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply) override;
 
 private:
+    static constexpr std::chrono::milliseconds TIME_THRESHOLD = std::chrono::milliseconds(500);
     static bool CheckInterfaceToken(MessageParcel& data);
     int32_t OnRemoteInsert(MessageParcel& data, MessageParcel& reply);
     int32_t OnRemoteUpdate(MessageParcel& data, MessageParcel& reply);
diff --git a/datamgr_service/services/distributeddataservice/service/data_share/data_share_silent_config.cpp b/datamgr_service/services/distributeddataservice/service/data_share/data_share_silent_config.cpp
index fbeb0e33f8fcda7c448c8749f90378fb9551a1c5..dba45026414108fa1139fcd5d8dda3b885ae8a0c 100644
--- a/datamgr_service/services/distributeddataservice/service/data_share/data_share_silent_config.cpp
+++ b/datamgr_service/services/distributeddataservice/service/data_share/data_share_silent_config.cpp
@@ -39,8 +39,6 @@ bool DataShareSilentConfig::IsSilentProxyEnable(uint32_t callerTokenId, int32_t
     }
     std::map<std::string, ProfileInfo> profileInfos;
     if (!DataShareProfileConfig::GetProfileInfo(calledBundleName, currentUserId, profileInfos)) {
-        ZLOGE("GetProfileInfo error, No configuration has been set for silent access. uri:%{public}s",
-              DistributedData::Anonymous::Change(uri).c_str());
         return true;
     }
     for (const auto &[key, value] : profileInfos) {
@@ -61,7 +59,7 @@ bool DataShareSilentConfig::EnableSilentProxy(uint32_t callerTokenId, const std:
         uri = ALL_URI;
     }
     ZLOGI("Enable silent proxy, callerTokenId:%{public}u, enable:%{public}d, uri:%{public}s",
-          callerTokenId, enable, uri.c_str());
+          callerTokenId, enable, DistributedData::Anonymous::Change(uri).c_str());
     enableSilentUris_.Compute(callerTokenId, [&enable, &uri](const uint32_t &key,
         std::map<std::string, bool> &uris) {
         uris[uri] = enable;
@@ -90,8 +88,6 @@ int DataShareSilentConfig::CheckExistEnableSilentUris(uint32_t callerTokenId,
         }
         return !uris.empty();
     });
-    ZLOGI("Check exist enable silent uris, callerTokenId:%{public}u, status:%{public}d, uri:%{public}s",
-          callerTokenId, status, uri.c_str());
     return status;
 }
 } // namespace OHOS::DataShare
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
index 1bfab8b2aacafe6edd612f8710b7d22edc7c0e49..6f17ca9ea600c812db69747c74ce7655a069e143 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
@@ -32,6 +32,7 @@
 #include "log_print.h"
 #include "matrix_event.h"
 #include "metadata/appid_meta_data.h"
+#include "metadata/capability_meta_data.h"
 #include "metadata/meta_data_manager.h"
 #include "permit_delegate.h"
 #include "query_helper.h"
@@ -200,7 +201,33 @@ Status KVDBServiceImpl::Sync(const AppId &appId, const StoreId &storeId, const S
         }
     }
     return KvStoreSyncManager::GetInstance()->AddSyncOperation(uintptr_t(metaData.tokenId), delay,
-        std::bind(&KVDBServiceImpl::DoSync, this, metaData, syncInfo, std::placeholders::_1, ACTION_SYNC),
+        std::bind(&KVDBServiceImpl::DoSyncInOrder, this, metaData, syncInfo, std::placeholders::_1, ACTION_SYNC),
+        std::bind(&KVDBServiceImpl::DoComplete, this, metaData, syncInfo, RefCount(), std::placeholders::_1));
+}
+
+Status KVDBServiceImpl::SyncExt(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo)
+{
+    if (syncInfo.devices.empty()) {
+        return Status::INVALID_ARGUMENT;
+    }
+    StoreMetaData metaData = GetStoreMetaData(appId, storeId);
+    MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData);
+    auto uuid = DMAdapter::GetInstance().ToUUID(syncInfo.devices[0]);
+    if (uuid.empty()) {
+        ZLOGE("invalid deviceId, appId:%{public}s storeId:%{public}s deviceId:%{public}s",
+            metaData.bundleName.c_str(), Anonymous::Change(metaData.storeId).c_str(),
+            Anonymous::Change(syncInfo.devices[0]).c_str());
+        return Status::INVALID_ARGUMENT;
+    }
+    auto code = DeviceMatrix::GetInstance().GetCode(metaData);
+    auto [exist, mask] = DeviceMatrix::GetInstance().GetRemoteMask(uuid);
+    if (code != 0 && exist && ((mask & code) != code)) {
+        ZLOGD("no change, do not need sync, appId:%{public}s storeId:%{public}s",
+            metaData.bundleName.c_str(), Anonymous::Change(metaData.storeId).c_str());
+        return SUCCESS;
+    }
+    return KvStoreSyncManager::GetInstance()->AddSyncOperation(uintptr_t(metaData.tokenId), 0,
+        std::bind(&KVDBServiceImpl::DoSyncInOrder, this, metaData, syncInfo, std::placeholders::_1, ACTION_SYNC),
         std::bind(&KVDBServiceImpl::DoComplete, this, metaData, syncInfo, RefCount(), std::placeholders::_1));
 }
 
@@ -314,7 +341,7 @@ Status KVDBServiceImpl::AddSubscribeInfo(const AppId &appId, const StoreId &stor
     MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData);
     auto delay = GetSyncDelayTime(syncInfo.delay, storeId);
     return KvStoreSyncManager::GetInstance()->AddSyncOperation(uintptr_t(metaData.tokenId), delay,
-        std::bind(&KVDBServiceImpl::DoSync, this, metaData, syncInfo, std::placeholders::_1, ACTION_SUBSCRIBE),
+        std::bind(&KVDBServiceImpl::DoSyncInOrder, this, metaData, syncInfo, std::placeholders::_1, ACTION_SUBSCRIBE),
         std::bind(&KVDBServiceImpl::DoComplete, this, metaData, syncInfo, RefCount(), std::placeholders::_1));
 }
 
@@ -324,7 +351,8 @@ Status KVDBServiceImpl::RmvSubscribeInfo(const AppId &appId, const StoreId &stor
     MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData);
     auto delay = GetSyncDelayTime(syncInfo.delay, storeId);
     return KvStoreSyncManager::GetInstance()->AddSyncOperation(uintptr_t(metaData.tokenId), delay,
-        std::bind(&KVDBServiceImpl::DoSync, this, metaData, syncInfo, std::placeholders::_1, ACTION_UNSUBSCRIBE),
+        std::bind(
+            &KVDBServiceImpl::DoSyncInOrder, this, metaData, syncInfo, std::placeholders::_1, ACTION_UNSUBSCRIBE),
         std::bind(&KVDBServiceImpl::DoComplete, this, metaData, syncInfo, RefCount(), std::placeholders::_1));
 }
 
@@ -383,7 +411,7 @@ Status KVDBServiceImpl::BeforeCreate(const AppId &appId, const StoreId &storeId,
     AddOptions(options, meta);
 
     StoreMetaData old;
-    auto isCreated = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), old);
+    auto isCreated = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), old, true);
     if (!isCreated) {
         return SUCCESS;
     }
@@ -416,7 +444,7 @@ Status KVDBServiceImpl::AfterCreate(const AppId &appId, const StoreId &storeId,
     AddOptions(options, metaData);
 
     StoreMetaData oldMeta;
-    auto isCreated = MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), oldMeta);
+    auto isCreated = MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), oldMeta, true);
     Status status = SUCCESS;
     if (isCreated && oldMeta != metaData) {
         auto dbStatus = Upgrade::GetInstance().UpdateStore(oldMeta, metaData, password);
@@ -430,7 +458,9 @@ Status KVDBServiceImpl::AfterCreate(const AppId &appId, const StoreId &storeId,
     }
 
     if (!isCreated || oldMeta != metaData) {
-        MetaDataManager::GetInstance().SaveMeta(metaData.GetKey(), metaData);
+        if (!CheckerManager::GetInstance().IsDistrust(Converter::ConvertToStoreInfo(metaData))) {
+            MetaDataManager::GetInstance().SaveMeta(metaData.GetKey(), metaData);
+        }
         MetaDataManager::GetInstance().SaveMeta(metaData.GetKey(), metaData, true);
     }
     AppIDMetaData appIdMeta;
@@ -439,7 +469,7 @@ Status KVDBServiceImpl::AfterCreate(const AppId &appId, const StoreId &storeId,
     MetaDataManager::GetInstance().SaveMeta(appIdMeta.GetKey(), appIdMeta, true);
     SaveLocalMetaData(options, metaData);
     Upgrade::GetInstance().UpdatePassword(metaData, password);
-    ZLOGI("appId:%{public}s storeId:%{public}s instanceId:%{public}d type:%{public}d dir:%{public}s"
+    ZLOGI("appId:%{public}s storeId:%{public}s instanceId:%{public}d type:%{public}d dir:%{public}s "
         "isCreated:%{public}d", appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(),
         metaData.instanceId, metaData.storeType, metaData.dataDir.c_str(), isCreated);
     return status;
@@ -636,6 +666,74 @@ Status KVDBServiceImpl::DoSync(const StoreMetaData &meta, const SyncInfo &info,
         return Status::ERROR;
     }
 
+    return DoSyncBegin(uuids, meta, info, complete, type);
+}
+
+Status KVDBServiceImpl::DoSyncInOrder(
+    const StoreMetaData &meta, const SyncInfo &info, const SyncEnd &complete, int32_t type)
+{
+    ZLOGD("type:%{public}d seqId:0x%{public}" PRIx64 " remote:%{public}zu appId:%{public}s storeId:%{public}s", type,
+        info.seqId, info.devices.size(), meta.bundleName.c_str(), Anonymous::Change(meta.storeId).c_str());
+    auto uuids = ConvertDevices(info.devices);
+    if (uuids.empty()) {
+        ZLOGW("no device seqId:0x%{public}" PRIx64 " remote:%{public}zu appId:%{public}s storeId:%{public}s",
+            info.seqId, info.devices.size(), meta.bundleName.c_str(), Anonymous::Change(meta.storeId).c_str());
+        return Status::ERROR;
+    }
+    bool isOnline = false;
+    bool isAfterMeta = false;
+    for (const auto &uuid : uuids) {
+        if (!DMAdapter::GetInstance().IsDeviceReady(uuid)) {
+            isOnline = true;
+            break;
+        }
+        auto metaData = meta;
+        metaData.deviceId = uuid;
+        auto matrixMeta = DeviceMatrix::GetInstance().GetMatrixMeta(uuid);
+        if (matrixMeta.version == MatrixMetaData::DEFAULT_VERSION
+            || !MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData)) {
+            isAfterMeta = true;
+        }
+    }
+    if (!isOnline && isAfterMeta) {
+        auto result = MetaDataManager::GetInstance().Sync(
+            uuids, [this, meta, info, complete, type](const auto &results) {
+            auto ret = ProcessResult(results);
+            if (ret.first.empty()) {
+                DoComplete(meta, info, RefCount(), ret.second);
+                return;
+            }
+            auto status = DoSyncBegin(ret.first, meta, info, complete, type);
+            ZLOGD("data sync status:%{public}d appId:%{public}s, storeId:%{public}s",
+                static_cast<int32_t>(status), meta.bundleName.c_str(), Anonymous::Change(meta.storeId).c_str());
+        });
+        return result ? Status::SUCCESS : Status::ERROR;
+    }
+    return DoSyncBegin(uuids, meta, info, complete, type);
+}
+
+KVDBServiceImpl::SyncResult KVDBServiceImpl::ProcessResult(const std::map<std::string, int32_t> &results)
+{
+    std::map<std::string, DBStatus> dbResults;
+    std::vector<std::string> devices;
+    for (const auto &[uuid, status] : results) {
+        dbResults.insert_or_assign(uuid, static_cast<DBStatus>(status));
+        if (static_cast<DBStatus>(status) != DBStatus::OK) {
+            continue;
+        }
+        DeviceMatrix::GetInstance().OnExchanged(uuid, DeviceMatrix::META_STORE_MASK);
+        devices.emplace_back(uuid);
+    }
+    ZLOGD("meta sync finish, total size:%{public}zu, success size:%{public}zu", dbResults.size(), devices.size());
+    return { devices, dbResults };
+}
+
+Status KVDBServiceImpl::DoSyncBegin(const std::vector<std::string> &devices, const StoreMetaData &meta,
+    const SyncInfo &info, const SyncEnd &complete, int32_t type)
+{
+    if (devices.empty()) {
+        return Status::INVALID_ARGUMENT;
+    }
     DistributedDB::DBStatus status;
     auto observers = GetObservers(meta.tokenId, meta.storeId);
     auto store = storeCache_.GetStore(meta, observers, status);
@@ -653,13 +751,19 @@ Status KVDBServiceImpl::DoSync(const StoreMetaData &meta, const SyncInfo &info,
 
     switch (type) {
         case ACTION_SYNC:
-            status = store->Sync(uuids, ConvertDBMode(SyncMode(info.mode)), complete, dbQuery, false);
-            break;
+            {
+                if (info.query.empty()) {
+                    status = store->Sync(devices, ConvertDBMode(SyncMode(info.mode)), complete, false);
+                } else {
+                    status = store->Sync(devices, ConvertDBMode(SyncMode(info.mode)), complete, dbQuery, false);
+                }
+                break;
+            }
         case ACTION_SUBSCRIBE:
-            status = store->SubscribeRemoteQuery(uuids, complete, dbQuery, false);
+            status = store->SubscribeRemoteQuery(devices, complete, dbQuery, false);
             break;
         case ACTION_UNSUBSCRIBE:
-            status = store->UnSubscribeRemoteQuery(uuids, complete, dbQuery, false);
+            status = store->UnSubscribeRemoteQuery(devices, complete, dbQuery, false);
             break;
         default:
             status = DBStatus::INVALID_ARGS;
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.h b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.h
index d6f5b945efa8ad9e8ef42182491d3edfc3893d88..4cdac4574f25934658a2cc823435a2855749d824 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.h
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_impl.h
@@ -42,6 +42,7 @@ public:
         const std::vector<uint8_t> &password) override;
     Status Delete(const AppId &appId, const StoreId &storeId) override;
     Status Sync(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) override;
+    Status SyncExt(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) override;
     Status RegisterSyncCallback(const AppId &appId, sptr<IKvStoreSyncCallback> callback) override;
     Status UnregisterSyncCallback(const AppId &appId) override;
     Status SetSyncParam(const AppId &appId, const StoreId &storeId, const KvSyncParam &syncParam) override;
@@ -97,12 +98,17 @@ private:
     StrategyMeta GetStrategyMeta(const AppId &appId, const StoreId &storeId);
     int32_t GetInstIndex(uint32_t tokenId, const AppId &appId);
     Status DoSync(const StoreMetaData &meta, const SyncInfo &info, const SyncEnd &complete, int32_t type);
+    Status DoSyncInOrder(const StoreMetaData &meta, const SyncInfo &info, const SyncEnd &complete, int32_t type);
+    Status DoSyncBegin(const std::vector<std::string> &devices, const StoreMetaData &meta,
+        const SyncInfo &info, const SyncEnd &complete, int32_t type);
     Status DoComplete(const StoreMetaData &meta, const SyncInfo &info, RefCount refCount, const DBResult &dbResult);
     uint32_t GetSyncDelayTime(uint32_t delay, const StoreId &storeId);
     Status ConvertDbStatus(DBStatus status) const;
     DBMode ConvertDBMode(SyncMode syncMode) const;
     std::vector<std::string> ConvertDevices(const std::vector<std::string> &deviceIds) const;
     std::shared_ptr<StoreCache::Observers> GetObservers(uint32_t tokenId, const std::string &storeId);
+    using SyncResult = std::pair<std::vector<std::string>, std::map<std::string, DBStatus>>;
+    SyncResult ProcessResult(const std::map<std::string, int32_t> &results);
     void SaveLocalMetaData(const Options &options, const StoreMetaData &metaData);
     void RegisterKvServiceInfo();
     void RegisterHandler();
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
index 1da51ce462fb7232c9cd535dba3ad376547de188..729e52b3d385aa69fbf5ad6ff0fdfc4e12885cd6 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
@@ -42,6 +42,7 @@ const KVDBServiceStub::Handler
     &KVDBServiceStub::OnSubscribe,
     &KVDBServiceStub::OnUnsubscribe,
     &KVDBServiceStub::OnGetBackupPassword,
+    &KVDBServiceStub::OnSyncExt,
 };
 
 int KVDBServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply)
@@ -168,6 +169,25 @@ int32_t KVDBServiceStub::OnSync(const AppId &appId, const StoreId &storeId, Mess
     return ERR_NONE;
 }
 
+int32_t KVDBServiceStub::OnSyncExt(
+    const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply)
+{
+    SyncInfo syncInfo;
+    if (!ITypesUtil::Unmarshal(
+        data, syncInfo.seqId, syncInfo.mode, syncInfo.devices, syncInfo.delay, syncInfo.query)) {
+        ZLOGE("Unmarshal appId:%{public}s storeId:%{public}s",
+            appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str());
+        return IPC_STUB_INVALID_DATA_ERR;
+    }
+    int32_t status = SyncExt(appId, storeId, syncInfo);
+    if (!ITypesUtil::Marshal(reply, status)) {
+        ZLOGE("Marshal status:0x%{public}x appId:%{public}s storeId:%{public}s", status,
+            appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str());
+        return IPC_STUB_WRITE_PARCEL_ERR;
+    }
+    return ERR_NONE;
+}
+
 int32_t KVDBServiceStub::OnRegisterCallback(
     const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply)
 {
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.h b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.h
index 00b1763def44b6c8f646ad4139525b3046e34129..183fdbe187b9114400e2c0414eb96f4516ce6363 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.h
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/kvdb_service_stub.h
@@ -44,6 +44,7 @@ private:
     int32_t OnSubscribe(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply);
     int32_t OnUnsubscribe(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply);
     int32_t OnGetBackupPassword(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply);
+    int32_t OnSyncExt(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply);
     static const Handler HANDLERS[static_cast<uint32_t>(KVDBServiceInterfaceCode::TRANS_BUTT)];
 };
 } // namespace OHOS::DistributedKv
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/query_helper.cpp b/datamgr_service/services/distributeddataservice/service/kvdb/query_helper.cpp
index 822b25d67cbe70d79877dec1b4e8186794abc2b6..59739ccbd32e3d4e52a5a4b4f84a4488a1378d39 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/query_helper.cpp
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/query_helper.cpp
@@ -34,7 +34,7 @@ DistributedDB::Query QueryHelper::StringToDbQuery(const std::string &query, bool
     ZLOGI("query string length:%{public}zu", query.length());
     DBQuery dbQuery = DBQuery::Select();
     if (query.empty()) {
-        ZLOGI("Query string is empty.");
+        ZLOGD("Query string is empty.");
         isSuccess = true;
         return dbQuery;
     }
diff --git a/datamgr_service/services/distributeddataservice/service/kvdb/user_delegate.cpp b/datamgr_service/services/distributeddataservice/service/kvdb/user_delegate.cpp
index 1d245bf96de5112df8ee5f4515f4cc04b4fdfa0b..2c6a5c95e8cf512004867279e57d10c2cd94f5e2 100644
--- a/datamgr_service/services/distributeddataservice/service/kvdb/user_delegate.cpp
+++ b/datamgr_service/services/distributeddataservice/service/kvdb/user_delegate.cpp
@@ -15,7 +15,8 @@
 
 #define LOG_TAG "UserDelegate"
 #include "user_delegate.h"
-
+#include <chrono>
+#include <cinttypes>
 #include <thread>
 #include "communicator/device_manager_adapter.h"
 #include "log_print.h"
@@ -24,6 +25,7 @@
 
 namespace OHOS::DistributedData {
 using namespace OHOS::DistributedKv;
+using namespace std::chrono;
 std::string GetLocalDeviceId()
 {
     return DeviceManagerAdapter::GetInstance().GetLocalDevice().uuid;
@@ -89,8 +91,10 @@ std::vector<UserStatus> UserDelegate::GetUsers(const std::string &deviceId)
         }
         return !users.empty();
     });
-    ZLOGI("device:%{public}s, users:%{public}s", Anonymous::Change(deviceId).c_str(),
-        Serializable::Marshall(userStatus).c_str());
+    auto time =
+        static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+    ZLOGI("device:%{public}s, users:%{public}s times %{public}" PRIu64 ".", Anonymous::Change(deviceId).c_str(),
+        Serializable::Marshall(userStatus).c_str(), time);
     return userStatus;
 }
 
diff --git a/datamgr_service/services/distributeddataservice/service/matrix/include/device_matrix.h b/datamgr_service/services/distributeddataservice/service/matrix/include/device_matrix.h
index f7f25b28ff48d08d77ab6193ca373084ef5ee899..527f0c57887eb76517547300d4cf61f4fd3829d2 100644
--- a/datamgr_service/services/distributeddataservice/service/matrix/include/device_matrix.h
+++ b/datamgr_service/services/distributeddataservice/service/matrix/include/device_matrix.h
@@ -44,10 +44,12 @@ public:
     bool IsChangedInTerm(const StoreMetaData &metaData, uint64_t term);
     uint16_t GetCode(const StoreMetaData &metaData);
     std::pair<bool, uint16_t> GetMask(const std::string &device);
+    std::pair<bool, uint16_t> GetRemoteMask(const std::string &device);
+    MatrixMetaData GetMatrixMeta(const std::string &device);
     void Clear();
 
 private:
-    static constexpr uint32_t CURRENT_VERSION = 1;
+    static constexpr uint32_t CURRENT_VERSION = 2;
     static constexpr uint32_t CURRENT_MASK = 0x000E;
     static constexpr size_t MAX_DEVICES = 16;
 
@@ -63,7 +65,6 @@ private:
     }
 
     uint16_t ConvertMask(const std::string &device, uint16_t code);
-    MatrixMetaData GetMatrixMeta(const std::string &device);
 
     struct Mask {
         uint16_t bitset = META_STORE_MASK | CURRENT_MASK;
diff --git a/datamgr_service/services/distributeddataservice/service/matrix/src/device_matrix.cpp b/datamgr_service/services/distributeddataservice/service/matrix/src/device_matrix.cpp
index e406e6eee21d107782cfc29aae5f95e594af8163..c1b20abb26db8fc8a007b6f5f8768d8b422b371a 100644
--- a/datamgr_service/services/distributeddataservice/service/matrix/src/device_matrix.cpp
+++ b/datamgr_service/services/distributeddataservice/service/matrix/src/device_matrix.cpp
@@ -200,6 +200,16 @@ std::pair<bool, uint16_t> DeviceMatrix::GetMask(const std::string &device)
     return { false, 0 };
 }
 
+std::pair<bool, uint16_t> DeviceMatrix::GetRemoteMask(const std::string &device)
+{
+    std::lock_guard<decltype(mutex_)> lockGuard(mutex_);
+    auto it = remotes_.find(device);
+    if (it != remotes_.end()) {
+        return { true, it->second.bitset };
+    }
+    return { false, 0 };
+}
+
 void DeviceMatrix::Clear()
 {
     versions_.ResetCapacity(0);
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.cpp b/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.cpp
index 8abeb3054d2071205ac430ae731278c2ab804c92..e72c81db9082481f975e5fd92714122ac548d69b 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.cpp
+++ b/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.cpp
@@ -29,13 +29,18 @@ ObjectAssetLoader *ObjectAssetLoader::GetInstance()
     return loader;
 }
 
+void ObjectAssetLoader::SetThreadPool(std::shared_ptr<ExecutorPool> executors)
+{
+    executors_ = executors;
+}
+
 bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string &bundleName,
     const std::string &deviceId, const DistributedData::Asset &assetValue)
 {
     AssetInfo assetInfo;
     assetInfo.uri = assetValue.uri;
     assetInfo.assetName = assetValue.name;
-    ZLOGD("Start transfer, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(),
+    ZLOGI("Start transfer, bundleName: %{public}s, deviceId: %{public}s, assetName: %{public}s", bundleName.c_str(),
           DistributedData::Anonymous::Change(deviceId).c_str(), assetInfo.assetName.c_str());
     auto block = std::make_shared<BlockData<std::tuple<bool, int32_t>>>(WAIT_TIME, std::tuple{ true, OBJECT_SUCCESS });
     auto res = CloudSyncAssetManager::GetInstance().DownloadFile(userId, bundleName, deviceId, assetInfo,
@@ -56,26 +61,22 @@ bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string &bundle
     return true;
 }
 
-bool ObjectAssetLoader::Transfer(const int32_t userId, const std::string& bundleName, const std::string& deviceId,
-    const DistributedData::Asset& assetValue, std::function<void(bool success)> callback)
+void ObjectAssetLoader::TransferAssetsAsync(const int32_t userId, const std::string& bundleName,
+    const std::string& deviceId, const std::vector<DistributedData::Asset>& assets,
+    const std::function<void(bool success)>& callback)
 {
-    AssetInfo assetInfo;
-    assetInfo.uri = assetValue.uri;
-    assetInfo.assetName = assetValue.name;
-    auto res = CloudSyncAssetManager::GetInstance().DownloadFile(userId, bundleName, deviceId, assetInfo,
-        [callback](const std::string& uri, int32_t status) {
-            if (status != OBJECT_SUCCESS) {
-                ZLOGE("fail, uri: %{public}s, status: %{public}d", DistributedData::Anonymous::Change(uri).c_str(),
-                    status);
-                return callback(false);
-            }
-            return callback(true);
-        });
-    if (res != OBJECT_SUCCESS) {
-        ZLOGE("fail, res: %{public}d, name: %{public}s, deviceId: %{public}s, bundleName: %{public}s", res,
-            assetValue.name.c_str(), DistributedData::Anonymous::Change(deviceId).c_str(), bundleName.c_str());
-        return false;
+    if (executors_ == nullptr) {
+        ZLOGE("executors is null, bundleName: %{public}s, deviceId: %{public}s, userId: %{public}d",
+            bundleName.c_str(), DistributedData::Anonymous::Change(deviceId).c_str(), userId);
+        callback(false);
+        return;
     }
-    return true;
+    executors_->Execute([this, userId, bundleName, deviceId, assets, callback]() {
+        bool result = true;
+        for (const auto& asset : assets) {
+            result &= Transfer(userId, bundleName, deviceId, asset);
+        }
+        callback(result);
+    });
 }
 } // namespace OHOS::DistributedObject
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.h b/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.h
index af4a7b5e7e8b244361c1f2af507a2216c343a631..2d8b300f19b6a6549e4ee482371fa1872c67907b 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.h
+++ b/datamgr_service/services/distributeddataservice/service/object/object_asset_loader.h
@@ -16,6 +16,7 @@
 #define DISTRIBUTEDDATAMGR_OBJECT_ASSET_LOADER_H
 
 #include <string>
+#include "executor_pool.h"
 #include "object_types.h"
 #include "store/general_value.h"
 
@@ -24,11 +25,11 @@ namespace DistributedObject {
 class ObjectAssetLoader {
 public:
     static ObjectAssetLoader *GetInstance();
+    void SetThreadPool(std::shared_ptr<ExecutorPool> executors);
     bool Transfer(const int32_t userId, const std::string &bundleName,
         const std::string &deviceId, const DistributedData::Asset &assetValue);
-
-    bool Transfer(const int32_t userId, const std::string& bundleName, const std::string& deviceId,
-        const DistributedData::Asset& assetValue, std::function<void(bool success)> callback);
+    void TransferAssetsAsync(const int32_t userId, const std::string& bundleName, const std::string& deviceId,
+        const std::vector<DistributedData::Asset>& assets, const std::function<void(bool success)>& callback);
 private:
     ObjectAssetLoader() = default;
     ~ObjectAssetLoader() = default;
@@ -36,6 +37,7 @@ private:
     ObjectAssetLoader &operator=(const ObjectAssetLoader &) = delete;
 
     static constexpr int WAIT_TIME = 60;
+    std::shared_ptr<ExecutorPool> executors_;
 };
 } // namespace DistributedObject
 } // namespace OHOS
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.cpp b/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.cpp
index 5135c5d1e73d665a9e0f9e65810d230b8a85b7f0..020382805d7bf126789d9b7d95ee89f4a871e90c 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.cpp
+++ b/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.cpp
@@ -37,22 +37,22 @@ using DmAdapter = OHOS::DistributedData::DeviceManagerAdapter;
 constexpr static const char* SQL_AND = " = ? and ";
 constexpr static const int32_t AND_SIZE = 5;
 static int32_t DoTransfer(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t ChangeAssetToNormal(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t CompensateSync(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t CompensateTransferring(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t SaveNewAsset(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t Recover(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset);
+    const std::pair<std::string, Asset>& newAsset);
 
 static int32_t UpdateStore(ChangedAssetInfo& changedAsset);
 
@@ -158,12 +158,13 @@ int32_t ObjectAssetMachine::DFAPostEvent(AssetEvent eventId, ChangedAssetInfo& c
 }
 
 static int32_t DoTransfer(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     changedAsset.deviceId = newAsset.first;
     changedAsset.asset = newAsset.second;
-    bool success = ObjectAssetLoader::GetInstance()->Transfer(changedAsset.storeInfo.user,
-        changedAsset.storeInfo.bundleName, changedAsset.deviceId, changedAsset.asset, [&changedAsset](bool success) {
+    std::vector<Asset> assets{ changedAsset.asset };
+    ObjectAssetLoader::GetInstance()->TransferAssetsAsync(changedAsset.storeInfo.user,
+        changedAsset.storeInfo.bundleName, changedAsset.deviceId, assets, [&changedAsset](bool success) {
             if (success) {
                 auto status = UpdateStore(changedAsset);
                 if (status != E_OK) {
@@ -176,9 +177,6 @@ static int32_t DoTransfer(int32_t eventId, ChangedAssetInfo& changedAsset, Asset
             }
             ObjectAssetMachine::DFAPostEvent(TRANSFER_FINISHED, changedAsset, changedAsset.asset);
         });
-    if (!success) {
-        ObjectAssetMachine::DFAPostEvent(TRANSFER_FINISHED, changedAsset, changedAsset.asset);
-    }
     return E_OK;
 }
 
@@ -304,14 +302,14 @@ static AutoCache::Store GetStore(ChangedAssetInfo& changedAsset)
 }
 
 static int32_t CompensateTransferring(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     std::pair<std::string, Asset> newChangedAsset{ changedAsset.deviceId, changedAsset.asset };
     return ObjectAssetMachine::DFAPostEvent(REMOTE_CHANGED, changedAsset, changedAsset.asset, newChangedAsset);
 }
 
 static int32_t CompensateSync(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     BindEvent::BindEventInfo bindEventInfo = MakeBindInfo(changedAsset);
     auto evt = std::make_unique<BindEvent>(BindEvent::COMPENSATE_SYNC, std::move(bindEventInfo));
@@ -320,7 +318,7 @@ static int32_t CompensateSync(int32_t eventId, ChangedAssetInfo& changedAsset, A
 }
 
 static int32_t SaveNewAsset(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     changedAsset.deviceId = newAsset.first;
     changedAsset.asset = newAsset.second;
@@ -328,14 +326,14 @@ static int32_t SaveNewAsset(int32_t eventId, ChangedAssetInfo& changedAsset, Ass
 }
 
 static int32_t ChangeAssetToNormal(int32_t eventId, ChangedAssetInfo& changedAssetInfo, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     asset.status = Asset::STATUS_NORMAL;
     return E_OK;
 }
 
 static int32_t Recover(int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset,
-    std::pair<std::string, Asset>& newAsset)
+    const std::pair<std::string, Asset>& newAsset)
 {
     ZLOGE("An abnormal event has occurred, eventId:%{public}d, status:%{public}d, assetName:%{public}s", eventId,
         changedAsset.status, changedAsset.asset.name.c_str());
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.h b/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.h
index 32b8a8a273ea2aaf1325a7a692157c1d0693ef17..fef1ccee2c86913058c35ec2c4339f7f7ee999cc 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.h
+++ b/datamgr_service/services/distributeddataservice/service/object/object_asset_machine.h
@@ -39,7 +39,7 @@ struct ChangedAssetInfo {
 };
 
 typedef int32_t (*Action)
-    (AssetEvent eventId, ChangedAssetInfo& changedAsset, Asset& asset, std::pair<std::string, Asset> newAsset);
+    (int32_t eventId, ChangedAssetInfo& changedAsset, Asset& asset, const std::pair<std::string, Asset>& newAsset);
 
 struct DFAAction {
     int32_t next;
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_manager.cpp b/datamgr_service/services/distributeddataservice/service/object/object_manager.cpp
index fcad1fbdf6128929f36ce9b22392e0691b787493..fedce9676a2a1e146de271da81a24c8080813130 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_manager.cpp
+++ b/datamgr_service/services/distributeddataservice/service/object/object_manager.cpp
@@ -14,6 +14,7 @@
  */
 
 #define LOG_TAG "ObjectStoreManager"
+#include <set>
 
 #include "object_manager.h"
 
@@ -187,7 +188,7 @@ int32_t ObjectStoreManager::Retrieve(
         return STORE_NOT_OPEN;
     }
 
-    std::map<std::string, std::vector<uint8_t>> results;
+    std::map<std::string, std::vector<uint8_t>> results{};
     int32_t status = RetrieveFromStore(bundleName, sessionId, results);
     if (status != OBJECT_SUCCESS) {
         ZLOGE("Retrieve failed, status = %{public}d", status);
@@ -195,8 +196,6 @@ int32_t ObjectStoreManager::Retrieve(
         proxy->Completed(std::map<std::string, std::vector<uint8_t>>());
         return status;
     }
-    const int32_t userId = DistributedKv::AccountDelegate::GetInstance()->GetUserByToken(tokenId);
-    TransferAssets(results, userId, bundleName);
     // delete local data
     status = RevokeSaveToStore(GetPrefixWithoutDeviceId(bundleName, sessionId));
     if (status != OBJECT_SUCCESS) {
@@ -206,42 +205,19 @@ int32_t ObjectStoreManager::Retrieve(
         return status;
     }
     Close();
-    proxy->Completed(results);
-    return status;
-}
-
-void ObjectStoreManager::TransferAssets(
-    std::map<std::string, std::vector<uint8_t>>& results, int32_t userId, const std::string& bundleName)
-{
-    std::map<std::string, Asset> assets;
-    std::string deviceId;
-
-    for (auto const&[key, value] : results) {
-        if (key.find(ObjectStore::ASSET_DOT) == std::string::npos) {
-            if (key == (ObjectStore::FIELDS_PREFIX + ObjectStore::DEVICEID_KEY)) {
-                ObjectStore::StringUtils::BytesToStrWithType(value, deviceId);
-            }
-        } else {
-            std::string assetKey = key.substr(0, key.find(ObjectStore::ASSET_DOT));
-            auto it = assets.find(assetKey);
-            if (it == assets.end()) {
-                Asset asset;
-                ObjectStore::StringUtils::BytesToStrWithType(results[assetKey+ObjectStore::NAME_SUFFIX], asset.name);
-                asset.name = asset.name.substr(ObjectStore::STRING_PREFIX_LEN);
-                ObjectStore::StringUtils::BytesToStrWithType(results[assetKey+ObjectStore::URI_SUFFIX], asset.uri);
-                asset.uri = asset.uri.substr(ObjectStore::STRING_PREFIX_LEN);
-                assets[assetKey] = asset;
-            }
-        }
-    }
-    if (!assets.empty()) {
-        for (auto&[key, asset] : assets) {
-            if (!ObjectAssetLoader::GetInstance()->Transfer(userId, bundleName, deviceId, asset)) {
-                ZLOGE("Transfer fail, userId: %{public}d, bundleName: %{public}s, networkId: %{public}s, asset name : "
-                    "%{public}s", userId, bundleName.c_str(), deviceId.c_str(), asset.name.c_str());
-            }
-        }
+    Assets assets = GetAssetsFromDBRecords(results);
+    if (assets.empty() || results.find(ObjectStore::FIELDS_PREFIX + ObjectStore::DEVICEID_KEY) == results.end()) {
+        proxy->Completed(results);
+        return status;
     }
+    int32_t userId = DistributedKv::AccountDelegate::GetInstance()->GetUserByToken(tokenId);
+    std::string deviceId;
+    ObjectStore::StringUtils::BytesToStrWithType(
+        results.find(ObjectStore::FIELDS_PREFIX + ObjectStore::DEVICEID_KEY)->second, deviceId);
+    ObjectAssetLoader::GetInstance()->TransferAssetsAsync(userId, bundleName, deviceId, assets, [=](bool success) {
+        proxy->Completed(results);
+    });
+    return status;
 }
 
 int32_t ObjectStoreManager::Clear()
@@ -354,33 +330,131 @@ void ObjectStoreManager::NotifyChange(std::map<std::string, std::vector<uint8_t>
     ZLOGD("ObjectStoreManager::NotifyChange start");
     SaveUserToMeta();
     std::map<std::string, std::map<std::string, std::vector<uint8_t>>> data;
-    std::map<std::string, std::map<std::string, std::vector<uint8_t>>> transferData;
     for (const auto &item : changedData) {
         std::string prefix = GetBundleName(item.first) + GetSessionId(item.first);
         std::string propertyName = GetPropertyName(item.first);
         data[prefix].insert_or_assign(propertyName, item.second);
-
-        std::string bundleName = GetBundleName(item.first);
-        transferData[bundleName].insert_or_assign(std::move(propertyName), std::move(item.second));
     }
-
+    std::function<void(bool success)> callback = [this, data](bool success) {
+        callbacks_.ForEach([this, &data](uint32_t tokenId, const CallbackInfo& value) {
+            DoNotify(tokenId, value, data);
+            return false;
+        });
+    };
+    std::map<std::string, std::map<std::string, Assets>> changedAssets = GetAssetsFromStore(changedData);
+    if (changedAssets.empty()) {
+        callback(true);
+    }
     const int32_t userId = std::stoi(GetCurrentUser());
-    for (auto item : transferData) {
-        std::string bundleName = item.first;
-        auto results = item.second;
-        TransferAssets(results, userId, bundleName);
+    for (const auto& assetsOfBundle : changedAssets) {
+        std::string bundleName = assetsOfBundle.first;
+        for (const auto& assetsOfDevice : assetsOfBundle.second) {
+            std::string deviceId = assetsOfDevice.first;
+            Assets assets = assetsOfDevice.second;
+            ObjectAssetLoader::GetInstance()->TransferAssetsAsync(userId, bundleName, deviceId, assets, callback);
+        }
     }
+}
 
-    callbacks_.ForEach([&data](uint32_t tokenId, CallbackInfo &value) {
-        for (const auto &observer : value.observers_) {
-            auto it = data.find(observer.first);
-            if (it == data.end()) {
-                continue;
-            }
-            observer.second->Completed((*it).second);
+std::map<std::string, std::map<std::string, Assets>> ObjectStoreManager::GetAssetsFromStore(
+    const std::map<std::string, std::vector<uint8_t>>& changedData)
+{
+    std::set<std::string> assetKeyPrefix;
+    for (const auto& item : changedData) {
+        if (isAssetKey(GetPropertyName(item.first))) {
+            assetKeyPrefix.insert(item.first.substr(0, item.first.find_last_of(ObjectStore::ASSET_DOT)));
+        }
+    }
+    std::map<std::string, std::map<std::string, std::map<std::string, std::vector<uint8_t>>>> results;
+    for (const auto& keyPrefix : assetKeyPrefix) {
+        std::vector<DistributedDB::Entry> entries;
+        auto status = delegate_->GetEntries(std::vector<uint8_t>(keyPrefix.begin(), keyPrefix.end()), entries);
+        if (status != DistributedDB::DBStatus::OK) {
+            ZLOGE("GetEntries fail. keyPrefix = %{public}s", keyPrefix.c_str());
+            continue;
         }
+        std::map<std::string, std::vector<uint8_t>> result{};
+        std::for_each(entries.begin(), entries.end(), [&result, this](const DistributedDB::Entry entry) {
+            std::string key(entry.key.begin(), entry.key.end());
+            result[GetPropertyName(key)] = entry.value;
+        });
+        if (!isAssetComplete(result, GetPropertyName(keyPrefix))) {
+            continue;
+        }
+        std::string networkId = GetNetworkId(keyPrefix);
+        for (const auto& [key, value] : result) {
+            results[GetBundleName(keyPrefix)][networkId][key] = value;
+        }
+    }
+    std::map<std::string, std::map<std::string, Assets>> changedAssets{};
+    for (const auto& resultOfBundle : results) {
+        std::string bundleName = resultOfBundle.first;
+        for (const auto& resultOfDevice : resultOfBundle.second) {
+            std::string deviceId = resultOfDevice.first;
+            Assets assets = GetAssetsFromDBRecords(resultOfDevice.second);
+            changedAssets[bundleName][deviceId] = assets;
+        }
+    }
+    return changedAssets;
+}
+
+bool ObjectStoreManager::isAssetKey(const std::string& key)
+{
+    return key.find(ObjectStore::ASSET_DOT) != std::string::npos;
+}
+
+bool ObjectStoreManager::isAssetComplete(const std::map<std::string, std::vector<uint8_t>>& result,
+    const std::string& assetPrefix)
+{
+    if (result.find(assetPrefix + ObjectStore::NAME_SUFFIX) == result.end() ||
+        result.find(assetPrefix + ObjectStore::URI_SUFFIX) == result.end() ||
+        result.find(assetPrefix + ObjectStore::PATH_SUFFIX) == result.end() ||
+        result.find(assetPrefix + ObjectStore::CREATE_TIME_SUFFIX) == result.end() ||
+        result.find(assetPrefix + ObjectStore::MODIFY_TIME_SUFFIX) == result.end() ||
+        result.find(assetPrefix + ObjectStore::SIZE_SUFFIX) == result.end()) {
         return false;
-    });
+    }
+    return true;
+}
+
+Assets ObjectStoreManager::GetAssetsFromDBRecords(const std::map<std::string, std::vector<uint8_t>>& result)
+{
+    Assets assets{};
+    std::set<std::string> assetKey;
+    for (const auto& [key, value] : result) {
+        std::string assetPrefix = key.substr(0, key.find(ObjectStore::ASSET_DOT));
+        if (!isAssetKey(key) || assetKey.find(assetPrefix) != assetKey.end() ||
+            result.find(assetPrefix + ObjectStore::NAME_SUFFIX) == result.end() ||
+            result.find(assetPrefix + ObjectStore::URI_SUFFIX) == result.end()) {
+            continue;
+        }
+        Asset asset;
+        ObjectStore::StringUtils::BytesToStrWithType(
+            result.find(assetPrefix + ObjectStore::NAME_SUFFIX)->second, asset.name);
+        if (asset.name.find(ObjectStore::STRING_PREFIX) != std::string::npos) {
+            asset.name = asset.name.substr(ObjectStore::STRING_PREFIX_LEN);
+        }
+        ObjectStore::StringUtils::BytesToStrWithType(
+            result.find(assetPrefix + ObjectStore::URI_SUFFIX)->second, asset.uri);
+        if (asset.uri.find(ObjectStore::STRING_PREFIX) != std::string::npos) {
+            asset.uri = asset.uri.substr(ObjectStore::STRING_PREFIX_LEN);
+        }
+        assets.push_back(asset);
+        assetKey.insert(assetPrefix);
+    }
+    return assets;
+}
+
+void ObjectStoreManager::DoNotify(uint32_t tokenId, const CallbackInfo& value,
+    const std::map<std::string, std::map<std::string, std::vector<uint8_t>>>& data)
+{
+    for (const auto& observer : value.observers_) {
+        auto it = data.find(observer.first);
+        if (it == data.end()) {
+            continue;
+        }
+        observer.second->Completed((*it).second);
+    }
 }
 
 void ObjectStoreManager::SetData(const std::string &dataDir, const std::string &userId)
@@ -703,6 +777,18 @@ std::string ObjectStoreManager::GetBundleName(const std::string &key)
     return result;
 }
 
+std::string ObjectStoreManager::GetNetworkId(const std::string& key)
+{
+    std::stringstream keyStream(key);
+    std::string sourceDeviceUdId;
+    for (int i = 0; getline(keyStream, sourceDeviceUdId, *SEPERATOR); i++) {
+        if (i == SOURCE_DEVICE_ID_INDEX) {
+            return DmAdaper::GetInstance().ToNetworkID(sourceDeviceUdId);
+        }
+    }
+    return {};
+}
+
 void ObjectStoreManager::SetThreadPool(std::shared_ptr<ExecutorPool> executors)
 {
     executors_ = executors;
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_manager.h b/datamgr_service/services/distributeddataservice/service/object/object_manager.h
index c3f15def3144c206a7521fc0b6c0678d6184539f..31ff24fc8b91f896b68fd6c146e9fe9bec2806cf 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_manager.h
+++ b/datamgr_service/services/distributeddataservice/service/object/object_manager.h
@@ -101,6 +101,7 @@ private:
     constexpr static const char *USERID = "USERID";
     constexpr static int8_t MAX_OBJECT_SIZE_PER_APP = 16;
     constexpr static int8_t DECIMAL_BASE = 10;
+    constexpr static int8_t SOURCE_DEVICE_ID_INDEX = 2;
     struct CallbackInfo {
         pid_t pid;
         std::map<std::string, sptr<ObjectChangeCallbackProxy>> observers_;
@@ -127,14 +128,21 @@ private:
     std::string GetPropertyName(const std::string &key);
     std::string GetSessionId(const std::string &key);
     std::string GetBundleName(const std::string &key);
+    std::string GetNetworkId(const std::string& key);
     int64_t GetTime(const std::string &key);
     void ProcessOldEntry(const std::string &appId);
     void ProcessSyncCallback(const std::map<std::string, int32_t> &results, const std::string &appId,
         const std::string &sessionId, const std::string &deviceId);
     void SaveUserToMeta();
     std::string GetCurrentUser();
-    void TransferAssets(
-        std::map<std::string, std::vector<uint8_t>>& results, int32_t userId, const std::string& bundleName);
+    void DoNotify(uint32_t tokenId, const CallbackInfo& value,
+        const std::map<std::string, std::map<std::string, std::vector<uint8_t>>>& data);
+    std::map<std::string, std::map<std::string, Assets>> GetAssetsFromStore(
+        const std::map<std::string, std::vector<uint8_t>>& changedData);
+    static bool isAssetKey(const std::string& key);
+    static bool isAssetComplete(const std::map<std::string, std::vector<uint8_t>>& result,
+        const std::string& assetPrefix);
+    Assets GetAssetsFromDBRecords(const std::map<std::string, std::vector<uint8_t>>& result);
     inline std::string GetPropertyPrefix(const std::string &appId, const std::string &sessionId)
     {
         return appId + SEPERATOR + sessionId + SEPERATOR + DmAdaper::GetInstance().GetLocalDevice().udid + SEPERATOR;
diff --git a/datamgr_service/services/distributeddataservice/service/object/object_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/object/object_service_impl.cpp
index 3cafdc81578c4c80ccb237366ca7e6c094c83c14..1994053d7a6b65acf01cb75ada940bf2a9e2eb39 100644
--- a/datamgr_service/services/distributeddataservice/service/object/object_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/object/object_service_impl.cpp
@@ -30,6 +30,7 @@
 #include "metadata/appid_meta_data.h"
 #include "metadata/meta_data_manager.h"
 #include "metadata/store_meta_data.h"
+#include "object_asset_loader.h"
 #include "permission/permission_validator.h"
 #include "snapshot/bind_event.h"
 #include "store/auto_cache.h"
@@ -386,6 +387,7 @@ int32_t ObjectServiceImpl::OnBind(const BindInfo &bindInfo)
 {
     executors_ = bindInfo.executors;
     ObjectStoreManager::GetInstance()->SetThreadPool(executors_);
+    ObjectAssetLoader::GetInstance()->SetThreadPool(executors_);
     return 0;
 }
 } // namespace OHOS::DistributedObject
diff --git a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
index ef6b2edadae7f14caa8edb1cfffb253933baa0cc..da1bfa6de5b28162366a650efdd59a5aeca798b2 100644
--- a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
+++ b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
@@ -13,7 +13,11 @@
  * limitations under the License.
  */
 #define LOG_TAG "RdbGeneralStore"
+
 #include "rdb_general_store.h"
+
+#include <chrono>
+#include <cinttypes>
 #include "cache_cursor.h"
 #include "cloud/asset_loader.h"
 #include "cloud/cloud_db.h"
@@ -39,6 +43,7 @@ using namespace DistributedData;
 using namespace DistributedDB;
 using namespace NativeRdb;
 using namespace  CloudData;
+using namespace std::chrono;
 using DBField = DistributedDB::Field;
 using DBTable = DistributedDB::TableSchema;
 using DBSchema = DistributedDB::DataBaseSchema;
@@ -46,6 +51,10 @@ using ClearMode = DistributedDB::ClearMode;
 using DBStatus = DistributedDB::DBStatus;
 using DmAdapter = OHOS::DistributedData::DeviceManagerAdapter;
 
+constexpr const char *INSERT = "INSERT INTO ";
+constexpr const char *REPLACE = "REPLACE INTO ";
+constexpr const char *VALUES = " VALUES ";
+
 RdbGeneralStore::RdbGeneralStore(const StoreMetaData &meta) : manager_(meta.appId, meta.user, meta.instanceId)
 {
     observer_.storeId_ = meta.storeId;
@@ -194,11 +203,13 @@ int32_t RdbGeneralStore::Execute(const std::string &table, const std::string &sq
 {
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed!");
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s, sql:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(table).c_str(),
+            Anonymous::Change(sql).c_str());
         return GeneralError::E_ERROR;
     }
     std::vector<DistributedDB::VBucket> changedData;
-    auto status = delegate_->ExecuteSql({ sql, {} }, changedData);
+    auto status = delegate_->ExecuteSql({ sql, {}, false }, changedData);
     if (status != DBStatus::OK) {
         ZLOGE("Failed! ret:%{public}d, sql:%{public}s, data size:%{public}zu", status, Anonymous::Change(sql).c_str(),
               changedData.size());
@@ -227,12 +238,8 @@ size_t RdbGeneralStore::SqlConcatenate(VBucket &value, std::string &strColumnSql
 
 int32_t RdbGeneralStore::Insert(const std::string &table, VBuckets &&values)
 {
-    if (table.empty()) {
-        ZLOGE("Insert: table can't be empty!");
-        return GeneralError::E_INVALID_ARGS;
-    }
-    if (values.size() == 0) {
-        ZLOGE("Insert: values size error, can't be 0!");
+    if (table.empty() || values.size() == 0) {
+        ZLOGE("Insert:table maybe empty:%{public}d,value size is:%{public}d", table.empty(), values.size());
         return GeneralError::E_INVALID_ARGS;
     }
 
@@ -258,24 +265,44 @@ int32_t RdbGeneralStore::Insert(const std::string &table, VBuckets &&values)
         strValueSql += strRowValueSql + ",";
     }
     strValueSql.pop_back();
-    std::string sql = "INSERT INTO " + table + strColumnSql + " VALUES " + strValueSql;
+    std::string sql = INSERT + table + strColumnSql + VALUES + strValueSql;
 
     std::vector<DistributedDB::VBucket> changedData;
     std::vector<DistributedDB::Type> bindArgs = ValueProxy::Convert(std::move(args));
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed!");
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(table).c_str());
         return GeneralError::E_ERROR;
     }
-    auto status = delegate_->ExecuteSql({ sql, std::move(bindArgs) }, changedData);
+    auto status = delegate_->ExecuteSql({ sql, std::move(bindArgs), false }, changedData);
     if (status != DBStatus::OK) {
-        ZLOGE("Failed! ret:%{public}d, sql:%{public}s, data size:%{public}zu", status, Anonymous::Change(sql).c_str(),
-              changedData.size());
+        if (IsPrintLog(status)) {
+            auto time =
+                static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+                ZLOGE("Failed! ret:%{public}d, sql:%{public}s, data size:%{public}zu times %{public}" PRIu64 ".",
+                status, Anonymous::Change(sql).c_str(), changedData.size(), time);
+        }
         return GeneralError::E_ERROR;
     }
     return GeneralError::E_OK;
 }
 
+bool RdbGeneralStore::IsPrintLog(DBStatus status)
+{
+    bool isPrint = false;
+    if (status == lastError_) {
+        if (++lastErrCnt_ % PRINT_ERROR_CNT == 0) {
+            isPrint = true;
+        }
+    } else {
+        isPrint = true;
+        lastErrCnt_ = 0;
+        lastError_ = status;
+    }
+    return isPrint;
+}
+
 /**
  * This function does not support batch updates in rdb, it only supports single data updates.
  */
@@ -308,10 +335,11 @@ int32_t RdbGeneralStore::Update(const std::string &table, const std::string &set
     std::vector<DistributedDB::Type> bindArgs = ValueProxy::Convert(std::move(args));
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed!");
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(table).c_str());
         return GeneralError::E_ERROR;
     }
-    auto status = delegate_->ExecuteSql({ sqlIn, std::move(bindArgs) }, changedData);
+    auto status = delegate_->ExecuteSql({ sqlIn, std::move(bindArgs), false }, changedData);
     if (status != DBStatus::OK) {
         ZLOGE("Failed! ret:%{public}d, sql:%{public}s, data size:%{public}zu", status, Anonymous::Change(sqlIn).c_str(),
               changedData.size());
@@ -320,6 +348,37 @@ int32_t RdbGeneralStore::Update(const std::string &table, const std::string &set
     return GeneralError::E_OK;
 }
 
+int32_t RdbGeneralStore::Replace(const std::string &table, VBucket &&value)
+{
+    if (table.empty() || value.size() == 0) {
+        return GeneralError::E_INVALID_ARGS;
+    }
+    std::string columnSql;
+    std::string valueSql;
+    SqlConcatenate(value, columnSql, valueSql);
+    std::string sql = REPLACE + table + columnSql + VALUES + valueSql;
+
+    Values args;
+    for (auto &[k, v] : value) {
+        args.emplace_back(std::move(v));
+    }
+    std::vector<DistributedDB::VBucket> changedData;
+    std::vector<DistributedDB::Type> bindArgs = ValueProxy::Convert(std::move(args));
+    std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
+    if (delegate_ == nullptr) {
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(table).c_str());
+        return GeneralError::E_ERROR;
+    }
+    auto status = delegate_->ExecuteSql({ sql, std::move(bindArgs) }, changedData);
+    if (status != DBStatus::OK) {
+        ZLOGE("Replace failed! ret:%{public}d, table:%{public}s, sql:%{public}s, fields:%{public}s",
+            status, Anonymous::Change(table).c_str(), Anonymous::Change(sql).c_str(), columnSql.c_str());
+        return GeneralError::E_ERROR;
+    }
+    return GeneralError::E_OK;
+}
+
 int32_t RdbGeneralStore::Delete(const std::string &table, const std::string &sql, Values &&args)
 {
     return 0;
@@ -330,10 +389,10 @@ std::shared_ptr<Cursor> RdbGeneralStore::Query(__attribute__((unused))const std:
 {
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed!");
+        ZLOGE("Database already closed! database:%{public}s", Anonymous::Change(storeInfo_.storeName).c_str());
         return nullptr;
     }
-    std::vector<VBucket> records = ExecuteSql(sql, std::move(args));
+    std::vector<VBucket> records = QuerySql(sql, std::move(args));
     return std::make_shared<CacheCursor>(std::move(records));
 }
 
@@ -347,7 +406,8 @@ std::shared_ptr<Cursor> RdbGeneralStore::Query(const std::string &table, GenQuer
     }
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed! tables name:%{public}s", Anonymous::Change(table).c_str());
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(table).c_str());
         return nullptr;
     }
     if (rdbQuery->IsRemoteQuery()) {
@@ -364,7 +424,8 @@ int32_t RdbGeneralStore::MergeMigratedData(const std::string& tableName, VBucket
 {
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed! tables name:%{public}s", Anonymous::Change(tableName).c_str());
+        ZLOGE("Database already closed! database:%{public}s, table:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(tableName).c_str());
         return GeneralError::E_ERROR;
     }
 
@@ -421,10 +482,10 @@ std::shared_ptr<Cursor> RdbGeneralStore::PreSharing(GenQuery& query)
     {
         std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
         if (delegate_ == nullptr) {
-            ZLOGE("database already closed!");
+            ZLOGE("Database already closed! database:%{public}s", Anonymous::Change(storeInfo_.storeName).c_str());
             return nullptr;
         }
-        values = ExecuteSql(sql, rdbQuery->GetBindArgs());
+        values = QuerySql(sql, rdbQuery->GetBindArgs());
     }
     if (rdbCloud_ == nullptr || values.empty()) {
         ZLOGW("rdbCloud is %{public}s, values size:%{public}zu", rdbCloud_ == nullptr ? "nullptr" : "not nullptr",
@@ -628,7 +689,8 @@ int32_t RdbGeneralStore::SetDistributedTables(const std::vector<std::string> &ta
 {
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed! tables size:%{public}zu, type:%{public}d", tables.size(), type);
+        ZLOGE("Database already closed! database:%{public}s, tables size:%{public}zu, type:%{public}d",
+            Anonymous::Change(storeInfo_.storeName).c_str(), tables.size(), type);
         return GeneralError::E_ALREADY_CLOSED;
     }
     for (const auto &table : tables) {
@@ -657,7 +719,8 @@ int32_t RdbGeneralStore::SetTrackerTable(const std::string& tableName, const std
 {
     std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
     if (delegate_ == nullptr) {
-        ZLOGE("database already closed! tables name:%{public}s", tableName.c_str());
+        ZLOGE("database already closed! database:%{public}s, tables name:%{public}s",
+            Anonymous::Change(storeInfo_.storeName).c_str(), Anonymous::Change(tableName).c_str());
         return GeneralError::E_ALREADY_CLOSED;
     }
     auto status = delegate_->SetTrackerTable({ tableName, extendColName, trackerColNames });
@@ -719,11 +782,11 @@ int32_t RdbGeneralStore::UnregisterDetailProgressObserver()
     return GenErr::E_OK;
 }
 
-VBuckets RdbGeneralStore::ExecuteSql(const std::string& sql, Values &&args)
+VBuckets RdbGeneralStore::QuerySql(const std::string& sql, Values &&args)
 {
     std::vector<DistributedDB::VBucket> changedData;
     std::vector<DistributedDB::Type> bindArgs = ValueProxy::Convert(std::move(args));
-    auto status = delegate_->ExecuteSql({ sql, std::move(bindArgs) }, changedData);
+    auto status = delegate_->ExecuteSql({ sql, std::move(bindArgs), true }, changedData);
     if (status != DBStatus::OK) {
         ZLOGE("Failed! ret:%{public}d, sql:%{public}s, data size:%{public}zu", status, Anonymous::Change(sql).c_str(),
             changedData.size());
diff --git a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
index d3625562365fe8ca1c5b3b7cc57548fbb04019f4..d10754be4c23dea4dd31de11a8396238699dc2a1 100644
--- a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
+++ b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
@@ -58,6 +58,7 @@ public:
     int32_t Insert(const std::string &table, VBuckets &&values) override;
     int32_t Update(const std::string &table, const std::string &setSql, Values &&values, const std::string &whereSql,
         Values &&conditions) override;
+    int32_t Replace(const std::string &table, VBucket &&value) override;
     int32_t Delete(const std::string &table, const std::string &sql, Values &&args) override;
     std::shared_ptr<Cursor> Query(const std::string &table, const std::string &sql, Values &&args) override;
     std::shared_ptr<Cursor> Query(const std::string &table, GenQuery &query) override;
@@ -113,10 +114,11 @@ private:
         const DistributedDB::RemoteCondition &remoteCondition);
     std::string BuildSql(const std::string& table, const std::string& statement,
         const std::vector<std::string>& columns) const;
-    VBuckets ExecuteSql(const std::string& sql, Values &&args);
+    VBuckets QuerySql(const std::string& sql, Values &&args);
     VBuckets ExtractExtend(VBuckets& values) const;
     size_t SqlConcatenate(VBucket &value, std::string &strColumnSql, std::string &strRowValueSql);
-
+    bool IsPrintLog(DistributedDB::DBStatus status);
+    
     ObserverProxy observer_;
     RdbManager manager_;
     RdbDelegate *delegate_ = nullptr;
@@ -131,6 +133,10 @@ private:
 
     BindAssets snapshots_;
     DistributedData::StoreInfo storeInfo_;
+
+    DistributedDB::DBStatus lastError_ = DistributedDB::DBStatus::OK;
+    static constexpr uint32_t PRINT_ERROR_CNT = 150;
+    uint32_t lastErrCnt_ = 0;
 };
 } // namespace OHOS::DistributedRdb
 #endif // OHOS_DISTRIBUTED_DATA_DATAMGR_SERVICE_RDB_GENERAL_STORE_H
diff --git a/datamgr_service/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
index 3dd9b0bcd1abcf1d1e558ceb663cfcd0f393d5a9..1ba52d4c739ff855d4a0015f981a06c24cc1f28e 100644
--- a/datamgr_service/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
@@ -269,16 +269,24 @@ int32_t RdbServiceImpl::SetDistributedTables(const RdbSyncerParam &param, const
         return RDB_ERROR;
     }
     auto meta = GetStoreMetaData(param);
-    StoreMetaData syncMeta;
-    StoreMetaData localMeta;
-    bool isCreatedSync = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), syncMeta);
-    bool isCreatedLocal = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), localMeta, true);
-    if (isCreatedLocal && (!isCreatedSync || localMeta != syncMeta)) {
-        ZLOGD("save sync meta. bundle:%{public}s store:%{public}s type:%{public}d->%{public}d "
-              "encrypt:%{public}d->%{public}d , area:%{public}d->%{public}d",
-            meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), syncMeta.storeType, meta.storeType,
-            syncMeta.isEncrypt, meta.isEncrypt, syncMeta.area, meta.area);
-        MetaDataManager::GetInstance().SaveMeta(meta.GetKey(), localMeta);
+
+    if (type == DistributedRdb::DistributedTableType::DISTRIBUTED_DEVICE) {
+        StoreMetaData localMeta;
+        bool isCreatedLocal = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), localMeta, true);
+        if (!isCreatedLocal) {
+            ZLOGE("no meta. bundleName:%{public}s, storeName:%{public}s. GetStore failed", param.bundleName_.c_str(),
+                Anonymous::Change(param.storeName_).c_str());
+            return RDB_ERROR;
+        }
+        StoreMetaData syncMeta;
+        bool isCreatedSync = MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), syncMeta);
+        if (!isCreatedSync || localMeta != syncMeta) {
+            ZLOGI("save sync meta. bundle:%{public}s store:%{public}s type:%{public}d->%{public}d "
+                  "encrypt:%{public}d->%{public}d , area:%{public}d->%{public}d",
+                meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), syncMeta.storeType, meta.storeType,
+                syncMeta.isEncrypt, meta.isEncrypt, syncMeta.area, meta.area);
+            MetaDataManager::GetInstance().SaveMeta(meta.GetKey(), localMeta);
+        }
     }
     auto store = GetStore(param);
     if (store == nullptr) {
diff --git a/datamgr_service/services/distributeddataservice/service/test/BUILD.gn b/datamgr_service/services/distributeddataservice/service/test/BUILD.gn
index 1cc7038dd484ba9b60946832fe5eff630390c02a..c1e32f9468af69a46bd2bd7d4087f2e26a888e41 100644
--- a/datamgr_service/services/distributeddataservice/service/test/BUILD.gn
+++ b/datamgr_service/services/distributeddataservice/service/test/BUILD.gn
@@ -72,6 +72,30 @@ ohos_unittest("CloudDataTest") {
   ]
 }
 
+ohos_unittest("CloudTest") {
+  module_out_path = module_output_path
+  sources = [ "cloud_test.cpp" ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "ability_base:base",
+    "ability_base:want",
+    "c_utils:utils",
+    "hilog:libhilog",
+    "ipc:ipc_core",
+    "kv_store:distributeddata_inner",
+  ]
+
+  deps = [
+    "${kv_store_distributeddb_path}:distributeddb",
+    "../../adapter:distributeddata_adapter",
+    "../../framework:distributeddatasvcfwk",
+    "../../service:distributeddatasvc",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
 ohos_unittest("ValueProxyTest") {
   module_out_path = module_output_path
   sources = [
@@ -361,6 +385,7 @@ group("unittest") {
 
   deps += [
     ":CloudDataTest",
+    ":CloudTest",
     ":CryptoManagerTest",
     ":DeviceMatrixTest",
     ":DirectoryManagerTest",
diff --git a/datamgr_service/services/distributeddataservice/service/test/cloud_data_test.cpp b/datamgr_service/services/distributeddataservice/service/test/cloud_data_test.cpp
index 1242139bb98c67e0309cd9fd8a7f64eabef5e1e1..6b8c965a22942e3e438f8edc4a28d028cae79972 100644
--- a/datamgr_service/services/distributeddataservice/service/test/cloud_data_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/cloud_data_test.cpp
@@ -135,7 +135,8 @@ void CloudDataTest::InitSchemaMeta()
 
 void CloudDataTest::SetUpTestCase(void)
 {
-    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, [](const auto &, auto) {
+    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr);
+    MetaDataManager::GetInstance().SetSyncer([](const auto &, auto) {
         DeviceMatrix::GetInstance().OnChanged(DeviceMatrix::META_STORE_MASK);
     });
 
diff --git a/datamgr_service/services/distributeddataservice/service/test/cloud_test.cpp b/datamgr_service/services/distributeddataservice/service/test/cloud_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fd87a48e51bd9eaa827898a0d3c6787d2db8edee
--- /dev/null
+++ b/datamgr_service/services/distributeddataservice/service/test/cloud_test.cpp
@@ -0,0 +1,160 @@
+/*
+* Copyright (c) 2024 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#define LOG_TAG "CloudTest"
+#include <string>
+
+#include "account/account_delegate.h"
+#include "cloud/cloud_server.h"
+#include "cloud/sync_event.h"
+#include "gtest/gtest.h"
+#include "ipc_skeleton.h"
+using namespace testing::ext;
+using namespace OHOS::DistributedData;
+namespace OHOS::Test {
+class CloudTest : public testing::Test {
+public:
+    static void SetUpTestCase(void){};
+    static void TearDownTestCase(void){};
+    void SetUp(){};
+    void TearDown(){};
+
+protected:
+    static constexpr const char* testCloudBundle = "test_cloud_bundleName";
+    static constexpr const char* testCloudStore = "test_cloud_database_name";
+};
+
+/**
+* @tc.name: EventInfo
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+*/
+HWTEST_F(CloudTest, EventInfo, TestSize.Level1)
+{
+    const int32_t mode = 1;
+    const int32_t wait = 10;
+    const bool retry = true;
+    std::shared_ptr<GenQuery> query = nullptr;
+    int sign = 0;
+    auto async = [&sign](const GenDetails& details) {
+        ++sign;
+    };
+    SyncEvent::EventInfo eventInfo1(mode, wait, retry, query, async);
+    SyncEvent::EventInfo eventInfo2(std::move(eventInfo1));
+    SyncEvent::EventInfo eventInfo3 = std::move(eventInfo2);
+    CloudEvent::StoreInfo storeInfo{ IPCSkeleton::GetCallingTokenID(), testCloudBundle, testCloudStore, 0 };
+    SyncEvent evt(storeInfo, eventInfo3);
+    EXPECT_EQ(evt.GetMode(), mode);
+    EXPECT_EQ(evt.GetWait(), wait);
+    EXPECT_EQ(evt.AutoRetry(), retry);
+    EXPECT_EQ(evt.GetQuery(), query);
+    evt.GetAsyncDetail()(GenDetails());
+    EXPECT_NE(0, sign);
+}
+
+/**
+* @tc.name: Serializable_Marshal
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+*/
+HWTEST_F(CloudTest, Serializable_Marshal, TestSize.Level1)
+{
+    SchemaMeta schemaMeta;
+    bool ret = schemaMeta.IsValid();
+    EXPECT_EQ(false, ret);
+
+    SchemaMeta::Database database;
+    database.name = testCloudStore;
+    database.alias = "database_alias_test";
+
+    schemaMeta.version = 1;
+    schemaMeta.bundleName = testCloudBundle;
+    schemaMeta.databases.emplace_back(database);
+    ret = schemaMeta.IsValid();
+    EXPECT_EQ(true, ret);
+
+    Serializable::json node = schemaMeta.Marshall();
+    SchemaMeta schemaMeta2;
+    schemaMeta2.Unmarshal(node);
+
+    EXPECT_EQ(schemaMeta.version, schemaMeta2.version);
+    EXPECT_EQ(schemaMeta.bundleName, schemaMeta2.bundleName);
+    Database database2 = schemaMeta2.GetDataBase(testCloudStore);
+    EXPECT_EQ(database.alias, database2.alias);
+}
+
+/**
+* @tc.name: Field_Marshal
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+*/
+HWTEST_F(CloudTest, Field_Marshal, TestSize.Level1)
+{
+    Field field;
+    field.colName = "field_name1_test";
+    field.alias = "field_alias1_test";
+    field.type = 1;
+    field.primary = true;
+    field.nullable = false;
+
+    Serializable::json node = field.Marshall();
+    Field field2;
+    field2.Unmarshal(node);
+
+    EXPECT_EQ(field.colName, field2.colName);
+    EXPECT_EQ(field.alias, field2.alias);
+    EXPECT_EQ(field.type, field2.type);
+    EXPECT_EQ(field.primary, field2.primary);
+    EXPECT_EQ(field.nullable, field2.nullable);
+}
+
+/**
+* @tc.name: Database_Marshal
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+*/
+HWTEST_F(CloudTest, Database_Marshal, TestSize.Level1)
+{
+    SchemaMeta::Table table1;
+    table1.name = "test_cloud_table_name1";
+    table1.alias = "test_cloud_table_alias1";
+    SchemaMeta::Table table2;
+    table2.name = "test_cloud_table_name2";
+    table2.alias = "test_cloud_table_alias2";
+
+    SchemaMeta::Database database1;
+    database1.name = testCloudStore;
+    database1.alias = "test_cloud_database_alias";
+    database1.tables.emplace_back(table1);
+    database1.tables.emplace_back(table2);
+
+    Serializable::json node = database1.Marshall();
+    SchemaMeta::Database database2;
+    database2.Unmarshal(node);
+
+    EXPECT_EQ(database1.name, database2.name);
+    EXPECT_EQ(database1.alias, database2.alias);
+    std::vector<std::string> tableNames1 = database1.GetTableNames();
+    std::vector<std::string> tableNames2 = database2.GetTableNames();
+    EXPECT_EQ(tableNames1.size(), tableNames2.size());
+    for (uint32_t i = 0; i < tableNames1.size(); ++i) {
+        EXPECT_EQ(tableNames1[i], tableNames2[i]);
+    }
+}
+} // namespace OHOS::Test
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/test/config_factory_test.cpp b/datamgr_service/services/distributeddataservice/service/test/config_factory_test.cpp
index c286e6e89648e79c4a809f9fb165e002cdc42e0f..d92ccf2e39ca03c9f16452df1a1b0e168e691b44 100644
--- a/datamgr_service/services/distributeddataservice/service/test/config_factory_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/config_factory_test.cpp
@@ -81,8 +81,7 @@ HWTEST_F(ConfigFactoryTest, CheckerConfig, TestSize.Level0)
 {
     auto *checker = ConfigFactory::GetInstance().GetCheckerConfig();
     ASSERT_NE(checker, nullptr);
-    std::vector<std::string> checkers{"SystemChecker", "BundleChecker", "PackageChecker",
-                                      "ExternalChecker"};
+    std::vector<std::string> checkers{"SystemChecker", "BundleChecker"};
     ASSERT_EQ(checker->checkers, checkers);
     ASSERT_EQ(checker->trusts[0].bundleName, "bundle_manager_service");
     ASSERT_EQ(checker->trusts[0].appId, "bundle_manager_service");
@@ -110,4 +109,4 @@ HWTEST_F(ConfigFactoryTest, NetworkConfig, TestSize.Level0)
     ASSERT_EQ(networks->protocols[0].name, "OHOS softbus");
     ASSERT_EQ(networks->protocols[0].address, "ohos.distributeddata");
     ASSERT_EQ(networks->protocols[0].transport, "softbus");
-}
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/test/device_matrix_test.cpp b/datamgr_service/services/distributeddataservice/service/test/device_matrix_test.cpp
index 39f99ca5958b7dd9cf476d6bb8b0da36ef48da69..ab03d50ce715464fad0d5c5ddb46ed0e891985c5 100644
--- a/datamgr_service/services/distributeddataservice/service/test/device_matrix_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/device_matrix_test.cpp
@@ -61,7 +61,8 @@ std::shared_ptr<DBStoreMock> DeviceMatrixTest::dbStoreMock_ = std::make_shared<D
 uint32_t DeviceMatrixTest::selfToken_ = 0;
 void DeviceMatrixTest::SetUpTestCase(void)
 {
-    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, [](const auto &, auto) {
+    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr);
+    MetaDataManager::GetInstance().SetSyncer([](const auto &, auto) {
         DeviceMatrix::GetInstance().OnChanged(DeviceMatrix::META_STORE_MASK);
     });
     selfToken_ = IPCSkeleton::GetCallingTokenID();
@@ -356,7 +357,7 @@ HWTEST_F(DeviceMatrixTest, BroadcastAll, TestSize.Level0)
 HWTEST_F(DeviceMatrixTest, UpdateMatrixMeta, TestSize.Level0)
 {
     MatrixMetaData metaData;
-    metaData.version = 2;
+    metaData.version = 3;
     metaData.mask = 0x1F;
     metaData.deviceId = TEST_DEVICE;
     metaData.maskInfo = { TEST_BUNDLE, "distributed_device_profile_service" };
diff --git a/datamgr_service/services/distributeddataservice/service/test/directory_manager_test.cpp b/datamgr_service/services/distributeddataservice/service/test/directory_manager_test.cpp
index 809403467f0db7889bad5e01fb15a184e03bb2ea..a41e1ac22ffc7f71bf792f107aaab6aebc07bd39 100644
--- a/datamgr_service/services/distributeddataservice/service/test/directory_manager_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/directory_manager_test.cpp
@@ -206,3 +206,27 @@ HWTEST_F(DirectoryManagerTest, GetStorageMetaPath, TestSize.Level0)
     auto path = DirectoryManager::GetInstance().GetMetaStorePath();
     EXPECT_EQ(path, "/data/service/el1/public/database/distributeddata/meta");
 }
+
+/**
+* @tc.name: GetSecretKeyPath
+* @tc.desc: test get secret key path
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author:
+*/
+HWTEST_F(DirectoryManagerTest, GetSecretKeyPath, TestSize.Level0)
+{
+    StoreMetaData metaData;
+    metaData.user = "0";
+    metaData.bundleName = "bundle_manager_service";
+    metaData.appId = "bundle_manager_service";
+    metaData.dataDir = "/data/service/el1/public/database/bundle_manager_service/kvdb";
+    metaData.securityLevel = SecurityLevel::S2;
+    metaData.area = 1;
+    metaData.tokenId = GetAccessTokenId(&tokenParam_);
+    metaData.storeType = KvStoreType::SINGLE_VERSION;
+    auto version = DirectoryManager::GetInstance().GetVersions();
+    EXPECT_NE(sizeof(version), 0);
+    auto path = DirectoryManager::GetInstance().GetSecretKeyPath(metaData);
+    EXPECT_EQ(path, "/data/service/el1/public/database/bundle_manager_service/kvdb/secret");
+}
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.cpp b/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.cpp
index 088c4254c2cd1fcc893e815618b72597ccd575a1..18f5d4807ab3fff719c9e225b0a5082756d14104 100644
--- a/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.cpp
@@ -311,6 +311,12 @@ DBStatus DBStoreMock::UpdateKey(const UpdateKeyCallback &callback)
     return NOT_SUPPORT;
 }
 
+std::pair<DBStatus, WatermarkInfo> DBStoreMock::GetWatermarkInfo(const std::string &device)
+{
+    WatermarkInfo mark;
+    return { DBStatus::OK, mark };
+}
+
 DBStatus DBStoreMock::Reset()
 {
     return USER_CHANGED;
diff --git a/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.h b/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.h
index 8d219c2b023132d64800379de9ca9ec4f6648b99..056b1639b53e20ba521cd07086f6e4ad43d18819 100644
--- a/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.h
+++ b/datamgr_service/services/distributeddataservice/service/test/mock/db_store_mock.h
@@ -37,6 +37,7 @@ public:
     using RemotePushFinishedNotifier = DistributedDB::RemotePushFinishedNotifier;
     using PushDataInterceptor = DistributedDB::PushDataInterceptor;
     using UpdateKeyCallback = DistributedDB::UpdateKeyCallback;
+    using WatermarkInfo = DistributedDB::WatermarkInfo;
     DBStatus Get(const Key &key, Value &value) const override;
     DBStatus GetEntries(const Key &keyPrefix, std::vector<Entry> &entries) const override;
     DBStatus GetEntries(const Key &keyPrefix, KvStoreResultSet *&resultSet) const override;
@@ -89,8 +90,8 @@ public:
     DBStatus GetKeys(const Key &keyPrefix, std::vector<Key> &keys) const override;
     size_t GetSyncDataSize(const std::string &device) const override;
     DBStatus UpdateKey(const UpdateKeyCallback &callback) override;
+    std::pair<DBStatus, WatermarkInfo> GetWatermarkInfo(const std::string &device) override;
     DBStatus Reset();
-
 private:
     static const uint32_t DEFAULT_SIZE = 0;
     DBStatus Get(ConcurrentMap<Key, Value> &store, const Key &key, Value &value) const;
diff --git a/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.cpp b/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.cpp
index beba4a6bbcd8dd376aebab2e7691095e0e0af0df..bc4730b9832d4a1fbd3cede391d1203ab5be74fe 100644
--- a/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.cpp
@@ -144,6 +144,10 @@ int32_t GeneralStoreMock::MergeMigratedData(const std::string& tableName, VBucke
 {
     return 0;
 }
+int32_t GeneralStoreMock::Replace(const std::string& table, VBucket&& value)
+{
+    return 0;
+}
 
 } // namespace DistributedData
 } // namespace OHOS
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.h b/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.h
index 9d503c3682e41628267c511c9c0772597e64c0ba..67283d1c37ffb03f4dc10ca049a094f99327d823 100644
--- a/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.h
+++ b/datamgr_service/services/distributeddataservice/service/test/mock/general_store_mock.h
@@ -57,6 +57,7 @@ public:
    int32_t Close() override;
    int32_t AddRef() override;
    int32_t Release() override;
+   int32_t Replace(const std::string &table, VBucket &&value) override;
 
    int32_t BindSnapshots(std::shared_ptr<std::map<std::string, std::shared_ptr<Snapshot>>> bindAssets) override;
 
diff --git a/datamgr_service/services/distributeddataservice/service/test/object_asset_machine_test.cpp b/datamgr_service/services/distributeddataservice/service/test/object_asset_machine_test.cpp
index 9348ad99b16f9b67b55a203e09245fd07cf2afaa..296fc94cecbe4e5f9782016e2bc4b326d934f9b1 100644
--- a/datamgr_service/services/distributeddataservice/service/test/object_asset_machine_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/object_asset_machine_test.cpp
@@ -19,8 +19,9 @@
 
 #include <gtest/gtest.h>
 
-#include "log_print.h"
 #include "snapshot/machine_status.h"
+#include "object_asset_loader.h"
+#include "executor_pool.h"
 
 using namespace testing::ext;
 using namespace OHOS::DistributedObject;
@@ -73,18 +74,20 @@ void ObjectAssetMachineTest::SetUp()
     storeInfo_ = storeInfo;
     ChangedAssetInfo changedAssetInfo(asset, AssetBindInfo, storeInfo);
     changedAssets_[uri_] = changedAssetInfo;
+    auto executors = std::make_shared<ExecutorPool>(1, 0);
+    ObjectAssetLoader::GetInstance()->SetThreadPool(executors);
 }
 
 void ObjectAssetMachineTest::TearDown() {}
 
 /**
-* @tc.name: StatusTransfer
-* @tc.desc: .
+* @tc.name: StatusTransfer001
+* @tc.desc: Transfer event.
 * @tc.type: FUNC
 * @tc.require:
 * @tc.author: whj
 */
-HWTEST_F(ObjectAssetMachineTest, StatusTransfer, TestSize.Level0)
+HWTEST_F(ObjectAssetMachineTest, StatusTransfer001, TestSize.Level0)
 {
     auto machine = std::make_shared<ObjectAssetMachine>();
     Asset asset{
@@ -95,33 +98,46 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer, TestSize.Level0)
         .hash = "modifyTime1_size1",
     };
     std::pair<std::string, Asset> changedAsset{ "device_1", asset };
+    changedAssets_[uri_].status = STATUS_STABLE;
     machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset);
-    // A TRANSFER_FINISHED event will be posted in the callback of the migrated file, therefore, the state will be
-    // STATUS_STABLE.
-    ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE);
+    ASSERT_EQ(changedAssets_[uri_].status, STATUS_TRANSFERRING);
+    ASSERT_EQ(changedAssets_[uri_].deviceId, changedAsset.first);
+    ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash);
+}
 
-    changedAsset.first = "device_2";
-    changedAsset.second.hash = "modifyTime2_size2";
+/**
+* @tc.name: StatusTransfer002
+* @tc.desc: Remote changed when transferring.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: whj
+*/
+HWTEST_F(ObjectAssetMachineTest, StatusTransfer002, TestSize.Level0)
+{
+    auto machine = std::make_shared<ObjectAssetMachine>();
+    Asset asset{
+        .name = "test_name",
+        .uri = uri_,
+        .modifyTime = "modifyTime2",
+        .size = "size2",
+        .hash = "modifyTime2_size2",
+    };
+    std::pair<std::string, Asset> changedAsset{ "device_2", asset };
+    changedAssets_[uri_].status = STATUS_TRANSFERRING;
     machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset);
-    ASSERT_EQ(changedAssets_[uri_].asset.hash, "modifyTime2_size2");
-    ASSERT_EQ(changedAssets_[uri_].deviceId, "device_2");
-
-    machine->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset);
-
-    ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE);
-
-    machine->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset);
-    ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE);
+    ASSERT_EQ(changedAssets_[uri_].status, STATUS_WAIT_TRANSFER);
+    ASSERT_EQ(changedAssets_[uri_].deviceId, changedAsset.first);
+    ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash);
 }
 
 /**
-* @tc.name: StatusTransfer001
-* @tc.desc: No conflict scenarios. Normal object Migration and cloud synchronization processes.
+* @tc.name: StatusTransfer003
+* @tc.desc: Compensate transfer in conflict scenario.
 * @tc.type: FUNC
 * @tc.require:
 * @tc.author: whj
 */
-HWTEST_F(ObjectAssetMachineTest, StatusTransfer001, TestSize.Level0)
+HWTEST_F(ObjectAssetMachineTest, StatusTransfer003, TestSize.Level0)
 {
     auto machine = std::make_shared<ObjectAssetMachine>();
     Asset asset{
@@ -132,20 +148,46 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer001, TestSize.Level0)
         .hash = "modifyTime1_size1",
     };
     std::pair<std::string, Asset> changedAsset{ "device_1", asset };
-    machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset);
-    ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash);
-    ASSERT_EQ(changedAssets_[uri_].deviceId, "device_1");
+    changedAssets_[uri_].status = STATUS_WAIT_TRANSFER;
+    changedAssets_[uri_].deviceId = "device_2";
+    changedAssets_[uri_].asset.hash = "modifyTime2_size2";
+    machine->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset, changedAsset);
+    ASSERT_EQ(changedAssets_[uri_].status, STATUS_TRANSFERRING);
+    ASSERT_EQ(changedAssets_[uri_].deviceId, "device_2");
+    ASSERT_EQ(changedAssets_[uri_].asset.hash, "modifyTime2_size2");
+}
+
+/**
+* @tc.name: StatusTransfer004
+* @tc.desc: Transfer finished.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: whj
+*/
+HWTEST_F(ObjectAssetMachineTest, StatusTransfer004, TestSize.Level0)
+{
+    auto machine = std::make_shared<ObjectAssetMachine>();
+    Asset asset{
+        .name = "test_name",
+        .uri = uri_,
+        .modifyTime = "modifyTime2",
+        .size = "size2",
+        .hash = "modifyTime2_size2",
+    };
+    std::pair<std::string, Asset> changedAsset{ "device_2", asset };
+    changedAssets_[uri_].status = STATUS_TRANSFERRING;
+    machine->DFAPostEvent(TRANSFER_FINISHED, changedAssets_[uri_], asset, changedAsset);
     ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE);
 }
 
 /**
-* @tc.name: StatusTransfer002
+* @tc.name: StatusUpload001
 * @tc.desc: No conflict scenarios: normal cloud sync.
 * @tc.type: FUNC
 * @tc.require:
 * @tc.author: whj
 */
-HWTEST_F(ObjectAssetMachineTest, StatusTransfer002, TestSize.Level0)
+HWTEST_F(ObjectAssetMachineTest, StatusUpload001, TestSize.Level0)
 {
     auto machine = std::make_shared<ObjectAssetMachine>();
     Asset asset{
@@ -164,13 +206,13 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer002, TestSize.Level0)
 }
 
 /**
-* @tc.name: StatusTransfer003
+* @tc.name: StatusUpload002
 * @tc.desc: Conflict scenario: Upload before transfer.
 * @tc.type: FUNC
 * @tc.require:
 * @tc.author: whj
 */
-HWTEST_F(ObjectAssetMachineTest, StatusTransfer003, TestSize.Level0)
+HWTEST_F(ObjectAssetMachineTest, StatusUpload002, TestSize.Level0)
 {
     auto machine = std::make_shared<ObjectAssetMachine>();
     Asset asset{
@@ -187,9 +229,8 @@ HWTEST_F(ObjectAssetMachineTest, StatusTransfer003, TestSize.Level0)
     machine->DFAPostEvent(REMOTE_CHANGED, changedAssets_[uri_], asset, changedAsset);
     ASSERT_EQ(changedAssets_[uri_].status, STATUS_WAIT_TRANSFER);
     ASSERT_EQ(changedAssets_[uri_].asset.hash, asset.hash);
-    ASSERT_EQ(changedAssets_[uri_].deviceId, "device_1");
 
     machine->DFAPostEvent(UPLOAD_FINISHED, changedAssets_[uri_], asset);
-    ASSERT_EQ(changedAssets_[uri_].status, STATUS_STABLE);
+    ASSERT_EQ(changedAssets_[uri_].status, STATUS_TRANSFERRING);
 }
 } // namespace OHOS::Test
diff --git a/datamgr_service/services/distributeddataservice/service/test/rdb_service_impl_test.cpp b/datamgr_service/services/distributeddataservice/service/test/rdb_service_impl_test.cpp
index 8dc6e121ee266f3ac63b94335f3ec2bd689abbc6..0bc7579af1adc0c56b12a61f6561523fb13bbb3f 100644
--- a/datamgr_service/services/distributeddataservice/service/test/rdb_service_impl_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/rdb_service_impl_test.cpp
@@ -83,7 +83,13 @@ public:
     {
         return true;
     }
+    bool SetDistrustInfo(const CheckerManager::Distrust &distrust) override {
+        return true;
+    };
 
+    bool IsDistrust(const CheckerManager::StoreInfo &info) override {
+        return true;
+    }
 private:
     static TestChecker instance_;
 };
@@ -157,7 +163,7 @@ void RdbServiceImplTest::SetUpTestCase(void) {
     AutoCache::GetInstance().RegCreator(RDB_DEVICE_COLLABORATION, [](const StoreMetaData &metaData) -> GeneralStore* {
         return new (std::nothrow) GeneralStoreMock(metaData);
     });
-    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, nullptr);
+    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr);
     std::vector<std::string> checks{ CHECK_NAME };
     CheckerManager::GetInstance().LoadCheckers(checks);
     FeatureSystem::GetInstance().GetCreator("relational_store")();
diff --git a/datamgr_service/services/distributeddataservice/service/test/unittest/cloud/cloud_data_test.cpp b/datamgr_service/services/distributeddataservice/service/test/unittest/cloud/cloud_data_test.cpp
index 5f73785b7b4489143bdf3e9cafafcf20f8a92564..1923bf4355e7e52dc1763562ac787d3dfd47cbf9 100644
--- a/datamgr_service/services/distributeddataservice/service/test/unittest/cloud/cloud_data_test.cpp
+++ b/datamgr_service/services/distributeddataservice/service/test/unittest/cloud/cloud_data_test.cpp
@@ -147,7 +147,7 @@ StoreMetaData CloudDataTest::GetStoreMetaData()
 
 void CloudDataTest::SetUpTestCase(void)
 {
-    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, nullptr);
+    MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr);
 
     FeatureSystem::GetInstance().GetCreator("cloud")();
     FeatureSystem::GetInstance().GetCreator("relational_store")();
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/store/runtime_store.cpp b/datamgr_service/services/distributeddataservice/service/udmf/store/runtime_store.cpp
index 8902a1b1ea5c70fd2d2ac688fb3840bdc95d157c..844c2ac9190356cd0b0d0001695a5234be5851e2 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/store/runtime_store.cpp
+++ b/datamgr_service/services/distributeddataservice/service/udmf/store/runtime_store.cpp
@@ -380,31 +380,48 @@ Status RuntimeStore::GetEntries(const std::string &dataPrefix, std::vector<Entry
 
 Status RuntimeStore::PutEntries(const std::vector<Entry> &entries)
 {
-    size_t size = entries.size();
-    DBStatus status;
-    for (size_t index = 0; index < size; index += MAX_BATCH_SIZE) {
-        std::vector<Entry> dbEntries(
-            entries.begin() + index, entries.begin() + std::min(index + MAX_BATCH_SIZE, size));
-        status = kvStore_->PutBatch(dbEntries);
+    DBStatus status = kvStore_->StartTransaction();
+    if (status != DBStatus::OK) {
+        ZLOGE("start transaction failed, status: %{public}d.", status);
+        return E_DB_ERROR;
+    }
+    status = kvStore_->PutBatch(entries);
+    if (status != DBStatus::OK) {
+        ZLOGE("putBatch failed, status: %{public}d.", status);
+        status = kvStore_->Rollback();
         if (status != DBStatus::OK) {
-            ZLOGE("KvStore putBatch failed, status: %{public}d.", status);
-            return E_DB_ERROR;
+            ZLOGE("rollback failed, status: %{public}d.", status);
         }
+        return E_DB_ERROR;
+    }
+    status = kvStore_->Commit();
+    if (status != DBStatus::OK) {
+        ZLOGE("commit failed, status: %{public}d.", status);
+        return E_DB_ERROR;
     }
     return E_OK;
 }
 
 Status RuntimeStore::DeleteEntries(const std::vector<Key> &keys)
 {
-    size_t size = keys.size();
-    DBStatus status;
-    for (size_t index = 0; index < size; index += MAX_BATCH_SIZE) {
-        std::vector<Key> dbKeys(keys.begin() + index, keys.begin() + std::min(index + MAX_BATCH_SIZE, size));
-        status = kvStore_->DeleteBatch(dbKeys);
+    DBStatus status = kvStore_->StartTransaction();
+    if (status != DBStatus::OK) {
+        ZLOGE("start transaction failed, status: %{public}d.", status);
+        return E_DB_ERROR;
+    }
+    status = kvStore_->DeleteBatch(keys);
+    if (status != DBStatus::OK) {
+        ZLOGE("deleteBatch failed, status: %{public}d.", status);
+        status = kvStore_->Rollback();
         if (status != DBStatus::OK) {
-            ZLOGE("KvStore deleteBatch failed, status: %{public}d.", status);
-            return E_DB_ERROR;
+            ZLOGE("rollback failed, status: %{public}d.", status);
         }
+        return E_DB_ERROR;
+    }
+    status = kvStore_->Commit();
+    if (status != DBStatus::OK) {
+        ZLOGE("commit failed, status: %{public}d.", status);
+        return E_DB_ERROR;
     }
     return E_OK;
 }
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.cpp b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
index 220050529ec633348913ff32384f8ca8828904ce..110319038a80f8f6d39faf7644a5d2382f7bc6c6 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
+++ b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.cpp
@@ -472,6 +472,38 @@ int32_t UdmfServiceImpl::Sync(const QueryOption &query, const std::vector<std::s
     return E_OK;
 }
 
+int32_t UdmfServiceImpl::IsRemoteData(const QueryOption &query, bool &result)
+{
+    UnifiedKey key(query.key);
+    if (!key.IsValid()) {
+        ZLOGE("Unified key: %{public}s is invalid.", query.key.c_str());
+        return E_INVALID_PARAMETERS;
+    }
+
+    auto store = StoreCache::GetInstance().GetStore(key.intention);
+    if (store == nullptr) {
+        ZLOGE("Get store failed, intention: %{public}s.", key.intention.c_str());
+        return E_DB_ERROR;
+    }
+
+    UnifiedData unifiedData;
+    if (store->Get(query.key, unifiedData) != E_OK) {
+        ZLOGE("Store get unifiedData failed, intention: %{public}s.", key.intention.c_str());
+        return E_DB_ERROR;
+    }
+    std::shared_ptr<Runtime> runtime = unifiedData.GetRuntime();
+    if (runtime == nullptr) {
+        ZLOGE("Store get runtime failed, key: %{public}s.", query.key.c_str());
+        return E_DB_ERROR;
+    }
+
+    std::string localDeviceId = PreProcessUtils::GetLocalDeviceId();
+    if (localDeviceId != runtime->deviceId) {
+        result = true;
+    }
+    return E_OK;
+}
+
 int32_t UdmfServiceImpl::OnInitialize()
 {
     ZLOGD("start");
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.h b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.h
index aac010bcef2acb5bde5cdef4c64dc928a0dbeacb..c1225340434989589b978542254d057b19e6604b 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.h
+++ b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_impl.h
@@ -45,6 +45,7 @@ public:
     int32_t GetSummary(const QueryOption &query, Summary &summary) override;
     int32_t AddPrivilege(const QueryOption &query, Privilege &privilege) override;
     int32_t Sync(const QueryOption &query, const std::vector<std::string> &devices) override;
+    int32_t IsRemoteData(const QueryOption &query, bool &result) override;
     int32_t OnInitialize() override;
     int32_t OnBind(const BindInfo &bindInfo) override;
 
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.cpp b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.cpp
index 018fe837292fba6c5e7c40b51fbbab934dafe585..94a4f6af203ada690a8b6241ce475ecf63b02a4a 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.cpp
+++ b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.cpp
@@ -200,5 +200,21 @@ int32_t UdmfServiceStub::OnSync(MessageParcel &data, MessageParcel &reply)
     }
     return E_OK;
 }
+
+int32_t UdmfServiceStub::OnIsRemoteData(MessageParcel &data, MessageParcel &reply)
+{
+    QueryOption query;
+    if (!ITypesUtil::Unmarshal(data, query)) {
+        ZLOGE("Unmarshal query failed");
+        return E_READ_PARCEL_ERROR;
+    }
+    bool result = false;
+    int32_t status = IsRemoteData(query, result);
+    if (!ITypesUtil::Marshal(reply, status, result)) {
+        ZLOGE("Marshal IsRemoteData result failed, key: %{public}s", query.key.c_str());
+        return E_WRITE_PARCEL_ERROR;
+    }
+    return E_OK;
+}
 } // namespace UDMF
 } // namespace OHOS
\ No newline at end of file
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.h b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.h
index 908d64cafae4c094d4a114ba1bc1b2d3038b61f7..90967b432899f5a8f13b98864c6fde1f961deeb1 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.h
+++ b/datamgr_service/services/distributeddataservice/service/udmf/udmf_service_stub.h
@@ -44,6 +44,7 @@ private:
     int32_t OnGetSummary(MessageParcel &data, MessageParcel &reply);
     int32_t OnAddPrivilege(MessageParcel &data, MessageParcel &reply);
     int32_t OnSync(MessageParcel &data, MessageParcel &reply);
+    int32_t OnIsRemoteData(MessageParcel &data, MessageParcel &reply);
 
     using Handler = int32_t (UdmfServiceStub::*)(MessageParcel &data, MessageParcel &reply);
     static constexpr Handler HANDLERS[static_cast<uint32_t>(UdmfServiceInterfaceCode::CODE_BUTT)] = {
@@ -54,7 +55,8 @@ private:
         &UdmfServiceStub::OnDeleteData,
         &UdmfServiceStub::OnGetSummary,
         &UdmfServiceStub::OnAddPrivilege,
-        &UdmfServiceStub::OnSync
+        &UdmfServiceStub::OnSync,
+        &UdmfServiceStub::OnIsRemoteData
     };
 };
 } // namespace UDMF
diff --git a/datamgr_service/services/distributeddataservice/service/udmf/utd/custom_utd_installer.cpp b/datamgr_service/services/distributeddataservice/service/udmf/utd/custom_utd_installer.cpp
index f8ecffbb5e11b3c091e076bb8a367fed87fc8da0..31944b7757fc09ce9a3710f4232b334051b851f9 100644
--- a/datamgr_service/services/distributeddataservice/service/udmf/utd/custom_utd_installer.cpp
+++ b/datamgr_service/services/distributeddataservice/service/udmf/utd/custom_utd_installer.cpp
@@ -155,7 +155,7 @@ CustomUtdCfgs CustomUtdInstaller::GetModuleCustomUtdTypes(const std::string &bun
     auto status = bundlemgr->GetJsonProfile(AppExecFwk::ProfileType::UTD_SDT_PROFILE, bundleName, moduleName, jsonStr,
         user);
     if (status != NO_ERROR) {
-        ZLOGE("get json profile failed, bundleName: %{public}s.", bundleName.c_str());
+        ZLOGD("get json profile failed, bundleName: %{public}s.", bundleName.c_str());
         return typeCfgs;
     }
     if (jsonStr.empty()) {
diff --git a/interface_sdk/api/@ohos.data.relationalStore.d.ts b/interface_sdk/api/@ohos.data.relationalStore.d.ts
index 3c368e9d8594dda68cafd17270f85fb11ec0a57d..3186ffdca769aa86196f0f5d7ada028b4dfa5905 100644
--- a/interface_sdk/api/@ohos.data.relationalStore.d.ts
+++ b/interface_sdk/api/@ohos.data.relationalStore.d.ts
@@ -3101,6 +3101,21 @@ declare namespace relationalStore {
      */
     executeSql(sql: string, bindArgs?: Array<ValueType>): Promise<void>;
 
+    /**
+     * Executes a SQL statement that contains specified parameters and returns a value of ValueType.
+     *
+     * @param { string } sql - Indicates the SQL statement to execute.
+     * @param { Array<ValueType> } args - Indicates the {@link ValueType} values of the parameters in the SQL statement. The values are strings.
+     * @returns { Promise<ValueType> } The promise returned by the function.
+     * @throws { BusinessError } 401 - Parameter error.
+     * @throws { BusinessError } 14800011 - Failed to open database by database corrupted.
+     * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit.
+     * @throws { BusinessError } 14800000 - Inner error.
+     * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core
+     * @since 12
+     */
+    execute(sql: string, args?: Array<ValueType>): Promise<ValueType>;
+
     /**
      * BeginTransaction before execute your sql.
      *
diff --git a/kv_store/CMakeLists.txt b/kv_store/CMakeLists.txt
index 00a795362abb62e6e2cc3266f84955982272666d..797eeddba2a9c24eebf2dbf708a05aa28b612d6b 100644
--- a/kv_store/CMakeLists.txt
+++ b/kv_store/CMakeLists.txt
@@ -3,4 +3,5 @@ project(kv_store)
 
 add_subdirectory(frameworks/libs)
 add_subdirectory(frameworks/libs/distributeddb/gaussdb_rd)
-add_subdirectory(frameworks)
\ No newline at end of file
+add_subdirectory(frameworks)
+add_subdirectory(databaseutils)
\ No newline at end of file
diff --git a/kv_store/bundle.json b/kv_store/bundle.json
index a1e55e77215458aae61c0dbb495021078ff40ac0..24e256fcd29499d68fa28ca094c28e6fa26e8974 100644
--- a/kv_store/bundle.json
+++ b/kv_store/bundle.json
@@ -86,7 +86,8 @@
         "//foundation/distributeddatamgr/kv_store/kvstoremock/interfaces/jskits/distributeddata:build_module",
         "//foundation/distributeddatamgr/kv_store/interfaces/jskits/distributedkvstore:build_module",
         "//foundation/distributeddatamgr/kv_store/kvstoremock/interfaces/jskits/distributedkvstore:build_module",
-        "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_client_sync"
+        "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_client_sync",
+        "//foundation/distributeddatamgr/kv_store/databaseutils:database_utils"
       ],
       "inner_kits": [
         {
@@ -194,6 +195,15 @@
             ],
             "header_base": "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/include/distributeddb"
           }
+        },
+        {
+          "name": "//foundation/distributeddatamgr/kv_store/databaseutils:database_utils",
+          "header": {
+            "header_files": [
+              "acl.h"
+            ],
+            "header_base": "//foundation/distributeddatamgr/kv_store/databaseutils/include"
+          }
         }
       ],
       "test": [
@@ -204,7 +214,8 @@
         "//foundation/distributeddatamgr/kv_store/test/unittest/distributeddata:unittest",
         "//foundation/distributeddatamgr/kv_store/test/unittest/distributedKVStore:unittest",
         "//foundation/distributeddatamgr/kv_store/frameworks/common/test:unittest",
-        "//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/kvdb/test:unittest"
+        "//foundation/distributeddatamgr/kv_store/frameworks/innerkitsimpl/kvdb/test:unittest",
+        "//foundation/distributeddatamgr/kv_store/databaseutils/test:unittest"
       ]
     }
   }
diff --git a/kv_store/databaseutils/BUILD.gn b/kv_store/databaseutils/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..a58428473c48c9fdee38f4a6bd51ee3f51a5bbc8
--- /dev/null
+++ b/kv_store/databaseutils/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright (c) 2024 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos.gni")
+import("//foundation/distributeddatamgr/kv_store/kv_store.gni")
+
+config("database_utils_config") {
+  visibility = [ ":*" ]
+  include_dirs = [
+    "include",
+    "${kv_store_base_path}/frameworks/common",
+  ]
+}
+
+config("database_utils_public_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "include" ]
+}
+
+base_sources = [ "src/acl.cpp" ]
+
+ohos_shared_library("database_utils") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+  sources = base_sources
+
+  configs = [ ":database_utils_config" ]
+  cflags_cc = [ "-fvisibility=hidden" ]
+  public_configs = [ ":database_utils_public_config" ]
+  external_deps = [ "hilog:libhilog" ]
+  public_external_deps = [ "bounds_checking_function:libsec_shared" ]
+  subsystem_name = "distributeddatamgr"
+  part_name = "kv_store"
+}
diff --git a/kv_store/databaseutils/CMakeLists.txt b/kv_store/databaseutils/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..997988f65ad67ed834d10d6f5cbb7375f753bb77
--- /dev/null
+++ b/kv_store/databaseutils/CMakeLists.txt
@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.11.2)
+project(kvdb)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -Wattributes")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../mock)
+add_definitions(-DNAPI_EXPERIMENTAL)
+
+# 设置名为databaseUtilsSrc的源代码目录
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src databaseUtilsSrc)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include(${MOCK_DIR}/include/CMakeLists.txt)
+
+# 创建一个名为databaseUtils的共享库，源代码路径是${databaseUtilsSrc}
+add_library(databaseUtils SHARED ${databaseUtilsSrc})
+
+# 对外暴露的头文件，Public表示我依赖，外部依赖本so以后也可以直接引头文件，private表示不能
+target_include_directories(databaseUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(databaseUtils PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../frameworks/common/)
+
+# 前者依赖后者，后边有多个时表示第一个依赖后边所有的
+target_link_libraries(databaseUtils mock)
diff --git a/kv_store/databaseutils/include/acl.h b/kv_store/databaseutils/include/acl.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc60ca9c2641e276aaf4108961e3bbbdbc62b2cf
--- /dev/null
+++ b/kv_store/databaseutils/include/acl.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
+#define OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
+
+#include <memory>
+#include <set>
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+
+#include "visibility.h"
+namespace OHOS {
+namespace DATABASE_UTILS {
+/*
+ * ACL tag values
+ */
+enum class ACL_TAG : uint16_t {
+    UNDEFINED = 0x00,
+    USER_OBJ = 0x01,
+    USER = 0x02,
+    GROUP_OBJ = 0x04,
+    GROUP = 0x08,
+    MASK = 0x10,
+    OTHER = 0x20,
+};
+
+/*
+ * ACL perm values
+ */
+class ACL_PERM {
+public:
+    uint16_t value_ = 0;
+    enum Value : uint16_t {
+        READ = 0x04,
+        WRITE = 0x02,
+        EXECUTE = 0x01,
+    };
+
+public:
+    ACL_PERM() = default;
+    ACL_PERM(const uint16_t x)
+    {
+        value_ = (x & READ) | (x & WRITE) | (x & EXECUTE);
+    }
+    void SetR() { value_ |= READ; }
+    void SetW() { value_ |= WRITE; }
+    void SetE() { value_ |= EXECUTE; }
+    bool IsReadable() const { return (value_ & READ) == READ; }
+    bool IsWritable() const { return (value_ & WRITE) == WRITE; }
+    bool IsExecutable() const { return (value_ & EXECUTE) == EXECUTE; }
+    void Merge(const ACL_PERM &acl_perm) { value_ |= acl_perm.value_; }
+};
+
+
+/*
+ * ACL data structure
+ */
+struct AclXattrHeader {
+    static constexpr uint32_t ACL_EA_VERSION = 0x0002;
+    uint32_t version = ACL_EA_VERSION;
+};
+
+struct AclXattrEntry {
+    static constexpr uint32_t ACL_UNDEFINED_ID = static_cast<uint32_t>(-1);
+    ACL_TAG tag_ = ACL_TAG::UNDEFINED;
+    ACL_PERM perm_ = {};
+    uint32_t id_ = ACL_UNDEFINED_ID;
+
+    AclXattrEntry(const ACL_TAG tag, const uint32_t id, const ACL_PERM mode) : tag_(tag), perm_(mode), id_(id)
+    {
+    }
+
+    bool IsValid() const
+    {
+        if (tag_ == ACL_TAG::USER || tag_ == ACL_TAG::GROUP) {
+            return id_ != ACL_UNDEFINED_ID;
+        }
+        return tag_ != ACL_TAG::UNDEFINED;
+    }
+
+    bool operator<(const AclXattrEntry &rhs) const
+    {
+        if (tag_ == rhs.tag_) {
+            return id_ < rhs.id_;
+        }
+        return tag_ < rhs.tag_;
+    }
+
+    bool operator==(const AclXattrEntry &rhs) const
+    {
+        return tag_ == rhs.tag_ && perm_.value_ == rhs.perm_.value_ && id_ == rhs.id_;
+    }
+
+    friend inline bool operator<(const AclXattrEntry &lhs, const ACL_TAG &rhs)
+    {
+        return lhs.tag_ < rhs;
+    }
+
+    friend inline bool operator<(const ACL_TAG &lhs, const AclXattrEntry &rhs)
+    {
+        return lhs < rhs.tag_;
+    }
+};
+
+class Acl {
+public:
+    static constexpr uint16_t R_RIGHT = 4;
+    static constexpr uint16_t W_RIGHT = 2;
+    static constexpr uint16_t E_RIGHT = 1;
+
+    API_EXPORT Acl(const std::string &path);
+    Acl();
+    API_EXPORT ~Acl();
+    API_EXPORT int32_t SetDefaultGroup(const uint32_t gid, const uint16_t mode);
+    API_EXPORT int32_t SetDefaultUser(const uint32_t uid, const uint16_t mode);
+    // just for Acl Test
+    bool HasEntry(const AclXattrEntry &entry);
+
+private:
+    /*
+     * ACL extended attributes (xattr) names
+    */
+    static constexpr const char *ACL_XATTR_DEFAULT = "system.posix_acl_default";
+    static constexpr int32_t E_OK = 0;
+    static constexpr int32_t E_ERROR = -1;
+    static constexpr int32_t USER_OFFSET = 6;
+    static constexpr int32_t GROUP_OFFSET = 3;
+    static constexpr int32_t BUF_SIZE = 400;
+    static constexpr size_t ENTRIES_MAX_NUM = 100; // just heuristic
+    static constexpr size_t BUF_MAX_SIZE = sizeof(AclXattrHeader) + sizeof(AclXattrEntry) * ENTRIES_MAX_NUM;
+    bool IsEmpty();
+    int32_t SetDefault();
+    void AclFromMode();
+    void AclFromDefault();
+    void CompareInsertEntry(const AclXattrEntry &entry);
+    ACL_PERM ReCalcMaskPerm();
+    std::unique_ptr<char[]> Serialize(int32_t &bufSize);
+    int DeSerialize(const char *p, int32_t bufSize);
+    int InsertEntry(const AclXattrEntry &entry);
+    AclXattrHeader header_;
+    /*
+    * Only one entry should exist for the following types:
+    *     ACL_USER_OBJ
+    *     ACL_GROUP_OBJ
+    *     ACL_MASK
+    *     ACL_OTHER
+    * While for these types, multiple entries could exist, but one entry
+    * for each id (i.e. uid/gid):
+    *     ACL_USER
+    *     ACL_GROUP
+    */
+    std::set<AclXattrEntry, std::less<>> entries_;
+    unsigned maskDemand_ = 0;
+    std::string path_;
+    bool hasError_ = false;
+};
+} // DATABASE_UTILS
+} // namespace OHOS
+
+#endif // OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
\ No newline at end of file
diff --git a/kv_store/databaseutils/src/acl.cpp b/kv_store/databaseutils/src/acl.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4f33429697fe28017abe627432f97c69b52e3d5b
--- /dev/null
+++ b/kv_store/databaseutils/src/acl.cpp
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "DataBaseUtilsAcl"
+#include "acl.h"
+
+#include <cerrno>
+#include <cstring>
+#include <dlfcn.h>
+#include <functional>
+#include <iosfwd>
+#include <memory>
+#include <new>
+#include <sys/stat.h>
+#include <sys/xattr.h>
+#include <type_traits>
+
+#include "log_print.h"
+#include "securec.h"
+
+namespace OHOS {
+namespace DATABASE_UTILS {
+using namespace DistributedKv;
+Acl::Acl(const std::string &path) : path_(path), hasError_(false)
+{
+    /* init acl from file's defaule or mode*/
+    AclFromDefault();
+}
+
+Acl::Acl()
+{
+}
+
+ACL_PERM Acl::ReCalcMaskPerm()
+{
+    ACL_PERM perm;
+    for (const auto &e : entries_) {
+        if (e.tag_ == ACL_TAG::USER || e.tag_ == ACL_TAG::GROUP_OBJ || e.tag_ == ACL_TAG::GROUP) {
+            perm.Merge(e.perm_);
+        }
+    }
+    return perm;
+}
+
+bool Acl::IsEmpty()
+{
+    return entries_.empty();
+}
+
+void Acl::CompareInsertEntry(const AclXattrEntry &entry)
+{
+    if (entries_.count(entry)) {
+        auto it = entries_.find(entry);
+        entries_.erase(it);
+    }
+    if (entry.perm_.IsReadable() || entry.perm_.IsWritable() ||
+        entry.perm_.IsExecutable()) {
+        entries_.insert(entry);
+    }
+}
+
+int Acl::InsertEntry(const AclXattrEntry &entry)
+{
+    if (entries_.size() >= ENTRIES_MAX_NUM) {
+        return E_ERROR;
+    }
+    CompareInsertEntry(entry); // must before ReCalcMaskPerm()
+
+    maskDemand_++;
+    /*
+    * In either case there's no or already one ACL_MASK entry in the set,
+    * we need to re-calculate MASK's permission and *insert* it (to replace
+    * the old one in latter case since we can't change std::set's element
+    * in-place). So do the following unconditionally.
+    *
+    * Be warned: do _NOT_ combine the following into one line, otherwise
+    * you can't pass the !!genius!! CI coding style check.
+    */
+    CompareInsertEntry(AclXattrEntry(ACL_TAG::MASK, AclXattrEntry::ACL_UNDEFINED_ID, ReCalcMaskPerm()));
+    return E_OK;
+}
+
+std::unique_ptr<char[]> Acl::Serialize(int32_t &bufSize)
+{
+    bufSize = sizeof(AclXattrHeader) + sizeof(AclXattrEntry) * entries_.size();
+    if (bufSize > static_cast<int32_t>(BUF_MAX_SIZE)) {
+        bufSize = 0;
+        return nullptr;
+    }
+    auto buf = std::make_unique<char[]>(bufSize);
+    auto err = memcpy_s(buf.get(), bufSize, &header_, sizeof(AclXattrHeader));
+    if (err != EOK) {
+        bufSize = 0;
+        return nullptr;
+    }
+
+    int32_t restSize = bufSize - sizeof(AclXattrHeader);
+    AclXattrEntry *ptr = reinterpret_cast<AclXattrEntry *>(buf.get() + sizeof(AclXattrHeader));
+    for (const auto &e : entries_) {
+        auto err = memcpy_s(ptr++, restSize, &e, sizeof(AclXattrEntry));
+        if (err != EOK) {
+            bufSize = 0;
+            return nullptr;
+        }
+        restSize -= sizeof(AclXattrEntry);
+    }
+    return buf;
+}
+
+int Acl::DeSerialize(const char *p, int32_t bufSize)
+{
+    header_ = *reinterpret_cast<const AclXattrHeader *>(p);
+    bufSize -= sizeof(AclXattrHeader);
+    p += sizeof(AclXattrHeader);
+
+    /*
+     * `e->tag != ACL_TAG::UNDEFINED` is unreliable outside the buffer, so check
+     * it after checking the size of remaining buffer.
+     */
+    for (const AclXattrEntry *e = reinterpret_cast<const AclXattrEntry *>(p);
+            bufSize >= static_cast<int32_t>(sizeof(AclXattrEntry)) && e->tag_ != ACL_TAG::UNDEFINED;
+            e++) {
+        InsertEntry(*e);
+        bufSize -= sizeof(AclXattrEntry);
+    }
+    if (bufSize < 0) {
+        entries_.clear();
+        header_ = { 0 };
+        return -1;
+    }
+
+    return 0;
+}
+
+void Acl::AclFromDefault()
+{
+    char buf[BUF_SIZE] = { 0 };
+    ssize_t len = getxattr(path_.c_str(), ACL_XATTR_DEFAULT, buf, BUF_SIZE);
+    if (len != -1) {
+        DeSerialize(buf, BUF_SIZE);
+    } else if (errno == ENODATA) {
+        AclFromMode();
+    } else {
+        hasError_ = true;
+        ZLOGW("getxattr failed. error %{public}s path %{public}s", std::strerror(errno), path_.c_str());
+    }
+}
+
+void Acl::AclFromMode()
+{
+    struct stat st;
+    if (stat(path_.c_str(), &st) == -1) {
+        return;
+    }
+
+    InsertEntry(AclXattrEntry(ACL_TAG::USER_OBJ, AclXattrEntry::ACL_UNDEFINED_ID,
+        (st.st_mode & S_IRWXU) >> USER_OFFSET));
+    InsertEntry(AclXattrEntry(ACL_TAG::GROUP_OBJ, AclXattrEntry::ACL_UNDEFINED_ID,
+        (st.st_mode & S_IRWXG) >> GROUP_OFFSET));
+    InsertEntry(AclXattrEntry(ACL_TAG::OTHER, AclXattrEntry::ACL_UNDEFINED_ID,
+        (st.st_mode & S_IRWXO)));
+}
+
+int32_t Acl::SetDefault()
+{
+    if (IsEmpty()) {
+        ZLOGE("Failed to generate ACL from file's mode: %{public}s", std::strerror(errno));
+        return E_ERROR;
+    }
+
+    /* transform to binary and write to file */
+    int32_t bufSize;
+    auto buf = Serialize(bufSize);
+    if (buf == nullptr) {
+        ZLOGE("Failed to serialize ACL into binary: %{public}s", std::strerror(errno));
+        return E_ERROR;
+    }
+    if (setxattr(path_.c_str(), ACL_XATTR_DEFAULT, buf.get(), bufSize, 0) == -1) {
+        ZLOGE("Failed to write into file's xattr: %{public}s", std::strerror(errno));
+        return E_ERROR;
+    }
+    return E_OK;
+}
+
+int32_t Acl::SetDefaultGroup(const uint32_t gid, const uint16_t mode)
+{
+    return InsertEntry(AclXattrEntry(ACL_TAG::GROUP, gid, mode));
+}
+
+int32_t Acl::SetDefaultUser(const uint32_t uid, const uint16_t mode)
+{
+    return InsertEntry(AclXattrEntry(ACL_TAG::USER, uid, mode));
+}
+
+Acl::~Acl()
+{
+    if (!hasError_) {
+        SetDefault();
+    }
+}
+
+bool Acl::HasEntry(const AclXattrEntry &Acl)
+{
+    return entries_.find(Acl) != entries_.end();
+}
+}
+}
\ No newline at end of file
diff --git a/kv_store/databaseutils/test/BUILD.gn b/kv_store/databaseutils/test/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..805e13f5764071e2e19d937f8f0b5a696d146396
--- /dev/null
+++ b/kv_store/databaseutils/test/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright (c) 2024 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/test.gni")
+import("//foundation/distributeddatamgr/kv_store/kv_store.gni")
+
+module_output_path = "kv_store/databaseutils"
+config("database_utils_config") {
+  visibility = [ ":*" ]
+
+  include_dirs = [
+    "../include",
+    "${kv_store_base_path}/frameworks/common",
+  ]
+}
+
+ohos_unittest("DataBaseUtilsTest") {
+  module_out_path = module_output_path
+
+  sources = [ "acl_test.cpp" ]
+  sources += [ "../src/acl.cpp" ]
+
+  configs = [ ":database_utils_config" ]
+
+  external_deps = [ "hilog:libhilog" ]
+  public_external_deps = [
+    "bounds_checking_function:libsec_shared",
+    "googletest:gtest",
+  ]
+}
+
+group("unittest") {
+  testonly = true
+
+  deps = []
+  deps += [ ":DataBaseUtilsTest" ]
+}
+###############################################################################
diff --git a/kv_store/databaseutils/test/acl_test.cpp b/kv_store/databaseutils/test/acl_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..aa83c9733f2843cbf53b0ea7cd2bfbf0dca269fa
--- /dev/null
+++ b/kv_store/databaseutils/test/acl_test.cpp
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "acl.h"
+
+#include <dlfcn.h>
+#include <fcntl.h>
+#include <string>
+#include <sys/xattr.h>
+#include <unistd.h>
+#include "gtest/gtest.h"
+#include "securec.h"
+using namespace testing::ext;
+namespace OHOS::Test {
+using namespace DATABASE_UTILS;
+class AclTest : public testing::Test {
+public:
+    static constexpr const char *PATH_ABC = "/data/test/abc";
+    static constexpr const char *PATH_ABC_XIAOMING = "/data/test/abc/xiaoming";
+    static constexpr const char *PATH_ABC_XIAOMING_TEST = "/data/test/abc/xiaoming/test.txt";
+    static constexpr const char *DATA = "SetDefaultUserTest";
+    static constexpr int UID = 2024;
+    static void SetUpTestCase(void);
+    static void TearDownTestCase(void);
+    void SetUp();
+    void TearDown();
+    void PreOperation() const;
+};
+
+void AclTest::SetUpTestCase(void)
+{
+}
+
+void AclTest::TearDownTestCase(void)
+{
+}
+
+// input testcase setup step，setup invoked before each testcases
+void AclTest::SetUp(void)
+{
+    (void)remove(PATH_ABC);
+}
+
+// input testcase teardown step，teardown invoked after each testcases
+void AclTest::TearDown(void)
+{
+    (void)remove(PATH_ABC);
+}
+
+void AclTest::PreOperation() const
+{
+    mode_t mode = S_IRWXU | S_IRWXG | S_IXOTH; // 0771
+    int res = mkdir(PATH_ABC, mode);
+    EXPECT_EQ(res, 0) << "directory creation failed." << std::strerror(errno);
+
+    Acl acl(PATH_ABC);
+    acl.SetDefaultUser(UID, Acl::R_RIGHT | Acl::W_RIGHT);
+    acl.SetDefaultGroup(UID, Acl::R_RIGHT | Acl::W_RIGHT);
+
+    res = mkdir(PATH_ABC_XIAOMING, mode);
+    EXPECT_EQ(res, 0) << "directory creation failed." << std::strerror(errno);
+
+    int fd = open(PATH_ABC_XIAOMING_TEST, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+    EXPECT_NE(fd, -1) << "open file failed." << std::strerror(errno);
+    res = write(fd, DATA, strlen(DATA));
+    EXPECT_NE(res, -1) << "write failed." << std::strerror(errno);
+    res = fsync(fd);
+    EXPECT_NE(res, -1) << "fsync failed." << std::strerror(errno);
+    close(fd);
+}
+
+/**
+* @tc.name: SetDefaultGroup001
+* @tc.desc: Set default extended properties for groups.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Jiaxing Chang
+*/
+HWTEST_F(AclTest, SetDefaultGroup001, TestSize.Level0)
+{
+    mode_t mode = S_IRWXU | S_IRWXG | S_IXOTH; // 0771
+    int res = mkdir(PATH_ABC, mode);
+    EXPECT_EQ(res, 0) << "directory creation failed.";
+    int rc = Acl(PATH_ABC).SetDefaultGroup(UID, Acl::R_RIGHT | Acl::W_RIGHT);
+    EXPECT_EQ(rc, 0);
+
+    Acl aclNew(PATH_ABC);
+    AclXattrEntry entry(ACL_TAG::GROUP, UID, Acl::R_RIGHT | Acl::W_RIGHT);
+    ASSERT_TRUE(aclNew.HasEntry(entry));
+}
+
+/**
+* @tc.name: SetDefaultpUser001
+* @tc.desc: Set default extended properties for user.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Jiaxing Chang
+*/
+HWTEST_F(AclTest, SetDefaultUser001, TestSize.Level0)
+{
+    mode_t mode = S_IRWXU | S_IRWXG | S_IXOTH; // 0771
+    int res = mkdir(PATH_ABC, mode);
+    EXPECT_EQ(res, 0) << "directory creation failed.";
+    int rc = Acl(PATH_ABC).SetDefaultUser(UID, Acl::R_RIGHT | Acl::W_RIGHT);
+    EXPECT_EQ(rc, 0);
+
+    Acl aclNew(PATH_ABC);
+    AclXattrEntry entry(ACL_TAG::USER, UID, Acl::R_RIGHT | Acl::W_RIGHT);
+    ASSERT_TRUE(aclNew.HasEntry(entry));
+}
+
+/**
+* @tc.name: SetDefaultUser002
+* @tc.desc: After the main process extends the uid attribute, set this uid to the uid and gid of the child process,
+* and the child process can access the files created by the main process normally.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: Jiaxing Chang
+*/
+HWTEST_F(AclTest, SetDefaultUser002, TestSize.Level0)
+{
+    PreOperation();
+    int fd[2];
+    pid_t pid;
+    char buf[100];
+    int res = pipe(fd);
+    ASSERT_TRUE(res >= 0) << "create pipe failed." << std::strerror(errno);
+    pid = fork();
+    ASSERT_TRUE(pid >= 0) << "fork failed." << std::strerror(errno);
+    if (pid == 0) { // subprocess
+        // close the read end of the pipeline.
+        close(fd[0]);
+        // redirect standard output to the write end of the pipeline
+        dup2(fd[1], STDOUT_FILENO);
+        auto exitFun = [&fd](const std::string &str, bool isErr) {
+            std::cout << str << (isErr ? std::strerror(errno) : "") << std::endl;
+            close(fd[1]);
+            _exit(0);
+        };
+        if (setuid(UID) != 0) {
+            exitFun("setuid failed.", true);
+        }
+        if (setgid(UID) != 0) {
+            exitFun("setgid failed.", true);
+        }
+        int file = open(PATH_ABC_XIAOMING_TEST, O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+        if (file == -1) {
+            exitFun("open file failed.", true);
+        }
+        if (read(file, buf, sizeof(buf)) == -1) {
+            close(file);
+            exitFun("read failed.", true);
+        }
+        close(file);
+        exitFun(buf, false);
+    } else { // main process
+        // close the write end of the pipeline.
+        close(fd[1]);
+        int status;
+        res = waitpid(pid, &status, 0);
+        EXPECT_NE(res, -1) << "waitpid falied." << std::strerror(errno);
+        res = memset_s(buf, sizeof(buf), 0, sizeof(buf));
+        EXPECT_EQ(res, EOK) << "memset_s falied." << std::strerror(errno);
+        res = read(fd[0], buf, sizeof(buf));
+        EXPECT_NE(res, -1) << "read falied." << std::strerror(errno);
+        EXPECT_EQ(std::string(buf, buf + strlen(buf) - 1), std::string(DATA)) << "buffer:[" << buf << "]";
+        close(fd[0]);
+    }
+}
+} // namespace OHOS::Test
\ No newline at end of file
diff --git a/kv_store/frameworks/CMakeLists.txt b/kv_store/frameworks/CMakeLists.txt
index a78af1d470112c44ef8ee18dcfcb7a3744898861..33ed5518a761b4bfcc8c24c5c7fff7beac4c6433 100644
--- a/kv_store/frameworks/CMakeLists.txt
+++ b/kv_store/frameworks/CMakeLists.txt
@@ -16,7 +16,6 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/innerkitsimpl/kvdb/src kvdbSrc)
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/jskitsimpl/distributedkvstore/src jsKVSrc)
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/jskitsimpl/distributeddata/src jsDataSrc)
 
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils_native/base/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../utils_native/safwk/native/include)
 include(${MOCK_DIR}/include/CMakeLists.txt OPTIONAL)
@@ -25,9 +24,10 @@ set(links secure mock distributeddb)
 add_library(kvdb SHARED ${kvdbSrc})
 add_library(jskvdb SHARED ${jsKVSrc})
 add_library(jsolddb SHARED ${jsDataSrc})
-target_link_libraries(kvdb ${links})
+target_link_libraries(kvdb ${links} databaseUtils)
 target_include_directories(kvdb PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/innerkits/distributeddata/include)
 target_include_directories(kvdb PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/innerkits/distributeddatamgr/include)
+target_include_directories(kvdb PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../databaseutils/include)
 target_include_directories(kvdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/common)
 target_include_directories(kvdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/innerkitsimpl/distributeddatafwk/include)
 target_include_directories(kvdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/innerkitsimpl/distributeddatasvc/include)
diff --git a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
index dc43f1adaec3661e4aca8ee8ffeac88b88c058ba..da2bc0c87c9fdcec714e2662f13138aa42f81637 100644
--- a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
+++ b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/BUILD.gn
@@ -45,6 +45,9 @@ ohos_source_set("distributeddatafwk_src_file") {
   testonly = true
 
   old_sources = [
+    "../../distributeddatasvc/src/datamgr_service_proxy.cpp",
+    "../../distributeddatasvc/src/distributed_data_mgr.cpp",
+    "../../distributeddatasvc/src/kvstore_data_service_mgr.cpp",
     "../src/blob.cpp",
     "../src/change_notification.cpp",
     "../src/data_query.cpp",
@@ -70,6 +73,8 @@ ohos_source_set("distributeddatafwk_src_file") {
     "../../kvdb/src/kv_types_util.cpp",
     "../../kvdb/src/kvdb_service_client.cpp",
     "../../kvdb/src/observer_bridge.cpp",
+    "../../kvdb/src/process_communication_impl.cpp",
+    "../../kvdb/src/process_system_api_adapter_impl.cpp",
     "../../kvdb/src/security_manager.cpp",
     "../../kvdb/src/single_store_impl.cpp",
     "../../kvdb/src/store_factory.cpp",
@@ -85,6 +90,7 @@ ohos_source_set("distributeddatafwk_src_file") {
   configs = [ ":module_private_config" ]
 
   deps = [
+    "../../../../databaseutils:database_utils",
     "../../../../interfaces/innerkits/distributeddatamgr:distributeddata_mgr",
     "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb:distributeddb",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
@@ -325,6 +331,49 @@ ohos_unittest("KvstoreDatashareBridgeTest") {
   ]
 }
 
+ohos_unittest("DistributedDataMgrTest") {
+  module_out_path = module_output_path
+
+  sources = [ "unittest/distributed_data_mgr_test.cpp" ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "access_token:libaccesstoken_sdk",
+    "access_token:libnativetoken",
+    "access_token:libtoken_setproc",
+    "c_utils:utils",
+    "hilog:libhilog",
+    "ipc:ipc_single",
+    "samgr:samgr_proxy",
+  ]
+
+  deps = [
+    ":distributeddatafwk_src_file",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
+ohos_unittest("EndPointTest") {
+  module_out_path = module_output_path
+
+  sources = [ "unittest/end_point_test.cpp" ]
+
+  configs = [ ":module_private_config" ]
+
+  external_deps = [
+    "c_utils:utils",
+    "hilog:libhilog",
+    "ipc:ipc_single",
+    "samgr:samgr_proxy",
+  ]
+
+  deps = [
+    ":distributeddatafwk_src_file",
+    "//third_party/googletest:gtest_main",
+  ]
+}
+
 ###############################################################################
 group("unittest") {
   testonly = true
@@ -334,8 +383,10 @@ group("unittest") {
   deps += [
     ":BlobTest",
     ":DeviceKvStoreTest",
+    ":DistributedDataMgrTest",
     ":DistributedKvDataManagerEncryptTest",
     ":DistributedKvDataManagerTest",
+    ":EndPointTest",
     ":KvUtilTest",
     ":KvstoreDatashareBridgeTest",
     ":LocalSubscribeDeviceStoreTest",
diff --git a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_data_mgr_test.cpp b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_data_mgr_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a90678861194d5f913d91830618902aea047834f
--- /dev/null
+++ b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_data_mgr_test.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "distributed_data_mgr.h"
+#include <gtest/gtest.h>
+#include <vector>
+#include "types.h"
+#include "accesstoken_kit.h"
+#include "nativetoken_kit.h"
+#include "token_setproc.h"
+
+using namespace testing::ext;
+using namespace OHOS::DistributedKv;
+using namespace OHOS::Security::AccessToken;
+namespace OHOS::Test {
+class DistributedDataMgrTest : public testing::Test {
+public:
+    static DistributedDataMgr manager;
+    static void SetUpTestCase(void) {};
+    static void TearDownTestCase(void) {};
+    void SetUp();
+    void TearDown();
+    static constexpr int32_t TEST_USERID = 100;
+    static constexpr int32_t APP_INDEX = 0;
+    NativeTokenInfoParams infoInstance {0};
+};
+DistributedDataMgr DistributedDataMgrTest::manager;
+
+void DistributedDataMgrTest::SetUp(void)
+{
+    infoInstance.dcapsNum = 0;
+    infoInstance.permsNum = 0;
+    infoInstance.aclsNum = 0;
+    infoInstance.dcaps = nullptr;
+    infoInstance.perms = nullptr;
+    infoInstance.acls = nullptr;
+    infoInstance.processName = "KvStoreDataServiceClearTest";
+    infoInstance.aplStr = "system_core";
+
+    HapInfoParams info = {
+        .userID = TEST_USERID,
+        .bundleName = "ohos.test.demo",
+        .instIndex = 0,
+        .appIDDesc = "ohos.test.demo"
+    };
+    PermissionDef infoManagerTestPermDef = {
+        .permissionName = "ohos.permission.test",
+        .bundleName = "ohos.test.demo",
+        .grantMode = 1,
+        .availableLevel = APL_NORMAL,
+        .label = "label",
+        .labelId = 1,
+        .description = "open the door",
+        .descriptionId = 1
+    };
+    PermissionStateFull infoManagerTestState = {
+        .permissionName = "ohos.permission.test",
+        .isGeneral = true,
+        .resDeviceID = {"local"},
+        .grantStatus = {PermissionState::PERMISSION_GRANTED},
+        .grantFlags = {1}
+    };
+    HapPolicyParams policy = {
+        .apl = APL_NORMAL,
+        .domain = "test.domain",
+        .permList = {infoManagerTestPermDef},
+        .permStateList = {infoManagerTestState}
+    };
+    AccessTokenKit::AllocHapToken(info, policy);
+}
+
+void DistributedDataMgrTest::TearDown(void)
+{
+    auto tokenId = AccessTokenKit::GetHapTokenID(TEST_USERID, "ohos.test.demo", 0);
+    AccessTokenKit::DeleteToken(tokenId);
+}
+
+/**
+* @tc.name: ClearAppStorage
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(DistributedDataMgrTest, ClearAppStorage001, TestSize.Level1)
+{
+    auto tokenId = AccessTokenKit::GetHapTokenID(TEST_USERID, "ohos.test.demo", 0);
+    auto ret = manager.ClearAppStorage("ohos.test.demo", TEST_USERID, APP_INDEX, tokenId);
+    EXPECT_EQ(ret, Status::SUCCESS);
+}
+
+/**
+* @tc.name: ClearAppStorage
+* @tc.desc:
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(DistributedDataMgrTest, ClearAppStorage002, TestSize.Level1)
+{
+    auto tokenId = AccessTokenKit::GetHapTokenID(TEST_USERID, "ohos.test.fail", 0);
+    auto ret = manager.ClearAppStorage("ohos.test.demo", TEST_USERID, APP_INDEX, tokenId);
+    EXPECT_EQ(ret, Status::ERROR);
+}
+} // namespace OHOS::Test
\ No newline at end of file
diff --git a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
index 1a2c9d8aeaf78708d7aa8a9a53b8c1da7ae05707..9acca9e6496af6a99bbb8331c299ad16e859a5f9 100644
--- a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
+++ b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
@@ -20,11 +20,14 @@
 #include "kvstore_death_recipient.h"
 #include "log_print.h"
 #include "types.h"
+
 using namespace testing::ext;
 using namespace OHOS::DistributedKv;
 namespace OHOS::Test {
 class DistributedKvDataManagerTest : public testing::Test {
 public:
+    static constexpr size_t NUM_MIN = 5;
+    static constexpr size_t NUM_MAX = 12;
     static DistributedKvDataManager manager;
     static Options create;
     static Options noCreate;
@@ -79,6 +82,9 @@ void DistributedKvDataManagerTest::RemoveAllStore(DistributedKvDataManager &mana
 }
 void DistributedKvDataManagerTest::SetUpTestCase(void)
 {
+    auto executors = std::make_shared<ExecutorPool>(NUM_MAX, NUM_MIN);
+    manager.SetExecutors(executors);
+
     userId.userId = "account0";
     appId.appId = "ohos.kvdatamanager.test";
     create.createIfMissing = true;
diff --git a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/end_point_test.cpp b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/end_point_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5b5a1cbb772a1e189aadb27aa1d64611c3ca2fc5
--- /dev/null
+++ b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/end_point_test.cpp
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+#include <unistd.h>
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+#include "dev_manager.h"
+#include "distributed_kv_data_manager.h"
+#include "file_ex.h"
+#include "types.h"
+
+using namespace testing::ext;
+using namespace OHOS::DistributedKv;
+namespace OHOS::Test {
+class EndPointTest : public testing::Test {
+public:
+    static void SetUpTestCase(void);
+    static void TearDownTestCase(void);
+    void SetUp();
+    void TearDown();
+    static std::string GetKey(const std::string &key);
+    static std::shared_ptr<SingleKvStore> kvStore_; // declare kvstore instance.
+    static Status status_;
+    static std::string deviceId_;
+    static Options options_;
+};
+
+const std::string VALID_SCHEMA = "{\"SCHEMA_VERSION\":\"1.0\","
+                                 "\"SCHEMA_MODE\":\"STRICT\","
+                                 "\"SCHEMA_SKIPSIZE\":0,"
+                                 "\"SCHEMA_DEFINE\":{"
+                                 "\"age\":\"INTEGER, NOT NULL\""
+                                 "},"
+                                 "\"SCHEMA_INDEXES\":[\"$.age\"]}";
+
+std::shared_ptr<SingleKvStore> EndPointTest::kvStore_ = nullptr;
+Status EndPointTest::status_ = Status::ERROR;
+std::string EndPointTest::deviceId_;
+Options EndPointTest::options_;
+
+void EndPointTest::SetUpTestCase(void)
+{
+    DistributedKvDataManager manager;
+    options_.area = EL1;
+    options_.baseDir = std::string("/data/service/el1/public/database/odmf");
+    options_.securityLevel = S1;
+    mkdir(options_.baseDir.c_str(), (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH));
+    AppId appId = { "odmf" };
+    StoreId storeId = { "student_device" }; // define kvstore(database) name.
+    // [create and] open and initialize kvstore instance.
+    status_ = manager.GetSingleKvStore(options_, appId, storeId, kvStore_);
+    auto deviceInfo = DevManager::GetInstance().GetLocalDevice();
+    deviceId_ = deviceInfo.networkId;
+}
+
+void EndPointTest::TearDownTestCase(void)
+{
+    DistributedKvDataManager manager;
+    AppId appId = { "odmf" };
+    manager.DeleteAllKvStore(appId, options_.baseDir);
+    (void)remove("/data/service/el1/public/database/odmf/key");
+    (void)remove("/data/service/el1/public/database/odmf/kvdb");
+    (void)remove("/data/service/el1/public/database/odmf");
+}
+
+void EndPointTest::SetUp(void)
+{}
+
+void EndPointTest::TearDown(void)
+{}
+
+std::string EndPointTest::GetKey(const std::string& key)
+{
+    std::ostringstream oss;
+    oss << std::setfill('0') << std::setw(sizeof(uint32_t)) << deviceId_.length();
+    oss << deviceId_ << std::string(key.begin(), key.end());
+    return oss.str();
+}
+
+class EndpointMock : public Endpoint {
+public:
+    EndpointMock() {}
+    virtual ~EndpointMock() {}
+
+    Status Start() override
+    {
+        return Status::SUCCESS;
+    }
+
+    Status Stop() override
+    {
+        return Status::SUCCESS;
+    }
+
+    Status RegOnDataReceive(const RecvHandler &callback) override
+    {
+        return Status::SUCCESS;
+    }
+
+    Status SendData(const std::string &dtsIdentifier, const uint8_t *data, uint32_t length) override
+    {
+        return Status::SUCCESS;
+    }
+
+    uint32_t GetMtuSize(const std::string &identifier) override
+    {
+        return 1 * 1024  * 1024; // 1 * 1024 * 1024 Byte.
+    }
+
+    std::string GetLocalDeviceInfos() override
+    {
+        return "Mock Device";
+    }
+
+    bool IsSaferThanDevice(int securityLevel, const std::string &devId) override
+    {
+        return true;
+    }
+
+    bool HasDataSyncPermission(const StoreBriefInfo &param, uint8_t flag) override
+    {
+        return true;
+    }
+};
+
+/**
+* @tc.name: SetEndpoint001
+* @tc.desc: test the SetEndpoint(std::shared_ptr<Endpoint> endpoint)
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(EndPointTest, SetEndpoint001, TestSize.Level1)
+{
+    DistributedKvDataManager manager;
+    std::shared_ptr<EndpointMock> endpoint = nullptr;
+    Status status = manager.SetEndpoint(endpoint);
+    ASSERT_EQ(status, Status::INVALID_ARGUMENT);
+}
+
+/**
+* @tc.name: SetEndpoint002
+* @tc.desc: test the SetEndpoint(std::shared_ptr<Endpoint> endpoint)
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(EndPointTest, SetEndpoint002, TestSize.Level1)
+{
+    DistributedKvDataManager manager;
+    std::shared_ptr<EndpointMock> endpoint = std::make_shared<EndpointMock>();
+    Status status = manager.SetEndpoint(endpoint);
+    EXPECT_EQ(status, Status::SUCCESS);
+    status = manager.SetEndpoint(endpoint);
+    EXPECT_EQ(status, Status::SUCCESS);
+}
+
+/**
+ * @tc.name: SetIdentifier001
+ * desc: test the Status set identifier function.
+ * type: FUNC
+ * require:
+ * author:SQL
+ */
+HWTEST_F(EndPointTest, SetIdentifier001, TestSize.Level1)
+{
+    DistributedKvDataManager manager;
+    EXPECT_NE(kvStore_, nullptr) << "kvStorePtr is null.";
+    AppId appId = { "odmf" };
+    StoreId storeId = { "test_storeid" };
+    std::vector<std::string> targetDev = {"devicid1", "devicid2"};
+    std::string accountId = "testAccount";
+    std::shared_ptr<EndpointMock> endpoint = std::make_shared<EndpointMock>();
+    Status status = manager.SetEndpoint(endpoint);
+    EXPECT_EQ(status, Status::SUCCESS);
+    auto testStatus = kvStore_->SetIdentifier(accountId, appId, storeId, targetDev);
+    EXPECT_EQ(testStatus, Status::SUCCESS);
+}
+
+/**
+ * @tc.name: SetIdentifier002
+ * desc: test the Status set identifier function.
+ * type: FUNC
+ * require:
+ * author:SQL
+ */
+HWTEST_F(EndPointTest, SetIdentifier002, TestSize.Level1)
+{
+    DistributedKvDataManager manager;
+    EXPECT_NE(kvStore_, nullptr) << "kvStorePtr is null.";
+    AppId appId = { "" };
+    StoreId storeId = { "" };
+    std::vector<std::string> targetDev = {"devicid1", "devicid2"};
+    std::string accountId = "testAccount";
+    std::shared_ptr<EndpointMock> endpoint = std::make_shared<EndpointMock>();
+    Status status = manager.SetEndpoint(endpoint);
+    EXPECT_EQ(status, Status::SUCCESS);
+    auto testStatus = kvStore_->SetIdentifier(accountId, appId, storeId, targetDev);
+    EXPECT_NE(testStatus, Status::SUCCESS);
+}
+} // namespace OHOS::Test
\ No newline at end of file
diff --git a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp
index fce33602f25ce60d7dce64610ed021b7c9d4d4eb..b1e9bfd721fd590dd0d00e08734ab7e48f60c101 100644
--- a/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp
+++ b/kv_store/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_query_test.cpp
@@ -1007,4 +1007,42 @@ HWTEST_F(SingleKvStoreClientQueryTest, DataQueryDeviceIdValidField, TestSize.Lev
     query.DeviceId(deviceId);
     EXPECT_TRUE(query.ToString().length() == 0);
 }
-} // namespace
\ No newline at end of file
+
+/**
+* @tc.name: DataQuery
+* @tc.desc: the predicate is between, the value is invalid.
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author: SQL
+*/
+HWTEST_F(SingleKvStoreClientQueryTest, DataQueryBetweenInvalid, TestSize.Level1)
+{
+    DistributedKvDataManager manager;
+    Options options = { .createIfMissing = true, .encrypt = true, .autoSync = true,
+                        .kvStoreType = KvStoreType::SINGLE_VERSION, .schema =  VALID_SCHEMA_STRICT_DEFINE };
+    options.area = EL1;
+    options.securityLevel = S1;
+    options.baseDir = "/data/service/el1/public/database/SingleKvStoreClientQueryTest";
+    AppId appId = { "SingleKvStoreClientQueryTest" };
+    StoreId storeId = { "SingleKvStoreClientQueryTestStoreId3" };
+    statusGetKvStore = manager.GetSingleKvStore(options, appId, storeId, singleKvStore);
+    EXPECT_NE(singleKvStore, nullptr) << "kvStorePtr is null.";
+    singleKvStore->Put("test_key_1", "{\"name\":1}");
+    singleKvStore->Put("test_key_2", "{\"name\":2}");
+    singleKvStore->Put("test_key_3", "{\"name\":3}");
+
+    DataQuery query;
+    query.Between({}, {});
+    std::vector<Entry> results1;
+    Status status = singleKvStore->GetEntries(query, results1);
+    EXPECT_EQ(status, NOT_SUPPORT);
+
+    singleKvStore->Delete("test_key_1");
+    singleKvStore->Delete("test_key_2");
+    singleKvStore->Delete("test_key_3");
+    status = manager.CloseAllKvStore(appId);
+    EXPECT_EQ(status, Status::SUCCESS);
+    status = manager.DeleteAllKvStore(appId, options.baseDir);
+    EXPECT_EQ(status, Status::SUCCESS);
+}
+} // namespace
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/include/distributeddata_kvdb_ipc_interface_code.h b/kv_store/frameworks/innerkitsimpl/kvdb/include/distributeddata_kvdb_ipc_interface_code.h
index 0b071cf22d3440ae739bf2e290f2eec637669912..3aea619c9536e879bc2e2796b253d806fd57b971 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/include/distributeddata_kvdb_ipc_interface_code.h
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/include/distributeddata_kvdb_ipc_interface_code.h
@@ -39,6 +39,7 @@ enum class KVDBServiceInterfaceCode : uint32_t {
     TRANS_SUB,
     TRANS_UNSUB,
     TRANS_GET_PASSWORD,
+    TRANS_SYNC_EXT,
     TRANS_BUTT
 };
 } // namespace OHOS::DistributedKv
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service.h b/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service.h
index c536a468e861be6447cb3ff4403a6011629784e5..16168dfc8535436523fc92bc0b544eb242de5dee 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service.h
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service.h
@@ -49,6 +49,7 @@ public:
         const AppId &appId, const StoreId &storeId, const Options &options, const std::vector<uint8_t> &password) = 0;
     virtual Status Delete(const AppId &appId, const StoreId &storeId) = 0;
     virtual Status Sync(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) = 0;
+    virtual Status SyncExt(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) = 0;
     virtual Status RegisterSyncCallback(const AppId &appId, sptr<IKvStoreSyncCallback> callback) = 0;
     virtual Status UnregisterSyncCallback(const AppId &appId) = 0;
     virtual Status SetSyncParam(const AppId &appId, const StoreId &storeId, const KvSyncParam &syncParam) = 0;
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service_client.h b/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service_client.h
index 1efb48a4e19610815e51c01de5aefcf35cfcbd06..0739491246c8dff04ba45542ae1a8855b46a59c6 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service_client.h
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/include/kvdb_service_client.h
@@ -36,6 +36,7 @@ public:
         const std::vector<uint8_t> &password) override;
     Status Delete(const AppId &appId, const StoreId &storeId) override;
     Status Sync(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) override;
+    Status SyncExt(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo) override;
     Status RegisterSyncCallback(const AppId &appId, sptr<IKvStoreSyncCallback> callback) override;
     Status UnregisterSyncCallback(const AppId &appIdd) override;
     Status SetSyncParam(const AppId &appId, const StoreId &storeId, const KvSyncParam &syncParam) override;
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h b/kv_store/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
index cb5d44ed689744d3d972bcf0a7d01f32f3eff130..2ba7f5c315560658aff31f7a71b277bc17a26c21 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
@@ -57,6 +57,7 @@ public:
     Status SubscribeKvStore(SubscribeType type, std::shared_ptr<Observer> observer) override;
     Status UnSubscribeKvStore(SubscribeType type, std::shared_ptr<Observer> observer) override;
     Status Get(const Key &key, Value &value) override;
+    Status Get(const Key &key, const std::string &networkId, Value &value) override;
     Status GetEntries(const Key &prefix, std::vector<Entry> &entries) const override;
     Status GetEntries(const DataQuery &query, std::vector<Entry> &entries) const override;
     Status GetResultSet(const Key &prefix, std::shared_ptr<ResultSet> &resultSet) const override;
@@ -94,30 +95,36 @@ protected:
     std::shared_ptr<ObserverBridge> TakeOut(uint32_t &realType, std::shared_ptr<Observer> observer);
 
 private:
+    using Time = ExecutorPool::Time;
+    using Duration = ExecutorPool::Duration;
+
     static constexpr size_t MAX_VALUE_LENGTH = 4 * 1024 * 1024;
     static constexpr size_t MAX_OBSERVER_SIZE = 8;
+    static constexpr Duration SYNC_DURATION = std::chrono::seconds(60);
+    static constexpr int32_t INTERVAL = 500; // ms
     Status GetResultSet(const DBQuery &query, std::shared_ptr<ResultSet> &resultSet) const;
     Status GetEntries(const DBQuery &query, std::vector<Entry> &entries) const;
     Status RetryWithCheckPoint(std::function<DistributedDB::DBStatus()> lambda);
     std::function<void(ObserverBridge *)> BridgeReleaser();
     Status DoSync(const SyncInfo &syncInfo, std::shared_ptr<SyncCallback> observer);
+    Status DoSyncExt(const SyncInfo &syncInfo, std::shared_ptr<SyncCallback> observer);
     Status DoClientSync(const SyncInfo &syncInfo, std::shared_ptr<SyncCallback> observer);
     void DoAutoSync();
     void Register();
 
     bool autoSync_ = false;
     bool isClientSync_ = false;
-    int32_t ref_ = 1;
     mutable std::shared_mutex rwMutex_;
     const Convertor &convertor_;
     std::string appId_;
     std::string storeId_;
+    int32_t ref_ = 1;
     uint32_t roleType_ = 0;
+    uint64_t taskId_ = 0;
     std::shared_ptr<DBStore> dbStore_ = nullptr;
     std::shared_ptr<SyncObserver> syncObserver_ = nullptr;
     ConcurrentMap<uintptr_t, std::pair<uint32_t, std::shared_ptr<ObserverBridge>>> observers_;
-    static constexpr int32_t INTERVAL = 500; // ms
-    uint64_t taskId_ = 0;
+    ConcurrentMap<std::string, std::pair<uint64_t, Time>> timePoints_;
 };
 } // namespace OHOS::DistributedKv
 #endif // OHOS_DISTRIBUTED_DATA_FRAMEWORKS_KVDB_SINGLE_STORE_IMPL_H
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/src/kvdb_service_client.cpp b/kv_store/frameworks/innerkitsimpl/kvdb/src/kvdb_service_client.cpp
index 37e468eafceab5eb1cfb204966750fd661f1ddae..d8713b7186bbee0de9e247507f75e4d0bd48c314 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/src/kvdb_service_client.cpp
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/src/kvdb_service_client.cpp
@@ -164,6 +164,18 @@ Status KVDBServiceClient::Sync(const AppId &appId, const StoreId &storeId, const
     return static_cast<Status>(status);
 }
 
+Status KVDBServiceClient::SyncExt(const AppId &appId, const StoreId &storeId, const SyncInfo &syncInfo)
+{
+    MessageParcel reply;
+    int32_t status = IPC_SEND(static_cast<uint32_t>(KVDBServiceInterfaceCode::TRANS_SYNC_EXT), reply, appId,
+        storeId, syncInfo.seqId, syncInfo.mode, syncInfo.devices, syncInfo.delay, syncInfo.query);
+    if (status != SUCCESS) {
+        ZLOGE("status:0x%{public}x, appId:%{public}s, storeId:%{public}s, sequenceId:%{public}" PRIu64,
+            status, appId.appId.c_str(), StoreUtil::Anonymous(storeId.storeId).c_str(), syncInfo.seqId);
+    }
+    return static_cast<Status>(status);
+}
+
 Status KVDBServiceClient::RegisterSyncCallback(const AppId &appId, sptr<IKvStoreSyncCallback> callback)
 {
     MessageParcel reply;
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp b/kv_store/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
index 254bddf9e6a64efac4a06afe806d0fd85d096126..c16df6c6b5c28caea4eaecf47575e1f343b62368 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
@@ -330,6 +330,49 @@ Status SingleStoreImpl::Get(const Key &key, Value &value)
     return status;
 }
 
+Status SingleStoreImpl::Get(const Key &key, const std::string &networkId, Value &value)
+{
+    DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__));
+    auto clientUuid = DevManager::GetInstance().ToUUID(networkId);
+    if (clientUuid.empty()) {
+        return INVALID_ARGUMENT;
+    }
+    auto status = Get(key, value);
+    if (status != NOT_FOUND) {
+        return status;
+    }
+    {
+        std::shared_lock<decltype(rwMutex_)> lock(rwMutex_);
+        auto watermark = dbStore_->GetWatermarkInfo(clientUuid);
+        if (StoreUtil::ConvertStatus(watermark.first) != SUCCESS
+            || (watermark.second.sendMark != 0 && watermark.second.receiveMark != 0)) {
+            ZLOGD("Do not need sync, dbStatus:%{public}d", watermark.first);
+            return status;
+        }
+    }
+    timePoints_.Compute(clientUuid, [this, &networkId, &status](const auto &key, auto &value) {
+        auto now = std::chrono::steady_clock::now();
+        if (value.first != 0 && now < value.second) {
+            status = SYNC_ACTIVATED;
+            return true;
+        }
+        KVDBService::SyncInfo syncInfo;
+        syncInfo.seqId = StoreUtil::GenSequenceId();
+        syncInfo.devices = { networkId };
+        auto result = DoSyncExt(syncInfo, nullptr);
+        if (result != SUCCESS) {
+            ZLOGE("sync ext failed, result:%{public}d networkId:%{public}s app:%{public}s store:%{public}s", result,
+                StoreUtil::Anonymous(networkId).c_str(), appId_.c_str(), StoreUtil::Anonymous(storeId_).c_str());
+            status = ERROR;
+            return false;
+        }
+        value.first = syncInfo.seqId;
+        value.second = now + SYNC_DURATION;
+        return true;
+    });
+    return status;
+}
+
 Status SingleStoreImpl::GetEntries(const Key &prefix, std::vector<Entry> &entries) const
 {
     DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__));
@@ -614,6 +657,7 @@ int32_t SingleStoreImpl::Close(bool isForce)
         return ref_;
     }
 
+    timePoints_.Clear();
     observers_.Clear();
     syncObserver_->Clean();
     std::unique_lock<decltype(rwMutex_)> lock(rwMutex_);
@@ -773,6 +817,9 @@ Status SingleStoreImpl::GetEntries(const DBQuery &query, std::vector<Entry> &ent
 Status SingleStoreImpl::DoClientSync(const SyncInfo &syncInfo, std::shared_ptr<SyncCallback> observer)
 {
     auto complete = [observer](const std::map<std::string, DistributedDB::DBStatus> &devicesMap) {
+        if (observer == nullptr) {
+            return;
+        }
         std::map<std::string, Status> result;
         for (auto &[key, dbStatus] : devicesMap) {
             result[key] = StoreUtil::ConvertStatus(dbStatus);
@@ -824,6 +871,26 @@ Status SingleStoreImpl::DoSync(const SyncInfo &syncInfo, std::shared_ptr<SyncCal
     }
 }
 
+Status SingleStoreImpl::DoSyncExt(const SyncInfo &syncInfo, std::shared_ptr<SyncCallback> observer)
+{
+    auto service = KVDBServiceClient::GetInstance();
+    if (service == nullptr) {
+        return SERVER_UNAVAILABLE;
+    }
+    auto syncAgent = service->GetSyncAgent({ appId_ });
+    if (syncAgent == nullptr) {
+        ZLOGE("failed! invalid agent app:%{public}s store:%{public}s!",
+            appId_.c_str(), StoreUtil::Anonymous(storeId_).c_str());
+        return ILLEGAL_STATE;
+    }
+    syncAgent->AddSyncCallback(observer, syncInfo.seqId);
+    auto status = service->SyncExt({ appId_ }, { storeId_ }, syncInfo);
+    if (status != Status::SUCCESS) {
+        syncAgent->DeleteSyncCallback(syncInfo.seqId);
+    }
+    return status;
+}
+
 void SingleStoreImpl::DoAutoSync()
 {
     if (!autoSync_) {
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/src/store_util.cpp b/kv_store/frameworks/innerkitsimpl/kvdb/src/store_util.cpp
index b5c404a5220b74debfab26469fd1b8ad5daeeb7f..c7d209765fa7325ec30cc10e3ac85166d3cb1241 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/src/store_util.cpp
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/src/store_util.cpp
@@ -20,13 +20,16 @@
 #include <unistd.h>
 #include "log_print.h"
 #include "types.h"
+#include "acl.h"
 namespace OHOS::DistributedKv {
+using namespace DATABASE_UTILS;
 constexpr mode_t DEFAULT_UMASK = 0002;
 constexpr int32_t HEAD_SIZE = 3;
 constexpr int32_t END_SIZE = 3;
 constexpr int32_t MIN_SIZE = HEAD_SIZE + END_SIZE + 3;
 constexpr const char *REPLACE_CHAIN = "***";
 constexpr const char *DEFAULT_ANONYMOUS = "******";
+constexpr int32_t SERVICE_GID = 3012;
 std::atomic<uint64_t> StoreUtil::sequenceId_ = 0;
 StoreUtil::DBSecurity StoreUtil::GetDBSecurity(int32_t secLevel)
 {
@@ -163,6 +166,9 @@ bool StoreUtil::InitPath(const std::string &path)
         ZLOGE("mkdir error:%{public}d, path:%{public}s", errno, path.c_str());
         return false;
     }
+    Acl acl(path);
+    acl.SetDefaultUser(getuid(), Acl::R_RIGHT | Acl::W_RIGHT);
+    acl.SetDefaultGroup(SERVICE_GID, Acl::R_RIGHT | Acl::W_RIGHT);
     return true;
 }
 
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/test/BUILD.gn b/kv_store/frameworks/innerkitsimpl/kvdb/test/BUILD.gn
index e067f62f959f7557afe80bdcf061d7a33a3c3043..adc18d6d2bb4a6b3d69af90e9f79a80e3469cfa3 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/test/BUILD.gn
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/test/BUILD.gn
@@ -88,6 +88,7 @@ ohos_source_set("kvdb_src_file") {
   configs = [ ":module_private_config" ]
 
   deps = [
+    "../../../../databaseutils:database_utils",
     "../../../../interfaces/innerkits/distributeddatamgr:distributeddata_mgr",
     "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb:distributeddb",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp b/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp
index a39069d6eebec2a0831f8e953604d917626b8d6c..a15e33c971af30db3bbb5d80d43e9a476efccc9d 100644
--- a/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp
+++ b/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp
@@ -155,6 +155,11 @@ HWTEST_F(SingleStoreImplTest, Put, TestSize.Level0)
     status = kvStore_->Get({ "Put Test" }, value);
     ASSERT_EQ(status, SUCCESS);
     ASSERT_EQ(value.ToString(), "Put2 Value");
+    Value value1;
+    status = kvStore_->Get({ "Put Test" }, "networkId", value1);
+    ASSERT_EQ(status, INVALID_ARGUMENT);
+    status = kvStore_->Get({ "Put Test" }, "", value1);
+    ASSERT_EQ(status, INVALID_ARGUMENT);
 }
 
 /**
diff --git a/kv_store/frameworks/jskitsimpl/distributeddata/include/uv_queue.h b/kv_store/frameworks/jskitsimpl/distributeddata/include/uv_queue.h
index b5b96ea7426f6ec2b288995d88cf193c902c4638..43f6ff6cb088782a51879c88676a1839bf6d9e05 100644
--- a/kv_store/frameworks/jskitsimpl/distributeddata/include/uv_queue.h
+++ b/kv_store/frameworks/jskitsimpl/distributeddata/include/uv_queue.h
@@ -31,6 +31,7 @@ public:
     napi_env GetEnv();
     void AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs = NapiArgsGenerator());
 private:
+    static void Work(uv_work_t* work, int uvStatus);
     struct UvEntry {
         napi_env env;
         NapiCallbackGetter callback;
diff --git a/kv_store/frameworks/jskitsimpl/distributeddata/src/js_util.cpp b/kv_store/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
index 095f2d6c99fb63581a22b20f42f0dec062f768e9..2aae9bc3cc41f795f1507b54ad6e89438e6cc337 100644
--- a/kv_store/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
@@ -937,6 +937,7 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, DistributedKv::Options
     CHECK_RETURN(status == napi_ok, "get encrypt param failed", napi_invalid_arg);
     status = GetNamedProperty(env, in, "backup", options.backup, true);
     CHECK_RETURN(status == napi_ok, "get backup param failed", napi_invalid_arg);
+    options.autoSync = false;
     status = GetNamedProperty(env, in, "autoSync", options.autoSync, true);
     CHECK_RETURN(status == napi_ok, "get autoSync param failed", napi_invalid_arg);
 
diff --git a/kv_store/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp b/kv_store/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
index 53d07bd79c3f2ecc80f11551762dfffc643c3d13..a59535c7054298a44d388b88389f7d7c01e15cfc 100644
--- a/kv_store/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
@@ -115,7 +115,7 @@ napi_value NapiQueue::AsyncWork(napi_env env, std::shared_ptr<ContextBase> ctxt,
             delete actx;
         },
         reinterpret_cast<void*>(aCtx), &aCtx->work);
-    auto status = napi_queue_async_work(env, aCtx->work);
+    auto status = napi_queue_async_work_with_qos(env, aCtx->work, napi_qos_user_initiated);
     if (status != napi_ok) {
         napi_get_undefined(env, &promise);
         delete aCtx;
@@ -154,4 +154,4 @@ void NapiQueue::GenerateOutput(AsyncContext &ctx, napi_value output)
         napi_call_function(ctx.env, nullptr, callback, RESULT_ALL, result, &callbackResult);
     }
 }
-} // namespace OHOS::DistributedData
+} // namespace OHOS::DistributedData
\ No newline at end of file
diff --git a/kv_store/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp b/kv_store/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp
index a54641eff80b4cd8e007123def36d78489526a95..76e9038aab8cc54d8230df576d0fb4b39a8d960b 100644
--- a/kv_store/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp
@@ -46,41 +46,55 @@ void UvQueue::AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs)
         return;
     }
     work->data = new UvEntry{ env_, getter, std::move(genArgs) };
-    uv_queue_work(
-        loop_, work, [](uv_work_t* work) {},
-        [](uv_work_t* work, int uvstatus) {
-            std::shared_ptr<UvEntry> entry(static_cast<UvEntry *>(work->data), [work](UvEntry *data) {
-                delete data;
-                delete work;
-            });
-            napi_handle_scope scope = nullptr;
-            napi_open_handle_scope(entry->env, &scope);
-            napi_value method = entry->callback(entry->env);
-            if (method == nullptr) {
-                ZLOGE("the callback is invalid, maybe is cleared!");
-                if (scope != nullptr) {
-                    napi_close_handle_scope(entry->env, scope);
-                }
-                return ;
-            }
-            int argc = 0;
-            napi_value argv[ARGC_MAX] = { nullptr };
-            if (entry->args) {
-                argc = ARGC_MAX;
-                entry->args(entry->env, argc, argv);
-            }
-            ZLOGD("queue uv_after_work_cb");
-            napi_value global = nullptr;
-            napi_get_global(entry->env, &global);
-            napi_value result;
-            napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
-            if (status != napi_ok) {
-                ZLOGE("notify data change failed status:%{public}d.", status);
-            }
-            if (scope != nullptr) {
-                napi_close_handle_scope(entry->env, scope);
-            }
-        });
+    if (work->data == nullptr) {
+        ZLOGE("no memory for UvEntry");
+        delete work;
+        work = nullptr;
+        return;
+    }
+    int retVal = uv_queue_work(
+        loop_, work, [](uv_work_t* work) {}, UvQueue::Work);
+    if (retVal != 0) {
+        delete (reinterpret_cast<UvEntry*>(work->data));
+        work->data = nullptr;
+        delete work;
+        work = nullptr;
+    }
+}
+
+void UvQueue::Work(uv_work_t* work, int uvStatus)
+{
+    std::shared_ptr<UvEntry> entry(static_cast<UvEntry*>(work->data), [work](UvEntry* data) {
+        delete data;
+        delete work;
+    });
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(entry->env, &scope);
+    napi_value method = entry->callback(entry->env);
+    if (method == nullptr) {
+        ZLOGE("the callback is invalid, maybe is cleared!");
+        if (scope != nullptr) {
+            napi_close_handle_scope(entry->env, scope);
+        }
+        return;
+    }
+    int argc = 0;
+    napi_value argv[ARGC_MAX] = { nullptr };
+    if (entry->args) {
+        argc = ARGC_MAX;
+        entry->args(entry->env, argc, argv);
+    }
+    ZLOGD("queue uv_after_work_cb");
+    napi_value global = nullptr;
+    napi_get_global(entry->env, &global);
+    napi_value result;
+    napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
+    if (status != napi_ok) {
+        ZLOGE("notify data change failed status:%{public}d.", status);
+    }
+    if (scope != nullptr) {
+        napi_close_handle_scope(entry->env, scope);
+    }
 }
 
 napi_env UvQueue::GetEnv()
diff --git a/kv_store/frameworks/jskitsimpl/distributedkvstore/include/uv_queue.h b/kv_store/frameworks/jskitsimpl/distributedkvstore/include/uv_queue.h
index f467a763d997fc263a15308632c0c3f65209fd7c..67da9bd6f23207a879361565dd62d07e27435fc5 100644
--- a/kv_store/frameworks/jskitsimpl/distributedkvstore/include/uv_queue.h
+++ b/kv_store/frameworks/jskitsimpl/distributedkvstore/include/uv_queue.h
@@ -31,6 +31,7 @@ public:
     napi_env GetEnv();
     void AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs = NapiArgsGenerator());
 private:
+    static void Work(uv_work_t* work, int uvStatus);
     struct UvEntry {
         napi_env env;
         NapiCallbackGetter callback;
diff --git a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/js_util.cpp b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/js_util.cpp
index 50baa878d6db8b9cc65508f795d2d93cd41e32be..3bec6fa97c9045bd06b3114bca48fa96d7ace5a5 100644
--- a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/js_util.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/js_util.cpp
@@ -1008,6 +1008,7 @@ JSUtil::StatusMsg JSUtil::GetValue(napi_env env, napi_value in, DistributedKv::O
     ASSERT(statusMsg.status == napi_ok, "get encrypt param failed", statusMsg);
     statusMsg = GetNamedProperty(env, in, "backup", options.backup, true);
     ASSERT(statusMsg.status == napi_ok, "get backup param failed", statusMsg);
+    options.autoSync = false;
     statusMsg = GetNamedProperty(env, in, "autoSync", options.autoSync, true);
     ASSERT(statusMsg.status == napi_ok, "get autoSync param failed", statusMsg);
 
diff --git a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/napi_queue.cpp b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/napi_queue.cpp
index c37c898b2a6ccd6d4cee2a927342d5095935bb8d..e58961f25818f8fdb23af1f4a10de9eeb051eec5 100644
--- a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/napi_queue.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/napi_queue.cpp
@@ -115,7 +115,7 @@ napi_value NapiQueue::AsyncWork(napi_env env, std::shared_ptr<ContextBase> ctxt,
             delete actx;
         },
         reinterpret_cast<void*>(aCtx), &aCtx->work);
-    auto status = napi_queue_async_work(env, aCtx->work);
+    auto status = napi_queue_async_work_with_qos(env, aCtx->work, napi_qos_user_initiated);
     if (status != napi_ok) {
         napi_get_undefined(env, &promise);
         delete aCtx;
@@ -162,4 +162,4 @@ void NapiQueue::GenerateOutput(AsyncContext &ctx, napi_value output)
         napi_call_function(ctx.env, nullptr, callback, RESULT_ALL, result, &callbackResult);
     }
 }
-} // namespace OHOS::DistributedKVStore
+} // namespace OHOS::DistributedKVStore
\ No newline at end of file
diff --git a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/uv_queue.cpp b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/uv_queue.cpp
index 2397918dee214236dae8cdbe54ed01dca5cf4880..240e611f0db2de221e3567bbd91cb9dfc1f6ea83 100644
--- a/kv_store/frameworks/jskitsimpl/distributedkvstore/src/uv_queue.cpp
+++ b/kv_store/frameworks/jskitsimpl/distributedkvstore/src/uv_queue.cpp
@@ -46,41 +46,55 @@ void UvQueue::AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs)
         return;
     }
     work->data = new UvEntry{ env_, getter, std::move(genArgs) };
-    uv_queue_work(
-        loop_, work, [](uv_work_t* work) {},
-        [](uv_work_t* work, int uvstatus) {
-            std::shared_ptr<UvEntry> entry(static_cast<UvEntry *>(work->data), [work](UvEntry *data) {
-                delete data;
-                delete work;
-            });
-            napi_handle_scope scope = nullptr;
-            napi_open_handle_scope(entry->env, &scope);
-            napi_value method = entry->callback(entry->env);
-            if (method == nullptr) {
-                ZLOGE("the callback is invalid, maybe is cleared!");
-                if (scope != nullptr) {
-                    napi_close_handle_scope(entry->env, scope);
-                }
-                return ;
-            }
-            int argc = 0;
-            napi_value argv[ARGC_MAX] = { nullptr };
-            if (entry->args) {
-                argc = ARGC_MAX;
-                entry->args(entry->env, argc, argv);
-            }
-            ZLOGD("queue uv_after_work_cb");
-            napi_value global = nullptr;
-            napi_get_global(entry->env, &global);
-            napi_value result;
-            napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
-            if (status != napi_ok) {
-                ZLOGE("notify data change failed status:%{public}d.", status);
-            }
-            if (scope != nullptr) {
-                napi_close_handle_scope(entry->env, scope);
-            }
-        });
+    if (work->data == nullptr) {
+        ZLOGE("no memory for UvEntry");
+        delete work;
+        work = nullptr;
+        return;
+    }
+    int retVal = uv_queue_work(
+        loop_, work, [](uv_work_t* work) {}, UvQueue::Work);
+    if (retVal != 0) {
+        delete (reinterpret_cast<UvEntry*>(work->data));
+        work->data = nullptr;
+        delete work;
+        work = nullptr;
+    }
+}
+
+void UvQueue::Work(uv_work_t* work, int uvStatus)
+{
+    std::shared_ptr<UvEntry> entry(static_cast<UvEntry*>(work->data), [work](UvEntry* data) {
+        delete data;
+        delete work;
+    });
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(entry->env, &scope);
+    napi_value method = entry->callback(entry->env);
+    if (method == nullptr) {
+        ZLOGE("the callback is invalid, maybe is cleared!");
+        if (scope != nullptr) {
+            napi_close_handle_scope(entry->env, scope);
+        }
+        return;
+    }
+    int argc = 0;
+    napi_value argv[ARGC_MAX] = { nullptr };
+    if (entry->args) {
+        argc = ARGC_MAX;
+        entry->args(entry->env, argc, argv);
+    }
+    ZLOGD("queue uv_after_work_cb");
+    napi_value global = nullptr;
+    napi_get_global(entry->env, &global);
+    napi_value result;
+    napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
+    if (status != napi_ok) {
+        ZLOGE("notify data change failed status:%{public}d.", status);
+    }
+    if (scope != nullptr) {
+        napi_close_handle_scope(entry->env, scope);
+    }
 }
 
 napi_env UvQueue::GetEnv()
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/cloud/cloud_db_constant.h b/kv_store/frameworks/libs/distributeddb/common/include/cloud/cloud_db_constant.h
index 29693f4b8e8185d2d4b1c0f6c59960871a9748c1..0710c58a4cec5e587b1b1601a0b4fc9512375889 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/cloud/cloud_db_constant.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/cloud/cloud_db_constant.h
@@ -33,6 +33,7 @@ public:
     static constexpr const char *REFERENCE_FIELD = "#_reference";
     static constexpr const char *VERSION_FIELD = "#_version";
     static constexpr const char *ERROR_FIELD = "#_error";
+    static constexpr const char *SHARING_RESOURCE_FIELD = "#_sharing_resource";
     static constexpr const char *ROW_ID_FIELD_NAME = "rowid";
     static constexpr const char *ASSET = "asset";
     static constexpr const char *ASSETS = "assets";
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/db_common.h b/kv_store/frameworks/libs/distributeddb/common/include/db_common.h
index 406c1321289759de2a26c20d2a41b42064c519da..2775893abecef39db12a01aa13839e8a072ac1db 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/db_common.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/db_common.h
@@ -108,6 +108,10 @@ public:
     static bool IsRecordError(const VBucket &record);
 
     static bool IsRecordIgnored(const VBucket &record);
+
+    static std::string GenerateHashLabel(const DBInfo &dbInfo);
+
+    static uint64_t EraseBit(uint64_t origin, uint64_t eraseBit);
 private:
     static void InsertNodesByScore(const std::map<std::string, std::map<std::string, bool>> &graph,
         const std::vector<std::string> &generateNodes, const std::map<std::string, int> &scoreGraph,
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/db_constant.h b/kv_store/frameworks/libs/distributeddb/common/include/db_constant.h
index 892026fa416f1f79efb5f793af0b530a0bf58740..41efc2ca4b2c5c7d0967d6d6e2b28ea380c113c6 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/db_constant.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/db_constant.h
@@ -26,6 +26,7 @@ public:
     static constexpr size_t MAX_BATCH_SIZE = 128;
     static constexpr size_t MAX_DEV_LENGTH = 128;
     static constexpr size_t MAX_TRANSACTION_ENTRY_SIZE = 128;
+    static constexpr size_t MAX_TRANSACTION_KEY_VALUE_LENS = 512 * 1024 * 1024; // 512M
 
     static constexpr size_t MAX_DATA_DIR_LENGTH = 512;
 
@@ -163,6 +164,7 @@ public:
     static constexpr const char *LOG_TABLE_VERSION_5 = "5.0";
     static constexpr const char *LOG_TABLE_VERSION_5_1 = "5.01";
     static constexpr const char *LOG_TABLE_VERSION_5_2 = "5.02"; // fix failure caused by comparing NULL using <>
+    static constexpr const char *LOG_TABLE_VERSION_5_3 = "5.03"; // add sharing_resource field
     static const std::string LOG_TABLE_VERSION_CURRENT;
 
     static const std::string LOG_TABLE_VERSION_KEY;
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/db_errno.h b/kv_store/frameworks/libs/distributeddb/common/include/db_errno.h
index 42606c2b56ab77d417b028941904e944447c29ec..a1a001c4b6822a5a4dc566fec0c0035a4a715809 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/db_errno.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/db_errno.h
@@ -140,6 +140,8 @@ constexpr int E_TASK_PAUSED = (E_BASE + 119); // the task was paused, don't fini
 constexpr int E_CLOUD_VERSION_CONFLICT = (E_BASE + 120); // cloud failed to update version
 constexpr int E_CLOUD_RECORD_EXIST_CONFLICT = (E_BASE + 121); // record conflict when upload/download
 constexpr int E_REMOVE_ASSETS_FAILED = (E_BASE + 122); // remove local assets failed
+constexpr int E_ABILITY_SYNC_FINISHED = (E_BASE + 123); // add at 108 version, use for machine check ability sync finish
+constexpr int E_NEED_TIME_SYNC = (E_BASE + 124); // time sync has not done
 // Num 150+ is reserved for schema related errno, since it may be added regularly
 constexpr int E_JSON_PARSE_FAIL = (E_BASE + 150); // Parse json fail in grammatical level
 constexpr int E_JSON_INSERT_PATH_EXIST = (E_BASE + 151); // Path already exist before insert
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/db_types.h b/kv_store/frameworks/libs/distributeddb/common/include/db_types.h
index ab8f2b827ba49e3bce543142e45594f41c7c16e7..3169d9af621cc3232c5a7e93de83c729027f3856 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/db_types.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/db_types.h
@@ -173,5 +173,11 @@ enum class SortType {
     TIMESTAMP_ASC,
     TIMESTAMP_DESC
 };
+
+struct DeviceTimeInfo {
+    Timestamp recordTime = 0; // info generate time
+    TimeOffset systemTimeOffset = 0; // raw system time offset
+    int64_t rtt = 0;
+};
 } // namespace DistributedDB
 #endif // DISTRIBUTEDDB_TYPES_H
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/runtime_context.h b/kv_store/frameworks/libs/distributeddb/common/include/runtime_context.h
index c972a42c8fb3b52b595633ed49cb55c7703c38d5..c4e275416c7c3cd40e9b16370f1e4b53f05ce716 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/runtime_context.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/runtime_context.h
@@ -23,6 +23,7 @@
 #include "auto_launch.h"
 #include "auto_launch_export.h"
 #include "cloud/icloud_data_translate.h"
+#include "db_info_handle.h"
 #include "icommunicator_aggregator.h"
 #include "iprocess_system_api_adapter.h"
 #include "ithread_pool.h"
@@ -30,6 +31,7 @@
 #include "kvdb_properties.h"
 #include "macro_utils.h"
 #include "notification_chain.h"
+#include "query_sync_object.h"
 #include "types_export.h"
 
 namespace DistributedDB {
@@ -146,6 +148,30 @@ public:
 
     virtual void StopTimeTickMonitorIfNeed() = 0;
 
+    virtual void SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &handle) = 0;
+
+    virtual void NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos) = 0;
+
+    virtual void RecordRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId,
+        const QuerySyncObject &query) = 0;
+
+    virtual void RemoveRemoteSubscribe(const DeviceID &deviceId) = 0;
+
+    virtual void RemoveRemoteSubscribe(const DBInfo &dbInfo) = 0;
+
+    virtual void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId) = 0;
+
+    virtual void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId,
+        const QuerySyncObject &query) = 0;
+
+    virtual void GetSubscribeQuery(const DBInfo &dbInfo,
+        std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) = 0;
+
+    virtual bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const std::string &devInfo) = 0;
+
+    virtual void SetRemoteOptimizeCommunication(const std::string &dev, bool optimize) = 0;
+
     virtual void SetTranslateToDeviceIdCallback(const TranslateToDeviceIdCallback &callback) = 0;
 
     virtual int TranslateDeviceId(const std::string &deviceId,
@@ -162,6 +188,14 @@ public:
     virtual int AssetsToBlob(const Assets &assets, std::vector<uint8_t> &blob) = 0;
     virtual int BlobToAsset(const std::vector<uint8_t> &blob, Asset &asset) = 0;
     virtual int BlobToAssets(const std::vector<uint8_t> &blob, Assets &assets) = 0;
+
+    virtual std::pair<int, DeviceTimeInfo> GetDeviceTimeInfo(const std::string &device) const = 0;
+    virtual void SetDeviceTimeInfo(const std::string &device, const DeviceTimeInfo &deviceTimeInfo) = 0;
+    virtual void ClearDeviceTimeInfo(const std::string &device) = 0;
+    virtual void ClearAllDeviceTimeInfo() = 0;
+    virtual void RecordAllTimeChange() = 0;
+    virtual void ResetDBTimeChangeStatus(const std::vector<uint8_t> &dbId) = 0;
+    virtual bool CheckDBTimeChange(const std::vector<uint8_t> &dbId) = 0;
 protected:
     RuntimeContext() = default;
     virtual ~RuntimeContext() {}
diff --git a/kv_store/frameworks/libs/distributeddb/common/include/version.h b/kv_store/frameworks/libs/distributeddb/common/include/version.h
index 1429350dc8408be102a27ef304658571638f0916..8cfc4c787df212f2d07a0ab24b2d30fc4b0abb37 100644
--- a/kv_store/frameworks/libs/distributeddb/common/include/version.h
+++ b/kv_store/frameworks/libs/distributeddb/common/include/version.h
@@ -39,9 +39,15 @@ constexpr uint32_t SOFTWARE_VERSION_RELEASE_4_0 = SOFTWARE_VERSION_BASE + 4; //
 constexpr uint32_t SOFTWARE_VERSION_RELEASE_5_0 = SOFTWARE_VERSION_BASE + 5; // 5 for fifth released version
 constexpr uint32_t SOFTWARE_VERSION_RELEASE_6_0 = SOFTWARE_VERSION_BASE + 6; // 6 for sixth released version
 // check both device has security label at 107
-constexpr uint32_t SOFTWARE_VERSION_RELEASE_7_0 = SOFTWARE_VERSION_BASE + 7; // 7 for sixth released version
+constexpr uint32_t SOFTWARE_VERSION_RELEASE_7_0 = SOFTWARE_VERSION_BASE + 7; // 7 for seventh released version
+// kv ability sync with 2 packet at 108
+constexpr uint32_t SOFTWARE_VERSION_RELEASE_8_0 = SOFTWARE_VERSION_BASE + 8; // 8 for eighth released version
+// 109 version add field in request packet
+// add schema version in ability request
+// add schema version, system time offset, sender local time offset in data request
+constexpr uint32_t SOFTWARE_VERSION_RELEASE_9_0 = SOFTWARE_VERSION_BASE + 9; // 9 for ninth released version
 constexpr uint32_t SOFTWARE_VERSION_EARLIEST = SOFTWARE_VERSION_RELEASE_1_0;
-constexpr uint32_t SOFTWARE_VERSION_CURRENT = SOFTWARE_VERSION_RELEASE_7_0;
+constexpr uint32_t SOFTWARE_VERSION_CURRENT = SOFTWARE_VERSION_RELEASE_9_0;
 constexpr int VERSION_INVALID = INT32_MAX;
 
 // Storage Related Version
diff --git a/kv_store/frameworks/libs/distributeddb/common/src/db_common.cpp b/kv_store/frameworks/libs/distributeddb/common/src/db_common.cpp
index a9cf311f0b6c71f73fd0dc9ca03a53689f32e958..f7950a032c7277ccdd6be834d2deb759169dfe40 100644
--- a/kv_store/frameworks/libs/distributeddb/common/src/db_common.cpp
+++ b/kv_store/frameworks/libs/distributeddb/common/src/db_common.cpp
@@ -620,4 +620,17 @@ bool DBCommon::IsRecordIgnored(const VBucket &record)
     auto status = std::get<int64_t>(record.at(CloudDbConstant::ERROR_FIELD));
     return status == static_cast<int64_t>(DBStatus::CLOUD_RECORD_EXIST_CONFLICT);
 }
+
+std::string DBCommon::GenerateHashLabel(const DBInfo &dbInfo)
+{
+    if (dbInfo.syncDualTupleMode) {
+        return DBCommon::TransferHashString(dbInfo.appId + "-" + dbInfo.storeId);
+    }
+    return DBCommon::TransferHashString(dbInfo.userId + "-" + dbInfo.appId + "-" + dbInfo.storeId);
+}
+
+uint64_t DBCommon::EraseBit(uint64_t origin, uint64_t eraseBit)
+{
+    return origin & (~eraseBit);
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/common/src/db_constant.cpp b/kv_store/frameworks/libs/distributeddb/common/src/db_constant.cpp
index 99b81fe0c0f96d3d5aa34a44986e64530a0fdc5d..4bad00ae369a069f4202f361bb14fc3d48560c0e 100644
--- a/kv_store/frameworks/libs/distributeddb/common/src/db_constant.cpp
+++ b/kv_store/frameworks/libs/distributeddb/common/src/db_constant.cpp
@@ -75,7 +75,7 @@ const std::string DBConstant::LOG_POSTFIX = "_log";
 
 const std::string DBConstant::LOG_TABLE_VERSION_1 = "1.0";
 const std::string DBConstant::LOG_TABLE_VERSION_2 = "2.0";
-const std::string DBConstant::LOG_TABLE_VERSION_CURRENT = LOG_TABLE_VERSION_5_2;
+const std::string DBConstant::LOG_TABLE_VERSION_CURRENT = LOG_TABLE_VERSION_5_3;
 
 const std::string DBConstant::LOG_TABLE_VERSION_KEY = "log_table_version";
 
diff --git a/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp b/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
index d21d40ad72d84268a6907a48694cc6db30405b5b..e5a6fc9997721d9cb7b4ff970316880e2e36b38e 100644
--- a/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
+++ b/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.cpp
@@ -36,7 +36,9 @@ RuntimeContextImpl::RuntimeContextImpl()
       timeTickMonitor_(nullptr),
       systemApiAdapter_(nullptr),
       lockStatusObserver_(nullptr),
-      currentSessionId_(1)
+      currentSessionId_(1),
+      dbStatusAdapter_(nullptr),
+      subscribeRecorder_(nullptr)
 {
 }
 
@@ -63,6 +65,8 @@ RuntimeContextImpl::~RuntimeContextImpl()
     delete lockStatusObserver_;
     lockStatusObserver_ = nullptr;
     userChangeMonitor_ = nullptr;
+    dbStatusAdapter_ = nullptr;
+    subscribeRecorder_ = nullptr;
     SetThreadPool(nullptr);
 }
 
@@ -100,6 +104,7 @@ int RuntimeContextImpl::SetCommunicatorAdapter(IAdapter *adapter)
 int RuntimeContextImpl::GetCommunicatorAggregator(ICommunicatorAggregator *&outAggregator)
 {
     outAggregator = nullptr;
+    const std::shared_ptr<DBStatusAdapter> statusAdapter = GetDBStatusAdapter();
     std::lock_guard<std::mutex> lock(communicatorLock_);
     if (communicatorAggregator_ != nullptr) {
         outAggregator = communicatorAggregator_;
@@ -117,7 +122,7 @@ int RuntimeContextImpl::GetCommunicatorAggregator(ICommunicatorAggregator *&outA
         return -E_OUT_OF_MEMORY;
     }
 
-    int errCode = communicatorAggregator_->Initialize(adapter_);
+    int errCode = communicatorAggregator_->Initialize(adapter_, statusAdapter);
     if (errCode != E_OK) {
         LOGE("CommunicatorAggregator init failed, err = %d!", errCode);
         RefObject::KillAndDecObjRef(communicatorAggregator_);
@@ -781,6 +786,144 @@ void RuntimeContextImpl::StopTimeTickMonitorIfNeed()
     LOGD("[RuntimeContext] TimeTickMonitor can not stop because listener is not empty");
 }
 
+void RuntimeContextImpl::SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &handle)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr) {
+        dbStatusAdapter->SetDBInfoHandle(handle);
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RemoveAllSubscribe();
+    }
+}
+
+void RuntimeContextImpl::NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr) {
+        dbStatusAdapter->NotifyDBInfos(devInfos, dbInfos);
+    }
+}
+
+std::shared_ptr<DBStatusAdapter> RuntimeContextImpl::GetDBStatusAdapter()
+{
+    std::lock_guard<std::mutex> autoLock(statusAdapterMutex_);
+    if (dbStatusAdapter_ == nullptr) {
+        dbStatusAdapter_ = std::make_unique<DBStatusAdapter>();
+    }
+    if (dbStatusAdapter_ == nullptr) {
+        LOGE("[RuntimeContextImpl] DbStatusAdapter create failed!");
+    }
+    return dbStatusAdapter_;
+}
+
+void RuntimeContextImpl::RecordRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId,
+    const QuerySyncObject &query)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RecordSubscribe(dbInfo, deviceId, query);
+    }
+}
+
+void RuntimeContextImpl::RemoveRemoteSubscribe(const DeviceID &deviceId)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RemoveRemoteSubscribe(deviceId);
+    }
+}
+
+void RuntimeContextImpl::RemoveRemoteSubscribe(const DBInfo &dbInfo)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RemoveRemoteSubscribe(dbInfo);
+    }
+}
+
+void RuntimeContextImpl::RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RemoveRemoteSubscribe(dbInfo, deviceId);
+    }
+}
+
+void RuntimeContextImpl::RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId,
+    const QuerySyncObject &query)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->RemoveRemoteSubscribe(dbInfo, deviceId, query);
+    }
+}
+
+void RuntimeContextImpl::GetSubscribeQuery(const DBInfo &dbInfo,
+    std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter != nullptr && dbStatusAdapter->IsSendLabelExchange()) {
+        return;
+    }
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder = GetSubscribeRecorder();
+    if (subscribeRecorder != nullptr) {
+        subscribeRecorder->GetSubscribeQuery(dbInfo, subscribeQuery);
+    }
+}
+
+std::shared_ptr<SubscribeRecorder> RuntimeContextImpl::GetSubscribeRecorder()
+{
+    std::lock_guard<std::mutex> autoLock(subscribeRecorderMutex_);
+    if (subscribeRecorder_ == nullptr) {
+        subscribeRecorder_ = std::make_unique<SubscribeRecorder>();
+    }
+    if (subscribeRecorder_ == nullptr) {
+        LOGE("[RuntimeContextImpl] SubscribeRecorder create failed!");
+    }
+    return subscribeRecorder_;
+}
+
+bool RuntimeContextImpl::IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+    const std::string &devInfo)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter == nullptr) {
+        return true;
+    }
+    return dbStatusAdapter->IsNeedAutoSync(userId, appId, storeId, devInfo);
+}
+
+void RuntimeContextImpl::SetRemoteOptimizeCommunication(const std::string &dev, bool optimize)
+{
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter = GetDBStatusAdapter();
+    if (dbStatusAdapter == nullptr) {
+        return;
+    }
+    dbStatusAdapter->SetRemoteOptimizeCommunication(dev, optimize);
+}
+
 void RuntimeContextImpl::SetTranslateToDeviceIdCallback(const TranslateToDeviceIdCallback &callback)
 {
     std::lock_guard<std::mutex> autoLock(translateToDeviceIdLock_);
@@ -999,4 +1142,56 @@ int RuntimeContextImpl::BlobToAssets(const std::vector<uint8_t> &blob, Assets &a
     assets = dataTranslate_->BlobToAssets(blob);
     return E_OK;
 }
+
+std::pair<int, DeviceTimeInfo> RuntimeContextImpl::GetDeviceTimeInfo(const std::string &device) const
+{
+    std::pair<int, DeviceTimeInfo> res;
+    auto &[errCode, info] = res;
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    if (deviceTimeInfos_.find(device) == deviceTimeInfos_.end()) {
+        errCode = -E_NOT_FOUND;
+    } else {
+        info = deviceTimeInfos_.at(device);
+        errCode = E_OK;
+    }
+    return res;
+}
+
+void RuntimeContextImpl::SetDeviceTimeInfo(const std::string &device, const DeviceTimeInfo &deviceTimeInfo)
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    deviceTimeInfos_[device] = deviceTimeInfo;
+}
+
+void RuntimeContextImpl::ClearDeviceTimeInfo(const std::string &device)
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    deviceTimeInfos_.erase(device);
+}
+
+void RuntimeContextImpl::ClearAllDeviceTimeInfo()
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    deviceTimeInfos_.clear();
+}
+
+void RuntimeContextImpl::RecordAllTimeChange()
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    for (auto &item : dbTimeChange_) {
+        item.second = true;
+    }
+}
+
+void RuntimeContextImpl::ResetDBTimeChangeStatus(const std::vector<uint8_t> &dbId)
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    dbTimeChange_[dbId] = false;
+}
+
+bool RuntimeContextImpl::CheckDBTimeChange(const std::vector<uint8_t> &dbId)
+{
+    std::lock_guard<std::mutex> autoLock(deviceTimeInfoLock_);
+    return dbTimeChange_[dbId];
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.h b/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.h
index c3afcf9800b681b00b75f91e4be00a247af7e356..72d8f31572b32f1f728fb7c8acd04c890b8b9df1 100644
--- a/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.h
+++ b/kv_store/frameworks/libs/distributeddb/common/src/runtime_context_impl.h
@@ -21,10 +21,12 @@
 #include <shared_mutex>
 
 #include "auto_launch.h"
+#include "db_status_adapter.h"
 #include "evloop/src/ievent.h"
 #include "evloop/src/ievent_loop.h"
 #include "icommunicator_aggregator.h"
 #include "lock_status_observer.h"
+#include "subscribe_recorder.h"
 #include "task_pool.h"
 #include "time_tick_monitor.h"
 #include "user_change_monitor.h"
@@ -131,6 +133,28 @@ public:
 
     void StopTimeTickMonitorIfNeed() override;
 
+    void SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &handle) override;
+
+    void NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos) override;
+
+    void RecordRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId, const QuerySyncObject &query) override;
+
+    void RemoveRemoteSubscribe(const DeviceID &deviceId) override;
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo) override;
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId) override;
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId, const QuerySyncObject &query) override;
+
+    void GetSubscribeQuery(const DBInfo &dbInfo,
+        std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) override;
+
+    bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const std::string &devInfo) override;
+
+    void SetRemoteOptimizeCommunication(const std::string &dev, bool optimize) override;
+
     void SetTranslateToDeviceIdCallback(const TranslateToDeviceIdCallback &callback) override;
 
     int TranslateDeviceId(const std::string &deviceId,
@@ -147,6 +171,14 @@ public:
     int AssetsToBlob(const Assets &assets, std::vector<uint8_t> &blob) override;
     int BlobToAsset(const std::vector<uint8_t> &blob, Asset &asset) override;
     int BlobToAssets(const std::vector<uint8_t> &blob, Assets &assets) override;
+
+    std::pair<int, DeviceTimeInfo> GetDeviceTimeInfo(const std::string &device) const override;
+    void SetDeviceTimeInfo(const std::string &device, const DeviceTimeInfo &deviceTimeInfo) override;
+    void ClearDeviceTimeInfo(const std::string &device) override;
+    void ClearAllDeviceTimeInfo() override;
+    void RecordAllTimeChange() override;
+    void ResetDBTimeChangeStatus(const std::vector<uint8_t> &dbId) override;
+    bool CheckDBTimeChange(const std::vector<uint8_t> &dbId) override;
 private:
     static constexpr int MAX_TP_THREADS = 10;  // max threads of the task pool.
     static constexpr int MIN_TP_THREADS = 1;   // min threads of the task pool.
@@ -155,6 +187,8 @@ private:
     int PrepareLoop(IEventLoop *&loop);
     int PrepareTaskPool();
     int AllocTimerId(IEvent *evTimer, TimerId &timerId);
+    std::shared_ptr<DBStatusAdapter> GetDBStatusAdapter();
+    std::shared_ptr<SubscribeRecorder> GetSubscribeRecorder();
 
     int ScheduleTaskByThreadPool(const TaskAction &task) const __attribute__((no_sanitize("cfi")));
 
@@ -221,6 +255,12 @@ private:
     mutable std::shared_mutex permissionConditionLock_;
     PermissionConditionCallback permissionConditionCallback_;
 
+    mutable std::mutex statusAdapterMutex_;
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter_;
+
+    mutable std::mutex subscribeRecorderMutex_;
+    std::shared_ptr<SubscribeRecorder> subscribeRecorder_;
+
     mutable std::mutex translateToDeviceIdLock_;
     TranslateToDeviceIdCallback translateToDeviceIdCallback_;
     std::map<std::string, std::map<std::string, std::string>> deviceIdCache_; // cache <uuid, <appId, newDeviceId>>
@@ -234,6 +274,10 @@ private:
 
     mutable std::shared_mutex dataTranslateLock_;
     std::shared_ptr<ICloudDataTranslate> dataTranslate_;
+
+    mutable std::mutex deviceTimeInfoLock_;
+    std::map<std::string, DeviceTimeInfo> deviceTimeInfos_;
+    std::map<std::vector<uint8_t>, bool> dbTimeChange_;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h b/kv_store/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
index 9cf86ec70e27a4e5bd91fe23112284b12c404c43..8b43fae52b9ff10b12194d268ede2e070a4e5a39 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/include/communicator_aggregator.h
@@ -54,7 +54,7 @@ public:
     DISABLE_COPY_ASSIGN_MOVE(CommunicatorAggregator);
 
     // See ICommunicatorAggregator for detail
-    int Initialize(IAdapter *inAdapter) override;
+    int Initialize(IAdapter *inAdapter, const std::shared_ptr<DBStatusAdapter> &statusAdapter) override;
 
     // Must not call any other functions if Finalize had been called. In fact, Finalize has no chance to be called.
     void Finalize() override;
@@ -135,6 +135,12 @@ private:
     // Record the protocol version of remote target.
     void SetRemoteCommunicatorVersion(const std::string &target, uint16_t version);
 
+    void OnRemoteDBStatusChange(const std::string &devInfo, const std::vector<DBInfo> &dbInfos);
+
+    void NotifyConnectChange(const std::string &srcTarget, const std::map<LabelType, bool> &changedLabels);
+
+    void RegDBChangeCallback();
+
     void InitSendThread();
 
     void SendOnceData();
@@ -196,6 +202,8 @@ private:
     Finalizer onConnectFinalizer_;
     mutable std::mutex onConnectMutex_;
 
+    std::shared_ptr<DBStatusAdapter> dbStatusAdapter_;
+
     std::atomic<bool> useExclusiveThread_ = false;
     bool sendTaskStart_ = false;
     mutable std::mutex scheduleSendTaskMutex_;
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/include/db_status_adapter.h b/kv_store/frameworks/libs/distributeddb/communicator/include/db_status_adapter.h
new file mode 100644
index 0000000000000000000000000000000000000000..35b5cc3fe1c292f38ac3be0bfd6348d3a6cdf4c0
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/communicator/include/db_status_adapter.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DB_STATUS_ADAPTER_H
+#define DB_STATUS_ADAPTER_H
+
+#include "db_info_handle.h"
+#include <mutex>
+#include "macro_utils.h"
+
+namespace DistributedDB {
+using RemoteDBChangeCallback = std::function<void(const std::string &devInfo, const std::vector<DBInfo> &dbInfos)>;
+using LocalDBChangeCallback = std::function<void(void)>;
+using RemoteSupportChangeCallback = std::function<void(const std::string &devInfo)>;
+class DBStatusAdapter {
+public:
+    DBStatusAdapter();
+    ~DBStatusAdapter() = default;
+    DISABLE_COPY_ASSIGN_MOVE(DBStatusAdapter);
+
+    void SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &dbInfoHandle);
+    bool IsSupport(const std::string &devInfo);
+    int GetLocalDBInfos(std::vector<DBInfo> &dbInfos);
+    void SetDBStatusChangeCallback(const RemoteDBChangeCallback &remote, const LocalDBChangeCallback &local,
+        const RemoteSupportChangeCallback &supportCallback);
+    void NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos);
+    void TargetOffline(const std::string &device);
+    bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const std::string &devInfo);
+    void SetRemoteOptimizeCommunication(const std::string &dev, bool optimize);
+    bool IsSendLabelExchange();
+private:
+    std::shared_ptr<DBInfoHandle> GetDBInfoHandle() const;
+    bool LoadIntoCache(bool isLocal, const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos);
+    void ClearAllCache();
+    void NotifyRemoteOffline();
+
+    static int GetLocalDeviceId(std::string &deviceId);
+    static bool IsLocalDeviceId(const std::string &deviceId);
+    static bool MergeDBInfos(const std::vector<DBInfo> &srcDbInfos, std::vector<DBInfo> &dstDbInfos);
+    mutable std::mutex handleMutex_;
+    std::shared_ptr<DBInfoHandle> dbInfoHandle_ = nullptr;
+
+    mutable std::mutex callbackMutex_;
+    RemoteDBChangeCallback remoteCallback_;
+    LocalDBChangeCallback localCallback_;
+    RemoteSupportChangeCallback supportCallback_;
+
+    mutable std::mutex localInfoMutex_;
+    std::vector<DBInfo> localDBInfos_;
+
+    mutable std::mutex remoteInfoMutex_;
+    std::map<std::string, std::vector<DBInfo>> remoteDBInfos_; // key: device uuid, value: all db which has notified
+
+    mutable std::mutex supportMutex_;
+    bool localSendLabelExchange_;
+    bool cacheLocalSendLabelExchange_;
+    std::map<std::string, bool> remoteOptimizeInfo_; // key: device uuid, value: is support notified by user
+};
+}
+#endif // DB_STATUS_ADAPTER_H
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h b/kv_store/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
index 06ae9e7c1e91e74188cf57540be44690eb309fe8..70ee63cf8f1b09bc74c00931df7a31a36c9f4145 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/include/icommunicator_aggregator.h
@@ -18,6 +18,7 @@
 
 #include <cstdint>
 #include "communicator_type_define.h"
+#include "db_status_adapter.h"
 #include "iadapter.h"
 #include "ref_object.h"
 
@@ -32,7 +33,7 @@ public:
     // The caller is the owner of inAdapter and responsible for manage its lifecycle.
     // The ICommunicatorAggregator is only the user of inAdapter
     // If Initialize fail, the ICommunicatorAggregator will rollback what had done to inAdapter so it can be reuse.
-    virtual int Initialize(IAdapter *inAdapter) = 0;
+    virtual int Initialize(IAdapter *inAdapter, const std::shared_ptr<DBStatusAdapter> &statusAdapter) = 0;
 
     // Call this method after Initialize successfully and before destroy the ICommunicatorAggregator
     // Emphasize again : DO NOT CALL Finalize IF Initialize FAIL.
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/include/parse_result.h b/kv_store/frameworks/libs/distributeddb/communicator/include/parse_result.h
index 99d0cebd6137e708a567e4d7fc116d7f5a4c7729..2186bbb9601ae5304df4913e3462b35b20c034bd 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/include/parse_result.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/include/parse_result.h
@@ -47,6 +47,10 @@ public:
     {
         frameType_ = inFrameType;
     }
+    void SetSendLabelExchange(bool sendLabelExchange)
+    {
+        sendLabelExchange_ = sendLabelExchange;
+    }
     void SetFrameLen(uint32_t inFrameLen)
     {
         frameLen_ = inFrameLen;
@@ -104,6 +108,10 @@ public:
     {
         return frameType_;
     }
+    bool IsSendLabelExchange() const
+    {
+        return sendLabelExchange_;
+    }
     uint32_t GetFrameLen() const
     {
         return frameLen_;
@@ -154,6 +162,7 @@ private:
     uint8_t paddingLen_ = 0;
     bool isFragment_ = false;
     FrameType frameType_ = FrameType::INVALID_MAX_FRAME_TYPE;
+    bool sendLabelExchange_ = true;
 
     // For CommPhyOptHeader
     uint32_t frameLen_ = 0;
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
index a5bfbd2c1eeda1cfa0cd2ceb63e4a355a5aa8cfd..2db196df70705548969f23e944d881afe74e66dd 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_aggregator.cpp
@@ -52,7 +52,7 @@ CommunicatorAggregator::~CommunicatorAggregator()
     commLinker_ = nullptr;
 }
 
-int CommunicatorAggregator::Initialize(IAdapter *inAdapter)
+int CommunicatorAggregator::Initialize(IAdapter *inAdapter, const std::shared_ptr<DBStatusAdapter> &statusAdapter)
 {
     if (inAdapter == nullptr) {
         return -E_INVALID_ARGS;
@@ -64,7 +64,7 @@ int CommunicatorAggregator::Initialize(IAdapter *inAdapter)
     scheduler_.Initialize();
 
     int errCode;
-    commLinker_ = new (std::nothrow) CommunicatorLinker(this);
+    commLinker_ = new (std::nothrow) CommunicatorLinker(this, statusAdapter);
     if (commLinker_ == nullptr) {
         errCode = -E_OUT_OF_MEMORY;
         goto ROLL_BACK;
@@ -85,6 +85,8 @@ int CommunicatorAggregator::Initialize(IAdapter *inAdapter)
 
     shutdown_ = false;
     InitSendThread();
+    dbStatusAdapter_ = statusAdapter;
+    RegDBChangeCallback();
     return E_OK;
 ROLL_BACK:
     UnRegCallbackFromAdapter();
@@ -129,6 +131,7 @@ void CommunicatorAggregator::Finalize()
     commLinker_ = nullptr;
     retainer_.Finalize();
     combiner_.Finalize();
+    dbStatusAdapter_ = nullptr;
 }
 
 ICommunicator *CommunicatorAggregator::AllocCommunicator(uint64_t commLabel, int &outErrorNo)
@@ -303,7 +306,12 @@ int CommunicatorAggregator::ScheduleSendTask(const std::string &dstTarget, Seria
         LOGE("[CommAggr][Create] Exit ok but discard since localSourceId zero, thread=%s.", GetThreadId().c_str());
         return E_OK; // Returns E_OK here to indicate this buffer was accepted though discard immediately
     }
-    PhyHeaderInfo info{localSourceId_, incFrameId_.fetch_add(1, std::memory_order_seq_cst), inType};
+    bool sendLabelExchange = true;
+    if (dbStatusAdapter_ != nullptr) {
+        sendLabelExchange = dbStatusAdapter_->IsSendLabelExchange();
+    }
+    PhyHeaderInfo info{localSourceId_, incFrameId_.fetch_add(1, std::memory_order_seq_cst), inType,
+        sendLabelExchange};
     int errCode = ProtocolProto::SetPhyHeader(inBuff, info);
     if (errCode != E_OK) {
         LOGE("[CommAggr][Create] Set phyHeader fail, thread=%s, errCode=%d", GetThreadId().c_str(), errCode);
@@ -484,6 +492,9 @@ void CommunicatorAggregator::OnBytesReceive(const std::string &srcTarget, const
 
     // Update version of remote target
     SetRemoteCommunicatorVersion(srcTarget, packetResult.GetDbVersion());
+    if (dbStatusAdapter_ != nullptr) {
+        dbStatusAdapter_->SetRemoteOptimizeCommunication(srcTarget, !packetResult.IsSendLabelExchange());
+    }
     if (packetResult.GetFrameTypeInfo() == FrameType::EMPTY) { // Empty frame will never be fragmented
         LOGI("[CommAggr][Receive] Empty frame, just ignore in this version of distributeddb.");
         return;
@@ -608,24 +619,7 @@ int CommunicatorAggregator::OnCommLayerFrameReceive(const std::string &srcTarget
             LOGE("[CommAggr][CommReceive] Receive LabelExchange Fail.");
             return errCode;
         }
-        if (!commLinker_->IsRemoteTargetOnline(srcTarget)) {
-            LOGW("[CommAggr][CommReceive] Receive LabelExchange from offline target=%s{private}.", srcTarget.c_str());
-            for (const auto &entry : changedLabels) {
-                LOGW("[CommAggr][CommReceive] REMEMBER: label=%.3s, inOnline=%d.", VEC_TO_STR(entry.first),
-                    entry.second);
-            }
-            return E_OK;
-        }
-        // Do target change notify
-        std::lock_guard<std::mutex> commMapLockGuard(commMapMutex_);
-        for (auto &entry : changedLabels) {
-            // Ignore nonactivated communicator
-            if (commMap_.count(entry.first) != 0 && commMap_.at(entry.first).second) {
-                LOGI("[CommAggr][CommReceive] label=%.3s, srcTarget=%s{private}, isOnline=%d.",
-                    VEC_TO_STR(entry.first), srcTarget.c_str(), entry.second);
-                commMap_.at(entry.first).first->OnConnectChange(srcTarget, entry.second);
-            }
-        }
+        NotifyConnectChange(srcTarget, changedLabels);
     }
     return E_OK;
 }
@@ -763,6 +757,9 @@ void CommunicatorAggregator::UnRegCallbackFromAdapter()
     adapterHandle_->RegBytesReceiveCallback(nullptr, nullptr);
     adapterHandle_->RegTargetChangeCallback(nullptr, nullptr);
     adapterHandle_->RegSendableCallback(nullptr, nullptr);
+    if (dbStatusAdapter_ != nullptr) {
+        dbStatusAdapter_->SetDBStatusChangeCallback(nullptr, nullptr, nullptr);
+    }
 }
 
 void CommunicatorAggregator::GenerateLocalSourceId()
@@ -874,6 +871,62 @@ std::shared_ptr<ExtendHeaderHandle> CommunicatorAggregator::GetExtendHeaderHandl
     return adapterHandle_->GetExtendHeaderHandle(paramInfo);
 }
 
+void CommunicatorAggregator::OnRemoteDBStatusChange(const std::string &devInfo, const std::vector<DBInfo> &dbInfos)
+{
+    std::map<LabelType, bool> changedLabels;
+    for (const auto &dbInfo: dbInfos) {
+        std::string label = DBCommon::GenerateHashLabel(dbInfo);
+        LabelType labelType(label.begin(), label.end());
+        changedLabels[labelType] = dbInfo.isNeedSync;
+    }
+    if (commLinker_ != nullptr) {
+        commLinker_->UpdateOnlineLabels(devInfo, changedLabels);
+    }
+    NotifyConnectChange(devInfo, changedLabels);
+}
+
+void CommunicatorAggregator::NotifyConnectChange(const std::string &srcTarget,
+    const std::map<LabelType, bool> &changedLabels)
+{
+    if (commLinker_ != nullptr && !commLinker_->IsRemoteTargetOnline(srcTarget)) {
+        LOGW("[CommAggr][NotifyConnectChange] from offline target=%s{private}.", srcTarget.c_str());
+        for (const auto &entry : changedLabels) {
+            LOGW("[CommAggr] REMEMBER: label=%s, inOnline=%d.", VEC_TO_STR(entry.first), entry.second);
+        }
+        return;
+    }
+    // Do target change notify
+    std::lock_guard<std::mutex> commMapLockGuard(commMapMutex_);
+    for (auto &entry : changedLabels) {
+        // Ignore nonactivated communicator
+        if (commMap_.count(entry.first) != 0 && commMap_.at(entry.first).second) {
+            LOGI("[CommAggr][NotifyConnectChange] label=%s, srcTarget=%s{private}, isOnline=%d.",
+                 VEC_TO_STR(entry.first), srcTarget.c_str(), entry.second);
+            commMap_.at(entry.first).first->OnConnectChange(srcTarget, entry.second);
+        }
+    }
+}
+
+void CommunicatorAggregator::RegDBChangeCallback()
+{
+    if (dbStatusAdapter_ != nullptr) {
+        dbStatusAdapter_->SetDBStatusChangeCallback(
+            [this](const std::string &devInfo, const std::vector<DBInfo> &dbInfos) {
+                OnRemoteDBStatusChange(devInfo, dbInfos);
+            },
+            [this]() {
+                if (commLinker_ != nullptr) {
+                    (void)commLinker_->TriggerLabelExchangeEvent(false);
+                }
+            },
+            [this](const std::string &dev) {
+                if (commLinker_ != nullptr) {
+                    std::set<LabelType> relatedLabels;
+                    (void)commLinker_->TargetOnline(dev, relatedLabels);
+                }
+            });
+    }
+}
 void CommunicatorAggregator::InitSendThread()
 {
     if (RuntimeContext::GetInstance()->GetThreadPool() != nullptr) {
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
index 42a232f70daf2780fc87e37b4ab7ff8bf641ed5b..96f358942c4af7cdfb86d73ed2aba76cbecd7824 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.cpp
@@ -14,7 +14,10 @@
  */
 
 #include "communicator_linker.h"
+
+#include <utility>
 #include "communicator_aggregator.h"
+#include "db_common.h"
 #include "db_errno.h"
 #include "hash.h"
 #include "log_print.h"
@@ -29,10 +32,12 @@ constexpr uint32_t RETRANSMIT_LIMIT = 20; // Currently we do at most 20 retransm
 constexpr uint32_t RETRANSMIT_LIMIT_EQUAL_INTERVAL = 5; // First 5 retransmission will be equal interval
 }
 
-CommunicatorLinker::CommunicatorLinker(CommunicatorAggregator *inAggregator)
+CommunicatorLinker::CommunicatorLinker(CommunicatorAggregator *inAggregator,
+    std::shared_ptr<DBStatusAdapter> statusAdapter)
     : incSequenceId_(0), incAckTriggerId_(0)
 {
     aggregator_ = inAggregator;
+    statusAdapter_ = std::move(statusAdapter);
     RefObject::IncObjRef(aggregator_); // The linker rely on CommunicatorAggregator
 }
 
@@ -40,6 +45,7 @@ CommunicatorLinker::~CommunicatorLinker()
 {
     RefObject::DecObjRef(aggregator_); // The linker no longer rely on CommunicatorAggregator
     aggregator_ = nullptr;
+    statusAdapter_ = nullptr;
 }
 
 void CommunicatorLinker::Initialize()
@@ -75,6 +81,9 @@ int CommunicatorLinker::TargetOnline(const std::string &inTarget, std::set<Label
 // The caller should notify all related communicator about this target offline.
 void CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<LabelType> &outRelatedLabels)
 {
+    if (statusAdapter_ != nullptr) {
+        statusAdapter_->TargetOffline(inTarget);
+    }
     std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
     outRelatedLabels = targetMapOnlineLabels_[inTarget];
     // Do not erase the Labels of inTarget from targetMapOnlineLabels_, remember it for using when TargetOnline
@@ -83,6 +92,9 @@ void CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<Lab
     // the distinctValue of this remote target may be changed, and the sequenceId may start from zero
     targetDistinctValue_.erase(inTarget);
     topRecvLabelSeq_.erase(inTarget);
+    if (statusAdapter_ != nullptr && statusAdapter_->IsSupport(inTarget)) {
+        targetMapOnlineLabels_.erase(inTarget);
+    }
 }
 
 // Add local label. Create async task to send out label_exchange and waiting for label_exchange_ack.
@@ -91,11 +103,9 @@ void CommunicatorLinker::TargetOffline(const std::string &inTarget, std::set<Lab
 // The caller should notify communicator of this label about already online target.
 int CommunicatorLinker::IncreaseLocalLabel(const LabelType &inLabel, std::set<std::string> &outOnlineTarget)
 {
-    std::set<std::string> totalOnlineTargets;
     {
         std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
         localOnlineLabels_.insert(inLabel);
-        totalOnlineTargets = remoteOnlineTarget_;
         for (auto &entry : targetMapOnlineLabels_) {
             if (remoteOnlineTarget_.count(entry.first) == 0) { // Ignore offline target
                 continue;
@@ -105,34 +115,18 @@ int CommunicatorLinker::IncreaseLocalLabel(const LabelType &inLabel, std::set<st
             }
         }
     }
-    bool everFail = false;
-    for (const auto &entry : totalOnlineTargets) {
-        int errCode = TriggerLabelExchangeEvent(entry);
-        if (errCode != E_OK) {
-            everFail = true;
-        }
-    }
-    return everFail ? -E_INTERNAL_ERROR : E_OK;
+    return TriggerLabelExchangeEvent() ? -E_INTERNAL_ERROR : E_OK;
 }
 
 // Del 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.
 int CommunicatorLinker::DecreaseLocalLabel(const LabelType &inLabel)
 {
-    std::set<std::string> totalOnlineTargets;
     {
         std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
         localOnlineLabels_.erase(inLabel);
-        totalOnlineTargets = remoteOnlineTarget_;
-    }
-    bool everFail = false;
-    for (const auto &entry : totalOnlineTargets) {
-        int errCode = TriggerLabelExchangeEvent(entry);
-        if (errCode != E_OK) {
-            everFail = true;
-        }
     }
-    return everFail ? -E_INTERNAL_ERROR : E_OK;
+    return TriggerLabelExchangeEvent() ? -E_INTERNAL_ERROR : E_OK;
 }
 
 // Compare the latest labels with previous Label, find out label changes.
@@ -284,11 +278,21 @@ void CommunicatorLinker::DetectDistinctValueChange(const std::string &inTarget,
 
 int CommunicatorLinker::TriggerLabelExchangeEvent(const std::string &toTarget)
 {
+    if (statusAdapter_ != nullptr && statusAdapter_->IsSupport(toTarget)) {
+        return E_OK;
+    }
     // Apply for a latest sequenceId
     uint64_t sequenceId = incSequenceId_.fetch_add(1, std::memory_order_seq_cst);
     // Get a snapshot of current online labels
     std::set<LabelType> onlineLabels;
-    {
+    std::vector<DBInfo> dbInfos;
+    if (statusAdapter_ != nullptr && statusAdapter_->GetLocalDBInfos(dbInfos) == E_OK) {
+        for (const auto &dbInfo: dbInfos) {
+            std::string label = DBCommon::GenerateHashLabel(dbInfo);
+            LabelType labelType(label.begin(), label.end());
+            onlineLabels.insert(labelType);
+        }
+    } else {
         std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
         onlineLabels = localOnlineLabels_;
     }
@@ -462,5 +466,35 @@ void CommunicatorLinker::SendLabelExchangeAck(const std::string &toTarget, Seria
     }
 }
 
+void CommunicatorLinker::UpdateOnlineLabels(const std::string &device, const std::map<LabelType, bool> &labels)
+{
+    std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
+    for (const auto &[label, isOnline]: labels) {
+        if (isOnline) {
+            targetMapOnlineLabels_[device].insert(label);
+        } else {
+            targetMapOnlineLabels_[device].erase(label);
+        }
+    }
+}
+
+bool CommunicatorLinker::TriggerLabelExchangeEvent(bool checkAdapter)
+{
+    if (checkAdapter && statusAdapter_ != nullptr && !statusAdapter_->IsSendLabelExchange()) {
+        return false;
+    }
+    bool everFail = false;
+    std::set<std::string> totalOnlineTargets;
+    {
+        std::lock_guard<std::mutex> entireInfoLockGuard(entireInfoMutex_);
+        totalOnlineTargets = remoteOnlineTarget_;
+    }
+    for (auto &entry : totalOnlineTargets) {
+        if (TriggerLabelExchangeEvent(entry) != E_OK) {
+            everFail = true;
+        }
+    }
+    return everFail;
+}
 DEFINE_OBJECT_TAG_FACILITIES(CommunicatorLinker)
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.h b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
index 3d0d701d312d5fa897df033891394057b0d5432c..10733a16cce07a5b44fcc5a05f50796ddad3b07f 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/communicator_linker.h
@@ -25,6 +25,7 @@
 #include <string>
 #include <vector>
 #include "communicator_type_define.h"
+#include "db_status_adapter.h"
 #include "ref_object.h"
 #include "serial_buffer.h"
 
@@ -33,7 +34,8 @@ class CommunicatorAggregator; // Forward Declaration
 
 class CommunicatorLinker : public virtual RefObject {
 public:
-    explicit CommunicatorLinker(CommunicatorAggregator *inAggregator);
+    explicit CommunicatorLinker(CommunicatorAggregator *inAggregator,
+        std::shared_ptr<DBStatusAdapter> statusAdapter);
     ~CommunicatorLinker();
 
     DISABLE_COPY_ASSIGN_MOVE(CommunicatorLinker);
@@ -71,6 +73,10 @@ public:
     std::set<std::string> GetOnlineRemoteTarget() const;
 
     bool IsRemoteTargetOnline(const std::string &inTarget) const;
+
+    void UpdateOnlineLabels(const std::string &device, const std::map<LabelType, bool> &labels);
+
+    bool TriggerLabelExchangeEvent(bool checkAdapter = true);
 private:
     DECLARE_OBJECT_TAG(CommunicatorLinker);
 
@@ -116,6 +122,8 @@ private:
 
     // remember the opened labels no matter target now online or offline
     std::map<std::string, std::set<LabelType>> targetMapOnlineLabels_;
+
+    std::shared_ptr<DBStatusAdapter> statusAdapter_;
 };
 }
 
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/db_status_adapter.cpp b/kv_store/frameworks/libs/distributeddb/communicator/src/db_status_adapter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d2f66e1fec90d2c230300406e279f3581280876d
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/db_status_adapter.cpp
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "db_status_adapter.h"
+
+#include "db_common.h"
+#include "db_errno.h"
+#include "log_print.h"
+#include "param_check_utils.h"
+#include "runtime_context.h"
+
+namespace DistributedDB {
+DBStatusAdapter::DBStatusAdapter()
+    : dbInfoHandle_(nullptr),
+      localSendLabelExchange_(false),
+      cacheLocalSendLabelExchange_(false)
+{
+}
+
+void DBStatusAdapter::SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &dbInfoHandle)
+{
+    {
+        std::lock_guard<std::mutex> autoLock(handleMutex_);
+        dbInfoHandle_ = dbInfoHandle;
+    }
+    NotifyRemoteOffline();
+    ClearAllCache();
+    LOGI("[DBStatusAdapter] SetDBInfoHandle Finish");
+}
+
+bool DBStatusAdapter::IsSupport(const std::string &devInfo)
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr) {
+        LOGD("[DBStatusAdapter] dbInfoHandle not set");
+        return false;
+    }
+    if (IsSendLabelExchange()) {
+        return false;
+    }
+    {
+        std::lock_guard<std::mutex> autoLock(supportMutex_);
+        if (remoteOptimizeInfo_.find(devInfo) != remoteOptimizeInfo_.end()) {
+            return remoteOptimizeInfo_[devInfo];
+        }
+    }
+    std::lock_guard<std::mutex> autoLock(supportMutex_);
+    remoteOptimizeInfo_[devInfo] = true;
+    return true;
+}
+
+int DBStatusAdapter::GetLocalDBInfos(std::vector<DBInfo> &dbInfos)
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr) {
+        LOGD("[DBStatusAdapter][GetLocalDBInfos] handle not set");
+        return -E_NOT_SUPPORT;
+    }
+    if (IsSendLabelExchange()) {
+        return -E_NOT_SUPPORT;
+    }
+    std::lock_guard<std::mutex> autoLock(localInfoMutex_);
+    for (const auto &info: localDBInfos_) {
+        if (info.isNeedSync) {
+            dbInfos.push_back(info);
+        }
+    }
+    return E_OK;
+}
+
+void DBStatusAdapter::SetDBStatusChangeCallback(const RemoteDBChangeCallback &remote,
+    const LocalDBChangeCallback &local, const RemoteSupportChangeCallback &supportCallback)
+{
+    {
+        std::lock_guard<std::mutex> autoLock(callbackMutex_);
+        remoteCallback_ = remote;
+        localCallback_ = local;
+        supportCallback_ = supportCallback;
+    }
+    if (remote == nullptr || local == nullptr) {
+        return;
+    }
+    // avoid notify before set callback
+    bool triggerNow = false;
+    std::map<std::string, std::vector<DBInfo>> remoteDBInfos;
+    {
+        std::lock_guard<std::mutex> autoLock(remoteInfoMutex_);
+        remoteDBInfos = remoteDBInfos_;
+        triggerNow = !remoteDBInfos.empty();
+    }
+    bool triggerLocal = false;
+    {
+        std::lock_guard<std::mutex> autoLock(localInfoMutex_);
+        triggerLocal = !localDBInfos_.empty();
+        triggerNow |= triggerLocal;
+    }
+    // trigger callback async
+    if (!triggerNow) {
+        return;
+    }
+    int errCode = RuntimeContext::GetInstance()->ScheduleTask([triggerLocal, remoteDBInfos, remote, local]() {
+        for (const auto &[devInfo, dbInfos]: remoteDBInfos) {
+            remote(devInfo, dbInfos);
+        }
+        if (triggerLocal) {
+            local();
+        }
+    });
+    if (errCode != E_OK) {
+        LOGW("[DBStatusAdapter][SetDBStatusChangeCallback] Schedule Task failed! errCode = %d", errCode);
+    }
+}
+
+void DBStatusAdapter::NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos)
+{
+    int errCode = RuntimeContext::GetInstance()->ScheduleTask([this, devInfos, dbInfos]() {
+        if (IsSendLabelExchange()) {
+            LOGW("[DBStatusAdapter][NotifyDBInfos] local dev no support communication optimize");
+            return;
+        }
+        bool isLocal = IsLocalDeviceId(devInfos.identifier);
+        if (!isLocal && !IsSupport(devInfos.identifier)) {
+            LOGW("[DBStatusAdapter][NotifyDBInfos] no support dev %s", STR_MASK(devInfos.identifier));
+            return;
+        }
+        bool isChange = LoadIntoCache(isLocal, devInfos, dbInfos);
+        std::lock_guard<std::mutex> autoLock(callbackMutex_);
+        if (!isLocal && remoteCallback_ != nullptr) {
+            remoteCallback_(devInfos.identifier, dbInfos);
+        } else if (isLocal && localCallback_ != nullptr && isChange) {
+            localCallback_();
+        }
+    });
+    if (errCode != E_OK) {
+        LOGW("[DBStatusAdapter][NotifyDBInfos] Schedule Task failed! errCode = %d", errCode);
+    }
+}
+
+void DBStatusAdapter::TargetOffline(const std::string &device)
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr) {
+        return;
+    }
+    {
+        std::lock_guard<std::mutex> autoLock(supportMutex_);
+        if (remoteOptimizeInfo_.find(device) != remoteOptimizeInfo_.end()) {
+            remoteOptimizeInfo_.erase(device);
+        }
+    }
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(device);
+}
+
+bool DBStatusAdapter::IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+    const std::string &devInfo)
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr || IsSendLabelExchange()) {
+        return true;
+    }
+    return dbInfoHandle->IsNeedAutoSync(userId, appId, storeId, { devInfo });
+}
+
+void DBStatusAdapter::SetRemoteOptimizeCommunication(const std::string &dev, bool optimize)
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr) {
+        return;
+    }
+    bool triggerLocalCallback = false;
+    {
+        std::lock_guard<std::mutex> autoLock(supportMutex_);
+        if (remoteOptimizeInfo_.find(dev) == remoteOptimizeInfo_.end()) {
+            remoteOptimizeInfo_[dev] = optimize;
+            return;
+        }
+        if (remoteOptimizeInfo_[dev] == optimize) {
+            return;
+        }
+        if (remoteOptimizeInfo_[dev] && !optimize) {
+            triggerLocalCallback = true;
+        }
+        remoteOptimizeInfo_[dev] = optimize;
+    }
+    if (!triggerLocalCallback) {
+        return;
+    }
+    LOGI("[DBStatusAdapter][SetRemoteOptimizeCommunication] remote dev %.3s optimize change!", dev.c_str());
+    int errCode = RuntimeContext::GetInstance()->ScheduleTask([this, dev]() {
+        RemoteSupportChangeCallback callback;
+        {
+            std::lock_guard<std::mutex> autoLock(callbackMutex_);
+            callback = supportCallback_;
+        }
+        if (callback) {
+            callback(dev);
+        }
+    });
+    if (errCode != E_OK) {
+        LOGW("[DBStatusAdapter][SetRemoteOptimizeCommunication] Schedule Task failed! errCode = %d", errCode);
+    }
+}
+
+bool DBStatusAdapter::IsSendLabelExchange()
+{
+    std::shared_ptr<DBInfoHandle> dbInfoHandle = GetDBInfoHandle();
+    if (dbInfoHandle == nullptr) {
+        return true;
+    }
+    {
+        std::lock_guard<std::mutex> autoLock(supportMutex_);
+        if (cacheLocalSendLabelExchange_) {
+            return localSendLabelExchange_;
+        }
+    }
+    bool isSupport = dbInfoHandle->IsSupport();
+    std::lock_guard<std::mutex> autoLock(supportMutex_);
+    LOGD("[DBStatusAdapter][IsSendLabelExchange] local support status is %d", isSupport);
+    localSendLabelExchange_ = !isSupport;
+    cacheLocalSendLabelExchange_ = true;
+    return localSendLabelExchange_;
+}
+
+std::shared_ptr<DBInfoHandle> DBStatusAdapter::GetDBInfoHandle() const
+{
+    std::lock_guard<std::mutex> autoLock(handleMutex_);
+    return dbInfoHandle_;
+}
+
+bool DBStatusAdapter::LoadIntoCache(bool isLocal, const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos)
+{
+    if (isLocal) {
+        std::lock_guard<std::mutex> autoLock(localInfoMutex_);
+        return MergeDBInfos(dbInfos, localDBInfos_);
+    }
+    std::lock_guard<std::mutex> autoLock(remoteInfoMutex_);
+    if (remoteDBInfos_.find(devInfos.identifier) == remoteDBInfos_.end()) {
+        remoteDBInfos_.insert({devInfos.identifier, {}});
+    }
+    return MergeDBInfos(dbInfos, remoteDBInfos_[devInfos.identifier]);
+}
+
+void DBStatusAdapter::ClearAllCache()
+{
+    {
+        std::lock_guard<std::mutex> autoLock(localInfoMutex_);
+        localDBInfos_.clear();
+    }
+    {
+        std::lock_guard<std::mutex> autoLock(remoteInfoMutex_);
+        remoteDBInfos_.clear();
+    }
+    std::lock_guard<std::mutex> autoLock(supportMutex_);
+    remoteOptimizeInfo_.clear();
+    cacheLocalSendLabelExchange_ = false;
+    localSendLabelExchange_ = false;
+    LOGD("[DBStatusAdapter] ClearAllCache ok");
+}
+
+void DBStatusAdapter::NotifyRemoteOffline()
+{
+    std::map<std::string, std::vector<DBInfo>> remoteOnlineDBInfos;
+    {
+        std::lock_guard<std::mutex> autoLock(remoteInfoMutex_);
+        for (const auto &[dev, dbInfos]: remoteDBInfos_) {
+            for (const auto &dbInfo: dbInfos) {
+                if (dbInfo.isNeedSync) {
+                    DBInfo info = dbInfo;
+                    info.isNeedSync = false;
+                    remoteOnlineDBInfos[dev].push_back(info);
+                }
+            }
+        }
+    }
+    RemoteDBChangeCallback callback;
+    {
+        std::lock_guard<std::mutex> autoLock(callbackMutex_);
+        callback = remoteCallback_;
+    }
+    if (callback == nullptr || remoteOnlineDBInfos.empty()) {
+        LOGD("[DBStatusAdapter] no need to notify offline when reset handle");
+        return;
+    }
+    for (const auto &[dev, dbInfos]: remoteOnlineDBInfos) {
+        callback(dev, dbInfos);
+    }
+    LOGD("[DBStatusAdapter] Notify offline ok");
+}
+
+bool DBStatusAdapter::MergeDBInfos(const std::vector<DBInfo> &srcDbInfos, std::vector<DBInfo> &dstDbInfos)
+{
+    bool isDbInfoChange = false;
+    for (const auto &srcInfo: srcDbInfos) {
+        if (!ParamCheckUtils::CheckStoreParameter(srcInfo.storeId, srcInfo.appId, srcInfo.userId)) {
+            continue;
+        }
+        auto res = std::find_if(dstDbInfos.begin(), dstDbInfos.end(), [&srcInfo](const DBInfo &dstInfo) {
+            return srcInfo.appId == dstInfo.appId && srcInfo.userId == dstInfo.userId &&
+                srcInfo.storeId == dstInfo.storeId && srcInfo.syncDualTupleMode == dstInfo.syncDualTupleMode;
+        });
+        if (res == dstDbInfos.end()) {
+            dstDbInfos.push_back(srcInfo);
+            isDbInfoChange = true;
+        } else if (res->isNeedSync != srcInfo.isNeedSync) {
+            res->isNeedSync = srcInfo.isNeedSync;
+            isDbInfoChange = true;
+        }
+    }
+    return isDbInfoChange;
+}
+
+int DBStatusAdapter::GetLocalDeviceId(std::string &deviceId)
+{
+    ICommunicatorAggregator *communicatorAggregator = nullptr;
+    int errCode = RuntimeContext::GetInstance()->GetCommunicatorAggregator(communicatorAggregator);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    return communicatorAggregator->GetLocalIdentity(deviceId);
+}
+
+bool DBStatusAdapter::IsLocalDeviceId(const std::string &deviceId)
+{
+    std::string localId;
+    if (GetLocalDeviceId(localId) != E_OK) {
+        return false;
+    }
+    return deviceId == localId;
+}
+}
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/frame_header.h b/kv_store/frameworks/libs/distributeddb/communicator/src/frame_header.h
index b861a3e14b5f1f45486ff93a311e85f6ead616e3..f4de8a7ea558f76e87e9ddbdb9d44b546e321c57 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/frame_header.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/frame_header.h
@@ -22,7 +22,8 @@
 namespace DistributedDB {
 /*
  * packetType: Bit0:   FragmentFlag: 1: Fragmented 0: Not Fragmented
- *             Bit1~3: Reserved
+ *             Bit1~2: Reserved
+ *             Bit3: Communication negotiation mark 0:support 1:not support
  *             Bit4~7: FrameType
  */
 struct CommPhyHeader {
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp b/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
index 7f994d81652732adfd0327caf663b806e8cad4bc..84048d9810cc1fa363217ae2af5dd60228dcc534 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
@@ -58,6 +58,16 @@ FrameType GetFrameType(uint8_t inPacketType)
     }
     return static_cast<FrameType>(frameType);
 }
+bool IsSendLabelExchange(uint8_t inPacketType)
+{
+    return ((inPacketType & 0x08) >> 3) == 0; // Use 0x08 and remove low 3 bit, it is Communication negotiation mark
+}
+void SetSendLabelExchange(uint8_t &inPacketType, bool sendLabelExchange)
+{
+    if (!sendLabelExchange) {
+        inPacketType |= 0x08; // mark 0x08 when not support communication
+    }
+}
 }
 
 std::map<uint32_t, TransformFunc> ProtocolProto::msgIdMapFunc_;
@@ -446,6 +456,7 @@ int ProtocolProto::SetPhyHeader(SerialBuffer *inBuff, const PhyHeaderInfo &inInf
     } else {
         return -E_INVALID_ARGS;
     }
+    SetSendLabelExchange(packetType, inInfo.sendLabelExchange);
 
     CommPhyHeader phyHeader;
     phyHeader.magic = MAGIC_CODE;
@@ -791,6 +802,7 @@ int ProtocolProto::ParseCommPhyHeader(const std::string &srcTarget, const uint8_
         return -E_FRAME_TYPE_NOT_SUPPORT;
     }
     inResult.SetFrameTypeInfo(frameType);
+    inResult.SetSendLabelExchange(IsSendLabelExchange(phyHeader.packetType));
     return E_OK;
 }
 
diff --git a/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.h b/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
index f151f0a609d7c265eccc20571dfcad7cc9891bb9..34c021071867f5ec82810c144ecbdda01324409e 100644
--- a/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
+++ b/kv_store/frameworks/libs/distributeddb/communicator/src/protocol_proto.h
@@ -32,6 +32,7 @@ struct PhyHeaderInfo {
     uint64_t sourceId = 0u;
     uint32_t frameId = 0u;
     FrameType frameType = FrameType::EMPTY;
+    bool sendLabelExchange = true;
 };
 
 struct FrameFragmentInfo {
diff --git a/kv_store/frameworks/libs/distributeddb/distributeddb.gni b/kv_store/frameworks/libs/distributeddb/distributeddb.gni
index 3e0349638258d966fa0e5f46c6996a1d5e55d7a7..7fd5bdcab24e20b84fb14f275d7388e16827f849 100644
--- a/kv_store/frameworks/libs/distributeddb/distributeddb.gni
+++ b/kv_store/frameworks/libs/distributeddb/distributeddb.gni
@@ -68,6 +68,7 @@ distributeddb_src = [
   "${distributeddb_path}/communicator/src/communicator.cpp",
   "${distributeddb_path}/communicator/src/communicator_aggregator.cpp",
   "${distributeddb_path}/communicator/src/communicator_linker.cpp",
+  "${distributeddb_path}/communicator/src/db_status_adapter.cpp",
   "${distributeddb_path}/communicator/src/frame_combiner.cpp",
   "${distributeddb_path}/communicator/src/frame_retainer.cpp",
   "${distributeddb_path}/communicator/src/header_converter.cpp",
@@ -236,6 +237,7 @@ distributeddb_src = [
   "${distributeddb_path}/syncer/src/device/singlever/single_ver_sync_task_context.cpp",
   "${distributeddb_path}/syncer/src/device/singlever/single_ver_syncer.cpp",
   "${distributeddb_path}/syncer/src/device/subscribe_manager.cpp",
+  "${distributeddb_path}/syncer/src/device/subscribe_recorder.cpp",
   "${distributeddb_path}/syncer/src/device/sync_engine.cpp",
   "${distributeddb_path}/syncer/src/device/sync_state_machine.cpp",
   "${distributeddb_path}/syncer/src/device/sync_target.cpp",
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/include/cloud/cloud_store_types.h b/kv_store/frameworks/libs/distributeddb/interfaces/include/cloud/cloud_store_types.h
index 90cff59d88efc6ac4e4206337d7a1ee5f1f85fc4..a446377eb922127cd078fec70f90e089e50676cb 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/include/cloud/cloud_store_types.h
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/include/cloud/cloud_store_types.h
@@ -144,6 +144,7 @@ struct QueryNode {
 struct SqlCondition {
     std::string sql;  // The sql statement;
     std::vector<Type> bindArgs;  // The bind args.
+    bool readOnly = false;
 };
 
 enum class RecordStatus {
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/include/db_info_handle.h b/kv_store/frameworks/libs/distributeddb/interfaces/include/db_info_handle.h
new file mode 100644
index 0000000000000000000000000000000000000000..831db79db334dc7bc56e9ae8ae64ebda9f9caff7
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/include/db_info_handle.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DB_INFO_HANDLE_H
+#define DB_INFO_HANDLE_H
+
+#include "iprocess_communicator.h"
+#include "store_types.h"
+
+namespace DistributedDB {
+// For all functions with returnType DBStatus:
+// return DBStatus::OK if successful, otherwise DBStatus::DB_ERROR if anything wrong.
+class DBInfoHandle {
+public:
+    DBInfoHandle() = default;
+    virtual ~DBInfoHandle() = default;
+    // return true if you can notify with RuntimeConfig::NotifyDBInfo
+    virtual bool IsSupport() = 0;
+    // check is need auto sync when remote db is open
+    // return true if data has changed
+    virtual bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const DeviceInfos &devInfo) = 0;
+};
+}
+#endif // DB_INFO_HANDLE_H
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h b/kv_store/frameworks/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h
index f33bb86655bbead36d258b5d58472ba011c22ea5..ec68c4561a965cb6055c15f4ad1dae1dd314b70c 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/include/kv_store_nb_delegate.h
@@ -232,6 +232,10 @@ public:
 
     // update all key in sync_data which is not deleted data
     DB_API virtual DBStatus UpdateKey(const UpdateKeyCallback &callback) = 0;
+
+    // get full watermark by device which is not contain query watermark
+    // this api get watermark from cache which reload in get kv store
+    DB_API virtual std::pair<DBStatus, WatermarkInfo> GetWatermarkInfo(const std::string &device) = 0;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/include/runtime_config.h b/kv_store/frameworks/libs/distributeddb/interfaces/include/runtime_config.h
index 77c078997f19ae83eec7b438d6c0858cc24e4041..f98fe90247bc6da82438c2f5c3923b147c46c976 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/include/runtime_config.h
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/include/runtime_config.h
@@ -20,6 +20,7 @@
 #include <mutex>
 
 #include "auto_launch_export.h"
+#include "db_info_handle.h"
 #include "cloud/icloud_data_translate.h"
 #include "iprocess_communicator.h"
 #include "iprocess_system_api_adapter.h"
@@ -58,6 +59,10 @@ public:
 
     DB_API static bool IsProcessSystemApiAdapterValid();
 
+    DB_API static void SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &handle);
+
+    DB_API static void NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos);
+
     DB_API static void SetTranslateToDeviceIdCallback(const TranslateToDeviceIdCallback &callback);
 
     DB_API static void SetAutoLaunchRequestCallback(const AutoLaunchRequestCallback &callback, DBType type);
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/include/store_types.h b/kv_store/frameworks/libs/distributeddb/interfaces/include/store_types.h
index 29c151073b315f9037ee2fb592fb733f4cea2a7a..556755dd9ccb0024d41a81ed0e0f1cf7b2f6dd9f 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/include/store_types.h
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/include/store_types.h
@@ -184,6 +184,15 @@ struct RemoteCondition {
     std::string sql;  // The sql statement;
     std::vector<std::string> bindArgs;  // The bind args.
 };
+
+struct DBInfo {
+    std::string userId;
+    std::string appId;
+    std::string storeId;
+    bool syncDualTupleMode = false;
+    bool isNeedSync = false;
+};
+
 using UpdateKeyCallback = std::function<void (const Key &originKey, Key &newKey)>;
 
 struct TrackerSchema {
@@ -207,5 +216,10 @@ struct ChangeProperties {
 struct Rdconfig {
     bool readOnly = false;
 };
+
+struct WatermarkInfo {
+    uint64_t sendMark = 0; // data will be sent which timestamp greater than sendMark
+    uint64_t receiveMark = 0; // data will be sent in remote which timestamp greater than receiveMark
+};
 } // namespace DistributedDB
 #endif // KV_STORE_TYPE_H
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp
index adfdd81135679caf6015b3fbcf2ae1ba2bbe9ae2..9b2233f5dcfa517b178777deb56ad48ad805845b 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_delegate_manager.cpp
@@ -406,6 +406,11 @@ DBStatus KvStoreDelegateManager::DeleteKvStore(const std::string &storeId)
     int errCode = KvDBManager::RemoveDatabase(properties);
     if (errCode == E_OK) {
         LOGI("Database deleted successfully!");
+        DBInfo dbInfo;
+        dbInfo.userId = userId_;
+        dbInfo.appId = appId_;
+        dbInfo.storeId = storeId;
+        RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo);
         return OK;
     }
     LOGE("Delete the kv store error:%d", errCode);
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp
index 94cd66c7543b4251df634c178c69316c2e9220ca..3ba746f0d039ba4d91304c44ae6988aa8f77a109 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.cpp
@@ -1003,4 +1003,27 @@ DBStatus KvStoreNbDelegateImpl::UpdateKey(const UpdateKeyCallback &callback)
     LOGW("[KvStoreNbDelegate] update keys failed:%d", errCode);
     return TransferDBErrno(errCode);
 }
+
+std::pair<DBStatus, WatermarkInfo> KvStoreNbDelegateImpl::GetWatermarkInfo(const std::string &device)
+{
+    std::pair<DBStatus, WatermarkInfo> res;
+    if (device.empty() || device.size() > DBConstant::MAX_DEV_LENGTH) {
+        LOGE("[KvStoreNbDelegate] device invalid length %zu", device.size());
+        res.first = INVALID_ARGS;
+        return res;
+    }
+    if (conn_ == nullptr) {
+        LOGE("%s", INVALID_CONNECTION);
+        res.first = DB_ERROR;
+        return res;
+    }
+    int errCode = conn_->GetWatermarkInfo(device, res.second);
+    if (errCode == E_OK) {
+        LOGI("[KvStoreNbDelegate] get watermark info success");
+    } else {
+        LOGE("[KvStoreNbDelegate] get watermark info failed:%d", errCode);
+    }
+    res.first = TransferDBErrno(errCode);
+    return res;
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h
index df27752286fbb84266d23596fc49ec0f06cc7e3e..e28999587d76a2ecaf631b9a272c82f5d481f017 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/src/kv_store_nb_delegate_impl.h
@@ -159,6 +159,8 @@ public:
 
     // update all key in sync_data which is not deleted data
     DBStatus UpdateKey(const UpdateKeyCallback &callback) override;
+
+    std::pair<DBStatus, WatermarkInfo> GetWatermarkInfo(const std::string &device) override;
 private:
     DBStatus GetInner(const IOption &option, const Key &key, Value &value) const;
     DBStatus PutInner(const IOption &option, const Key &key, const Value &value);
diff --git a/kv_store/frameworks/libs/distributeddb/interfaces/src/runtime_config.cpp b/kv_store/frameworks/libs/distributeddb/interfaces/src/runtime_config.cpp
index 092c58f9b57fb9668082b6f5dc7446136f156753..45d80fcd8edd4b87f24e05afc47c21e9c1fdd25f 100644
--- a/kv_store/frameworks/libs/distributeddb/interfaces/src/runtime_config.cpp
+++ b/kv_store/frameworks/libs/distributeddb/interfaces/src/runtime_config.cpp
@@ -126,6 +126,16 @@ DBStatus RuntimeConfig::SetPermissionConditionCallback(const PermissionCondition
     return TransferDBErrno(RuntimeContext::GetInstance()->SetPermissionConditionCallback(callback));
 }
 
+void RuntimeConfig::SetDBInfoHandle(const std::shared_ptr<DBInfoHandle> &handle)
+{
+    RuntimeContext::GetInstance()->SetDBInfoHandle(handle);
+}
+
+void RuntimeConfig::NotifyDBInfos(const DeviceInfos &devInfos, const std::vector<DBInfo> &dbInfos)
+{
+    RuntimeContext::GetInstance()->NotifyDBInfos(devInfos, dbInfos);
+}
+
 void RuntimeConfig::SetTranslateToDeviceIdCallback(const DistributedDB::TranslateToDeviceIdCallback &callback)
 {
     RuntimeContext::GetInstance()->SetTranslateToDeviceIdCallback(callback);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/include/cloud/cloud_storage_utils.h b/kv_store/frameworks/libs/distributeddb/storage/include/cloud/cloud_storage_utils.h
index 1395989d3a9b9edf042a96497a150f218758209a..fe8449c71055db318c5f89af5a580f83cf18ce59 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/include/cloud/cloud_storage_utils.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/include/cloud/cloud_storage_utils.h
@@ -147,9 +147,10 @@ public:
 
     static bool GetTypeCaseInsensitive(const std::string &fieldName, const VBucket &vBucket, Type &data);
 
-    static void TransferSchemaFieldToLower(TableSchema &tableSchema);
-
     static bool CheckCloudSchemaFields(const TableSchema &tableSchema, const TableSchema &oldSchema);
+
+    static int BindUpdateLogStmtFromVBucket(const VBucket &vBucket, const TableSchema &tableSchema,
+        const std::vector<std::string> &colNames, sqlite3_stmt *updateLogStmt);
 };
 }
 #endif // CLOUD_STORAGE_UTILS_H
diff --git a/kv_store/frameworks/libs/distributeddb/storage/include/ikvdb_connection.h b/kv_store/frameworks/libs/distributeddb/storage/include/ikvdb_connection.h
index eec37ba70d14b129cb7644af9931d64db2f23eaf..d26218fe1404563f2def7c846293eded027d1056 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/include/ikvdb_connection.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/include/ikvdb_connection.h
@@ -133,6 +133,8 @@ public:
     virtual int GetSyncDataSize(const std::string &device, size_t &size) const = 0;
 
     virtual int UpdateKey(const UpdateKeyCallback &callback) = 0;
+
+    virtual int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) = 0;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/include/sync_generic_interface.h b/kv_store/frameworks/libs/distributeddb/storage/include/sync_generic_interface.h
index 0d01835a232adee4912b8ebff95fdb8ff109835b..759aaad9d6a89cb0e04af49dc3c4c042547b31b4 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/include/sync_generic_interface.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/include/sync_generic_interface.h
@@ -16,8 +16,9 @@
 #define SYNC_GENERIC_INTERFACE_H
 
 #include "isync_interface.h"
-#include "query_object.h"
 #include "single_ver_kv_entry.h"
+#include "store_types.h"
+#include "query_object.h"
 
 namespace DistributedDB {
 class SyncGenericInterface : public ISyncInterface {
@@ -145,6 +146,13 @@ public:
         return {};
     }
 
+    virtual void GetDBInfo(DBInfo &dbInfo) const
+    {
+        dbInfo.appId = GetDbProperties().GetStringProp(DBProperties::APP_ID, "");
+        dbInfo.userId = GetDbProperties().GetStringProp(DBProperties::USER_ID, "");
+        dbInfo.storeId = GetDbProperties().GetStringProp(DBProperties::STORE_ID, "");
+    }
+
     int IsSupportSubscribe() const override
     {
         return -E_NOT_SUPPORT;
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/cloud/cloud_storage_utils.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/cloud/cloud_storage_utils.cpp
index 0e7889e0ebc61926bfb29da02e1f946cd5c62f5b..ce90eb0657e78b663b3aeea2e97da19ba21cbb7e 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/cloud/cloud_storage_utils.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/cloud/cloud_storage_utils.cpp
@@ -20,6 +20,7 @@
 #include "cloud/cloud_db_types.h"
 #include "db_common.h"
 #include "runtime_context.h"
+#include "cloud/cloud_db_constant.h"
 
 namespace DistributedDB {
 int CloudStorageUtils::BindInt64(int index, const VBucket &vBucket, const Field &field,
@@ -1041,13 +1042,6 @@ bool CloudStorageUtils::GetTypeCaseInsensitive(const std::string &fieldName, con
     return true;
 }
 
-void CloudStorageUtils::TransferSchemaFieldToLower(TableSchema &tableSchema)
-{
-    for (auto &field : tableSchema.fields) {
-        std::transform(field.colName.begin(), field.colName.end(), field.colName.begin(), tolower);
-    }
-}
-
 bool CloudStorageUtils::CheckCloudSchemaFields(const TableSchema &tableSchema, const TableSchema &oldSchema)
 {
     if (tableSchema.name != oldSchema.name) {
@@ -1064,4 +1058,50 @@ bool CloudStorageUtils::CheckCloudSchemaFields(const TableSchema &tableSchema, c
     }
     return true;
 }
+
+int CloudStorageUtils::BindUpdateLogStmtFromVBucket(const VBucket &vBucket, const TableSchema &tableSchema,
+    const std::vector<std::string> &colNames, sqlite3_stmt *updateLogStmt)
+{
+    int index = 0;
+    int errCode = E_OK;
+    for (const auto &colName : colNames) {
+        index++;
+        if (colName == CloudDbConstant::GID_FIELD) {
+            if (vBucket.find(colName) == vBucket.end()) {
+                LOGE("cloud data doesn't contain gid field when bind update log stmt.");
+                return -E_CLOUD_ERROR;
+            }
+            errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index,
+                std::get<std::string>(vBucket.at(colName)));
+        } else if (colName == CloudDbConstant::MODIFY_FIELD) {
+            if (vBucket.find(colName) == vBucket.end()) {
+                LOGE("cloud data doesn't contain modify field when bind update log stmt.");
+                return -E_CLOUD_ERROR;
+            }
+            errCode = SQLiteUtils::BindInt64ToStatement(updateLogStmt, index, std::get<int64_t>(vBucket.at(colName)));
+        } else if (colName == CloudDbConstant::VERSION_FIELD) {
+            if (vBucket.find(colName) == vBucket.end()) {
+                LOGE("cloud data doesn't contain version field when bind update log stmt.");
+                return -E_CLOUD_ERROR;
+            }
+            errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index,
+                std::get<std::string>(vBucket.at(colName)));
+        } else if (colName == CloudDbConstant::SHARING_RESOURCE_FIELD) {
+            if (vBucket.find(colName) == vBucket.end()) {
+                errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index, std::string(""));
+            } else {
+                errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index,
+                    std::get<std::string>(vBucket.at(colName)));
+            }
+        } else {
+            LOGE("invalid col name when bind value to update log statement.");
+            return -E_INTERNAL_ERROR;
+        }
+        if (errCode != E_OK) {
+            LOGE("fail to bind value to update log statement.");
+            return errCode;
+        }
+    }
+    return E_OK;
+}
 }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/data_transformer.h b/kv_store/frameworks/libs/distributeddb/storage/src/data_transformer.h
index f78983ef227a2779fc326e2d0181a2cf70f79ba8..bf15e697d88a67ffb89c36406bcbad813597747e 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/data_transformer.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/data_transformer.h
@@ -35,6 +35,7 @@ struct LogInfo {
     uint64_t flag = 0;
     Key hashKey; // primary key hash value
     std::string cloudGid; // use for sync with cloud
+    std::string sharingResource; // use for cloud share data
 };
 
 enum class LogInfoFlag : uint32_t {
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.cpp
index 6d8e198538e44dea38fe40967c9d73220ac8d9ae..a64aa13c2ce0c3ddaa709b8eeb9e5896be785150 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.cpp
@@ -364,4 +364,10 @@ int GenericKvDBConnection::UpdateKey(const UpdateKeyCallback &callback)
 {
     return -E_NOT_SUPPORT;
 }
+
+int GenericKvDBConnection::GetWatermarkInfo([[gnu::unused]] const std::string &device,
+    [[gnu::unused]] WatermarkInfo &info)
+{
+    return -E_NOT_SUPPORT;
+}
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.h b/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.h
index 05a8c8533073e27cc4fe28ad9d4c69a6b93610a5..c0b4203565a2d2118a065d264727085789362532 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/generic_kvdb_connection.h
@@ -80,6 +80,8 @@ public:
     int GetSyncDataSize(const std::string &device, size_t &size) const override;
 
     int UpdateKey(const UpdateKeyCallback &callback) override;
+
+    int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) override;
 protected:
     // Get the stashed 'KvDB_ pointer' without ref.
     template<typename DerivedDBType>
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.cpp
index 7d62af397455977886bb591a7d50ea87a69159f3..782fe20c0f73ff4bf758683a87d0adeb4fd24e81 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.cpp
@@ -454,4 +454,17 @@ int SyncAbleKvDB::GetHashDeviceId(const std::string &clientId, std::string &hash
     }
     return syncer_.GetHashDeviceId(clientId, hashDevId);
 }
+
+int SyncAbleKvDB::GetWatermarkInfo(const std::string &device, WatermarkInfo &info)
+{
+    if (NeedStartSyncer()) {
+        StartSyncer();
+    }
+    return syncer_.GetWatermarkInfo(device, info);
+}
+
+int SyncAbleKvDB::UpgradeSchemaVerInMeta()
+{
+    return syncer_.UpgradeSchemaVerInMeta();
+}
 }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.h b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.h
index 2b4c079a297f286c4920728bee3aac61f4062774..ec49c2560d4f3f688e58d336866b9235ac6786c5 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb.h
@@ -89,6 +89,9 @@ public:
 
     int GetHashDeviceId(const std::string &clientId, std::string &hashDevId);
 
+    int GetWatermarkInfo(const std::string &device, WatermarkInfo &info);
+
+    int UpgradeSchemaVerInMeta();
 protected:
     virtual IKvDBSyncInterface *GetSyncInterface() = 0;
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.cpp
index 57d6f14438602920e7f351282c356b838f343aac..a0aec45b1e959685800225cc99f2e5b2533244da 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.cpp
@@ -332,4 +332,13 @@ int SyncAbleKvDBConnection::GetSyncDataSize(const std::string &device, size_t &s
     }
     return kvDB->GetSyncDataSize(device, size);
 }
+
+int SyncAbleKvDBConnection::GetWatermarkInfo(const std::string &device, WatermarkInfo &info)
+{
+    SyncAbleKvDB *kvDB = GetDB<SyncAbleKvDB>();
+    if (kvDB == nullptr) {
+        return -E_INVALID_CONNECTION;
+    }
+    return kvDB->GetWatermarkInfo(device, info);
+}
 }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.h b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.h
index 07edbb3dc8ef48eee6388f1b45aa315e50305866..b0184d8dc2d8dbc8d21cfff29d237ea1d96620d6 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/kv/sync_able_kvdb_connection.h
@@ -37,6 +37,7 @@ public:
 
     int GetSyncDataSize(const std::string &device, size_t &size) const override;
 
+    int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) override;
 protected:
     int DisableManualSync();
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/relational/relational_sync_able_storage.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/relational/relational_sync_able_storage.cpp
index 88a2f7b67245c72d9caf7d08d5dc37aa67b173aa..ba082afbc233871aae345d34a5ba8265f0f530b2 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/relational/relational_sync_able_storage.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/relational/relational_sync_able_storage.cpp
@@ -1737,6 +1737,7 @@ int RelationalSyncAbleStorage::UpsertDataInTransaction(SQLiteSingleVerRelational
             recordCopy[CloudDbConstant::GID_FIELD] = dataInfoWithLog.logInfo.cloudGid;
             recordCopy[CloudDbConstant::MODIFY_FIELD] = static_cast<int64_t>(dataInfoWithLog.logInfo.timestamp);
             recordCopy[CloudDbConstant::CREATE_FIELD] = static_cast<int64_t>(dataInfoWithLog.logInfo.wTimestamp);
+            recordCopy[CloudDbConstant::SHARING_RESOURCE_FIELD] = dataInfoWithLog.logInfo.sharingResource;
         }
         downloadData.existDataKey.push_back(dataInfoWithLog.logInfo.dataKey);
         downloadData.data.push_back(std::move(recordCopy));
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.cpp
index c7fd1dc028753ca18d6507433dda4985450875f0..5bdb228d65e3b72feae598c536a1bc401964b5ca 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.cpp
@@ -55,28 +55,36 @@ bool SingleVerNaturalStoreConnection::IsExtendedCacheDBMode() const
     return false;
 }
 
-int SingleVerNaturalStoreConnection::CheckSyncEntriesValid(const std::vector<Entry> &entries) const
+bool SingleVerNaturalStoreConnection::CheckAndGetEntryLen(const std::vector<Entry> &entries, uint32_t limit,
+    uint32_t &entryLen) const
 {
-    if (entries.size() > DBConstant::MAX_BATCH_SIZE) {
-        return -E_INVALID_ARGS;
-    }
-
-    SingleVerNaturalStore *naturalStore = GetDB<SingleVerNaturalStore>();
-    if (naturalStore == nullptr) {
-        return -E_INVALID_DB;
-    }
-
-    int errCode = CheckWritePermission();
-    if (errCode != E_OK) {
-        return errCode;
+    uint32_t len = 0;
+    for (const auto &entry : entries) {
+        len += (entry.key.size() + entry.value.size());
+        if (len > limit) {
+            return false; // stop calculate key len when it excced limit.
+        }
     }
+    entryLen = len;
+    return true;
+}
 
-    for (const auto &entry : entries) {
-        errCode = naturalStore->CheckDataStatus(entry.key, entry.value, false);
-        if (errCode != E_OK) {
-            return errCode;
+bool SingleVerNaturalStoreConnection::CheckAndGetKeyLen(const std::vector<Key> &keys, const uint32_t limit,
+    uint32_t &keyLen) const
+{
+    uint32_t len = 0;
+    for (const auto &key : keys) {
+        len += key.size();
+        if (len > limit) {
+            return false; // stop calculate key len when it excced limit.
         }
     }
+    keyLen = len;
+    return true;
+}
+
+int SingleVerNaturalStoreConnection::CheckSyncEntriesValid(const std::vector<Entry> &entries) const
+{
     return E_OK;
 }
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.h b/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.h
index 6c0f72f3f4fbab518199345261e62cfa4e178bc1..c22b372f5a8453cc79f57bb9e713e03e0f8ec6ac 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/single_ver_natural_store_connection.h
@@ -48,6 +48,10 @@ protected:
     virtual int CheckSyncKeysValid(const std::vector<Key> &keys) const = 0;
 
     virtual int DeleteBatchInner(const IOption &option, const std::vector<Key> &keys) = 0;
+
+    bool CheckAndGetEntryLen(const std::vector<Entry> &entries, uint32_t limit, uint32_t &keyLen) const;
+
+    bool CheckAndGetKeyLen(const std::vector<Key> &keys, const uint32_t limit, uint32_t &keyLen) const;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/cloud_sync_log_table_manager.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/cloud_sync_log_table_manager.cpp
index df4a8380c61849cbb410b98e1297cac2fa6df980..2ca1aede645f0c87c7c3047253b0d3d1be220757 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/cloud_sync_log_table_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/cloud_sync_log_table_manager.cpp
@@ -100,7 +100,7 @@ std::string CloudSyncLogTableManager::GetInsertTrigger(const TableInfo &table, c
     insertTrigger += "BEGIN\n";
     insertTrigger += "\t INSERT OR REPLACE INTO " + logTblName;
     insertTrigger += " (data_key, device, ori_device, timestamp, wtimestamp, flag, hash_key, cloud_gid, ";
-    insertTrigger += " extend_field, cursor, version)";
+    insertTrigger += " extend_field, cursor, version, sharing_resource)";
     insertTrigger += " VALUES (new." + std::string(DBConstant::SQLITE_INNER_ROWID) + ", '', '',";
     insertTrigger += " get_raw_sys_time(), get_raw_sys_time(), 0x02, ";
     insertTrigger += CalcPrimaryKeyHash("NEW.", table, identity) + ", CASE WHEN (SELECT count(*)<>0 FROM ";
@@ -111,7 +111,7 @@ std::string CloudSyncLogTableManager::GetInsertTrigger(const TableInfo &table, c
     insertTrigger += ", case when (SELECT count(1)<>0 FROM " + logTblName + ") then ";
     insertTrigger += " (SELECT case when (MAX(cursor) is null) then 1 else MAX(cursor) + 1 END";
     insertTrigger += " FROM " +  logTblName + ")";
-    insertTrigger += " ELSE new." + std::string(DBConstant::SQLITE_INNER_ROWID) + " end, '');\n";
+    insertTrigger += " ELSE new." + std::string(DBConstant::SQLITE_INNER_ROWID) + " end, '', '');\n";
     insertTrigger += CloudStorageUtils::GetTableRefUpdateSql(table, OpType::INSERT);
     insertTrigger += "SELECT client_observer('" + tableName + "', NEW." + std::string(DBConstant::SQLITE_INNER_ROWID);
     insertTrigger += ", 0, ";
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/collaboration_log_table_manager.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/collaboration_log_table_manager.cpp
index 4c97b628280691137c628f98bb7c34636b882003..702e6ec21376354eb05fac20e365fd7e57f18a4b 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/collaboration_log_table_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/collaboration_log_table_manager.cpp
@@ -90,7 +90,7 @@ std::string CollaborationLogTableManager::GetUpdateTrigger(const TableInfo &tabl
             std::string(DBConstant::SQLITE_INNER_ROWID) + ", '', '', get_sys_time(0), "
             "get_last_time(), CASE WHEN (" + CalcPrimaryKeyHash("NEW.", table, identity) + " != " +
             CalcPrimaryKeyHash("NEW.", table, identity) + ") THEN 0x02 ELSE 0x22 END, " +
-            CalcPrimaryKeyHash("NEW.", table, identity) + ", '', '', '', '');\n";
+            CalcPrimaryKeyHash("NEW.", table, identity) + ", '', '', '', '', '');\n";
     }
     updateTrigger += "END;";
     return updateTrigger;
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/simple_tracker_log_table_manager.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/simple_tracker_log_table_manager.cpp
index 1a47c331c1fbc8445160c068bb8fc55faada1932..c46130a34a1b63c4478b7da81900fc3514521f2d 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/simple_tracker_log_table_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/simple_tracker_log_table_manager.cpp
@@ -65,7 +65,7 @@ std::string SimpleTrackerLogTableManager::GetInsertTrigger(const TableInfo &tabl
     insertTrigger += "BEGIN\n";
     insertTrigger += "\t INSERT OR REPLACE INTO " + logTblName;
     insertTrigger += " (data_key, device, ori_device, timestamp, wtimestamp, flag, hash_key, cloud_gid";
-    insertTrigger += ", extend_field, cursor, version)";
+    insertTrigger += ", extend_field, cursor, version, sharing_resource)";
     insertTrigger += " VALUES (new." + std::string(DBConstant::SQLITE_INNER_ROWID) + ", '', '',";
     insertTrigger += " get_raw_sys_time(), get_raw_sys_time(), 0x02, ";
     insertTrigger += CalcPrimaryKeyHash("NEW.", table, identity) + ", '', ";
@@ -73,7 +73,7 @@ std::string SimpleTrackerLogTableManager::GetInsertTrigger(const TableInfo &tabl
     insertTrigger += ", case when (SELECT count(1)<>0 FROM " + logTblName + ") then ";
     insertTrigger += " (SELECT case when (MAX(cursor) is null) then 1 else MAX(cursor) + 1 END";
     insertTrigger += " FROM " +  logTblName + ")";
-    insertTrigger += " ELSE new." + std::string(DBConstant::SQLITE_INNER_ROWID) + " end, '');\n";
+    insertTrigger += " ELSE new." + std::string(DBConstant::SQLITE_INNER_ROWID) + " end, '', '');\n";
     insertTrigger += "SELECT client_observer('" + tableName + "', NEW._rowid_, 0, ";
     insertTrigger += table.GetTrackerTable().GetTrackerColNames().empty() ? "0" : "1";
     insertTrigger += ");\n";
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/split_device_log_table_manager.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/split_device_log_table_manager.cpp
index 2e775e435075dded6e9bd3f27948eb775a940cbe..caa5920cd86f74f0b77e95bb231b7e4326dffdfd 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/split_device_log_table_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/split_device_log_table_manager.cpp
@@ -77,7 +77,7 @@ std::string SplitDeviceLogTableManager::GetUpdateTrigger(const TableInfo &table,
             std::string(DBConstant::SQLITE_INNER_ROWID) + ", '', '', get_sys_time(0), "
             "get_last_time(), CASE WHEN (" + CalcPrimaryKeyHash("NEW.", table, identity) + " != " +
             CalcPrimaryKeyHash("NEW.", table, identity) + ") THEN 0x02 ELSE 0x22 END, " +
-            CalcPrimaryKeyHash("NEW.", table, identity) + ", '', '', '', '');\n";
+            CalcPrimaryKeyHash("NEW.", table, identity) + ", '', '', '', '', '');\n";
     }
     updateTrigger += "END;";
     return updateTrigger;
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.cpp
index 3941c0fd03b6492bc51aad9644a77fd523b58339..03e31ace8235aa83a1d15b9ecb88d9bf5d692e52 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.cpp
@@ -20,6 +20,7 @@
 #include "db_errno.h"
 #include "log_table_manager_factory.h"
 #include "relational_schema_object.h"
+#include "simple_tracker_log_table_manager.h"
 #include "sqlite_relational_utils.h"
 
 namespace DistributedDB {
@@ -65,13 +66,25 @@ int SqliteRelationalDatabaseUpgrader::ExecuteUpgrade()
         return (errCode == -E_NOT_FOUND) ? E_OK : errCode;
     }
 
-    errCode = UpgradeLogTable(logTableVersion);
+    if (IsNewestVersion(logTableVersion)) {
+        LOGD("[Relational][UpgradeTrigger] No need upgrade.");
+        return E_OK;
+    }
+
+    RelationalSchemaObject schemaObj;
+    RelationalSchemaObject trackerSchemaObj;
+    errCode = GetParseSchema(schemaObj, trackerSchemaObj);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+
+    errCode = UpgradeLogTable(logTableVersion, schemaObj, trackerSchemaObj);
     if (errCode != E_OK) {
         LOGE("[Relational][Upgrade] Upgrade log table failed, err = %d.", errCode);
         return errCode;
     }
 
-    return UpgradeTrigger(logTableVersion);
+    return UpgradeTrigger(logTableVersion, schemaObj, trackerSchemaObj);
 }
 
 int SqliteRelationalDatabaseUpgrader::EndUpgrade(bool isSuccess)
@@ -88,87 +101,71 @@ bool SqliteRelationalDatabaseUpgrader::IsNewestVersion(const std::string &logTab
     return logTableVersion == DBConstant::LOG_TABLE_VERSION_CURRENT;
 }
 
-int SqliteRelationalDatabaseUpgrader::UpgradeTrigger(const std::string &logTableVersion)
+int SqliteRelationalDatabaseUpgrader::UpgradeTrigger(const std::string &logTableVersion,
+    const RelationalSchemaObject &schemaObj, const RelationalSchemaObject &trackerSchemaObj)
 {
-    if (IsNewestVersion(logTableVersion)) {
-        LOGD("[Relational][UpgradeTrigger] No need upgrade trigger.");
-        return E_OK;
-    }
-
-    // get schema from meta
-    std::string schemaDefine;
-    int errCode = SQLiteUtils::GetRelationalSchema(db_, schemaDefine);
-    if (errCode == -E_NOT_FOUND || (errCode == E_OK && schemaDefine.empty())) {
-        LOGI("[Relational][UpgradeTrigger] relational schema not found from meta return.");
-        return E_OK;
-    }
-    if (errCode != E_OK) {
-        LOGE("[Relational][UpgradeTrigger] Get relational schema from meta return %d.", errCode);
-        return errCode;
-    }
-
-    RelationalSchemaObject schemaObject;
-    errCode = schemaObject.ParseFromSchemaString(schemaDefine);
-    if (errCode != E_OK) {
-        LOGE("[Relational][UpgradeTrigger] Parse to relational schema failed. err:%d", errCode);
-        return errCode;
-    }
-
-    std::string trackerSchemaDefine;
-    RelationalSchemaObject trackerSchemaObject;
-    errCode = SQLiteUtils::GetRelationalSchema(db_, trackerSchemaDefine, DBConstant::RELATIONAL_TRACKER_SCHEMA_KEY);
-    if (errCode != E_OK && errCode != -E_NOT_FOUND) {
-        LOGE("[Relational][UpgradeTrigger] Get tracker schema from meta return. err:%d", errCode);
-        return errCode;
-    }
-    if (errCode == -E_NOT_FOUND || trackerSchemaDefine.empty()) {
-        LOGI("[Relational][UpgradeTrigger] tracker schema is empty.");
-    } else {
-        errCode = trackerSchemaObject.ParseFromTrackerSchemaString(trackerSchemaDefine);
+    DistributedTableMode mode = schemaObj.GetTableMode();
+    TableInfoMap trackerTables = trackerSchemaObj.GetTrackerTables();
+    for (const auto &table : schemaObj.GetTables()) {
+        bool isExists = false;
+        int errCode = SQLiteUtils::CheckTableExists(db_, table.first, isExists);
+        if (errCode == E_OK && !isExists) {
+            LOGI("[Relational][UpgradeLogTable] table may has been deleted, skip upgrade distributed trigger.");
+            continue;
+        }
+        TableInfo tableInfo = table.second;
+        tableInfo.SetTrackerTable(trackerSchemaObj.GetTrackerTable(table.first));
+        auto manager = LogTableManagerFactory::GetTableManager(mode, tableInfo.GetTableSyncType());
+        errCode = manager->AddRelationalLogTableTrigger(db_, tableInfo, "");
         if (errCode != E_OK) {
-            LOGE("[Relational][UpgradeTrigger] Parse to tracker schema failed. err:%d", errCode);
+            LOGE("[Relational][Upgrade] recreate distributed trigger failed. err:%d", errCode);
             return errCode;
         }
+        trackerTables.erase(table.first);
+    }
+    // Need to upgrade non-distributed trigger
+    auto manager = std::make_unique<SimpleTrackerLogTableManager>();
+    for (const auto &table: trackerTables) {
+        TableInfo tableInfo;
+        int ret = SQLiteRelationalUtils::AnalysisTrackerTable(db_, table.second.GetTrackerTable(), tableInfo);
+        if (ret == -E_NOT_FOUND) {
+            LOGI("[Relational][Upgrade] table may has been deleted, skip upgrade tracker trigger.");
+            continue;
+        }
+        if (ret != E_OK) {
+            LOGE("[Relational][Upgrade] analysis tracker table schema failed %d.", ret);
+            return ret;
+        }
+        ret = manager->AddRelationalLogTableTrigger(db_, tableInfo, "");
+        if (ret != E_OK) {
+            LOGE("[Relational][Upgrade] recreate trigger failed. err:%d", ret);
+            return ret;
+        }
     }
-
-    return UpgradeTriggerBaseOnSchema(schemaObject, trackerSchemaObject);
-}
-
-static bool inline NeedUpdateLogTable(const std::string &logTableVersion)
-{
-    return logTableVersion < DBConstant::LOG_TABLE_VERSION_CURRENT;
+    LOGI("[Relational][UpgradeLogTable] recreate trigger success, ver:%s to ver:%s", logTableVersion.c_str(),
+        DBConstant::LOG_TABLE_VERSION_CURRENT.c_str());
+    return E_OK;
 }
 
-int SqliteRelationalDatabaseUpgrader::UpgradeLogTable(const std::string &logTableVersion)
+int SqliteRelationalDatabaseUpgrader::UpgradeLogTable(const std::string &logTableVersion,
+    const RelationalSchemaObject &schemaObj, const RelationalSchemaObject &trackerSchemaObj)
 {
-    if (!NeedUpdateLogTable(logTableVersion)) {
-        LOGD("[Relational][Upgrade] No need upgrade log table.");
-        return E_OK;
-    }
-
-    // get schema from meta
-    std::string schemaDefine;
-    int errCode = SQLiteUtils::GetRelationalSchema(db_, schemaDefine);
-    if (errCode == -E_NOT_FOUND || (errCode == E_OK && schemaDefine.empty())) {
-        LOGI("[Relational][UpgradeLogTable] relational schema not found from meta return.");
-        return E_OK;
-    }
-    if (errCode != E_OK) {
-        LOGW("[Relational][UpgradeLogTable] Get relational schema from meta return %d.", errCode);
-        return errCode;
-    }
-
-    RelationalSchemaObject schemaObject;
-    errCode = schemaObject.ParseFromSchemaString(schemaDefine);
-    if (errCode != E_OK) {
-        LOGE("[Relational][UpgradeLogTable] Parse to relational schema failed. %d", errCode);
-        return errCode;
+    TableInfoMap trackerTables = trackerSchemaObj.GetTrackerTables();
+    for (const auto &table : schemaObj.GetTables()) {
+        std::string logName = DBCommon::GetLogTableName(table.first);
+        int errCode = UpgradeLogBaseOnVersion(logTableVersion, logName);
+        if (errCode != E_OK) {
+            LOGE("[Relational][UpgradeLogTable] upgrade distributed log table failed. err:%d", errCode);
+            return errCode;
+        }
+        trackerTables.erase(table.first);
     }
-
-    for (const auto &item : schemaObject.GetTables()) {
-        std::string logName = DBCommon::GetLogTableName(item.first);
-        errCode = UpgradeLogBaseOnVersion(logTableVersion, logName);
+    // Need to upgrade non-distributed log table
+    for (const auto &table: trackerTables) {
+        std::string logName = DBCommon::GetLogTableName(table.first);
+        int errCode = UpgradeLogBaseOnVersion(logTableVersion, logName);
         if (errCode != E_OK) {
+            LOGE("[Relational][UpgradeLogTable] upgrade tracker log table failed. err:%d", errCode);
             return errCode;
         }
     }
@@ -181,11 +178,15 @@ int SqliteRelationalDatabaseUpgrader::UpgradeLogBaseOnVersion(const std::string
     const std::string &logName)
 {
     TableInfo tableInfo;
+    tableInfo.SetTableName(logName);
     int errCode = SQLiteUtils::AnalysisSchemaFieldDefine(db_, logName, tableInfo);
+    if (errCode == E_OK && tableInfo.Empty()) {
+        LOGI("[Relational][UpgradeLogTable] table may has been deleted, skip upgrade log table.");
+        return E_OK;
+    }
     if (errCode != E_OK) {
         return errCode;
     }
-    tableInfo.SetTableName(logName);
     std::vector<std::string> addColSqlVec;
     if (oldVersion < DBConstant::LOG_TABLE_VERSION_3) {
         SQLiteRelationalUtils::AddUpgradeSqlToList(tableInfo, { { "cloud_gid", "text" } }, addColSqlVec);
@@ -194,6 +195,9 @@ int SqliteRelationalDatabaseUpgrader::UpgradeLogBaseOnVersion(const std::string
         SQLiteRelationalUtils::AddUpgradeSqlToList(tableInfo, { { "extend_field", "blob" },
             { "cursor", "int" }, { "version", "text" } }, addColSqlVec);
     }
+    if (oldVersion < DBConstant::LOG_TABLE_VERSION_5_3) {
+        SQLiteRelationalUtils::AddUpgradeSqlToList(tableInfo, { { "sharing_resource", "text" } }, addColSqlVec);
+    }
     for (size_t i = 0; i < addColSqlVec.size(); ++i) {
         errCode = SQLiteUtils::ExecuteRawSQL(db_, addColSqlVec[i]);
         if (errCode != E_OK) {
@@ -205,34 +209,41 @@ int SqliteRelationalDatabaseUpgrader::UpgradeLogBaseOnVersion(const std::string
     return errCode;
 }
 
-int SqliteRelationalDatabaseUpgrader::UpgradeTriggerBaseOnSchema(const RelationalSchemaObject &relationalSchema,
-    const RelationalSchemaObject &trackerSchema)
+int SqliteRelationalDatabaseUpgrader::GetParseSchema(RelationalSchemaObject &schemaObj,
+    RelationalSchemaObject &trackerSchemaObj)
 {
-    DistributedTableMode mode = relationalSchema.GetTableMode();
-    int errCode = E_OK;
-    for (const auto &table : relationalSchema.GetTables()) {
-        std::vector<std::string> dropSqlVec;
-        std::string prefixName = DBConstant::SYSTEM_TABLE_PREFIX + table.first;
-        dropSqlVec.push_back("DROP TRIGGER IF EXISTS " + prefixName + "_ON_UPDATE;");
-        dropSqlVec.push_back("DROP TRIGGER IF EXISTS " + prefixName + "_ON_INSERT;");
-        dropSqlVec.push_back("DROP TRIGGER IF EXISTS " + prefixName + "_ON_DELETE;");
-        for (size_t i = 0; i < dropSqlVec.size(); ++i) {
-            errCode = SQLiteUtils::ExecuteRawSQL(db_, dropSqlVec[i]);
-            if (errCode != E_OK) {
-                LOGE("[Relational][Upgrade] drop trigger failed. err:%d, index:%zu", errCode, i);
-                return errCode;
-            }
+    // get schema from meta
+    std::string schemaDefine;
+    int errCode = SQLiteUtils::GetRelationalSchema(db_, schemaDefine);
+    if (errCode != E_OK && errCode != -E_NOT_FOUND) {
+        LOGE("[Relational][UpgradeTrigger] Get relational schema from meta return. err:%d", errCode);
+        return errCode;
+    }
+    if (errCode == -E_NOT_FOUND || schemaDefine.empty()) {
+        LOGI("[Relational][UpgradeTrigger] relational schema is empty:%d.", errCode);
+    } else {
+        errCode = schemaObj.ParseFromSchemaString(schemaDefine);
+        if (errCode != E_OK) {
+            LOGE("[Relational][UpgradeTrigger] Parse to relational schema failed. err:%d", errCode);
+            return errCode;
         }
-        TableInfo tableInfo = table.second;
-        tableInfo.SetTrackerTable(trackerSchema.GetTrackerTable(table.first));
-        auto manager = LogTableManagerFactory::GetTableManager(mode, tableInfo.GetTableSyncType());
-        errCode = manager->AddRelationalLogTableTrigger(db_, tableInfo, "");
+    }
+
+    std::string trackerSchemaDefine;
+    errCode = SQLiteUtils::GetRelationalSchema(db_, trackerSchemaDefine, DBConstant::RELATIONAL_TRACKER_SCHEMA_KEY);
+    if (errCode != E_OK && errCode != -E_NOT_FOUND) {
+        LOGE("[Relational][UpgradeTrigger] Get tracker schema from meta return. err:%d", errCode);
+        return errCode;
+    }
+    if (errCode == -E_NOT_FOUND || trackerSchemaDefine.empty()) {
+        LOGI("[Relational][UpgradeTrigger] tracker schema is empty:%d", errCode);
+    } else {
+        errCode = trackerSchemaObj.ParseFromTrackerSchemaString(trackerSchemaDefine);
         if (errCode != E_OK) {
-            LOGE("[Relational][Upgrade] recreate trigger failed. err:%d", errCode);
+            LOGE("[Relational][UpgradeTrigger] Parse to tracker schema failed. err:%d", errCode);
             return errCode;
         }
     }
-    LOGI("[Relational][Upgrade] recreate trigger finish.");
     return E_OK;
 }
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.h
index 51521d53e688adebabcbb74e384dea0a6e17ee59..153c23e391bd99f2ad779058dbef261fb6951e2a 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_database_upgrader.h
@@ -33,11 +33,12 @@ private:
     int EndUpgrade(bool isSuccess);
 
     bool IsNewestVersion(const std::string &logTableVersion);
-    int UpgradeTrigger(const std::string &logTableVersion);
-    int UpgradeLogTable(const std::string &logTableVersion);
+    int UpgradeTrigger(const std::string &logTableVersion, const RelationalSchemaObject &schemaObj,
+        const RelationalSchemaObject &trackerSchemaObj);
+    int UpgradeLogTable(const std::string &logTableVersion, const RelationalSchemaObject &schemaObj,
+        const RelationalSchemaObject &trackerSchemaObj);
     int UpgradeLogBaseOnVersion(const std::string &oldVersion, const std::string &logName);
-    int UpgradeTriggerBaseOnSchema(const RelationalSchemaObject &relationalSchema,
-        const RelationalSchemaObject &trackerSchema);
+    int GetParseSchema(RelationalSchemaObject &schemaObj, RelationalSchemaObject &trackerSchemaObj);
     sqlite3 *db_;
 };
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.cpp
index fad19d4d0e289a5c6128b7da3c01a95e88c61d82..9a947481b4c29ca3b7ed61c9cc7864e892c3662b 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.cpp
@@ -412,4 +412,19 @@ void SQLiteRelationalUtils::AddUpgradeSqlToList(const TableInfo &tableInfo,
             " " + colType + ";");
     }
 }
+
+int SQLiteRelationalUtils::AnalysisTrackerTable(sqlite3 *db, const TrackerTable &trackerTable, TableInfo &tableInfo)
+{
+    int errCode = SQLiteUtils::AnalysisSchema(db, trackerTable.GetTableName(), tableInfo, true);
+    if (errCode != E_OK) {
+        LOGE("analysis table schema failed %d.", errCode);
+        return errCode;
+    }
+    tableInfo.SetTrackerTable(trackerTable);
+    errCode = tableInfo.CheckTrackerTable();
+    if (errCode != E_OK) {
+        LOGE("check tracker table schema failed %d.", errCode);
+    }
+    return errCode;
+}
 } // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.h
index a8a7054112b3969a7dc017923aa803c430c8666f..1495cab4c33985943e1c138ec5565a3101200a01 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_relational_utils.h
@@ -45,6 +45,8 @@ public:
 
     static void AddUpgradeSqlToList(const TableInfo &tableInfo,
         const std::vector<std::pair<std::string, std::string>> &fieldList, std::vector<std::string> &sqlList);
+
+    static int AnalysisTrackerTable(sqlite3 *db, const TrackerTable &trackerTable, TableInfo &tableInfo);
 private:
     static int BindExtendStatementByType(sqlite3_stmt *statement, int cid, Type &typeVal);
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_relational_storage_engine.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_relational_storage_engine.cpp
index e86180587d42333aa8e1d8e9cdff7addfdec2c34..f5cc46a5e29547df0c47833c38ec28ea4743c3e2 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_relational_storage_engine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_relational_storage_engine.cpp
@@ -574,8 +574,8 @@ int SQLiteSingleRelationalStorageEngine::SaveTrackerSchema()
 int SQLiteSingleRelationalStorageEngine::ExecuteSql(const SqlCondition &condition, std::vector<VBucket> &records)
 {
     int errCode = E_OK;
-    auto *handle = static_cast<SQLiteSingleVerRelationalStorageExecutor *>(FindExecutor(true, OperatePerm::NORMAL_PERM,
-        errCode));
+    auto *handle = static_cast<SQLiteSingleVerRelationalStorageExecutor *>(FindExecutor(!condition.readOnly,
+        OperatePerm::NORMAL_PERM, errCode));
     if (handle == nullptr) {
         return errCode;
     }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.cpp
index 5aa0fc31aee14bf96cc7cc47fcde78a5c228a089..050c3d2ec2ff3f74990f0b87e95a94b0ed13bd63 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.cpp
@@ -39,6 +39,7 @@ static constexpr const char *DATAKEY = "DATA_KEY";
 static constexpr const char *DEVICE_FIELD = "DEVICE";
 static constexpr const char *CLOUD_GID_FIELD = "CLOUD_GID";
 static constexpr const char *HASH_KEY = "HASH_KEY";
+static constexpr const char *SHARING_RESOURCE = "SHARING_RESOURCE";
 static constexpr const char *FLAG_IS_CLOUD = "FLAG & 0x02 = 0"; // see if 1th bit of a flag is cloud
 // set 1th bit of flag to one which is local, clean 5th bit of flag to one which is wait compensated sync
 static constexpr const char *SET_FLAG_LOCAL_AND_CLEAN_WAIT_COMPENSATED_SYNC = "(FLAG | 0x02) & (~0x10)";
@@ -172,7 +173,7 @@ int SQLiteSingleVerRelationalStorageExecutor::GeneLogInfoForExistedData(sqlite3
             std::string(DBConstant::SQLITE_INNER_ROWID) +
             ") ELSE " + std::string(DBConstant::SQLITE_INNER_ROWID) + " end";
     }
-    sql += ", ''";
+    sql += ", '', ''";
     sql += " FROM '" + tableName + "' AS a WHERE 1=1;";
     return SQLiteUtils::ExecuteRawSQL(db, sql);
 }
@@ -194,10 +195,15 @@ int SQLiteSingleVerRelationalStorageExecutor::CreateDistributedTable(Distributed
     if (mode == DistributedTableMode::SPLIT_BY_DEVICE && !isUpgraded) {
         bool isEmpty = false;
         errCode = SQLiteUtils::CheckTableEmpty(dbHandle_, tableName, isEmpty);
-        if (errCode != E_OK || !isEmpty) {
-            LOGE("[CreateDistributedTable] check table empty failed. error=%d, isEmpty=%d", errCode, isEmpty);
+        if (errCode != E_OK) {
+            LOGE("[CreateDistributedTable] check table empty failed. error=%d", errCode);
             return -E_NOT_SUPPORT;
         }
+        if (!isEmpty) {
+            LOGW("[CreateDistributedTable] generate %.3s log for existed data, table type %d",
+                DBCommon::TransferStringToHex(DBCommon::TransferHashString(tableName)).c_str(),
+                static_cast<int>(syncType));
+        }
     }
 
     errCode = CheckTableConstraint(table, mode, syncType);
@@ -1788,7 +1794,8 @@ int SQLiteSingleVerRelationalStorageExecutor::CleanCloudDataOnLogTable(const std
 {
     std::string cleanLogSql = "UPDATE " + logTableName + " SET " + FLAG + " = " +
         SET_FLAG_LOCAL_AND_CLEAN_WAIT_COMPENSATED_SYNC + ", " +
-        DEVICE_FIELD + " = '', " + CLOUD_GID_FIELD + " = '' WHERE (" + FLAG_IS_LOGIC_DELETE + ") OR " +
+        DEVICE_FIELD + " = '', " + CLOUD_GID_FIELD + " = '', " + SHARING_RESOURCE + " = '' " +
+        "WHERE (" + FLAG_IS_LOGIC_DELETE + ") OR " +
         CLOUD_GID_FIELD + " IS NOT NULL AND " + CLOUD_GID_FIELD + " != '';";
     int errCode = SQLiteUtils::ExecuteRawSQL(dbHandle_, cleanLogSql);
     if (errCode != E_OK) {
@@ -1870,10 +1877,11 @@ int SQLiteSingleVerRelationalStorageExecutor::GetUpdateLogRecordStatement(const
         updateLogSql += "flag = flag | " + std::to_string(SET_FLAG_ONE_MASK); // set 2th bit of flag
     }  else if (opType == OpType::UPDATE_TIMESTAMP) {
         updateLogSql += "device = 'cloud', flag = flag & " + std::to_string(SET_CLOUD_FLAG) +
-            ", timestamp = ?, cloud_gid = '', version = ''";
+            ", timestamp = ?, cloud_gid = '', version = '', sharing_resource = ''";
         updateColName.push_back(CloudDbConstant::MODIFY_FIELD);
     } else if (opType == OpType::CLEAR_GID) {
-        updateLogSql += "cloud_gid = '', version = '', flag = flag & " + std::to_string(SET_FLAG_ZERO_MASK);
+        updateLogSql += "cloud_gid = '', version = '', sharing_resource = '', flag = flag & " +
+            std::to_string(SET_FLAG_ZERO_MASK);
     } else {
         if (opType == OpType::DELETE) {
             updateLogSql += GetCloudDeleteSql(DBCommon::GetLogTableName(tableSchema.name));
@@ -1884,11 +1892,14 @@ int SQLiteSingleVerRelationalStorageExecutor::GetUpdateLogRecordStatement(const
         updateLogSql += "device = 'cloud', timestamp = ?";
         updateColName.push_back(CloudDbConstant::MODIFY_FIELD);
     }
-    // only share table need to set version
-    if (CloudStorageUtils::IsSharedTable(tableSchema) && opType != OpType::DELETE &&
-        opType != OpType::CLEAR_GID && opType != OpType::UPDATE_TIMESTAMP) {
-        updateLogSql += ", version = ?";
-        updateColName.push_back(CloudDbConstant::VERSION_FIELD);
+    if (opType != OpType::DELETE && opType != OpType::CLEAR_GID && opType != OpType::UPDATE_TIMESTAMP) {
+        // only share table need to set version
+        if (CloudStorageUtils::IsSharedTable(tableSchema)) {
+            updateLogSql += ", version = ?";
+            updateColName.push_back(CloudDbConstant::VERSION_FIELD);
+        }
+        updateLogSql += ", sharing_resource = ?";
+        updateColName.push_back(CloudDbConstant::SHARING_RESOURCE_FIELD);
     }
 
     int errCode = AppendUpdateLogRecordWhereSqlCondition(tableSchema, vBucket, updateLogSql);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.h
index cef0612d400d54a68973394465f85583be0898e7..1b085caa8af0ca4f448e0592bb95a2fc98d1ea91 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor.h
@@ -265,7 +265,7 @@ private:
     int InitFillUploadAssetStatement(OpType opType, const TableSchema &tableSchema, const CloudSyncBatch &data,
         const int &index, sqlite3_stmt *&statement);
 
-    void GetLogInfoByStatement(sqlite3_stmt *statement, LogInfo &logInfo);
+    int GetLogInfoByStatement(sqlite3_stmt *statement, LogInfo &logInfo);
 
     int GetInfoByStatement(sqlite3_stmt *statement, std::vector<Field> &assetFields,
         const std::map<std::string, Field> &pkMap, DataInfoWithLog &dataInfoWithLog, VBucket &assetInfo);
@@ -282,6 +282,9 @@ private:
     int BindHashKeyAndGidToInsertLogStatement(const VBucket &vBucket, const TableSchema &tableSchema,
         const TrackerTable &trackerTable, sqlite3_stmt *insertLogStmt);
 
+    int BindShareValueToInsertLogStatement(const VBucket &vBucket, const TableSchema &tableSchema,
+        sqlite3_stmt *insertLogStmt);
+
     int BindValueToInsertLogStatement(VBucket &vBucket, const TableSchema &tableSchema,
         const TrackerTable &trackerTable, sqlite3_stmt *insertLogStmt);
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor_extend.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor_extend.cpp
index 2d9a782b32c6bfc39984cb8ed0ad081c7ee8201b..e23b3384e0f27545880c96a9d7f50932e170a064 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor_extend.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_executor_extend.cpp
@@ -86,20 +86,23 @@ int SQLiteSingleVerRelationalStorageExecutor::GetInfoByPrimaryKeyOrGid(const Tab
     return errCode != E_OK ? errCode : ret;
 }
 
-void SQLiteSingleVerRelationalStorageExecutor::GetLogInfoByStatement(sqlite3_stmt *statement, LogInfo &logInfo)
+int SQLiteSingleVerRelationalStorageExecutor::GetLogInfoByStatement(sqlite3_stmt *statement, LogInfo &logInfo)
 {
-    logInfo.dataKey = sqlite3_column_int64(statement, 0);
+    int index = 0;
+    logInfo.dataKey = sqlite3_column_int64(statement, index++);
     std::vector<uint8_t> device;
-    (void)SQLiteUtils::GetColumnBlobValue(statement, 1, device);    // 1 is device
+    (void)SQLiteUtils::GetColumnBlobValue(statement, index++, device);    // 1 is device
     DBCommon::VectorToString(device, logInfo.device);
     std::vector<uint8_t> originDev;
-    (void)SQLiteUtils::GetColumnBlobValue(statement, 2, originDev); // 2 is originDev
+    (void)SQLiteUtils::GetColumnBlobValue(statement, index++, originDev); // 2 is originDev
     DBCommon::VectorToString(originDev, logInfo.originDev);
-    logInfo.timestamp = static_cast<Timestamp>(sqlite3_column_int64(statement, 3)); // 3 is timestamp
-    logInfo.wTimestamp = static_cast<Timestamp>(sqlite3_column_int64(statement, 4)); // 4 is wtimestamp
-    logInfo.flag = static_cast<uint64_t>(sqlite3_column_int(statement, 5)); // 5 is flag
-    (void)SQLiteUtils::GetColumnBlobValue(statement, 6, logInfo.hashKey); // 6 is hash_key
-    (void)SQLiteUtils::GetColumnTextValue(statement, 7, logInfo.cloudGid); // 7 is cloud_gid
+    logInfo.timestamp = static_cast<Timestamp>(sqlite3_column_int64(statement, index++)); // 3 is timestamp
+    logInfo.wTimestamp = static_cast<Timestamp>(sqlite3_column_int64(statement, index++)); // 4 is wtimestamp
+    logInfo.flag = static_cast<uint64_t>(sqlite3_column_int(statement, index++)); // 5 is flag
+    (void)SQLiteUtils::GetColumnBlobValue(statement, index++, logInfo.hashKey); // 6 is hash_key
+    (void)SQLiteUtils::GetColumnTextValue(statement, index++, logInfo.cloudGid); // 7 is cloud_gid
+    (void)SQLiteUtils::GetColumnTextValue(statement, index++, logInfo.sharingResource); // 8 is sharing_resource
+    return index;
 }
 
 int SQLiteSingleVerRelationalStorageExecutor::GetInfoByStatement(sqlite3_stmt *statement,
@@ -107,7 +110,7 @@ int SQLiteSingleVerRelationalStorageExecutor::GetInfoByStatement(sqlite3_stmt *s
     VBucket &assetInfo)
 {
     GetLogInfoByStatement(statement, dataInfoWithLog.logInfo);
-    int index = 8; // 8 is start index of assetInfo or primary key
+    int index = GetLogInfoByStatement(statement, dataInfoWithLog.logInfo); // start index of assetInfo or primary key
     int errCode = E_OK;
     for (const auto &field: assetFields) {
         Type cloudValue;
@@ -232,8 +235,8 @@ int SQLiteSingleVerRelationalStorageExecutor::GetQueryLogSql(const std::string &
         LOGE("query log table failed because of both primary key and gid are empty.");
         return -E_CLOUD_ERROR;
     }
-    std::string sql = "SELECT data_key, device, ori_device, timestamp, wtimestamp, flag, hash_key, cloud_gid FROM "
-        + DBConstant::RELATIONAL_PREFIX + tableName + "_log WHERE ";
+    std::string sql = "SELECT data_key, device, ori_device, timestamp, wtimestamp, flag, hash_key, cloud_gid,"
+        " sharing_resource FROM " + DBConstant::RELATIONAL_PREFIX + tableName + "_log WHERE ";
     if (!cloudGid.empty()) {
         sql += "cloud_gid = ? OR ";
     }
@@ -570,7 +573,7 @@ int SQLiteSingleVerRelationalStorageExecutor::InsertLogRecord(const TableSchema
     }
 
     std::string sql = "INSERT OR REPLACE INTO " + DBCommon::GetLogTableName(tableSchema.name) +
-        " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?)";
+        " VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?)";
     sqlite3_stmt *insertLogStmt = nullptr;
     int errCode = SQLiteUtils::GetStatement(dbHandle_, sql, insertLogStmt);
     if (errCode != E_OK) {
@@ -669,11 +672,7 @@ int SQLiteSingleVerRelationalStorageExecutor::BindHashKeyAndGidToInsertLogStatem
             return -E_CLOUD_ERROR;
         }
     }
-    errCode = SQLiteUtils::BindTextToStatement(insertLogStmt, 10, version); // 10 is version
-    if (errCode != E_OK) {
-        LOGE("Bind version to insert log statement failed, %d", errCode);
-    }
-    return errCode;
+    return BindShareValueToInsertLogStatement(vBucket, tableSchema, insertLogStmt);
 }
 
 int SQLiteSingleVerRelationalStorageExecutor::BindValueToInsertLogStatement(VBucket &vBucket,
@@ -892,38 +891,9 @@ int SQLiteSingleVerRelationalStorageExecutor::BindValueToUpdateLogStatement(cons
     const TableSchema &tableSchema, const std::vector<std::string> &colNames, bool allowPrimaryKeyEmpty,
     sqlite3_stmt *updateLogStmt)
 {
-    int index = 0;
-    int errCode = E_OK;
-    for (const auto &colName : colNames) {
-        index++;
-        if (colName == CloudDbConstant::GID_FIELD) {
-            if (vBucket.find(colName) == vBucket.end()) {
-                LOGE("cloud data doesn't contain gid field when bind update log stmt.");
-                return -E_CLOUD_ERROR;
-            }
-            errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index,
-                std::get<std::string>(vBucket.at(colName)));
-        } else if (colName == CloudDbConstant::MODIFY_FIELD) {
-            if (vBucket.find(colName) == vBucket.end()) {
-                LOGE("cloud data doesn't contain modify field when bind update log stmt.");
-                return -E_CLOUD_ERROR;
-            }
-            errCode = SQLiteUtils::BindInt64ToStatement(updateLogStmt, index, std::get<int64_t>(vBucket.at(colName)));
-        } else if (colName == CloudDbConstant::VERSION_FIELD) {
-            if (vBucket.find(colName) == vBucket.end()) {
-                LOGE("cloud data doesn't contain version field when bind update log stmt.");
-                return -E_CLOUD_ERROR;
-            }
-            errCode = SQLiteUtils::BindTextToStatement(updateLogStmt, index,
-                std::get<std::string>(vBucket.at(colName)));
-        } else {
-            LOGE("invalid col name when bind value to update log statement.");
-            return -E_INTERNAL_ERROR;
-        }
-        if (errCode != E_OK) {
-            LOGE("fail to bind value to update log statement.");
-            return errCode;
-        }
+    int errCode = CloudStorageUtils::BindUpdateLogStmtFromVBucket(vBucket, tableSchema, colNames, updateLogStmt);
+    if (errCode != E_OK) {
+        return errCode;
     }
     std::map<std::string, Field> pkMap = CloudStorageUtils::GetCloudPrimaryKeyFieldMap(tableSchema);
     if (pkMap.empty()) {
@@ -935,7 +905,7 @@ int SQLiteSingleVerRelationalStorageExecutor::BindValueToUpdateLogStatement(cons
     if (errCode != E_OK) {
         return errCode;
     }
-    return SQLiteUtils::BindBlobToStatement(updateLogStmt, index + 1, hashKey);
+    return SQLiteUtils::BindBlobToStatement(updateLogStmt, colNames.size() + 1, hashKey);
 }
 
 int SQLiteSingleVerRelationalStorageExecutor::GetDeleteStatementForCloudSync(const TableSchema &tableSchema,
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_extend_executor.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_extend_executor.cpp
index c2aef59d56df04533b7c209626f506bd68072197..d931c0dc03ffa72c2a01ffa59486e686d475a577 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_extend_executor.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/relational/sqlite_single_ver_relational_storage_extend_executor.cpp
@@ -49,7 +49,7 @@ int SQLiteSingleVerRelationalStorageExecutor::GetQueryInfoSql(const std::string
         return -E_CLOUD_ERROR;
     }
     std::string sql = "select a.data_key, a.device, a.ori_device, a.timestamp, a.wtimestamp, a.flag, a.hash_key,"
-        " a.cloud_gid";
+        " a.cloud_gid, a.sharing_resource";
     for (const auto &field : assetFields) {
         sql += ", b." + field.colName;
     }
@@ -323,17 +323,7 @@ bool SQLiteSingleVerRelationalStorageExecutor::IsGetCloudDataContinue(uint32_t c
 int SQLiteSingleVerRelationalStorageExecutor::AnalysisTrackerTable(const TrackerTable &trackerTable,
     TableInfo &tableInfo)
 {
-    int errCode = SQLiteUtils::AnalysisSchema(dbHandle_, trackerTable.GetTableName(), tableInfo, true);
-    if (errCode != E_OK) {
-        LOGW("analysis table schema failed. %d", errCode);
-        return errCode;
-    }
-    tableInfo.SetTrackerTable(trackerTable);
-    errCode = tableInfo.CheckTrackerTable();
-    if (errCode != E_OK) {
-        LOGE("check tracker table schema failed. %d", errCode);
-    }
-    return errCode;
+    return SQLiteRelationalUtils::AnalysisTrackerTable(dbHandle_, trackerTable, tableInfo);
 }
 
 int SQLiteSingleVerRelationalStorageExecutor::CreateTrackerTable(const TrackerTable &trackerTable, bool isUpgrade)
@@ -988,6 +978,9 @@ std::string SQLiteSingleVerRelationalStorageExecutor::GetCloudDeleteSql(const st
         sql += "data_key = -1,  flag = 1";
     }
     sql += ", cloud_gid = '', version = '', ";
+    if (!isLogicDelete_) {
+        sql += "sharing_resource = '', ";
+    }
     return sql;
 }
 
@@ -1855,5 +1848,41 @@ int SQLiteSingleVerRelationalStorageExecutor::GetRecordFromStmt(sqlite3_stmt *st
     }
     return errCode;
 }
+
+int SQLiteSingleVerRelationalStorageExecutor::BindShareValueToInsertLogStatement(const VBucket &vBucket,
+    const TableSchema &tableSchema, sqlite3_stmt *insertLogStmt)
+{
+    int errCode = E_OK;
+    std::string version;
+    if (putDataMode_ == PutDataMode::SYNC && CloudStorageUtils::IsSharedTable(tableSchema)) {
+        errCode = CloudStorageUtils::GetValueFromVBucket<std::string>(CloudDbConstant::VERSION_FIELD, vBucket, version);
+        if (errCode != E_OK || version.empty()) {
+            LOGE("get version for insert log statement failed, %d", errCode);
+            return -E_CLOUD_ERROR;
+        }
+    }
+    errCode = SQLiteUtils::BindTextToStatement(insertLogStmt, 10, version); // 10 is version
+    if (errCode != E_OK) {
+        LOGE("Bind version to insert log statement failed, %d", errCode);
+        return errCode;
+    }
+
+    std::string shareUri;
+    if (putDataMode_ == PutDataMode::SYNC) {
+        errCode = CloudStorageUtils::GetValueFromVBucket<std::string>(CloudDbConstant::SHARING_RESOURCE_FIELD,
+            vBucket, shareUri);
+        if (errCode != E_OK && errCode != -E_NOT_FOUND) {
+            LOGE("get shareUri for insert log statement failed, %d", errCode);
+            return -E_CLOUD_ERROR;
+        }
+    }
+
+    errCode = SQLiteUtils::BindTextToStatement(insertLogStmt, 11, shareUri); // 11 is sharing_resource
+    if (errCode != E_OK) {
+        LOGE("Bind shareUri to insert log statement failed, %d", errCode);
+        return errCode;
+    }
+    return errCode;
+}
 } // namespace DistributedDB
 #endif
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_log_table_manager.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_log_table_manager.cpp
index 5ba1ac9012bc411732e5b6af0638b11a6b3ccf41..6d777d7b8fa7b46fe188cab34733337053b2490c 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_log_table_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_log_table_manager.cpp
@@ -60,6 +60,7 @@ int SqliteLogTableManager::CreateRelationalLogTable(sqlite3 *db, const TableInfo
         "extend_field BLOB," + \
         "cursor INT DEFAULT 0," + \
         "version TEXT DEFAULT ''," + \
+        "sharing_resource TEXT DEFAULT ''," + \
         primaryKey + ");";
     std::vector<std::string> logTableSchema;
     logTableSchema.emplace_back(createTableSql);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp
index ced5b4943abae6f415d3da62b60385480d4e52ad..3c55b6005c62cb40ae1df89e3cda1298252dfb7a 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.cpp
@@ -359,4 +359,9 @@ int SQLiteSingleVerDatabaseUpgrader::MoveDatabaseToNewDir(const std::string &par
     }
     return errCode;
 }
+
+bool SQLiteSingleVerDatabaseUpgrader::IsValueNeedUpgrade() const
+{
+    return valueNeedUpgrade_;
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h
index 65a5c859a52843ccbcc97a32ac65f021e17a3c73..2ae342c22120b704e07a3db1d38fadbbd497405d 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_database_upgrader.h
@@ -35,6 +35,8 @@ public:
     static int SetPathSecOptWithCheck(const std::string &path, const SecurityOption &secOption,
         const std::string &dbStore, bool isWithChecked = false);
     static int SetSecOption(const std::string &path, const SecurityOption &secOption, bool isWithChecked);
+    bool IsValueNeedUpgrade() const override;
+
 protected:
     int BeginUpgrade() override;
     int EndUpgrade(bool isSuccess) override;
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp
index 6f77ae42faefee0b4abccb19886c643003161084..5b6e1937840a0550514ac7ff9381beadf2be7df4 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store.cpp
@@ -456,6 +456,7 @@ int SQLiteSingleVerNaturalStore::Open(const KvDBProperties &kvDBProp)
     }
 
     InitialLocalDataTimestamp();
+    storageEngine_->UpgradeLocalMetaData();
     isInitialized_ = true;
     isReadOnly_ = isReadOnly;
     return E_OK;
@@ -891,7 +892,7 @@ void SQLiteSingleVerNaturalStore::GetMaxTimestamp(Timestamp &stamp) const
         return;
     }
     int errCode = E_OK;
-    SQLiteSingleVerStorageExecutor *handle = GetHandle(true, errCode);
+    SQLiteSingleVerStorageExecutor *handle = GetHandle(false, errCode);
     if (handle == nullptr) {
         return;
     }
@@ -1307,6 +1308,11 @@ int SQLiteSingleVerNaturalStore::InitStorageEngine(const KvDBProperties &kvDBPro
             this->CommitAndReleaseNotifyData(commitData, true, eventType);
         }
     );
+    storageEngine_->SetSchemaChangedCallback(
+        [&]() {
+            return this->UpgradeSchemaVerInMeta();
+        }
+    );
 
     std::string identifier = kvDBProp.GetStringProp(KvDBProperties::IDENTIFIER_DATA, "");
     storageEngine_->SetNeedUpdateSecOption(isNeedUpdateSecOpt);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp
index 953c80ddb06ae980e59851a0156f6758785000ab..610613e88f7c9ffbc3a81341662abd5a57b0ca1e 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp
@@ -43,7 +43,7 @@ SQLiteSingleVerNaturalStoreConnection::SQLiteSingleVerNaturalStoreConnection(SQL
     : SingleVerNaturalStoreConnection(kvDB),
       cacheMaxSizeForNewResultSet_(DEFAULT_RESULT_SET_CACHE_MAX_SIZE),
       conflictType_(0),
-      transactionEntrySize_(0),
+      transactionEntryLen_(0),
       currentMaxTimestamp_(0),
       committedData_(nullptr),
       localCommittedData_(nullptr),
@@ -810,8 +810,8 @@ int SQLiteSingleVerNaturalStoreConnection::PutBatchInner(const IOption &option,
             return errCode;
         }
     }
-
-    if ((transactionEntrySize_ + entries.size()) > DBConstant::MAX_TRANSACTION_ENTRY_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetEntryLen(entries, (DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS - transactionEntryLen_), len)) {
         DBDfxAdapter::FinishTracing();
         return -E_MAX_LIMITS;
     }
@@ -822,7 +822,7 @@ int SQLiteSingleVerNaturalStoreConnection::PutBatchInner(const IOption &option,
         errCode = SaveLocalEntries(entries);
     }
     if (errCode == E_OK) {
-        transactionEntrySize_ += entries.size();
+        transactionEntryLen_ += len;
     }
 
     if (isAuto) {
@@ -852,8 +852,8 @@ int SQLiteSingleVerNaturalStoreConnection::DeleteBatchInner(const IOption &optio
             return errCode;
         }
     }
-
-    if ((transactionEntrySize_ + keys.size()) > DBConstant::MAX_TRANSACTION_ENTRY_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetKeyLen(keys, (DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS - transactionEntryLen_), len)) {
         DBDfxAdapter::FinishTracing();
         return -E_MAX_LIMITS;
     }
@@ -864,7 +864,7 @@ int SQLiteSingleVerNaturalStoreConnection::DeleteBatchInner(const IOption &optio
         errCode = DeleteLocalEntries(keys);
     }
     if (errCode == E_OK) {
-        transactionEntrySize_ += keys.size();
+        transactionEntryLen_ += len;
     }
 
     if (isAuto) {
@@ -1095,7 +1095,8 @@ int SQLiteSingleVerNaturalStoreConnection::CheckWritePermission() const
 
 int SQLiteSingleVerNaturalStoreConnection::CheckSyncEntriesValid(const std::vector<Entry> &entries) const
 {
-    if (entries.size() > DBConstant::MAX_BATCH_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetEntryLen(entries, DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS, len)) {
         return -E_INVALID_ARGS;
     }
 
@@ -1119,10 +1120,10 @@ int SQLiteSingleVerNaturalStoreConnection::CheckSyncEntriesValid(const std::vect
 
 int SQLiteSingleVerNaturalStoreConnection::CheckSyncKeysValid(const std::vector<Key> &keys) const
 {
-    if (keys.size() > DBConstant::MAX_BATCH_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetKeyLen(keys, DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS, len)) {
         return -E_INVALID_ARGS;
     }
-
     SQLiteSingleVerNaturalStore *naturalStore = GetDB<SQLiteSingleVerNaturalStore>();
     if (naturalStore == nullptr) {
         return -E_INVALID_DB;
@@ -1143,7 +1144,8 @@ int SQLiteSingleVerNaturalStoreConnection::CheckSyncKeysValid(const std::vector<
 
 int SQLiteSingleVerNaturalStoreConnection::CheckLocalEntriesValid(const std::vector<Entry> &entries) const
 {
-    if (entries.size() > DBConstant::MAX_BATCH_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetEntryLen(entries, DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS, len)) {
         return -E_INVALID_ARGS;
     }
 
@@ -1167,10 +1169,10 @@ int SQLiteSingleVerNaturalStoreConnection::CheckLocalEntriesValid(const std::vec
 
 int SQLiteSingleVerNaturalStoreConnection::CheckLocalKeysValid(const std::vector<Key> &keys) const
 {
-    if (keys.size() > DBConstant::MAX_BATCH_SIZE) {
+    uint32_t len = 0;
+    if (!CheckAndGetKeyLen(keys, DBConstant::MAX_TRANSACTION_KEY_VALUE_LENS, len)) {
         return -E_INVALID_ARGS;
     }
-
     GenericKvDB *naturalStore = GetDB<GenericKvDB>();
     if (naturalStore == nullptr) {
         return -E_INVALID_DB;
@@ -1236,7 +1238,7 @@ int SQLiteSingleVerNaturalStoreConnection::StartTransactionInCacheMode(TransactT
     }
 
     writeHandle_ = handle;
-    transactionEntrySize_ = 0;
+    transactionEntryLen_ = 0;
     return E_OK;
 }
 
@@ -1286,7 +1288,7 @@ int SQLiteSingleVerNaturalStoreConnection::StartTransactionNormally(TransactType
     }
 
     writeHandle_ = handle;
-    transactionEntrySize_ = 0;
+    transactionEntryLen_ = 0;
     return E_OK;
 }
 
@@ -1312,7 +1314,7 @@ int SQLiteSingleVerNaturalStoreConnection::CommitInner()
 
     int errCode = writeHandle_->Commit();
     ReleaseExecutor(writeHandle_);
-    transactionEntrySize_ = 0;
+    transactionEntryLen_ = 0;
 
     if (!isCacheOrMigrating) {
         CommitAndReleaseNotifyData(committedData_, true,
@@ -1334,7 +1336,7 @@ int SQLiteSingleVerNaturalStoreConnection::CommitInner()
 int SQLiteSingleVerNaturalStoreConnection::RollbackInner()
 {
     int errCode = writeHandle_->Rollback();
-    transactionEntrySize_ = 0;
+    transactionEntryLen_ = 0;
     currentMaxTimestamp_ = 0;
     if (!IsExtendedCacheDBMode()) {
         ReleaseCommitData(committedData_);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h
index da101f89684651979fae788992508e67d644a3bb..7ff1d5d5900b0aecedab0fedd32fc932abefcd03 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h
@@ -211,7 +211,7 @@ private:
     std::atomic<int> cacheMaxSizeForNewResultSet_{0}; // Will be init to default value in constructor
 
     int conflictType_;
-    uint32_t transactionEntrySize_; // used for transaction
+    uint32_t transactionEntryLen_; // used for transaction
     Timestamp currentMaxTimestamp_; // used for transaction
     SingleVerNaturalStoreCommitNotifyData *committedData_; // used for transaction
     SingleVerNaturalStoreCommitNotifyData *localCommittedData_;
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp
index f57c744796d494b43334dda0610ce0396f72743e..3cd0e224c5b6f4ca006acf358bc4762515427d16 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.cpp
@@ -860,8 +860,6 @@ int SQLiteSingleVerStorageEngine::CreateNewExecutor(bool isWrite, StorageExecuto
 int SQLiteSingleVerStorageEngine::Upgrade(sqlite3 *db)
 {
     if (isUpdated_ || GetEngineState() == EngineState::CACHEDB) {
-        LOGI("Storage engine [%.6s] is in cache status or has been upgraded[%d]!",
-            DBCommon::TransferStringToHex(identifier_).c_str(), isUpdated_);
         return E_OK;
     }
 
@@ -905,6 +903,7 @@ int SQLiteSingleVerStorageEngine::Upgrade(sqlite3 *db)
 
     LOGD("Finish upgrade single ver database!");
     isUpdated_ = true; // Identification to avoid repeated upgrades
+    isSchemaChanged_ = upgrader->IsValueNeedUpgrade();
     return errCode;
 }
 
@@ -1094,4 +1093,15 @@ bool SQLiteSingleVerStorageEngine::IsUseExistedSecOption(const SecurityOption &e
     }
     return true;
 }
+
+int SQLiteSingleVerStorageEngine::UpgradeLocalMetaData()
+{
+    std::shared_lock<std::shared_mutex> lock(schemaChangedMutex_);
+    if (isSchemaChanged_) {
+        int errCode = schemaChangedFunc_();
+        isSchemaChanged_ = false;
+        return errCode;
+    }
+    return E_OK;
+}
 }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h
index 319fee7ee591afd9ec96a5f0c481976c8309b0ee..fa9ce3341f95d671185749537dff1f96cf598f6e 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_engine.h
@@ -60,6 +60,8 @@ public:
 
     void CacheSubscribe(const std::string &subscribeId, const QueryObject &query);
 
+    int UpgradeLocalMetaData();
+
 protected:
     virtual StorageExecutor *NewSQLiteStorageExecutor(sqlite3 *dbHandle, bool isWrite, bool isMemDb) override;
 
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.cpp
index 1ac4cbc2c3278fbafb78c3a95db18f0baf9d247c..e25015b8840e666af7400fb7a686daa08944c5e0 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.cpp
@@ -30,6 +30,8 @@ StorageEngine::StorageEngine()
     : isUpdated_(false),
       isMigrating_(false),
       commitNotifyFunc_(nullptr),
+      schemaChangedFunc_(nullptr),
+      isSchemaChanged_(false),
       isInitialized_(false),
       perm_(OperatePerm::NORMAL_PERM),
       operateAbort_(false),
@@ -347,7 +349,6 @@ EngineState StorageEngine::GetEngineState() const
 
 void StorageEngine::SetEngineState(EngineState state)
 {
-    LOGI("Storage engine state to [%d]!", state);
     engineState_ = state;
 }
 
@@ -486,4 +487,10 @@ uint64_t StorageEngine::GetAndIncreaseCacheRecordVersion()
 {
     return 0;
 }
+
+void StorageEngine::SetSchemaChangedCallback(const std::function<int(void)> &callback)
+{
+    std::unique_lock<std::shared_mutex> lock(schemaChangedMutex_);
+    schemaChangedFunc_ = callback;
+}
 }
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.h b/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.h
index efbde751dc08cbfbe5346cfe553b272c2448246d..096a311e1de52f0c15fdcc5644f32b063dfc3711 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/storage_engine.h
@@ -87,6 +87,8 @@ public:
     virtual uint64_t GetCacheRecordVersion() const;
     virtual uint64_t GetAndIncreaseCacheRecordVersion();
 
+    virtual void SetSchemaChangedCallback(const std::function<int(void)> &callback);
+
 protected:
     virtual int CreateNewExecutor(bool isWrite, StorageExecutor *&handle) = 0;
 
@@ -111,6 +113,14 @@ protected:
     // Callback function for commit notify.
     std::function<void(int, KvDBCommitNotifyFilterAbleData *)> commitNotifyFunc_;
 
+    // Mutex for schemaChangedFunc_.
+    mutable std::shared_mutex schemaChangedMutex_;
+
+    // Callback function for schema changed.
+    std::function<int(void)> schemaChangedFunc_;
+
+    bool isSchemaChanged_;
+
 private:
     StorageExecutor *FetchStorageExecutor(bool isWrite, std::list<StorageExecutor *> &idleList,
         std::list<StorageExecutor *> &usingList, int &errCode);
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.h b/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.h
index fcdbae46a50c84070ff6915b472950ac291a4b61..6d337bb0d2fceb8d00b08a414f6d0f17b05d03d5 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.h
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_database_upgrader.h
@@ -23,6 +23,7 @@ class SingleVerDatabaseUpgrader : virtual public DatabaseUpgrader {
 public:
     ~SingleVerDatabaseUpgrader() override {};
     int Upgrade() override;
+    virtual bool IsValueNeedUpgrade() const = 0;
 protected:
     virtual int BeginUpgrade() = 0;
     virtual int ExecuteUpgrade();
@@ -35,6 +36,7 @@ protected:
 
     // Database version only increased when the structure of database changed
     int dbVersion_ = 0;
+    bool valueNeedUpgrade_ = false;
 };
 } // namespace DistributedDB
 #endif // SINGLE_VER_DATABASE_UPGRADER_H
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp b/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp
index 3ab4b1189de3d81fcdd844e3d6ace609c4060bc7..e0158df4a3dcfc5138d230833e4744b85b0d35d9 100644
--- a/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp
+++ b/kv_store/frameworks/libs/distributeddb/storage/src/upgrader/single_ver_schema_database_upgrader.cpp
@@ -48,7 +48,7 @@ int SingleVerSchemaDatabaseUpgrader::ExecuteUpgradeSchema()
         return errCode;
     }
     // Judge and gather upgrade information
-    bool valueNeedUpgrade = false;
+    valueNeedUpgrade_ = false;
     IndexDifference indexDiffer;
     if (oriSchemaObject.IsSchemaValid()) {
         errCode = oriSchemaObject.CompareAgainstSchemaObject(newSchema_, indexDiffer);
@@ -58,16 +58,16 @@ int SingleVerSchemaDatabaseUpgrader::ExecuteUpgradeSchema()
         } else if (errCode == -E_SCHEMA_UNEQUAL_INCOMPATIBLE) {
             return -E_SCHEMA_MISMATCH;
         } else if (errCode == -E_SCHEMA_UNEQUAL_COMPATIBLE_UPGRADE) {
-            valueNeedUpgrade = true;
+            valueNeedUpgrade_ = true;
         }
         // ValueNeedUpgrade false for case E_SCHEMA_UNEQUAL_COMPATIBLE
     } else {
         // Upgrade normalDb to schemaDb
-        valueNeedUpgrade = true;
+        valueNeedUpgrade_ = true;
         indexDiffer.increase = newSchema_.GetIndexInfo();
     }
     // Remember to upgrade value first, upgrade index later, for both Json-Schema and FlatBuffer-Schema
-    if (valueNeedUpgrade) {
+    if (valueNeedUpgrade_) {
         errCode = UpgradeValues();
         if (errCode != E_OK) {
             return errCode;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/include/isyncer.h b/kv_store/frameworks/libs/distributeddb/syncer/include/isyncer.h
index 2ac1bb9a14fb212aef881b59fc9faba33d583cd7..38d190b708098e07648c9dac278512ac6683af86 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/include/isyncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/include/isyncer.h
@@ -125,6 +125,10 @@ public:
     virtual int GetSyncDataSize(const std::string &device, size_t &size) const = 0;
 
     virtual int GetHashDeviceId(const std::string &clientId, std::string &hashDevId) const = 0;
+
+    virtual int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) = 0;
+
+    virtual int UpgradeSchemaVerInMeta() = 0;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/include/syncer_proxy.h b/kv_store/frameworks/libs/distributeddb/syncer/include/syncer_proxy.h
index 7beecb1b9dcb3dca932c90d77eaf78d1ef1ec272..d912af51fabeb78770922d678ffdf07c80d10c1c 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/include/syncer_proxy.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/include/syncer_proxy.h
@@ -108,6 +108,10 @@ public:
     int GetSyncDataSize(const std::string &device, size_t &size) const override;
 
     int GetHashDeviceId(const std::string &clientId, std::string &hashDevId) const override;
+
+    int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) override;
+
+    int UpgradeSchemaVerInMeta() override;
 private:
     std::mutex syncerLock_;
     std::shared_ptr<ISyncer> syncer_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_force_push_strategy.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_force_push_strategy.cpp
index b7b78186347937b61c895ce06caa710effe01181..b2c1a93015ae22af7cd30599f5c342484f357fce 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_force_push_strategy.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_force_push_strategy.cpp
@@ -31,11 +31,15 @@ OpType CloudForcePushStrategy::TagSyncDataStatus(bool existInLocal, const LogInf
     if (isCloudDelete) {
         return OpType::CLEAR_GID;
     }
-    if (localInfo.device == cloud_device_name && localInfo.timestamp == cloudInfo.timestamp) {
-        return OpType::SET_CLOUD_FORCE_PUSH_FLAG_ONE;
+    if (localInfo.device == cloud_device_name) {
+        if (localInfo.timestamp == cloudInfo.timestamp) {
+            return OpType::SET_CLOUD_FORCE_PUSH_FLAG_ONE;
+        } else {
+            return OpType::SET_CLOUD_FORCE_PUSH_FLAG_ZERO;
+        }
     }
-    if (localInfo.device == cloud_device_name && localInfo.timestamp != cloudInfo.timestamp) {
-        return OpType::SET_CLOUD_FORCE_PUSH_FLAG_ZERO;
+    if (IsSharingResourceChanged(cloudInfo, localInfo)) {
+        return OpType::ONLY_UPDATE_GID;
     }
     return OpType::NOT_HANDLE;
 }
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_merge_strategy.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_merge_strategy.cpp
index d7c368dafe5aa925f6e8830dc13a06d42000465f..857be65cdd5c22b310aee38c54f7c1292ecb5d60 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_merge_strategy.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_merge_strategy.cpp
@@ -27,14 +27,17 @@ OpType CloudMergeStrategy::TagSyncDataStatus(bool existInLocal, const LogInfo &l
         }
         return OpType::INSERT;
     }
-    OpType type = OpType::NOT_HANDLE;
     if (localInfo.timestamp > cloudInfo.timestamp) {
         if (localInfo.cloudGid.empty()) {
-            type = isCloudDelete ? OpType::NOT_HANDLE : (isLocalDelete ? OpType::INSERT : OpType::ONLY_UPDATE_GID);
-        } else {
-            type = isCloudDelete ? OpType::CLEAR_GID : type;
+            return isCloudDelete ? OpType::NOT_HANDLE : (isLocalDelete ? OpType::INSERT : OpType::ONLY_UPDATE_GID);
         }
-        return type;
+        if (isCloudDelete) {
+            return OpType::CLEAR_GID;
+        }
+        if (IsSharingResourceChanged(cloudInfo, localInfo)) {
+            return OpType::ONLY_UPDATE_GID;
+        }
+        return OpType::NOT_HANDLE;
     }
     if (isCloudDelete) {
         return isLocalDelete ? OpType::UPDATE_TIMESTAMP : OpType::DELETE;
@@ -44,8 +47,8 @@ OpType CloudMergeStrategy::TagSyncDataStatus(bool existInLocal, const LogInfo &l
     }
     // avoid local data insert to cloud success but return failed
     // we just fill back gid here
-    if ((localInfo.timestamp == cloudInfo.timestamp) &&
-        (localInfo.wTimestamp == cloudInfo.wTimestamp) && localInfo.cloudGid.empty()) {
+    bool isTimeSame = (localInfo.timestamp == cloudInfo.timestamp) && (localInfo.wTimestamp == cloudInfo.wTimestamp);
+    if (isTimeSame && (localInfo.cloudGid.empty() || IsSharingResourceChanged(cloudInfo, localInfo))) {
         return OpType::ONLY_UPDATE_GID;
     }
     return OpType::UPDATE;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_strategy.h b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_strategy.h
index 5c2a1805f7064eee84f7efafb8ea3c18b51d640d..f7c53f813b732a9c2087c984305e5a59731e7921 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_strategy.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_strategy.h
@@ -50,6 +50,11 @@ public:
         return (info.flag & static_cast<uint32_t>(LogInfoFlag::FLAG_DELETE)) ==
             static_cast<uint32_t>(LogInfoFlag::FLAG_DELETE);
     }
+
+    static bool IsSharingResourceChanged(const LogInfo &cloudInfo, const LogInfo &localInfo)
+    {
+        return (cloudInfo.sharingResource != localInfo.sharingResource);
+    }
 };
 }
 #endif // CLOUD_SYNC_STRATEGY_H
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_utils.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_utils.cpp
index a3352444c396a6e8c7ad86c011ece0073c1d806d..f3115bfcb87846f70ddc68d54cca56d472bfe7b5 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_utils.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_sync_utils.cpp
@@ -75,6 +75,7 @@ void CloudSyncUtils::RemoveDataExceptExtendInfo(VBucket &datum, const std::vecto
             key != CloudDbConstant::DELETE_FIELD &&
             key != CloudDbConstant::CURSOR_FIELD &&
             key != CloudDbConstant::VERSION_FIELD &&
+            key != CloudDbConstant::SHARING_RESOURCE_FIELD &&
             (std::find(pkColNames.begin(), pkColNames.end(), key) == pkColNames.end())) {
                 item = datum.erase(item);
             } else {
@@ -148,6 +149,7 @@ bool CloudSyncUtils::NeedSaveData(const LogInfo &localLogInfo, const LogInfo &cl
     bool isSame = localLogInfo.timestamp == cloudLogInfo.timestamp &&
         EqualInMsLevel(localLogInfo.wTimestamp, cloudLogInfo.wTimestamp) &&
         localLogInfo.cloudGid == cloudLogInfo.cloudGid &&
+        localLogInfo.sharingResource == cloudLogInfo.sharingResource &&
         (localLogInfo.flag & static_cast<uint64_t>(LogInfoFlag::FLAG_WAIT_COMPENSATED_SYNC)) == 0;
     return !isSame;
 }
@@ -183,6 +185,8 @@ LogInfo CloudSyncUtils::GetCloudLogInfo(DistributedDB::VBucket &datum)
     cloudLogInfo.wTimestamp = (Timestamp)std::get<int64_t>(datum[CloudDbConstant::CREATE_FIELD]);
     cloudLogInfo.flag = (std::get<bool>(datum[CloudDbConstant::DELETE_FIELD])) ? 1u : 0u;
     cloudLogInfo.cloudGid = std::get<std::string>(datum[CloudDbConstant::GID_FIELD]);
+    (void)CloudStorageUtils::GetValueFromVBucket<std::string>(CloudDbConstant::SHARING_RESOURCE_FIELD,
+        datum, cloudLogInfo.sharingResource);
     return cloudLogInfo;
 }
 
@@ -347,6 +351,7 @@ void CloudSyncUtils::UpdateLocalCache(OpType opType, const LogInfo &cloudInfo, c
             updateLogInfo.wTimestamp = cloudInfo.wTimestamp;
             updateLogInfo.device = CloudDbConstant::DEFAULT_CLOUD_DEV;
             updateLogInfo.hashKey = Key(hashKey.begin(), hashKey.end());
+            updateLogInfo.sharingResource = cloudInfo.sharingResource;
             if (opType == OpType::DELETE) {
                 updateLogInfo.flag |= static_cast<uint64_t>(LogInfoFlag::FLAG_DELETE);
             } else if (opType == OpType::INSERT) {
@@ -358,6 +363,7 @@ void CloudSyncUtils::UpdateLocalCache(OpType opType, const LogInfo &cloudInfo, c
         case OpType::UPDATE_TIMESTAMP: {
             updateLogInfo = localInfo;
             updateLogInfo.cloudGid.clear();
+            updateLogInfo.sharingResource.clear();
             break;
         }
         default:
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
index 12449f041571fb202ba3f3f7421661119931ad38..882854c76017d86943d906b0553a249d4fcb10d1 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.cpp
@@ -40,8 +40,7 @@ CloudSyncer::CloudSyncer(std::shared_ptr<StorageProxy> storageProxy)
       closed_(false),
       timerId_(0u),
       heartBeatCount_(0),
-      failedHeartBeatCount_(0),
-      syncCallbackCount_(0)
+      failedHeartBeatCount_(0)
 {
     if (storageProxy_ != nullptr) {
         id_ = storageProxy_->GetIdentify();
@@ -146,7 +145,6 @@ void CloudSyncer::Close()
         LOGI("[CloudSyncer] finished taskId %" PRIu64 " errCode %d", info.taskId, info.errCode);
     }
     storageProxy_->Close();
-    WaitAllSyncCallbackTaskFinish();
 }
 
 int CloudSyncer::TriggerSync()
@@ -395,31 +393,6 @@ bool CloudSyncer::IsDataContainAssets()
     return true;
 }
 
-void CloudSyncer::IncSyncCallbackTaskCount()
-{
-    std::lock_guard<std::mutex> autoLock(syncCallbackMutex_);
-    syncCallbackCount_++;
-}
-
-void CloudSyncer::DecSyncCallbackTaskCount()
-{
-    {
-        std::lock_guard<std::mutex> autoLock(syncCallbackMutex_);
-        syncCallbackCount_--;
-    }
-    syncCallbackCv_.notify_all();
-}
-
-void CloudSyncer::WaitAllSyncCallbackTaskFinish()
-{
-    std::unique_lock<std::mutex> uniqueLock(syncCallbackMutex_);
-    LOGD("[CloudSyncer] Begin wait all callback task finish");
-    syncCallbackCv_.wait(uniqueLock, [this]() {
-        return syncCallbackCount_ <= 0;
-    });
-    LOGD("[CloudSyncer] End wait all callback task finish");
-}
-
 std::map<std::string, Assets> CloudSyncer::TagAssetsInSingleRecord(VBucket &coveredData, VBucket &beCoveredData,
     bool setNormalStatus, int &errCode)
 {
@@ -1341,22 +1314,26 @@ int CloudSyncer::DoUploadInner(const std::string &tableName, UploadParam &upload
 
 int CloudSyncer::PreHandleData(VBucket &datum, const std::vector<std::string> &pkColNames)
 {
-    // type index of field in fields
-    std::vector<std::pair<std::string, int32_t>> fieldAndIndex = {
-        std::pair<std::string, int32_t>(CloudDbConstant::GID_FIELD, TYPE_INDEX<std::string>),
-        std::pair<std::string, int32_t>(CloudDbConstant::CREATE_FIELD, TYPE_INDEX<int64_t>),
-        std::pair<std::string, int32_t>(CloudDbConstant::MODIFY_FIELD, TYPE_INDEX<int64_t>),
-        std::pair<std::string, int32_t>(CloudDbConstant::DELETE_FIELD, TYPE_INDEX<bool>),
-        std::pair<std::string, int32_t>(CloudDbConstant::CURSOR_FIELD, TYPE_INDEX<std::string>)
+    // type index of field in fields, true means mandatory filed
+    static std::vector<std::tuple<std::string, int32_t, bool>> fieldAndIndex = {
+        std::make_tuple(CloudDbConstant::GID_FIELD, TYPE_INDEX<std::string>, true),
+        std::make_tuple(CloudDbConstant::CREATE_FIELD, TYPE_INDEX<int64_t>, true),
+        std::make_tuple(CloudDbConstant::MODIFY_FIELD, TYPE_INDEX<int64_t>, true),
+        std::make_tuple(CloudDbConstant::DELETE_FIELD, TYPE_INDEX<bool>, true),
+        std::make_tuple(CloudDbConstant::CURSOR_FIELD, TYPE_INDEX<std::string>, true),
+        std::make_tuple(CloudDbConstant::SHARING_RESOURCE_FIELD, TYPE_INDEX<std::string>, false)
     };
 
     for (const auto &fieldIndex : fieldAndIndex) {
-        if (datum.find(fieldIndex.first) == datum.end()) {
-            LOGE("[CloudSyncer] Cloud data do not contain expected field: %s.", fieldIndex.first.c_str());
+        if (datum.find(std::get<0>(fieldIndex)) == datum.end()) {
+            if (!std::get<2>(fieldIndex)) { // 2 is index of mandatory flag
+                continue;
+            }
+            LOGE("[CloudSyncer] Cloud data do not contain expected field: %s.", std::get<0>(fieldIndex).c_str());
             return -E_CLOUD_ERROR;
         }
-        if (datum[fieldIndex.first].index() != static_cast<size_t>(fieldIndex.second)) {
-            LOGE("[CloudSyncer] Cloud data's field: %s, doesn't has expected type.", fieldIndex.first.c_str());
+        if (datum[std::get<0>(fieldIndex)].index() != static_cast<size_t>(std::get<1>(fieldIndex))) {
+            LOGE("[CloudSyncer] Cloud data's field: %s, doesn't has expected type.", std::get<0>(fieldIndex).c_str());
             return -E_CLOUD_ERROR;
         }
     }
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.h b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.h
index 5b669ad58afd93173b90cabaa594069c50719b48..5f3a497e62897f4c8507c867b5ef9faa25fb2d4e 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer.h
@@ -60,10 +60,6 @@ public:
 
     void Close();
 
-    void IncSyncCallbackTaskCount() override;
-
-    void DecSyncCallbackTaskCount() override;
-
     std::string GetIdentify() const override;
 protected:
     struct TaskContext {
@@ -253,8 +249,6 @@ protected:
 
     int UpdateChangedData(SyncParam &param, DownloadList &assetsDownloadList);
 
-    void WaitAllSyncCallbackTaskFinish();
-
     void UpdateCloudWaterMark(TaskId taskId, const SyncParam &param);
 
     int TagStatusByStrategy(bool isExist, SyncParam &param, DataInfo &dataInfo, OpType &strategyOpResult);
@@ -361,10 +355,6 @@ protected:
     int32_t heartBeatCount_;
     std::atomic<int32_t> failedHeartBeatCount_;
 
-    std::mutex syncCallbackMutex_;
-    std::condition_variable syncCallbackCv_;
-    int32_t syncCallbackCount_;
-
     std::string id_;
 
     static constexpr const TaskId INVALID_TASK_ID = 0u;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
index 9cb560c7aba1b2438d8af66d51ff9e9f3d5567c1..81f6043b4405152b2f43ead6f7fd3baa05e24f47 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp
@@ -454,6 +454,7 @@ int CloudSyncer::GetLocalInfo(size_t index, SyncParam &param, DataInfoWithLog &l
         logInfo.logInfo.timestamp = localLogInfoCache[hashKey].timestamp;
         logInfo.logInfo.cloudGid = localLogInfoCache[hashKey].cloudGid;
         logInfo.logInfo.device = localLogInfoCache[hashKey].device;
+        logInfo.logInfo.sharingResource = localLogInfoCache[hashKey].sharingResource;
         // delete record should remove local asset info
         if ((localLogInfoCache[hashKey].flag & DataItem::DELETE_FLAG) == DataItem::DELETE_FLAG) {
             localAssetInfo.clear();
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/icloud_syncer.h b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/icloud_syncer.h
index 577f4461b35258f507106b0c57938281ba8d79cd..ecea7eef9029c3de4602e02b31aa25c96d49f5c4 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/icloud_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/icloud_syncer.h
@@ -74,10 +74,6 @@ public:
         LogInfo cloudLogInfo;
     };
 
-    virtual void IncSyncCallbackTaskCount() = 0;
-
-    virtual void DecSyncCallbackTaskCount() = 0;
-
     virtual std::string GetIdentify() const = 0;
 };
 }
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/process_notifier.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/process_notifier.cpp
index f487367793a1d3d1eef3bb96e54f930ec86d5120..1d9ce868ad5993e0b0066629adb3db10de51de64 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/process_notifier.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/cloud/process_notifier.cpp
@@ -97,11 +97,14 @@ void ProcessNotifier::NotifyProcess(const ICloudSyncer::CloudTaskInfo &taskInfo,
     }
     RefObject::IncObjRef(syncer);
     auto id = syncer->GetIdentify();
-    syncer->IncSyncCallbackTaskCount();
     int errCode = RuntimeContext::GetInstance()->ScheduleQueuedTask(id, [callback, currentProcess, syncer]() {
         LOGD("[ProcessNotifier] begin notify process");
+        if (syncer->IsKilled()) {
+            LOGI("[ProcessNotifier] db has closed, process return");
+            RefObject::DecObjRef(syncer);
+            return;
+        }
         callback(currentProcess);
-        syncer->DecSyncCallbackTaskCount();
         RefObject::DecObjRef(syncer);
         LOGD("[ProcessNotifier] notify process finish");
     });
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.cpp
index eca4829c878db5b214bbb4726fe1bbed80f77789..3a9eb303a1f0518c59ccca57351b8c5ae8d3be86 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.cpp
@@ -37,7 +37,8 @@ AbilitySyncRequestPacket::AbilitySyncRequestPacket()
       secLabel_(0),
       secFlag_(0),
       schemaType_(0),
-      dbCreateTime_(0)
+      dbCreateTime_(0),
+      schemaVersion_(0)
 {
 }
 
@@ -142,6 +143,7 @@ uint32_t AbilitySyncRequestPacket::CalculateLen() const
     len += Parcel::GetUInt32Len(); // schemaType_
     len += Parcel::GetUInt64Len(); // dbCreateTime_
     len += DbAbility::CalculateLen(dbAbility_); // dbAbility_
+    len += Parcel::GetUInt64Len(); // schema version add in 109
     // the reason why not 8-byte align is that old version is not 8-byte align
     // so it is not possible to set 8-byte align for high version.
     if (len > INT32_MAX) {
@@ -161,6 +163,16 @@ void AbilitySyncRequestPacket::SetDbAbility(const DbAbility &dbAbility)
     dbAbility_ = dbAbility;
 }
 
+void AbilitySyncRequestPacket::SetSchemaVersion(uint64_t schemaVersion)
+{
+    schemaVersion_ = schemaVersion;
+}
+
+uint64_t AbilitySyncRequestPacket::GetSchemaVersion() const
+{
+    return schemaVersion_;
+}
+
 AbilitySyncAckPacket::AbilitySyncAckPacket()
     : protocolVersion_(ABILITY_SYNC_VERSION_V1),
       softwareVersion_(SOFTWARE_VERSION_CURRENT),
@@ -170,7 +182,8 @@ AbilitySyncAckPacket::AbilitySyncAckPacket()
       schemaType_(0),
       permitSync_(0),
       requirePeerConvert_(0),
-      dbCreateTime_(0)
+      dbCreateTime_(0),
+      schemaVersion_(0)
 {
 }
 
@@ -278,6 +291,16 @@ uint64_t AbilitySyncAckPacket::GetDbCreateTime() const
     return dbCreateTime_;
 }
 
+uint64_t AbilitySyncAckPacket::GetSchemaVersion() const
+{
+    return schemaVersion_;
+}
+
+void AbilitySyncAckPacket::SetSchemaVersion(uint64_t schemaVersion)
+{
+    schemaVersion_ = schemaVersion;
+}
+
 uint32_t AbilitySyncAckPacket::CalculateLen() const
 {
     uint64_t len = 0;
@@ -298,6 +321,7 @@ uint32_t AbilitySyncAckPacket::CalculateLen() const
     len += Parcel::GetUInt64Len(); // dbCreateTime_
     len += DbAbility::CalculateLen(dbAbility_); // dbAbility_
     len += SchemaNegotiate::CalculateParcelLen(relationalSyncOpinion_);
+    len += Parcel::GetUInt64Len(); // schemaVersion_
     if (len > INT32_MAX) {
         LOGE("[AbilitySyncAckPacket][CalculateLen] err len:%" PRIu64, len);
         return 0;
@@ -467,6 +491,7 @@ int AbilitySync::AckNotifyRecv(const Message *message, ISyncTaskContext *context
     AbilitySyncAckPacket sendPacket;
     std::pair<bool, bool> schemaSyncStatus;
     errCode = HandleVersionV3AckSchemaParam(packet, sendPacket, context, false, schemaSyncStatus);
+    errCode = errCode == -E_ABILITY_SYNC_FINISHED ? E_OK : errCode;
     int ackCode = errCode;
     LOGI("[AckNotifyRecv] receive dev = %s ack notify, remoteSoftwareVersion = %u, ackCode = %d",
         STR_MASK(deviceId_), remoteSoftwareVersion, errCode);
@@ -482,16 +507,27 @@ bool AbilitySync::GetAbilitySyncFinishedStatus() const
     return syncFinished_;
 }
 
-void AbilitySync::SetAbilitySyncFinishedStatus(bool syncFinished)
+void AbilitySync::SetAbilitySyncFinishedStatus(bool syncFinished, ISyncTaskContext &context)
 {
     syncFinished_ = syncFinished;
+    if (context.GetRemoteSoftwareVersion() < SOFTWARE_VERSION_RELEASE_9_0) {
+        return;
+    }
+    // record finished with all schema compatible
+    if (syncFinished && !context.IsSchemaCompatible()) {
+        return;
+    }
+    int errCode = metadata_->SetAbilitySyncFinishMark(deviceId_, syncFinished);
+    if (errCode != E_OK) {
+        LOGW("[AbilitySync] Set ability sync finish mark failed %d", errCode);
+    }
 }
 
 bool AbilitySync::SecLabelCheck(const AbilitySyncRequestPacket *packet) const
 {
     SecurityOption option;
     int errCode = (static_cast<SyncGenericInterface *>(storageInterface_))->GetSecurityOption(option);
-    int32_t remoteSecLabel = TransformRemoteSecLabelIfNeed(packet->GetSecLabel(), option.securityLabel);
+    int32_t remoteSecLabel = TransformSecLabelIfNeed(packet->GetSecLabel(), option.securityLabel);
     LOGI("[AbilitySync][RequestRecv] remote label:%d local l:%d, f:%d, errCode:%d", remoteSecLabel,
         option.securityLabel, option.securityFlag, errCode);
     if (remoteSecLabel == NOT_SURPPORT_SEC_CLASSIFICATION && errCode == -E_NOT_SUPPORT) {
@@ -549,13 +585,12 @@ void AbilitySync::HandleVersionV3AckSecOptionParam(const AbilitySyncAckPacket *p
 
 int AbilitySync::HandleVersionV3AckSchemaParam(const AbilitySyncAckPacket *recvPacket,
     AbilitySyncAckPacket &sendPacket,  ISyncTaskContext *context, bool sendOpinion,
-    std::pair<bool, bool> &schemaSyncStatus) const
+    std::pair<bool, bool> &schemaSyncStatus)
 {
     if (IsSingleRelationalVer()) {
         return HandleRelationAckSchemaParam(recvPacket, sendPacket, context, sendOpinion, schemaSyncStatus);
     }
-    HandleKvAckSchemaParam(recvPacket, context, sendPacket, schemaSyncStatus);
-    return E_OK;
+    return HandleKvAckSchemaParam(recvPacket, context, sendPacket, schemaSyncStatus);
 }
 
 void AbilitySync::GetPacketSecOption(const ISyncTaskContext *context, SecurityOption &option) const
@@ -573,10 +608,7 @@ void AbilitySync::GetPacketSecOption(const ISyncTaskContext *context, SecurityOp
         return;
     }
     auto remoteSecOption = (static_cast<const SingleVerSyncTaskContext *>(context))->GetRemoteSeccurityOption();
-    if (remoteSecOption.securityLabel == SecurityLabel::S0 && option.securityLabel == SecurityLabel::S1) {
-        option.securityLabel = SecurityLabel::S0;
-        LOGI("[AbilitySync] Transform SecLabel From S1 To S0");
-    }
+    option.securityLabel = TransformSecLabelIfNeed(option.securityLabel, remoteSecOption.securityLabel);
 }
 
 int AbilitySync::RegisterTransformFunc()
@@ -696,6 +728,7 @@ int AbilitySync::RequestPacketSerialization(uint8_t *buffer, uint32_t length, co
     parcel.WriteUInt32(packet->GetSchemaType());
     parcel.WriteUInt64(packet->GetDbCreateTime());
     int errCode = DbAbility::Serialize(parcel, packet->GetDbAbility());
+    parcel.WriteUInt64(packet->GetSchemaVersion());
     if (parcel.IsError() || errCode != E_OK) {
         return -E_PARSE_FAIL;
     }
@@ -728,6 +761,11 @@ int AbilitySync::AckPacketSerialization(uint8_t *buffer, uint32_t length, const
     if (parcel.IsError() || errCode != E_OK) {
         return -E_PARSE_FAIL;
     }
+    parcel.WriteUInt64(packet->GetSchemaVersion());
+    if (parcel.IsError()) {
+        LOGE("[AbilitySync] Serialize schema version failed");
+        return -E_PARSE_FAIL;
+    }
     return E_OK;
 }
 
@@ -805,6 +843,15 @@ int AbilitySync::RequestPacketDeSerializationTailPart(Parcel &parcel, AbilitySyn
         return errCode;
     }
     packet->SetDbAbility(remoteDbAbility);
+    if (version >= SOFTWARE_VERSION_RELEASE_9_0) {
+        uint64_t schemaVersion = 0;
+        parcel.ReadUInt64(schemaVersion);
+        packet->SetSchemaVersion(schemaVersion);
+        if (parcel.IsError()) {
+            LOGW("[AbilitySync] request packet read schema version failed");
+            return -E_PARSE_FAIL;
+        }
+    }
     return E_OK;
 }
 
@@ -846,6 +893,15 @@ int AbilitySync::AckPacketDeSerializationTailPart(Parcel &parcel, AbilitySyncAck
         return errCode;
     }
     packet->SetRelationalSyncOpinion(relationalSyncOpinion);
+    if (version >= SOFTWARE_VERSION_RELEASE_9_0) {
+        uint64_t schemaVersion = 0;
+        parcel.ReadUInt64(schemaVersion);
+        packet->SetSchemaVersion(schemaVersion);
+        if (parcel.IsError()) {
+            LOGW("[AbilitySync] ack packet read schema version failed.");
+            return -E_PARSE_FAIL;
+        }
+    }
     return E_OK;
 }
 
@@ -928,6 +984,11 @@ int AbilitySync::SetAbilityRequestBodyInfo(uint16_t remoteCommunicatorVersion, c
         LOGE("[AbilitySync][FillAbilityRequest] GetDbAbility failed, err %d", errCode);
         return errCode;
     }
+    auto [err, localSchemaVer] = metadata_->GetLocalSchemaVersion();
+    if (err != E_OK) {
+        LOGE("[AbilitySync][FillAbilityRequest] GetLocalSchemaVersion failed, err %d", err);
+        return err;
+    }
     // 102 version is forbidden to sync with 103 json-schema or flatbuffer-schema
     // so schema should put null string while remote is 102 version to avoid this bug.
     if (remoteCommunicatorVersion == 1) {
@@ -943,8 +1004,9 @@ int AbilitySync::SetAbilityRequestBodyInfo(uint16_t remoteCommunicatorVersion, c
     packet.SetSecFlag(option.securityFlag);
     packet.SetDbCreateTime(dbCreateTime);
     packet.SetDbAbility(dbAbility);
-    LOGI("[AbilitySync][FillRequest] ver=%u,Lab=%d,Flag=%d,dbCreateTime=%" PRId64, SOFTWARE_VERSION_CURRENT,
-        option.securityLabel, option.securityFlag, dbCreateTime);
+    packet.SetSchemaVersion(localSchemaVer);
+    LOGI("[AbilitySync][FillRequest] ver=%u,Lab=%d,Flag=%d,dbCreateTime=%" PRId64 ",schemaVer=%" PRId64,
+        SOFTWARE_VERSION_CURRENT, option.securityLabel, option.securityFlag, dbCreateTime, localSchemaVer);
     return E_OK;
 }
 
@@ -974,7 +1036,12 @@ int AbilitySync::SetAbilityAckBodyInfo(const ISyncTaskContext *context, int ackC
         ackPacket.SetDbCreateTime(dbCreateTime);
         ackPacket.SetDbAbility(dbAbility);
     }
+    auto [ret, schemaVersion] = metadata_->GetLocalSchemaVersion();
+    if (ret != E_OK) {
+        return ret;
+    }
     ackPacket.SetAckCode(ackCode);
+    ackPacket.SetSchemaVersion(schemaVersion);
     return E_OK;
 }
 
@@ -1067,11 +1134,14 @@ int AbilitySync::HandleRequestRecv(const Message *message, ISyncTaskContext *con
     if (ackCode == E_OK && remoteSoftwareVersion > SOFTWARE_VERSION_RELEASE_3_0) {
         ackCode = metadata_->SetDbCreateTime(deviceId_, packet->GetDbCreateTime(), true);
     }
+    if (ackCode == E_OK && remoteSoftwareVersion >= SOFTWARE_VERSION_RELEASE_9_0) {
+        ackCode = metadata_->SetRemoteSchemaVersion(context->GetDeviceId(), packet->GetSchemaVersion());
+    }
     AbilitySyncAckPacket ackPacket;
     if (IsSingleRelationalVer()) {
         ackPacket.SetRelationalSyncOpinion(MakeRelationSyncOpinion(packet, schema));
     } else {
-        SetAbilityAckSyncOpinionInfo(ackPacket, MakeKvSyncOpinion(packet, schema));
+        SetAbilityAckSyncOpinionInfo(ackPacket, MakeKvSyncOpinion(packet, schema, context));
     }
     LOGI("[AbilitySync][RequestRecv] remote dev=%s,ver=%u,schemaCompatible=%d", STR_MASK(deviceId_),
         remoteSoftwareVersion, isCompatible);
@@ -1138,11 +1208,18 @@ int AbilitySync::SendAck(const Message *inMsg, const AbilitySyncAckPacket &ackPa
 }
 
 SyncOpinion AbilitySync::MakeKvSyncOpinion(const AbilitySyncRequestPacket *packet,
-    const std::string &remoteSchema) const
+    const std::string &remoteSchema, ISyncTaskContext *context)
 {
     uint8_t remoteSchemaType = packet->GetSchemaType();
     SchemaObject localSchema = (static_cast<SingleVerKvDBSyncInterface *>(storageInterface_))->GetSchemaInfo();
     SyncOpinion localSyncOpinion = SchemaNegotiate::MakeLocalSyncOpinion(localSchema, remoteSchema, remoteSchemaType);
+    if (IsBothKvAndOptAbilitySync(context->GetRemoteSoftwareVersion(), localSchema.GetSchemaType(), remoteSchemaType)) {
+        // both kv no need convert
+        SyncStrategy localStrategy;
+        localStrategy.permitSync = true;
+        (static_cast<SingleVerKvSyncTaskContext *>(context))->SetSyncStrategy(localStrategy, true);
+        SetAbilitySyncFinishedStatus(true, *context);
+    }
     return localSyncOpinion;
 }
 
@@ -1154,8 +1231,8 @@ RelationalSyncOpinion AbilitySync::MakeRelationSyncOpinion(const AbilitySyncRequ
     return SchemaNegotiate::MakeLocalSyncOpinion(localSchema, remoteSchema, remoteSchemaType);
 }
 
-void AbilitySync::HandleKvAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
-    ISyncTaskContext *context, AbilitySyncAckPacket &sendPacket, std::pair<bool, bool> &schemaSyncStatus) const
+int AbilitySync::HandleKvAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
+    ISyncTaskContext *context, AbilitySyncAckPacket &sendPacket, std::pair<bool, bool> &schemaSyncStatus)
 {
     std::string remoteSchema = recvPacket->GetSchema();
     uint8_t remoteSchemaType = recvPacket->GetSchemaType();
@@ -1171,10 +1248,17 @@ void AbilitySync::HandleKvAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
         localStrategy.permitSync,
         true
     };
+    if (localStrategy.permitSync) {
+        RecordAbilitySyncFinish(recvPacket->GetSchemaVersion(), *context);
+    }
+    if (IsBothKvAndOptAbilitySync(context->GetRemoteSoftwareVersion(), localSchema.GetSchemaType(), remoteSchemaType)) {
+        return -E_ABILITY_SYNC_FINISHED;
+    }
+    return E_OK;
 }
 
 int AbilitySync::HandleRelationAckSchemaParam(const AbilitySyncAckPacket *recvPacket, AbilitySyncAckPacket &sendPacket,
-    ISyncTaskContext *context, bool sendOpinion, std::pair<bool, bool> &schemaSyncStatus) const
+    ISyncTaskContext *context, bool sendOpinion, std::pair<bool, bool> &schemaSyncStatus)
 {
     std::string remoteSchema = recvPacket->GetSchema();
     uint8_t remoteSchemaType = recvPacket->GetSchemaType();
@@ -1209,6 +1293,9 @@ int AbilitySync::HandleRelationAckSchemaParam(const AbilitySyncAckPacket *recvPa
         !(strategy == localStrategy.end()) && strategy->second.permitSync,
         true
     };
+    if (permitSync) {
+        RecordAbilitySyncFinish(recvPacket->GetSchemaVersion(), *context);
+    }
     return errCode;
 }
 
@@ -1218,17 +1305,7 @@ int AbilitySync::AckRecvWithHighVersion(const Message *message, ISyncTaskContext
     HandleVersionV3AckSecOptionParam(packet, context);
     AbilitySyncAckPacket ackPacket;
     std::pair<bool, bool> schemaSyncStatus;
-    int errCode = HandleVersionV3AckSchemaParam(packet, ackPacket, context, true, schemaSyncStatus);
-    if (errCode != E_OK) {
-        context->SetTaskErrCode(errCode);
-        return errCode;
-    }
-    auto singleVerContext = static_cast<SingleVerSyncTaskContext *>(context);
-    if (!schemaSyncStatus.first) {
-        singleVerContext->SetTaskErrCode(-E_SCHEMA_MISMATCH);
-        LOGE("[AbilitySync][AckRecv] scheme check failed");
-        return -E_SCHEMA_MISMATCH;
-    }
+    int errCode = E_OK;
     if (context->GetRemoteSoftwareVersion() > SOFTWARE_VERSION_RELEASE_3_0) {
         errCode = metadata_->SetDbCreateTime(deviceId_, packet->GetDbCreateTime(), true);
         if (errCode != E_OK) {
@@ -1237,18 +1314,70 @@ int AbilitySync::AckRecvWithHighVersion(const Message *message, ISyncTaskContext
             return errCode;
         }
     }
+    errCode = HandleVersionV3AckSchemaParam(packet, ackPacket, context, true, schemaSyncStatus);
     DbAbility remoteDbAbility = packet->GetDbAbility();
+    auto singleVerContext = static_cast<SingleVerSyncTaskContext *>(context);
     singleVerContext->SetDbAbility(remoteDbAbility);
+    if (errCode == -E_ABILITY_SYNC_FINISHED) {
+        return errCode;
+    }
+    if (errCode != E_OK) {
+        context->SetTaskErrCode(errCode);
+        return errCode;
+    }
+    if (!schemaSyncStatus.first) {
+        singleVerContext->SetTaskErrCode(-E_SCHEMA_MISMATCH);
+        LOGE("[AbilitySync][AckRecv] scheme check failed");
+        return -E_SCHEMA_MISMATCH;
+    }
     (void)SendAck(context, message, AbilitySync::CHECK_SUCCESS, true, ackPacket);
     return E_OK;
 }
 
-int32_t AbilitySync::TransformRemoteSecLabelIfNeed(int32_t remoteSecLabel, int localSecLabel)
+int32_t AbilitySync::TransformSecLabelIfNeed(int32_t originLabel, int targetLabel)
+{
+    if ((originLabel == S0 && targetLabel == S1) || (originLabel == S1 && targetLabel == S0)) {
+        LOGI("[AbilitySync] Accept SecLabel From %d To %d", originLabel, targetLabel);
+        return targetLabel;
+    }
+    return originLabel;
+}
+
+bool AbilitySync::IsBothKvAndOptAbilitySync(uint32_t remoteVersion, SchemaType localType, uint8_t remoteType)
+{
+    return remoteVersion >= SOFTWARE_VERSION_RELEASE_8_0 && localType == SchemaType::NONE &&
+        static_cast<SchemaType>(remoteType) == SchemaType::NONE;
+}
+
+void AbilitySync::InitAbilitySyncFinishStatus(ISyncTaskContext &context)
+{
+    if (!metadata_->IsAbilitySyncFinish(context.GetDeviceId())) {
+        return;
+    }
+    LOGI("[AbilitySync] Mark ability sync finish from db status");
+    syncFinished_ = true;
+    if (context.GetRemoteSoftwareVersion() == 0u) {
+        LOGD("[AbilitySync] Init remote version with default");
+        context.SetRemoteSoftwareVersion(SOFTWARE_VERSION_RELEASE_9_0); // remote version >= 109
+    }
+    InitRemoteDBAbility(context);
+}
+
+void AbilitySync::InitRemoteDBAbility(ISyncTaskContext &context)
+{
+    DbAbility ability;
+    int errCode = GetDbAbilityInfo(ability);
+    if (errCode != E_OK) {
+        return;
+    }
+    context.SetDbAbility(ability);
+}
+
+void AbilitySync::RecordAbilitySyncFinish(uint64_t remoteSchemaVersion, ISyncTaskContext &context)
 {
-    if (remoteSecLabel == SecurityLabel::S0 && localSecLabel == SecurityLabel::S1) {
-        LOGI("[AbilitySync] Accept SecLabel From S0 To S1");
-        return SecurityLabel::S1;
+    SetAbilitySyncFinishedStatus(true, context);
+    if (context.GetRemoteSoftwareVersion() >= SOFTWARE_VERSION_RELEASE_9_0) {
+        (void)metadata_->SetRemoteSchemaVersion(deviceId_, remoteSchemaVersion);
     }
-    return remoteSecLabel;
 }
 } // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.h
index 4b33c22a2117dd44224f2ac5f0243482b22e4de3..21ecfa2ba2f1e1874dcd750a6b105a63f2b6596c 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/ability_sync.h
@@ -65,6 +65,10 @@ public:
 
     void SetDbAbility(const DbAbility &dbAbility);
 
+    void SetSchemaVersion(uint64_t schemaVersion);
+
+    uint64_t GetSchemaVersion() const;
+
 private:
     uint32_t protocolVersion_;
     int32_t sendCode_;
@@ -75,6 +79,7 @@ private:
     uint32_t schemaType_;
     uint64_t dbCreateTime_;
     DbAbility dbAbility_;
+    uint64_t schemaVersion_;
 };
 
 class AbilitySyncAckPacket {
@@ -118,6 +123,10 @@ public:
 
     void SetDbAbility(const DbAbility &dbAbility);
 
+    void SetSchemaVersion(uint64_t schemaVersion);
+
+    uint64_t GetSchemaVersion() const;
+
     void SetRelationalSyncOpinion(const RelationalSyncOpinion &relationalSyncOpinion);
 
     RelationalSyncOpinion GetRelationalSyncOpinion() const;
@@ -133,6 +142,7 @@ private:
     uint32_t permitSync_;
     uint32_t requirePeerConvert_;
     uint64_t dbCreateTime_;
+    uint64_t schemaVersion_;
     DbAbility dbAbility_;
     RelationalSyncOpinion relationalSyncOpinion_;
 };
@@ -159,7 +169,9 @@ public:
 
     bool GetAbilitySyncFinishedStatus() const;
 
-    void SetAbilitySyncFinishedStatus(bool syncFinished);
+    void SetAbilitySyncFinishedStatus(bool syncFinished, ISyncTaskContext &context);
+
+    void InitAbilitySyncFinishStatus(ISyncTaskContext &context);
 
     static int RegisterTransformFunc();
 
@@ -196,14 +208,14 @@ private:
 
     int HandleVersionV3AckSchemaParam(const AbilitySyncAckPacket *recvPacket,
         AbilitySyncAckPacket &sendPacket,  ISyncTaskContext *context, bool sendOpinion,
-        std::pair<bool, bool> &schemaSyncStatus) const;
+        std::pair<bool, bool> &schemaSyncStatus);
 
-    void HandleKvAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
-        ISyncTaskContext *context, AbilitySyncAckPacket &sendPacket, std::pair<bool, bool> &schemaSyncStatus) const;
+    int HandleKvAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
+        ISyncTaskContext *context, AbilitySyncAckPacket &sendPacket, std::pair<bool, bool> &schemaSyncStatus);
 
     int HandleRelationAckSchemaParam(const AbilitySyncAckPacket *recvPacket,
         AbilitySyncAckPacket &sendPacket, ISyncTaskContext *context, bool sendOpinion,
-        std::pair<bool, bool> &schemaSyncStatus) const;
+        std::pair<bool, bool> &schemaSyncStatus);
 
     void GetPacketSecOption(const ISyncTaskContext *context, SecurityOption &option) const;
 
@@ -234,14 +246,21 @@ private:
 
     int HandleRequestRecv(const Message *message, ISyncTaskContext *context, bool isCompatible);
 
-    SyncOpinion MakeKvSyncOpinion(const AbilitySyncRequestPacket *packet, const std::string &remoteSchema) const;
+    SyncOpinion MakeKvSyncOpinion(const AbilitySyncRequestPacket *packet, const std::string &remoteSchema,
+        ISyncTaskContext *context);
 
     RelationalSyncOpinion MakeRelationSyncOpinion(const AbilitySyncRequestPacket *packet,
         const std::string &remoteSchema) const;
 
     int AckRecvWithHighVersion(const Message *message, ISyncTaskContext *context, const AbilitySyncAckPacket *packet);
 
-    static int32_t TransformRemoteSecLabelIfNeed(int32_t remoteSecLabel, int localSecLabel);
+    void InitRemoteDBAbility(ISyncTaskContext &context);
+
+    void RecordAbilitySyncFinish(uint64_t remoteSchemaVersion, ISyncTaskContext &context);
+
+    static int32_t TransformSecLabelIfNeed(int32_t originLabel, int targetLabel);
+
+    static bool IsBothKvAndOptAbilitySync(uint32_t remoteVersion, SchemaType localType, uint8_t remoteType);
 
     ICommunicator *communicator_;
     ISyncInterface *storageInterface_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.cpp
index ab7ff0e8442566413086295a95127080c951e218..7c76c068c52eb8cdcb5fc4a633644d686146b5eb 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.cpp
@@ -94,8 +94,7 @@ int GenericSyncer::Initialize(ISyncInterface *syncInterface, bool isNeedActive)
             return -E_BUSY;
         }
         std::vector<uint8_t> label = syncInterface->GetIdentifier();
-        label.resize(3); // only show 3 Bytes enough
-        label_ = DBCommon::VectorToHexString(label);
+        label_ = DBCommon::StringMasking(DBCommon::VectorToHexString(label));
 
         int errCode = InitStorageResource(syncInterface);
         if (errCode != E_OK) {
@@ -202,15 +201,19 @@ int GenericSyncer::PrepareSync(const SyncParma &param, uint32_t syncId, uint64_t
         SubQueuedSyncSize();
         return -E_OUT_OF_MEMORY;
     }
+    ISyncEngine *engine = nullptr;
     {
         std::lock_guard<std::mutex> autoLock(syncerLock_);
         PerformanceAnalysis::GetInstance()->StepTimeRecordStart(PT_TEST_RECORDS::RECORD_SYNC_TOTAL);
         InitSyncOperation(operation, param);
         LOGI("[Syncer] GenerateSyncId %" PRIu32 ", mode = %d, wait = %d, label = %s, devices = %s", syncId, param.mode,
             param.wait, label_.c_str(), GetSyncDevicesStr(param.devices).c_str());
-        AddSyncOperation(operation);
-        PerformanceAnalysis::GetInstance()->StepTimeRecordEnd(PT_TEST_RECORDS::RECORD_SYNC_TOTAL);
+        engine = syncEngine_;
+        RefObject::IncObjRef(engine);
     }
+    AddSyncOperation(engine, operation);
+    RefObject::DecObjRef(engine);
+    PerformanceAnalysis::GetInstance()->StepTimeRecordEnd(PT_TEST_RECORDS::RECORD_SYNC_TOTAL);
     if (connectionId != DBConstant::IGNORE_CONNECTION_ID) {
         std::lock_guard<std::mutex> lockGuard(syncIdLock_);
         connectionIdMap_[connectionId].push_back(static_cast<int>(syncId));
@@ -338,14 +341,14 @@ void GenericSyncer::QueryAutoSync(const InternalSyncParma &param)
     }
 }
 
-void GenericSyncer::AddSyncOperation(SyncOperation *operation)
+void GenericSyncer::AddSyncOperation(ISyncEngine *engine, SyncOperation *operation)
 {
     if (operation == nullptr) {
         return;
     }
 
     LOGD("[Syncer] AddSyncOperation.");
-    syncEngine_->AddSyncOperation(operation);
+    engine->AddSyncOperation(operation);
 
     if (operation->CheckIsAllFinished()) {
         return;
@@ -924,6 +927,8 @@ int GenericSyncer::InitTimeChangedListener()
     }
     timeChangedListener_ = RuntimeContext::GetInstance()->RegisterTimeChangedLister(
         [this](void *changedOffset) {
+            RuntimeContext::GetInstance()->RecordAllTimeChange();
+            RuntimeContext::GetInstance()->ClearAllDeviceTimeInfo();
             RecordTimeChangeOffset(changedOffset);
         },
         [this]() {
@@ -941,6 +946,9 @@ int GenericSyncer::InitTimeChangedListener()
         std::lock_guard<std::mutex> autoLock(timeChangeListenerMutex_);
         timeChangeListenerFinalize_ = false;
     }
+    if (RuntimeContext::GetInstance()->CheckDBTimeChange(syncInterface_->GetIdentifier())) {
+        ResetTimeSyncMarkByTimeChange(metadata_, *syncInterface_);
+    }
     return E_OK;
 }
 
@@ -996,6 +1004,7 @@ void GenericSyncer::RecordTimeChangeOffset(void *changedOffset)
             static_cast<TimeOffset>(TimeHelper::MS_TO_100_NS); // 1ms
     }
     metadata->SaveLocalTimeOffset(orgOffset);
+    ResetTimeSyncMarkByTimeChange(metadata, *storage);
     storage->DecRefCount();
 }
 
@@ -1115,4 +1124,68 @@ int GenericSyncer::InitStorageResource(ISyncInterface *syncInterface)
     }
     return errCode;
 }
+
+int GenericSyncer::GetWatermarkInfo(const std::string &device, WatermarkInfo &info)
+{
+    std::shared_ptr<Metadata> metadata = nullptr;
+    {
+        std::lock_guard<std::mutex> autoLock(syncerLock_);
+        metadata = metadata_;
+    }
+    if (metadata == nullptr) {
+        LOGE("[Syncer] Metadata is not init");
+        return -E_NOT_INIT;
+    }
+    std::string dev;
+    bool devNeedHash = true;
+    int errCode = metadata->GetHashDeviceId(device, dev);
+    if (errCode != E_OK && errCode != -E_NOT_SUPPORT) {
+        LOGE("[Syncer] Get watermark info failed %d", errCode);
+        return errCode;
+    } else if (errCode == E_OK) {
+        devNeedHash = false;
+    } else {
+        dev = device;
+    }
+    return metadata->GetWaterMarkInfoFromDB(dev, devNeedHash, info);
+}
+
+int GenericSyncer::UpgradeSchemaVerInMeta()
+{
+    std::shared_ptr<Metadata> metadata = nullptr;
+    {
+        std::lock_guard<std::mutex> autoLock(syncerLock_);
+        metadata = metadata_;
+    }
+    if (metadata == nullptr) {
+        LOGE("[Syncer] metadata is not init");
+        return -E_NOT_INIT;
+    }
+    int errCode = metadata->ClearAllAbilitySyncFinishMark();
+    if (errCode != E_OK) {
+        LOGE("[Syncer] clear ability mark failed:%d", errCode);
+        return errCode;
+    }
+    auto [err, localSchemaVer] = metadata->GetLocalSchemaVersion();
+    if (err != E_OK) {
+        LOGE("[Syncer] get local schema version failed:%d", err);
+        return err;
+    }
+    errCode = metadata->SetLocalSchemaVersion(localSchemaVer + 1);
+    if (errCode != E_OK) {
+        LOGE("[Syncer] increase local schema version failed:%d", errCode);
+    }
+    return errCode;
+}
+
+void GenericSyncer::ResetTimeSyncMarkByTimeChange(std::shared_ptr<Metadata> &metadata, ISyncInterface &storage)
+{
+    int errCode = metadata->ClearAllTimeSyncFinishMark();
+    if (errCode != E_OK) {
+        LOGW("[GenericSyncer] %s clear time sync finish mark failed %d", label_.c_str(), errCode);
+    } else {
+        LOGD("[GenericSyncer] ClearAllTimeSyncFinishMark finish");
+        RuntimeContext::GetInstance()->ResetDBTimeChangeStatus(storage.GetIdentifier());
+    }
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.h
index 3b5c315a247b762b257e18f3fdda33fc8c1a7630..ede55c98ac10a12fb51f47df3bdac9970eb451f4 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/generic_syncer.h
@@ -105,6 +105,10 @@ public:
     int GetSyncDataSize(const std::string &device, size_t &size) const override;
 
     int GetHashDeviceId(const std::string &clientId, std::string &hashDevId) const override;
+
+    int GetWatermarkInfo(const std::string &device, WatermarkInfo &info) override;
+
+    int UpgradeSchemaVerInMeta() override;
 protected:
 
     // trigger query auto sync or auto subscribe
@@ -118,7 +122,7 @@ protected:
     virtual int PrepareSync(const SyncParma &param, uint32_t syncId, uint64_t connectionId);
 
     // Add a Sync Operation, after call this function, the operation will be start
-    virtual void AddSyncOperation(SyncOperation *operation);
+    virtual void AddSyncOperation(ISyncEngine *engine, SyncOperation *operation);
 
     // Used to set to the SyncOperation Onkill
     virtual void SyncOperationKillCallbackInner(int syncId);
@@ -133,7 +137,7 @@ protected:
     int InitTimeHelper(ISyncInterface *syncInterface);
 
     // Init the Sync engine
-    int InitSyncEngine(ISyncInterface *syncInterface);
+    virtual int InitSyncEngine(ISyncInterface *syncInterface);
 
     int CheckSyncActive(ISyncInterface *syncInterface, bool isNeedActive);
 
@@ -190,6 +194,8 @@ protected:
 
     int InitStorageResource(ISyncInterface *syncInterface);
 
+    void ResetTimeSyncMarkByTimeChange(std::shared_ptr<Metadata> &metadata, ISyncInterface &storage);
+
     static int SyncModuleInit();
 
     static int SyncResourceInit();
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_engine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_engine.h
index 4690099c7006a1f9a032b43d1b10d6ce3652c6b7..8bca65d7dfbac13921d24d887522636cecfea58a 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_engine.h
@@ -96,6 +96,8 @@ public:
 
     virtual void AbortMachineIfNeed(uint32_t syncId) = 0;
 
+    virtual void AddSubscribe(SyncGenericInterface *storage,
+        const std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) = 0;
 protected:
     ~ISyncEngine() override {};
 };
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_state_machine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_state_machine.h
index 2cb42296d1ff2a4b31e2af6f3dec7c23161b7b60..8efbd5070de5ecbee17929e2ddafa0a17a493b6e 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_state_machine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_state_machine.h
@@ -71,6 +71,9 @@ public:
 
     // start a timer to ResetWatchDog when get data
     virtual void StopFeedDogForGetData() = 0;
+
+    // schema change and reset ability finish status
+    virtual void SchemaChange() = 0;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_task_context.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_task_context.h
index e489afd54955979faa31aee5c22ac15ca8d6a356..e07e8192a4d0a43329612e97dc678b4e972b5f7a 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_task_context.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/isync_task_context.h
@@ -16,7 +16,7 @@
 #ifndef I_SYNC_TASK_CONTEXT_H
 #define I_SYNC_TASK_CONTEXT_H
 
-
+#include "db_ability.h"
 #include "icommunicator.h"
 #include "ikvdb_sync_interface.h"
 #include "meta_data.h"
@@ -175,13 +175,15 @@ public:
     // some sync task can be skipped if there is no change in data base since last sync
     virtual bool IsCurrentSyncTaskCanBeSkipped() const = 0;
 
-    virtual void SetIsNeedResetAbilitySync(bool isNeedReset) = 0;
-
     virtual void SchemaChange() = 0;
 
     virtual void Dump(int fd) = 0;
 
     virtual void AbortMachineIfNeed(uint32_t syncId) = 0;
+
+    virtual bool IsSchemaCompatible() const = 0;
+
+    virtual void SetDbAbility(DbAbility &remoteDbAbility) = 0;
 protected:
     virtual ~ISyncTaskContext() {};
 };
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.cpp
index 1e5a726463e5eca2346066f968c493cbbeb350c2..919ea3e94608f0fe09b9af4d8e62dc46d9daa8ad 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.cpp
@@ -25,13 +25,15 @@
 #include "securec.h"
 #include "sync_types.h"
 #include "time_helper.h"
+#include "version.h"
 
 namespace DistributedDB {
 namespace {
-    const int STR_TO_LL_BY_DEVALUE = 10;
+    constexpr const int STR_TO_LL_BY_DEVALUE = 10;
     // store local timeoffset;this is a special key;
-    const std::string LOCALTIME_OFFSET_KEY = "localTimeOffset";
-    const char *CLIENT_ID_PREFIX_KEY = "clientId";
+    constexpr const char *LOCALTIME_OFFSET_KEY = "localTimeOffset";
+    constexpr const char *CLIENT_ID_PREFIX_KEY = "clientId";
+    constexpr const char *LOCAL_META_DATA_KEY = "localMetaData";
 }
 
 Metadata::Metadata()
@@ -51,7 +53,7 @@ int Metadata::Initialize(ISyncInterface* storage)
     naturalStoragePtr_ = storage;
     std::vector<uint8_t> key;
     std::vector<uint8_t> timeOffset;
-    DBCommon::StringToVector(LOCALTIME_OFFSET_KEY, key);
+    DBCommon::StringToVector(std::string(LOCALTIME_OFFSET_KEY), key);
 
     int errCode = GetMetadataFromDb(key, timeOffset);
     if (errCode == -E_NOT_FOUND) {
@@ -111,11 +113,11 @@ int Metadata::SaveLocalWaterMark(const DeviceID &deviceId, uint64_t inValue)
     return SaveMetaDataValue(deviceId, metadata);
 }
 
-void Metadata::GetPeerWaterMark(const DeviceID &deviceId, uint64_t &outValue)
+void Metadata::GetPeerWaterMark(const DeviceID &deviceId, uint64_t &outValue, bool isNeedHash)
 {
     MetaDataValue metadata;
     std::lock_guard<std::mutex> lockGuard(metadataLock_);
-    GetMetaDataValue(deviceId, metadata, true);
+    GetMetaDataValue(deviceId, metadata, isNeedHash);
     outValue = metadata.peerWaterMark;
 }
 
@@ -133,8 +135,8 @@ int Metadata::SaveLocalTimeOffset(TimeOffset timeOffset)
 {
     std::string timeOffsetString = std::to_string(timeOffset);
     std::vector<uint8_t> timeOffsetValue(timeOffsetString.begin(), timeOffsetString.end());
-    std::vector<uint8_t> localTimeOffsetValue(
-        LOCALTIME_OFFSET_KEY.begin(), LOCALTIME_OFFSET_KEY.end());
+    std::string keyStr(LOCALTIME_OFFSET_KEY);
+    std::vector<uint8_t> localTimeOffsetValue(keyStr.begin(), keyStr.end());
 
     std::lock_guard<std::mutex> lockGuard(localTimeOffsetLock_);
     localTimeOffset_ = timeOffset;
@@ -328,7 +330,11 @@ int Metadata::LoadAllMetadata()
             }
         }
     }
-    return querySyncWaterMarkHelper_.RemoveLeastUsedQuerySyncItems(querySyncIds);
+    errCode = querySyncWaterMarkHelper_.RemoveLeastUsedQuerySyncItems(querySyncIds);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    return InitLocalMetaData();
 }
 
 int Metadata::LoadDeviceIdDataToMap(const Key &key)
@@ -608,7 +614,7 @@ int Metadata::GetHashDeviceId(const std::string &clientId, std::string &hashDevI
     Value value;
     int errCode = GetMetadataFromDb(key, value);
     if (errCode == -E_NOT_FOUND) {
-        LOGD("[Metadata] not found clientId");
+        LOGD("[Metadata] not found clientId by %.3s", clientId.c_str());
         return -E_NOT_SUPPORT;
     }
     if (errCode != E_OK) {
@@ -629,6 +635,294 @@ void Metadata::UnlockWaterMark() const
     waterMarkMutex_.unlock();
 }
 
+int Metadata::GetWaterMarkInfoFromDB(const std::string &dev, bool isNeedHash, WatermarkInfo &info)
+{
+    Key devKey;
+    DeviceID hashDeviceId;
+    {
+        std::lock_guard<std::mutex> lockGuard(metadataLock_);
+        GetHashDeviceId(dev, hashDeviceId, isNeedHash);
+        DBCommon::StringToVector(hashDeviceId, devKey);
+    }
+    // read from db avoid watermark update in diff process
+    int errCode = LoadDeviceIdDataToMap(devKey);
+    if (errCode == -E_NOT_FOUND) {
+        LOGD("[Metadata] not found meta value");
+        return E_OK;
+    }
+    if (errCode != E_OK) {
+        LOGE("[Metadata] reload meta value failed %d", errCode);
+        return errCode;
+    }
+    {
+        std::lock_guard<std::mutex> lockGuard(metadataLock_);
+        MetaDataValue metadata;
+        GetMetadataFromMap(hashDeviceId, metadata);
+        info.sendMark = metadata.localWaterMark;
+        info.receiveMark = metadata.peerWaterMark;
+    }
+    return E_OK;
+}
+
+int Metadata::ClearAllAbilitySyncFinishMark()
+{
+    return ClearAllMetaDataValue(static_cast<uint32_t>(MetaValueAction::CLEAR_ABILITY_SYNC_MARK) |
+        static_cast<uint32_t>(MetaValueAction::CLEAR_REMOTE_SCHEMA_VERSION));
+}
+
+int Metadata::ClearAllTimeSyncFinishMark()
+{
+    return ClearAllMetaDataValue(static_cast<uint32_t>(MetaValueAction::CLEAR_TIME_SYNC_MARK) |
+        static_cast<uint32_t>(MetaValueAction::CLEAR_SYSTEM_TIME_OFFSET) |
+        static_cast<uint32_t>(MetaValueAction::SET_TIME_CHANGE_MARK));
+}
+
+int Metadata::ClearAllMetaDataValue(uint32_t innerClearAction)
+{
+    int errCode = E_OK;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    for (auto &[hashDev, metaDataValue] : metadataMap_) {
+        ClearMetaDataValue(innerClearAction, metaDataValue);
+        std::vector<uint8_t> value;
+        int innerErrCode = SerializeMetaData(metaDataValue, value);
+        // clear sync mark without transaction here
+        // just ignore error metadata value
+        if (innerErrCode != E_OK) {
+            LOGW("[Metadata][ClearAllMetaDataValue] action %" PRIu32 " serialize meta data failed %d", innerClearAction,
+                innerErrCode);
+            errCode = errCode == E_OK ? innerErrCode : errCode;
+            continue;
+        }
+
+        std::vector<uint8_t> key;
+        DBCommon::StringToVector(hashDev, key);
+        innerErrCode = SetMetadataToDb(key, value);
+        if (innerErrCode != E_OK) {
+            LOGW("[Metadata][ClearAllMetaDataValue] action %" PRIu32 " save meta data failed %d", innerClearAction,
+                innerErrCode);
+            errCode = errCode == E_OK ? innerErrCode : errCode;
+        }
+    }
+    if (errCode == E_OK) {
+        LOGI("[Metadata][ClearAllMetaDataValue] success clear action %" PRIu32, innerClearAction);
+    }
+    return errCode;
+}
+
+void Metadata::ClearMetaDataValue(uint32_t innerClearAction, MetaDataValue &metaDataValue)
+{
+    auto mark = static_cast<uint32_t>(MetaValueAction::CLEAR_ABILITY_SYNC_MARK);
+    if ((innerClearAction & mark) == mark) {
+        metaDataValue.syncMark =
+            DBCommon::EraseBit(metaDataValue.syncMark, static_cast<uint64_t>(SyncMark::SYNC_MARK_ABILITY_SYNC));
+    }
+    mark = static_cast<uint32_t>(MetaValueAction::CLEAR_TIME_SYNC_MARK);
+    if ((innerClearAction & mark) == mark) {
+        metaDataValue.syncMark =
+            DBCommon::EraseBit(metaDataValue.syncMark, static_cast<uint64_t>(SyncMark::SYNC_MARK_TIME_SYNC));
+    }
+    mark = static_cast<uint32_t>(MetaValueAction::CLEAR_REMOTE_SCHEMA_VERSION);
+    if ((innerClearAction & mark) == mark) {
+        metaDataValue.remoteSchemaVersion = 0;
+    }
+    mark = static_cast<uint32_t>(MetaValueAction::CLEAR_SYSTEM_TIME_OFFSET);
+    if ((innerClearAction & mark) == mark) {
+        metaDataValue.systemTimeOffset = 0;
+    }
+    mark = static_cast<uint32_t>(MetaValueAction::SET_TIME_CHANGE_MARK);
+    if ((innerClearAction & mark) == mark) {
+        metaDataValue.syncMark |= static_cast<uint64_t>(SyncMark::SYNC_MARK_TIME_CHANGE);
+    }
+}
+
+int Metadata::SetAbilitySyncFinishMark(const std::string &deviceId, bool finish)
+{
+    return SetSyncMark(deviceId, SyncMark::SYNC_MARK_ABILITY_SYNC, finish);
+}
+
+bool Metadata::IsAbilitySyncFinish(const std::string &deviceId)
+{
+    return IsContainSyncMark(deviceId, SyncMark::SYNC_MARK_ABILITY_SYNC);
+}
+
+int Metadata::SetTimeSyncFinishMark(const std::string &deviceId, bool finish)
+{
+    return SetSyncMark(deviceId, SyncMark::SYNC_MARK_TIME_SYNC, finish);
+}
+
+int Metadata::SetTimeChangeMark(const std::string &deviceId, bool change)
+{
+    return SetSyncMark(deviceId, SyncMark::SYNC_MARK_TIME_CHANGE, change);
+}
+
+bool Metadata::IsTimeSyncFinish(const std::string &deviceId)
+{
+    return IsContainSyncMark(deviceId, SyncMark::SYNC_MARK_TIME_SYNC);
+}
+
+bool Metadata::IsTimeChange(const std::string &deviceId)
+{
+    return IsContainSyncMark(deviceId, SyncMark::SYNC_MARK_TIME_CHANGE);
+}
+
+int Metadata::SetSyncMark(const std::string &deviceId, SyncMark syncMark, bool finish)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    auto mark = static_cast<uint64_t>(syncMark);
+    if (finish) {
+        metadata.syncMark |= mark;
+    } else {
+        metadata.syncMark = DBCommon::EraseBit(metadata.syncMark, mark);
+    }
+    LOGD("[Metadata] Mark:%" PRIx64 " sync finish:%d sync mark:%" PRIu64, mark, static_cast<int>(finish),
+        metadata.syncMark);
+    return SaveMetaDataValue(deviceId, metadata);
+}
+
+bool Metadata::IsContainSyncMark(const std::string &deviceId, SyncMark syncMark)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    auto mark = static_cast<uint64_t>(syncMark);
+    return (metadata.syncMark & mark) == mark;
+}
+
+int Metadata::SetRemoteSchemaVersion(const std::string &deviceId, uint64_t schemaVersion)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    metadata.remoteSchemaVersion = schemaVersion;
+    LOGI("[Metadata] Set %.3s schema version %" PRIu64, deviceId.c_str(), schemaVersion);
+    int errCode = SaveMetaDataValue(deviceId, metadata);
+    if (errCode != E_OK) {
+        LOGW("[Metadata] Set remote schema version failed");
+    }
+    return errCode;
+}
+
+uint64_t Metadata::GetRemoteSchemaVersion(const std::string &deviceId)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    LOGI("[Metadata] Get %.3s schema version %" PRIu64, deviceId.c_str(), metadata.remoteSchemaVersion);
+    return metadata.remoteSchemaVersion;
+}
+
+int Metadata::SetSystemTimeOffset(const std::string &deviceId, int64_t systemTimeOffset)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    metadata.systemTimeOffset = systemTimeOffset;
+    LOGI("[Metadata] Set %.3s systemTimeOffset %" PRId64, deviceId.c_str(), systemTimeOffset);
+    return SaveMetaDataValue(deviceId, metadata);
+}
+
+int64_t Metadata::GetSystemTimeOffset(const std::string &deviceId)
+{
+    MetaDataValue metadata;
+    std::lock_guard<std::mutex> lockGuard(metadataLock_);
+    GetMetaDataValue(deviceId, metadata, true);
+    LOGI("[Metadata] Get %.3s systemTimeOffset %" PRId64, deviceId.c_str(), metadata.systemTimeOffset);
+    return metadata.systemTimeOffset;
+}
+
+std::pair<int, uint64_t> Metadata::GetLocalSchemaVersion()
+{
+    std::lock_guard<std::mutex> autoLock(localMetaDataMutex_);
+    auto [errCode, localMetaData] = GetLocalMetaData();
+    if (errCode != E_OK) {
+        return {errCode, 0};
+    }
+    LOGI("[Metadata] Get local schema version %" PRIu64, localMetaData.localSchemaVersion);
+    return {errCode, localMetaData.localSchemaVersion};
+}
+
+int Metadata::SetLocalSchemaVersion(uint64_t schemaVersion)
+{
+    std::lock_guard<std::mutex> autoLock(localMetaDataMutex_);
+    auto [errCode, localMetaData] = GetLocalMetaData();
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    localMetaData.localSchemaVersion = schemaVersion;
+    LOGI("[Metadata] Set local schema version %" PRIu64, schemaVersion);
+    return SaveLocalMetaData(localMetaData);
+}
+
+int Metadata::SaveLocalMetaData(const LocalMetaData &localMetaData)
+{
+    auto [errCode, value] = SerializeLocalMetaData(localMetaData);
+    if (errCode != E_OK) {
+        LOGE("[Metadata] Serialize local meta data failed %d", errCode);
+        return errCode;
+    }
+    std::string k(LOCAL_META_DATA_KEY);
+    Key key(k.begin(), k.end());
+    return SetMetadataToDb(key, value);
+}
+
+std::pair<int, LocalMetaData> Metadata::GetLocalMetaData()
+{
+    std::string k(LOCAL_META_DATA_KEY);
+    Key key(k.begin(), k.end());
+    Value value;
+    int errCode = GetMetadataFromDb(key, value);
+    if (errCode != E_OK && errCode != -E_NOT_FOUND) {
+        return {errCode, {}};
+    }
+    return DeSerializeLocalMetaData(value);
+}
+
+std::pair<int, Value> Metadata::SerializeLocalMetaData(const LocalMetaData &localMetaData)
+{
+    std::pair<int, Value> res = {E_OK, {}};
+    auto &[errCode, value] = res;
+    value.resize(CalculateLocalMetaDataLength());
+    Parcel parcel(value.data(), value.size());
+    (void)parcel.WriteUInt32(localMetaData.version);
+    (void)parcel.WriteUInt64(localMetaData.localSchemaVersion);
+    if (parcel.IsError()) {
+        LOGE("[Metadata] Serialize localMetaData failed");
+        errCode = -E_SERIALIZE_ERROR;
+        value.clear();
+        return res;
+    }
+    return res;
+}
+
+std::pair<int, LocalMetaData> Metadata::DeSerializeLocalMetaData(const Value &value)
+{
+    std::pair<int, LocalMetaData> res;
+    auto &[errCode, meta] = res;
+    if (value.empty()) {
+        errCode = E_OK;
+        meta.version = SOFTWARE_VERSION_RELEASE_8_0;
+        return res;
+    }
+    Parcel parcel(const_cast<uint8_t *>(value.data()), value.size());
+    parcel.ReadUInt32(meta.version);
+    parcel.ReadUInt64(meta.localSchemaVersion);
+    if (parcel.IsError()) {
+        LOGE("[Metadata] DeSerialize localMetaData failed");
+        errCode = -E_SERIALIZE_ERROR;
+        return res;
+    }
+    return res;
+}
+
+uint64_t Metadata::CalculateLocalMetaDataLength()
+{
+    uint64_t length = Parcel::GetUInt32Len(); // version
+    length += Parcel::GetUInt64Len(); // local schema version
+    return length;
+}
+
 Metadata::MetaWaterMarkAutoLock::MetaWaterMarkAutoLock(std::shared_ptr<Metadata> metadata)
     : metadataPtr_(std::move(metadata))
 {
@@ -643,4 +937,22 @@ Metadata::MetaWaterMarkAutoLock::~MetaWaterMarkAutoLock()
         metadataPtr_->UnlockWaterMark();
     }
 }
+
+int Metadata::InitLocalMetaData()
+{
+    std::lock_guard<std::mutex> autoLock(localMetaDataMutex_);
+    auto [errCode, localMetaData] = GetLocalMetaData();
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    if (localMetaData.localSchemaVersion != 0) {
+        return E_OK;
+    }
+    localMetaData.localSchemaVersion += 1;
+    errCode = SaveLocalMetaData(localMetaData);
+    if (errCode != E_OK) {
+        LOGE("[Metadata] init local schema version failed:%d", errCode);
+    }
+    return errCode;
+}
 }  // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.h
index f3d4a7cbf49604dbcf1e040c9fb15cca265c42a9..9a066d7fc08294fae3c29682a360efbad5ba75dd 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/meta_data.h
@@ -33,6 +33,20 @@ struct MetaDataValue {
     uint64_t peerWaterMark = 0;
     Timestamp dbCreateTime = 0;
     uint64_t clearDeviceDataMark = 0; // Default 0 for not remove device data.
+    uint64_t syncMark = 0; // 0x1 ability sync finish 0x2 time sync finish
+    uint64_t remoteSchemaVersion = 0; // reset zero when local schema change
+    int64_t systemTimeOffset = 0; // record dev time offset
+};
+
+struct LocalMetaData {
+    uint32_t version = 0; // start at 108
+    uint64_t localSchemaVersion = 0;
+};
+
+enum class SyncMark : uint32_t {
+    SYNC_MARK_ABILITY_SYNC = 0x01,
+    SYNC_MARK_TIME_SYNC = 0x02,
+    SYNC_MARK_TIME_CHANGE = 0x04,
 };
 
 class Metadata {
@@ -59,7 +73,7 @@ public:
 
     int SaveLocalWaterMark(const DeviceID &deviceId, uint64_t inValue);
 
-    void GetPeerWaterMark(const DeviceID &deviceId, uint64_t &outValue);
+    void GetPeerWaterMark(const DeviceID &deviceId, uint64_t &outValue, bool isNeedHash = true);
 
     int SavePeerWaterMark(const DeviceID &deviceId, uint64_t inValue, bool isNeedHash);
 
@@ -128,6 +142,36 @@ public:
     void LockWaterMark() const;
 
     void UnlockWaterMark() const;
+
+    int GetWaterMarkInfoFromDB(const std::string &dev, bool isNeedHash, WatermarkInfo &info);
+
+    int ClearAllAbilitySyncFinishMark();
+
+    int SetAbilitySyncFinishMark(const std::string &deviceId, bool finish);
+
+    bool IsAbilitySyncFinish(const std::string &deviceId);
+
+    int ClearAllTimeSyncFinishMark();
+
+    int SetTimeSyncFinishMark(const std::string &deviceId, bool finish);
+
+    int SetTimeChangeMark(const std::string &deviceId, bool change);
+
+    bool IsTimeSyncFinish(const std::string &deviceId);
+
+    bool IsTimeChange(const std::string &deviceId);
+
+    int SetRemoteSchemaVersion(const std::string &deviceId, uint64_t schemaVersion);
+
+    uint64_t GetRemoteSchemaVersion(const std::string &deviceId);
+
+    int SetSystemTimeOffset(const std::string &deviceId, int64_t systemTimeOffset);
+
+    int64_t GetSystemTimeOffset(const std::string &deviceId);
+
+    std::pair<int, uint64_t> GetLocalSchemaVersion();
+
+    int SetLocalSchemaVersion(uint64_t schemaVersion);
 private:
 
     int SaveMetaDataValue(const DeviceID &deviceId, const MetaDataValue &inValue, bool isNeedHash = true);
@@ -162,6 +206,35 @@ private:
     // reset the waterMark to zero
     int ResetRecvQueryWaterMark(const DeviceID &deviceId, const std::string &tableName, bool isNeedHash);
 
+    int SetSyncMark(const std::string &deviceId, SyncMark syncMark, bool finish);
+
+    bool IsContainSyncMark(const std::string &deviceId, SyncMark syncMark);
+
+    int SaveLocalMetaData(const LocalMetaData &localMetaData);
+
+    std::pair<int, LocalMetaData> GetLocalMetaData();
+
+    enum class MetaValueAction : uint32_t {
+        CLEAR_ABILITY_SYNC_MARK = 0x01,
+        CLEAR_TIME_SYNC_MARK = 0x02,
+        CLEAR_REMOTE_SCHEMA_VERSION = 0x04,
+        CLEAR_SYSTEM_TIME_OFFSET = 0x08,
+        CLEAR_TIME_CHANGE_MARK = 0x10,
+        SET_TIME_CHANGE_MARK = 0x20,
+    };
+
+    int ClearAllMetaDataValue(uint32_t innerAction);
+
+    static void ClearMetaDataValue(uint32_t innerAction, MetaDataValue &metaDataValue);
+
+    static std::pair<int, Value> SerializeLocalMetaData(const LocalMetaData &localMetaData);
+
+    static std::pair<int, LocalMetaData> DeSerializeLocalMetaData(const Value &value);
+
+    static uint64_t CalculateLocalMetaDataLength();
+
+    int InitLocalMetaData();
+
     // store localTimeOffset in ram; if change, should add a lock first, change here and metadata,
     // then release lock
     std::atomic<TimeOffset> localTimeOffset_;
@@ -189,6 +262,7 @@ private:
     std::map<DeviceID, std::string> clientIdCache_;
 
     mutable std::recursive_mutex waterMarkMutex_;
+    mutable std::mutex localMetaDataMutex_;
 };
 }  // namespace DistributedDB
 #endif
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.cpp
index 96018b9c686d37dc414083f68986ad11d5fed755..5190bbd03dfae8100774a79756d26a98243752db 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.cpp
@@ -105,11 +105,11 @@ ISyncEngine *MultiVerSyncer::CreateSyncEngine()
     return new (std::nothrow) MultiVerSyncEngine();
 }
 
-void MultiVerSyncer::AddSyncOperation(SyncOperation *operation)
+void MultiVerSyncer::AddSyncOperation(ISyncEngine *engine, SyncOperation *operation)
 {
     MultiVerKvDBSyncInterface *syncInterface = static_cast<MultiVerKvDBSyncInterface *>(syncInterface_);
     syncInterface->NotifyStartSyncOperation();
-    GenericSyncer::AddSyncOperation(operation);
+    GenericSyncer::AddSyncOperation(syncEngine_, operation);
 }
 
 void MultiVerSyncer::SyncOperationKillCallbackInner(int syncId)
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.h
index 37b431281d7b6c948c6a7c398765f12ba47f8fca..bba71c6bd30abce91c15050b31557fb31e563464 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/multiver/multi_ver_syncer.h
@@ -52,7 +52,7 @@ protected:
     ISyncEngine *CreateSyncEngine() override;
 
     // Add a Sync Operation, after call this function, the operation will be start
-    void AddSyncOperation(SyncOperation *operation) override;
+    void AddSyncOperation([[gnu::unused]] ISyncEngine *engine, SyncOperation *operation) override;
 
     // Used to set to the SyncOperation Onkill
     void SyncOperationKillCallbackInner(int syncId) override;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.cpp
index 83a07b66e5078f1e33e96faa5779ea3a30a49c20..b795a7d458edbb1d0e8a5fdbe5ce2d6cfe05fdef 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.cpp
@@ -190,6 +190,11 @@ uint32_t DataRequestPacket::CalculateLen(uint32_t messageId) const
         }
         totalLen = Parcel::GetEightByteAlign(totalLen); // 8-byte align
     }
+    if (version_ >= SOFTWARE_VERSION_RELEASE_9_0) {
+        totalLen += Parcel::GetUInt64Len(); // schemaVersion
+        totalLen += Parcel::GetInt64Len(); // systemTimeOffset
+        totalLen += Parcel::GetInt64Len(); // senderTimeOffset
+    }
     if (totalLen > INT32_MAX) {
         return 0;
     }
@@ -306,6 +311,36 @@ bool DataRequestPacket::IsExtraConditionData() const
     return ((flag_ & IS_CONDITION_DATA) == IS_CONDITION_DATA);
 }
 
+void DataRequestPacket::SetSchemaVersion(uint64_t schemaVersion)
+{
+    schemaVersion_ = schemaVersion;
+}
+
+uint64_t DataRequestPacket::GetSchemaVersion() const
+{
+    return schemaVersion_;
+}
+
+void DataRequestPacket::SetSystemTimeOffset(int64_t systemTimeOffset)
+{
+    systemTimeOffset_ = systemTimeOffset;
+}
+
+int64_t DataRequestPacket::GetSystemTimeOffset() const
+{
+    return systemTimeOffset_;
+}
+
+void DataRequestPacket::SetSenderTimeOffset(int64_t senderTimeOffset)
+{
+    senderTimeOffset_ = senderTimeOffset;
+}
+
+int64_t DataRequestPacket::GetSenderTimeOffset() const
+{
+    return senderTimeOffset_;
+}
+
 void DataAckPacket::SetData(uint64_t data)
 {
     data_ = data;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.h
index d20ea8b51e498cbcfafa685acb37cfb8e00c8b04..56bd3114283f36ecfc863f65ee97b35b80dd7776 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_packet.h
@@ -112,6 +112,14 @@ public:
     std::map<std::string, std::string> GetExtraConditions() const;
     bool IsExtraConditionData() const;
 
+    void SetSchemaVersion(uint64_t schemaVersion);
+    uint64_t GetSchemaVersion() const;
+
+    void SetSystemTimeOffset(int64_t systemTimeOffset);
+    int64_t GetSystemTimeOffset() const;
+
+    void SetSenderTimeOffset(int64_t senderTimeOffset);
+    int64_t GetSenderTimeOffset() const;
 protected:
     std::vector<SendDataItem> data_;
     WaterMark endWaterMark_ = 0;
@@ -130,6 +138,9 @@ protected:
     std::vector<uint8_t> compressData_; // if compressData size is above 0, means use compressData and ignore data_
     CompressAlgorithm algo_ = CompressAlgorithm::NONE; // used for param while serialize compress data
     std::map<std::string, std::string> extraConditions_; // use for checkpermission in annother device
+    uint64_t schemaVersion_ = 0; // sender schema version, add in 109
+    int64_t systemTimeOffset_ = 0; // sender device time offset with receiver, add in 109
+    int64_t senderTimeOffset_ = 0; // sender local time offset, add in 109
     static const uint32_t IS_LAST_SEQUENCE = 0x1; // bit 0 used for isLastSequence, 1: is last, 0: not last
     static const uint32_t IS_UPDATE_WATER = 0x2; // bit 1 used for update watermark, 0: update, 1: not update
     static const uint32_t IS_COMPRESS_DATA = 0x4; // bit 3 used for compress data, 0: raw data, 1: compress data
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.cpp
index 15bb3ea08474128f53d03843f4dd12fa589d0ea4..109eab6bdf4d5d58c2bb9712af1fc80e87597a40 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.cpp
@@ -269,6 +269,9 @@ int SingleVerDataSync::GetDataWithPerformanceRecord(SingleVerSyncTaskContext *co
     if (performance != nullptr) {
         performance->StepTimeRecordEnd(PT_TEST_RECORDS::RECORD_READ_DATA);
     }
+    if (!outData.empty()) {
+        RecordClientId(context);
+    }
     return errCode;
 }
 
@@ -403,19 +406,7 @@ int SingleVerDataSync::SaveData(const SingleVerSyncTaskContext *context, const s
     if (inData.empty()) {
         return E_OK;
     }
-    StoreInfo info = {
-        storage_->GetDbProperties().GetStringProp(DBProperties::USER_ID, ""),
-        storage_->GetDbProperties().GetStringProp(DBProperties::APP_ID, ""),
-        storage_->GetDbProperties().GetStringProp(DBProperties::STORE_ID, "")
-    };
-    std::string clientId;
-    int errCode = E_OK;
-    if (RuntimeContext::GetInstance()->TranslateDeviceId(context->GetDeviceId(), info, clientId) == E_OK) {
-        errCode = metadata_->SaveClientId(context->GetDeviceId(), clientId);
-        if (errCode != E_OK) {
-            LOGW("[DataSync] record clientId failed %d", errCode);
-        }
-    }
+    RecordClientId(context);
     PerformanceAnalysis *performance = PerformanceAnalysis::GetInstance();
     if (performance != nullptr) {
         performance->StepTimeRecordStart(PT_TEST_RECORDS::RECORD_SAVE_DATA);
@@ -424,7 +415,7 @@ int SingleVerDataSync::SaveData(const SingleVerSyncTaskContext *context, const s
     const std::string localHashName = DBCommon::TransferHashString(GetLocalDeviceName());
     SingleVerDataSyncUtils::TransSendDataItemToLocal(context, localHashName, inData);
     // query only support prefix key and don't have query in packet in 104 version
-    errCode = storage_->PutSyncDataWithQuery(query, inData, context->GetDeviceId());
+    int errCode = storage_->PutSyncDataWithQuery(query, inData, context->GetDeviceId());
     if (performance != nullptr) {
         performance->StepTimeRecordEnd(PT_TEST_RECORDS::RECORD_SAVE_DATA);
     }
@@ -663,6 +654,7 @@ void SingleVerDataSync::UpdateSendInfo(SyncTimeRange dataTimeRange, SingleVerSyn
 void SingleVerDataSync::FillDataRequestPacket(DataRequestPacket *packet, SingleVerSyncTaskContext *context,
     SyncEntry &syncData, int sendCode, int mode)
 {
+    SetDataRequestCommonInfo(*packet);
     SyncType curType = (context->IsQuerySync()) ? SyncType::QUERY_SYNC_TYPE : SyncType::MANUAL_FULL_SYNC_TYPE;
     uint32_t version = std::min(context->GetRemoteSoftwareVersion(), SOFTWARE_VERSION_CURRENT);
     WaterMark localMark = 0;
@@ -713,6 +705,7 @@ int SingleVerDataSync::RequestStart(SingleVerSyncTaskContext *context, int mode)
 {
     int errCode = QuerySyncCheck(context);
     if (errCode != E_OK) {
+        LOGE("[DataSync][PushStart] check query failed, errCode=%d", errCode);
         return errCode;
     }
     errCode = RemoveDeviceDataIfNeed(context);
@@ -810,7 +803,7 @@ int SingleVerDataSync::PullRequestStart(SingleVerSyncTaskContext *context)
     uint32_t version = std::min(context->GetRemoteSoftwareVersion(), SOFTWARE_VERSION_CURRENT);
     WaterMark endMark = context->GetEndMark();
     SyncTimeRange dataTime = {localMark, deleteMark, localMark, deleteMark};
-
+    SetDataRequestCommonInfo(*packet);
     packet->SetBasicInfo(E_OK, version, context->GetMode());
     packet->SetExtraConditions(RuntimeContext::GetInstance()->GetPermissionCheckParam(storage_->GetDbProperties()));
     packet->SetWaterMark(localMark, peerMark, deleteMark);
@@ -821,10 +814,9 @@ int SingleVerDataSync::PullRequestStart(SingleVerSyncTaskContext *context)
     packet->SetLastSequence();
     SingleVerDataSyncUtils::SetPacketId(packet, context, version);
     context->SetRetryStatus(SyncTaskContext::NO_NEED_RETRY);
-
     LOGD("[DataSync][Pull] curType=%d,local=%" PRIu64 ",del=%" PRIu64 ",end=%" PRIu64 ",peer=%" PRIu64 ",label=%s,"
-        "dev=%s", static_cast<int>(syncType), localMark, deleteMark, endMark, peerMark, label_.c_str(),
-        STR_MASK(GetDeviceId()));
+        "dev=%s", static_cast<int>(syncType), localMark, deleteMark, endMark, peerMark,
+        label_.c_str(), STR_MASK(GetDeviceId()));
     UpdateSendInfo(dataTime, context);
     return SendDataPacket(syncType, packet, context);
 }
@@ -973,6 +965,11 @@ int SingleVerDataSync::DataRequestRecvPre(SingleVerSyncTaskContext *context, con
     if (errCode == E_OK) {
         errCode = SingleVerDataSyncUtils::RequestQueryCheck(packet, storage_);
     }
+    if (errCode != E_OK) {
+        (void)SendDataAck(context, message, errCode, 0);
+        return errCode;
+    }
+    errCode = SchemaVersionMatchCheck(context, packet);
     if (errCode != E_OK) {
         (void)SendDataAck(context, message, errCode, 0);
     }
@@ -1190,7 +1187,7 @@ int SingleVerDataSync::AckRecv(SingleVerSyncTaskContext *context, const Message
         return -E_VERSION_NOT_SUPPORT;
     }
 
-    if (recvCode == -E_NEED_ABILITY_SYNC || recvCode == -E_NOT_PERMIT) {
+    if (recvCode == -E_NEED_ABILITY_SYNC || recvCode == -E_NOT_PERMIT || recvCode == -E_NEED_TIME_SYNC) {
         // we should ReleaseContinueToken, avoid crash
         LOGI("[DataSync][AckRecv] Data sync abort,recvCode =%d,label =%s,dev=%s", recvCode, label_.c_str(),
             STR_MASK(GetDeviceId()));
@@ -1532,6 +1529,9 @@ int SingleVerDataSync::CheckSchemaStrategy(SingleVerSyncTaskContext *context, co
     if (packet == nullptr) {
         return -E_INVALID_ARGS;
     }
+    if (metadata_->IsAbilitySyncFinish(deviceId_)) {
+        return E_OK;
+    }
     auto query = packet->GetQuery();
     std::pair<bool, bool> schemaSyncStatus = context->GetSchemaSyncStatus(query);
     if (!schemaSyncStatus.second) {
@@ -1684,6 +1684,7 @@ void SingleVerDataSync::UpdateMtuSize()
 void SingleVerDataSync::FillRequestReSendPacket(const SingleVerSyncTaskContext *context, DataRequestPacket *packet,
     DataSyncReSendInfo reSendInfo, SyncEntry &syncData, int sendCode)
 {
+    SetDataRequestCommonInfo(*packet);
     SyncType curType = (context->IsQuerySync()) ? SyncType::QUERY_SYNC_TYPE : SyncType::MANUAL_FULL_SYNC_TYPE;
     WaterMark peerMark = 0;
     GetPeerWaterMark(curType, context->GetQuerySyncId(), context->GetDeviceId(),
@@ -1706,7 +1707,7 @@ void SingleVerDataSync::FillRequestReSendPacket(const SingleVerSyncTaskContext *
     packet->SetBasicInfo(sendCode, version, reSendMode);
     packet->SetExtraConditions(RuntimeContext::GetInstance()->GetPermissionCheckParam(storage_->GetDbProperties()));
     packet->SetWaterMark(reSendInfo.start, peerMark, reSendInfo.deleteDataStart);
-    if (SyncOperation::TransferSyncMode(reSendMode) != SyncModeType::PUSH) {
+    if (SyncOperation::TransferSyncMode(reSendMode) != SyncModeType::PUSH || context->IsQuerySync()) {
         packet->SetEndWaterMark(context->GetEndMark());
         packet->SetQuery(context->GetQuery());
     }
@@ -2019,6 +2020,9 @@ int SingleVerDataSync::SubscribeRequestRecv(SingleVerSyncTaskContext *context, c
         return errCode;
     }
     subscribeManager->ActiveRemoteSubscribeQuery(context->GetDeviceId(), packet->GetQuery());
+    DBInfo dbInfo;
+    storage_->GetDBInfo(dbInfo);
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(dbInfo, context->GetDeviceId(), packet->GetQuery());
     return errCode;
 }
 
@@ -2053,6 +2057,9 @@ int SingleVerDataSync::UnsubscribeRequestRecv(SingleVerSyncTaskContext *context,
         return errCode;
     }
     subscribeManager->RemoveRemoteSubscribeQuery(context->GetDeviceId(), packet->GetQuery());
+    DBInfo dbInfo;
+    storage_->GetDBInfo(dbInfo);
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo, context->GetDeviceId(), packet->GetQuery());
     metadata_->RemoveQueryFromRecordSet(context->GetDeviceId(), packet->GetQuery().GetIdentify());
     return errCode;
 }
@@ -2107,4 +2114,47 @@ void SingleVerDataSync::RemoveSubscribeIfNeed(const std::string &queryId,
         storage_->RemoveSubscribe(queryId);
     }
 }
+
+void SingleVerDataSync::RecordClientId(const SingleVerSyncTaskContext *context)
+{
+    StoreInfo info = {
+        storage_->GetDbProperties().GetStringProp(DBProperties::USER_ID, ""),
+        storage_->GetDbProperties().GetStringProp(DBProperties::APP_ID, ""),
+        storage_->GetDbProperties().GetStringProp(DBProperties::STORE_ID, "")
+    };
+    std::string clientId;
+    int errCode = E_OK;
+    if (RuntimeContext::GetInstance()->TranslateDeviceId(context->GetDeviceId(), info, clientId) == E_OK) {
+        errCode = metadata_->SaveClientId(context->GetDeviceId(), clientId);
+        if (errCode != E_OK) {
+            LOGW("[DataSync] record clientId failed %d", errCode);
+        }
+    }
+}
+
+void SingleVerDataSync::SetDataRequestCommonInfo(DataRequestPacket &packet)
+{
+    packet.SetSenderTimeOffset(metadata_->GetLocalTimeOffset());
+    packet.SetSystemTimeOffset(metadata_->GetSystemTimeOffset(deviceId_));
+    auto [err, localSchemaVer] = metadata_->GetLocalSchemaVersion();
+    if (err != E_OK) {
+        LOGW("[DataSync] get local schema version failed:%d", err);
+        return;
+    }
+    packet.SetSchemaVersion(localSchemaVer);
+}
+
+int SingleVerDataSync::SchemaVersionMatchCheck(SingleVerSyncTaskContext *context, const DataRequestPacket *packet)
+{
+    if (context->GetRemoteSoftwareVersion() < SOFTWARE_VERSION_RELEASE_9_0) {
+        return E_OK;
+    }
+    auto remoteSchemaVersion = metadata_->GetRemoteSchemaVersion(deviceId_);
+    if (remoteSchemaVersion != packet->GetSchemaVersion()) {
+        LOGE("[DataSync] remote schema version misMatch, need ability sync again, packet %" PRIu64 " cache %" PRIu64,
+            packet->GetSchemaVersion(), remoteSchemaVersion);
+        return -E_NEED_ABILITY_SYNC;
+    }
+    return E_OK;
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.h
index 7ed2baa01004f2eb434ec4a799c6b77f2677d472..806f93759d03d97ed691717df4de2bda53f7cc7f 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync.h
@@ -251,6 +251,12 @@ protected:
 
     void RemoveSubscribeIfNeed(const std::string &queryId, const std::shared_ptr<SubscribeManager> &subscribeManager);
 
+    void RecordClientId(const SingleVerSyncTaskContext *context);
+
+    void SetDataRequestCommonInfo(DataRequestPacket &packet);
+
+    int SchemaVersionMatchCheck(SingleVerSyncTaskContext *context, const DataRequestPacket *packet);
+
     uint32_t mtuSize_;
     SyncGenericInterface* storage_;
     ICommunicator* communicateHandle_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.cpp
index 3768691dd98964bd10a99ace88ecaad5a208c1a0..6be9b3a5e73ea77bf020afbbd323a42b63904e16 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.cpp
@@ -484,4 +484,14 @@ int SingleVerDataSyncUtils::RunPermissionCheckInner(const SingleVerSyncTaskConte
     }
     return errCode;
 }
+
+std::pair<TimeOffset, TimeOffset> SingleVerDataSyncUtils::GetTimeOffsetFromRequestMsg(const Message *message)
+{
+    std::pair<TimeOffset, TimeOffset> res;
+    auto &[systemOffset, senderLocalOffset] = res;
+    const DataRequestPacket *packet = message->GetObject<DataRequestPacket>();
+    systemOffset = packet->GetSystemTimeOffset();
+    senderLocalOffset = packet->GetSenderTimeOffset();
+    return res;
+}
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.h
index d93df8f1e85c6148029ef0ffaf4e68fc626edc7d..bd5c7b052a34ceb69e3654a6e76f77f02a7ead0f 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_data_sync_utils.h
@@ -91,6 +91,8 @@ public:
 
     static SyncTimeRange GetSyncDataTimeRange(SyncType syncType, WaterMark localMark, WaterMark deleteMark,
         const std::vector<SendDataItem> &inData, UpdateWaterMark &isUpdate);
+
+    static std::pair<TimeOffset, TimeOffset> GetTimeOffsetFromRequestMsg(const Message *message);
 private:
     static int RunPermissionCheckInner(const SingleVerSyncTaskContext *context, const SyncGenericInterface* storage,
         const std::string &label, const DataRequestPacket *packet, int mode);
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.cpp
index 26d415380e8cc985d560a5c4875fc1738b97321e..648d6b10926813e8eae7eebf74538c3d68853d32 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.cpp
@@ -132,10 +132,13 @@ void SingleVerKVSyncer::RemoteDataChanged(const std::string &device)
     if (autoSyncEnable_) {
         RefObject::IncObjRef(syncEngine_);
         syncInterface_->IncRefCount();
-        int retCode = RuntimeContext::GetInstance()->ScheduleTask([this, device] {
+        int retCode = RuntimeContext::GetInstance()->ScheduleTask([this, userId, appId, storeId, device] {
             std::vector<std::string> devices;
             devices.push_back(device);
-            int errCode = Sync(devices, SyncModeType::AUTO_PUSH, nullptr, nullptr, false);
+            int errCode = E_OK;
+            if (RuntimeContext::GetInstance()->IsNeedAutoSync(userId, appId, storeId, device)) {
+                errCode = Sync(devices, SyncModeType::AUTO_PUSH, nullptr, nullptr, false);
+            }
             if (errCode != E_OK) {
                 LOGE("[SingleVerKVSyncer] sync start by RemoteDataChanged failed err %d", errCode);
             }
@@ -291,4 +294,48 @@ SyncerBasicInfo SingleVerKVSyncer::DumpSyncerBasicInfo()
     basicInfo.isAutoSync = autoSyncEnable_;
     return basicInfo;
 }
+
+int SingleVerKVSyncer::InitSyncEngine(DistributedDB::ISyncInterface *syncInterface)
+{
+    int errCode = GenericSyncer::InitSyncEngine(syncInterface);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    TriggerAddSubscribeAsync(syncInterface);
+    return E_OK;
+}
+
+void SingleVerKVSyncer::TriggerAddSubscribeAsync(ISyncInterface *syncInterface)
+{
+    if (syncInterface == nullptr || syncEngine_ == nullptr) {
+        return;
+    }
+    if (syncInterface->GetInterfaceType() != ISyncInterface::SYNC_SVD) {
+        return;
+    }
+    DBInfo dbInfo;
+    auto storage = static_cast<SyncGenericInterface *>(syncInterface);
+    storage->GetDBInfo(dbInfo);
+    std::map<std::string, std::vector<QuerySyncObject>> subscribeQuery;
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    if (subscribeQuery.empty()) {
+        LOGD("[SingleVerKVSyncer][TriggerAddSubscribeAsync] Subscribe cache is empty");
+        return;
+    }
+    storage->IncRefCount();
+    ISyncEngine *engine = syncEngine_;
+    RefObject::IncObjRef(engine);
+    int errCode = RuntimeContext::GetInstance()->ScheduleTask([this, engine, storage, subscribeQuery]() {
+        engine->AddSubscribe(storage, subscribeQuery);
+        // try to trigger query sync after add trigger
+        LocalDataChanged(static_cast<int>(SQLiteGeneralNSNotificationEventType::SQLITE_GENERAL_NS_PUT_EVENT));
+        RefObject::DecObjRef(engine);
+        storage->DecRefCount();
+    });
+    if (errCode != E_OK) {
+        LOGW("[SingleVerKVSyncer] TriggerAddSubscribeAsync failed errCode = %d", errCode);
+        syncInterface->DecRefCount();
+        RefObject::DecObjRef(engine);
+    }
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.h
index 6ca4a03fc35aad93d4bd27843fe169ce60d1fbe8..f2f6ca27dd1ada7350bc36d22e8120f0826d19ec 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_kv_syncer.h
@@ -40,10 +40,16 @@ public:
 protected:
     int SyncConditionCheck(const SyncParma &param, const ISyncEngine *engine, ISyncInterface *storage) const override;
 
+    // Init the Sync engine
+    int InitSyncEngine(ISyncInterface *syncInterface) override;
+
+    void TriggerAddSubscribeAsync(ISyncInterface *syncInterface);
 private:
     // if trigger full sync, no need to trigger query sync again
     bool TryFullSync(const std::vector<std::string> &devices);
+
     void TriggerSubQuerySync(const std::vector<std::string> &devices);
+
     bool autoSyncEnable_;
     std::atomic<bool> triggerSyncTask_;
 };
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.cpp
index c95b54ee2d62436e114ea6517229bba11e8773c5..1be90f1b4b7f28caa6d1318a7abbb4e3cb9d665a 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.cpp
@@ -91,9 +91,20 @@ std::pair<bool, bool> SingleVerRelationalSyncTaskContext::GetSchemaSyncStatus(Qu
 
 void SingleVerRelationalSyncTaskContext::SchemaChange()
 {
-    SetIsNeedResetAbilitySync(true);
     RelationalSyncStrategy strategy;
     SetRelationalSyncStrategy(strategy, false);
+    SyncTaskContext::SchemaChange();
+}
+
+bool SingleVerRelationalSyncTaskContext::IsSchemaCompatible() const
+{
+    std::lock_guard<std::mutex> autoLock(syncStrategyMutex_);
+    for (const auto &strategy : relationalSyncStrategy_) {
+        if (!strategy.second.permitSync) {
+            return false;
+        }
+    }
+    return true;
 }
 }
 #endif
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.h
index 5af3fc8d1ca3eb068f320eeb4a9113c3af228254..77b60c7523abf039a36a8d5b6cf68dcb5c7890c5 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_sync_task_context.h
@@ -35,6 +35,8 @@ public:
     std::pair<bool, bool> GetSchemaSyncStatus(QuerySyncObject &querySyncObject) const override;
 
     void SchemaChange() override;
+
+    bool IsSchemaCompatible() const override;
 protected:
     ~SingleVerRelationalSyncTaskContext() override;
     void CopyTargetData(const ISyncTarget *target, const TaskParam &taskParam) override;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_syncer.cpp
index 04f570680cb6be441aca92a085a83a9b22b04609..9cfcf588b7f1898dbdecada66576be5fdee39973 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_relational_syncer.cpp
@@ -165,6 +165,10 @@ void SingleVerRelationalSyncer::SchemaChangeCallback()
         return;
     }
     syncEngine_->SchemaChange();
+    int errCode = UpgradeSchemaVerInMeta();
+    if (errCode != E_OK) {
+        LOGE("[SingleVerRelationalSyncer] upgrade schema version in meta failed:%d", errCode);
+    }
 }
 
 int SingleVerRelationalSyncer::SyncConditionCheck(const SyncParma &param, const ISyncEngine *engine,
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.cpp
index 1d05a41b9d8a485dcb8eb18f96726a27315376d4..bf2f9fb5105a264784e362ff215d5c208421db6e 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.cpp
@@ -263,11 +263,7 @@ int SingleVerSerializeManager::DataPacketSerialization(uint8_t *buffer, uint32_t
             return errCode;
         }
     }
-    // flag mask add in 103
-    if (packet->GetVersion() < SOFTWARE_VERSION_RELEASE_3_0 || !packet->IsExtraConditionData()) {
-        return E_OK;
-    }
-    return DataPacketExtraConditionsSerialization(parcel, packet);
+    return DataPacketInnerSerialization(packet, parcel);
 }
 
 int SingleVerSerializeManager::DataPacketQuerySyncSerialization(Parcel &parcel, const DataRequestPacket *packet)
@@ -393,13 +389,7 @@ int SingleVerSerializeManager::DataPacketDeSerialization(const uint8_t *buffer,
             goto ERROR;
         }
     }
-    if (packet->IsCompressData()) {
-        errCode = DataPacketCompressDataDeSerialization(parcel, packet);
-        if (errCode != E_OK) {
-            goto ERROR;
-        }
-    }
-    errCode = DataPacketExtraConditionsDeserialization(parcel, packet);
+    errCode = DataPacketInnerDeSerialization(packet, parcel);
     if (errCode != E_OK) {
         goto ERROR;
     }
@@ -908,4 +898,60 @@ int SingleVerSerializeManager::DataPacketExtraConditionsDeserialization(Parcel &
     packet->SetExtraConditions(extraConditions);
     return E_OK;
 }
+
+int SingleVerSerializeManager::DataPacketInnerDeSerialization(DataRequestPacket *packet, Parcel &parcel)
+{
+    int errCode = E_OK;
+    if (packet->IsCompressData()) {
+        errCode = DataPacketCompressDataDeSerialization(parcel, packet);
+        if (errCode != E_OK) {
+            return errCode;
+        }
+    }
+    errCode = DataPacketExtraConditionsDeserialization(parcel, packet);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    if (packet->GetVersion() >= SOFTWARE_VERSION_RELEASE_9_0) {
+        uint64_t schemaVersion = 0u;
+        parcel.ReadUInt64(schemaVersion);
+        int64_t systemTimeOffset = 0u;
+        parcel.ReadInt64(systemTimeOffset);
+        int64_t senderTimeOffset = 0u;
+        parcel.ReadInt64(senderTimeOffset);
+        if (parcel.IsError()) {
+            LOGE("[SingleVerSerializeManager] parse schema version or time offset failed");
+            return -E_PARSE_FAIL;
+        }
+        packet->SetSchemaVersion(schemaVersion);
+        packet->SetSystemTimeOffset(systemTimeOffset);
+        packet->SetSenderTimeOffset(senderTimeOffset);
+    }
+    return errCode;
+}
+
+int SingleVerSerializeManager::DataPacketInnerSerialization(const DataRequestPacket *packet, Parcel &parcel)
+{
+    // flag mask add in 103
+    if (packet->GetVersion() < SOFTWARE_VERSION_RELEASE_3_0) {
+        return E_OK;
+    }
+    if (packet->IsExtraConditionData()) {
+        int errCode = DataPacketExtraConditionsSerialization(parcel, packet);
+        if (errCode != E_OK) {
+            LOGE("[SingleVerSerializeManager] Serialize extra condition failed %d", errCode);
+            return errCode;
+        }
+    }
+    if (packet->GetVersion() >= SOFTWARE_VERSION_RELEASE_9_0) {
+        parcel.WriteUInt64(packet->GetSchemaVersion());
+        parcel.WriteInt64(packet->GetSystemTimeOffset());
+        parcel.WriteInt64(packet->GetSenderTimeOffset());
+        if (parcel.IsError()) {
+            LOGE("[SingleVerSerializeManager] Serialize schema version or time offset failed");
+            return -E_PARSE_FAIL;
+        }
+    }
+    return E_OK;
+}
 }  // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.h
index 33f19fc7b0a20aba16e3d2f6fb6f308395dd42f9..52962e05688ba5321d4b79b4d0ff0b24835bee3a 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_serialize_manager.h
@@ -55,6 +55,7 @@ private:
     static int DataPacketQuerySyncSerialization(Parcel &parcel, const DataRequestPacket *packet);
     static int DataPacketExtraConditionsSerialization(Parcel &parcel, const DataRequestPacket *packet);
     static int DataPacketCalculateLen(const Message *inMsg, uint32_t &len);
+    static int DataPacketInnerSerialization(const DataRequestPacket *packet, Parcel &parcel);
 
     static int DataPacketQuerySyncDeSerialization(Parcel &parcel, DataRequestPacket *packet);
     static int DataPacketCompressDataDeSerialization(Parcel &parcel, DataRequestPacket *packet);
@@ -62,6 +63,7 @@ private:
     static int DataPacketSyncerPartDeSerialization(Parcel &parcel, DataRequestPacket *packet, uint32_t packLen,
         uint32_t length, uint32_t version);
     static int DataPacketExtraConditionsDeserialization(Parcel &parcel, DataRequestPacket *packet);
+    static int DataPacketInnerDeSerialization(DataRequestPacket *packet, Parcel &parcel);
 
     static int AckPacketCalculateLen(const Message *inMsg, uint32_t &len);
     static int AckPacketSerialization(uint8_t *buffer, uint32_t length, const Message *inMsg);
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.cpp
index 28f013cdc839e1daa8c3d83b25268318d3169665..356f4c1014c840ae7c795bc5acd211183125eb1a 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.cpp
@@ -119,14 +119,5 @@ int SingleVerSyncEngine::SubscribeTimeOut(TimerId id)
     }
     return E_OK;
 }
-
-void SingleVerSyncEngine::SetIsNeedResetAbilitySync(const std::string &deviceId, bool isNeedReset)
-{
-    ISyncTaskContext *context = GetSyncTaskContextAndInc(deviceId);
-    if (context != nullptr) {
-        context->SetIsNeedResetAbilitySync(isNeedReset);
-        RefObject::DecObjRef(context);
-    }
-}
 DEFINE_OBJECT_TAG_FACILITIES(SingleVerSyncEngine);
 } // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.h
index 2fc8498a5847d5b8048d49c445ec3713ed857758..1368e2a03e37912ea71db63e009540dbd6347a05 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_engine.h
@@ -34,8 +34,6 @@ public:
 
     int SubscribeTimeOut(TimerId id);
 
-    void SetIsNeedResetAbilitySync(const std::string &deviceId, bool isNeedReset);
-
     DISABLE_COPY_ASSIGN_MOVE(SingleVerSyncEngine);
 protected:
     ~SingleVerSyncEngine() override {};
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.cpp
index 8b83f21dc482df2dd157d0a98d565607f0158b11..545f2b1331d353f153d920238db31856eb08bc0f 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.cpp
@@ -63,6 +63,7 @@ namespace {
         {State::START_INITIACTIVE_DATA_SYNC, Event::INNER_ERR_EVENT, State::INNER_ERR},
         {State::START_INITIACTIVE_DATA_SYNC, Event::SEND_FINISHED_EVENT, State::START_PASSIVE_DATA_SYNC},
         {State::START_INITIACTIVE_DATA_SYNC, Event::RE_SEND_DATA_EVENT, State::START_INITIACTIVE_DATA_SYNC},
+        {State::START_INITIACTIVE_DATA_SYNC, Event::NEED_TIME_SYNC_EVENT, State::TIME_SYNC},
 
         // In START_PASSIVE_DATA_SYNC state, do response pull request, and send first packt of data sync
         {State::START_PASSIVE_DATA_SYNC, Event::SEND_FINISHED_EVENT, State::START_PASSIVE_DATA_SYNC},
@@ -71,6 +72,7 @@ namespace {
         {State::START_PASSIVE_DATA_SYNC, Event::INNER_ERR_EVENT, State::INNER_ERR},
         {State::START_PASSIVE_DATA_SYNC, Event::NEED_ABILITY_SYNC_EVENT, State::ABILITY_SYNC},
         {State::START_PASSIVE_DATA_SYNC, Event::RE_SEND_DATA_EVENT, State::START_PASSIVE_DATA_SYNC},
+        {State::START_PASSIVE_DATA_SYNC, Event::NEED_TIME_SYNC_EVENT, State::TIME_SYNC},
 
         // In WAIT_FOR_RECEIVE_DATA_FINISH,
         {State::WAIT_FOR_RECEIVE_DATA_FINISH, Event::RECV_FINISHED_EVENT, State::SYNC_TASK_FINISHED},
@@ -148,6 +150,7 @@ int SingleVerSyncStateMachine::Initialize(ISyncTaskContext *context, ISyncInterf
     if (errCode != E_OK) {
         goto ERROR_OUT;
     }
+    abilitySync_->InitAbilitySyncFinishStatus(*context);
 
     currentState_ = IDLE;
     context_ = static_cast<SingleVerSyncTaskContext *>(context);
@@ -472,6 +475,7 @@ Event SingleVerSyncStateMachine::DoWaitForDataRecv() const
 
 Event SingleVerSyncStateMachine::DoTimeSync() const
 {
+    timeSync_->SetTimeSyncFinishIfNeed();
     if (timeSync_->IsNeedSync()) {
         CommErrHandler handler = nullptr;
         // Auto sync need do retry don't use errHandler to return.
@@ -494,19 +498,15 @@ Event SingleVerSyncStateMachine::DoAbilitySync() const
 {
     uint16_t remoteCommunicatorVersion = 0;
     int errCode = communicator_->GetRemoteCommunicatorVersion(context_->GetDeviceId(), remoteCommunicatorVersion);
-    if (errCode != E_OK) {
+    if (errCode != E_OK && errCode != -E_NOT_FOUND) {
         LOGE("[StateMachine][DoAbilitySync] Get RemoteCommunicatorVersion errCode=%d", errCode);
         return Event::INNER_ERR_EVENT;
     }
     // Fistr version, not support AbilitySync
-    if (remoteCommunicatorVersion == 0) {
+    if (remoteCommunicatorVersion == 0 && errCode != -E_NOT_FOUND) {
         context_->SetRemoteSoftwareVersion(SOFTWARE_VERSION_EARLIEST);
         return GetEventAfterTimeSync(context_->GetMode());
     }
-    if (context_->GetIsNeedResetAbilitySync()) {
-        abilitySync_->SetAbilitySyncFinishedStatus(false);
-        context_->SetIsNeedResetAbilitySync(false);
-    }
     if (abilitySync_->GetAbilitySyncFinishedStatus()) {
         return GetEventAfterTimeSync(context_->GetMode());
     }
@@ -516,7 +516,7 @@ Event SingleVerSyncStateMachine::DoAbilitySync() const
     LOGI("[StateMachine][AbilitySync] start abilitySync,label=%s,dev=%s", dataSync_->GetLabel().c_str(),
         STR_MASK(context_->GetDeviceId()));
     errCode = abilitySync_->SyncStart(context_->GetRequestSessionId(), context_->GetSequenceId(),
-        remoteCommunicatorVersion, handler);
+        remoteCommunicatorVersion, handler, context_);
     if (errCode != E_OK) {
         LOGE("[StateMachine][DoAbilitySync] ability sync start failed,errCode=%d", errCode);
         return TransformErrCodeToEvent(errCode);
@@ -599,11 +599,16 @@ int SingleVerSyncStateMachine::AbilitySyncResponseRecv(const Message *inMsg)
         std::lock_guard<std::mutex> lock(stateMachineLock_);
         int errCode = abilitySync_->AckRecv(inMsg, context_);
         (void)ResetWatchDog();
-        if (errCode != E_OK) {
+        if (errCode == -E_ABILITY_SYNC_FINISHED) {
+            LOGI("[StateMachine][AbilitySyncRecv] ability sync finished with both kv,label=%s,dev=%s",
+                dataSync_->GetLabel().c_str(), STR_MASK(context_->GetDeviceId()));
+            abilitySync_->SetAbilitySyncFinishedStatus(true, *context_);
+            JumpStatusAfterAbilitySync(context_->GetMode());
+        } else if (errCode != E_OK) {
             LOGE("[StateMachine][AbilitySyncRecv] handle ackRecv failed,errCode=%d", errCode);
             SwitchStateAndStep(TransformErrCodeToEvent(errCode));
         } else if (context_->GetRemoteSoftwareVersion() <= SOFTWARE_VERSION_RELEASE_2_0) {
-            abilitySync_->SetAbilitySyncFinishedStatus(true);
+            abilitySync_->SetAbilitySyncFinishedStatus(true, *context_);
             LOGI("[StateMachine][AbilitySyncRecv] ability Sync Finished,label=%s,dev=%s",
                 dataSync_->GetLabel().c_str(), STR_MASK(context_->GetDeviceId()));
             currentRemoteVersionId_ = context_->GetRemoteSoftwareVersionId();
@@ -612,32 +617,7 @@ int SingleVerSyncStateMachine::AbilitySyncResponseRecv(const Message *inMsg)
         return E_OK;
     }
     if (inMsg->GetMessageType() == TYPE_NOTIFY) {
-        const AbilitySyncAckPacket *packet = inMsg->GetObject<AbilitySyncAckPacket>();
-        if (packet == nullptr) {
-            return -E_INVALID_ARGS;
-        }
-        int ackCode = packet->GetAckCode();
-        if (ackCode != AbilitySync::CHECK_SUCCESS && ackCode != AbilitySync::LAST_NOTIFY) {
-            LOGE("[StateMachine][AbilitySyncRecv] ackCode check failed,ackCode=%d", ackCode);
-            context_->SetTaskErrCode(ackCode);
-            std::lock_guard<std::mutex> lock(stateMachineLock_);
-            SwitchStateAndStep(Event::INNER_ERR_EVENT);
-            return E_OK;
-        }
-        if (ackCode == AbilitySync::LAST_NOTIFY && AbilityMsgSessionIdCheck(inMsg)) {
-            abilitySync_->SetAbilitySyncFinishedStatus(true);
-            // while recv last notify means ability sync finished,it is better to reset watchDog to avoid timeout.
-            LOGI("[StateMachine][AbilitySyncRecv] ability sync finished,label=%s,dev=%s",
-                dataSync_->GetLabel().c_str(), STR_MASK(context_->GetDeviceId()));
-            context_->SetRemoteSoftwareVersion(packet->GetSoftwareVersion());
-            currentRemoteVersionId_ = context_->GetRemoteSoftwareVersionId();
-            std::lock_guard<std::mutex> lock(stateMachineLock_);
-            (void)ResetWatchDog();
-            JumpStatusAfterAbilitySync(context_->GetMode());
-        } else if (ackCode != AbilitySync::LAST_NOTIFY) {
-            abilitySync_->AckNotifyRecv(inMsg, context_);
-        }
-        return E_OK;
+        return AbilitySyncNotifyRecv(inMsg);
     }
     LOGE("[StateMachine][AbilitySyncRecv] msg type invalid");
     return -E_NOT_SUPPORT;
@@ -646,9 +626,15 @@ int SingleVerSyncStateMachine::AbilitySyncResponseRecv(const Message *inMsg)
 int SingleVerSyncStateMachine::HandleDataRequestRecv(const Message *inMsg)
 {
     TimeOffset offset = 0;
+    auto [systemOffset, senderLocalOffset] = SingleVerDataSyncUtils::GetTimeOffsetFromRequestMsg(inMsg);
+    int errCode = timeSync_->GenerateTimeOffsetIfNeed(systemOffset, senderLocalOffset);
+    if (errCode != E_OK) {
+        (void)dataSync_->SendDataAck(context_, inMsg, errCode, 0);
+        return errCode;
+    }
     uint32_t timeout = communicator_->GetTimeout(context_->GetDeviceId());
     // If message is data sync request, we should check timeoffset.
-    int errCode = timeSync_->GetTimeOffset(offset, timeout);
+    errCode = timeSync_->GetTimeOffset(offset, timeout);
     if (errCode != E_OK) {
         LOGE("[StateMachine][HandleDataRequestRecv] GetTimeOffset err! errCode=%d", errCode);
         return errCode;
@@ -726,7 +712,7 @@ void SingleVerSyncStateMachine::NeedAbilitySyncHandle()
     } else {
         currentRemoteVersionId_ = context_->GetRemoteSoftwareVersionId();
     }
-    abilitySync_->SetAbilitySyncFinishedStatus(false);
+    abilitySync_->SetAbilitySyncFinishedStatus(false, *context_);
     dataSync_->ClearSyncStatus();
 }
 
@@ -759,7 +745,7 @@ int SingleVerSyncStateMachine::HandleDataAckRecv(const Message *inMsg)
     if (isNeedStop) {
         StopSaveDataNotify();
     }
-    if (errCode == -E_NEED_ABILITY_SYNC || errCode == -E_RE_SEND_DATA) {
+    if (errCode == -E_NEED_ABILITY_SYNC || errCode == -E_RE_SEND_DATA || errCode == -E_NEED_TIME_SYNC) {
         StopFeedDogForSync(SyncDirectionFlag::SEND);
     } else if (errCode == -E_SAVE_DATA_NOTIFY) {
         return errCode;
@@ -816,7 +802,7 @@ void SingleVerSyncStateMachine::ScheduleMsgAndHandle(Message *inMsg)
         bool isNeedClearMap = false;
         if (isNeedHandle) {
             int errCode = HandleDataRequestRecv(msg);
-            if (context_->IsReceiveWaterMarkErr() || errCode == -E_NEED_ABILITY_SYNC) {
+            if (context_->IsReceiveWaterMarkErr() || errCode == -E_NEED_ABILITY_SYNC || errCode == -E_NEED_TIME_SYNC) {
                 isNeedClearMap = true;
             }
             if (errCode == -E_TIMEOUT) {
@@ -1061,6 +1047,8 @@ Event SingleVerSyncStateMachine::TransformErrCodeToEvent(int errCode) const
             return Event::START_PULL_RESPONSE_EVENT;
         case -E_RE_SEND_DATA:
             return Event::RE_SEND_DATA_EVENT;
+        case -E_NEED_TIME_SYNC:
+            return Event::NEED_TIME_SYNC_EVENT;
         default:
             return Event::INNER_ERR_EVENT;
     }
@@ -1183,6 +1171,9 @@ void SingleVerSyncStateMachine::DataAckRecvErrCodeHandle(int errCode, bool handl
         case -E_NEED_ABILITY_SYNC:
             NeedAbilitySyncHandle();
             break;
+        case -E_NEED_TIME_SYNC:
+            timeSync_->ClearTimeSyncFinish();
+            break;
         case -E_NOT_PERMIT:
             if (handleError) {
                 context_->SetOperationStatus(SyncOperation::OP_PERMISSION_CHECK_FAILED);
@@ -1287,4 +1278,39 @@ void SingleVerSyncStateMachine::NotifyClosing()
         timeSync_->Close();
     }
 }
+
+int SingleVerSyncStateMachine::AbilitySyncNotifyRecv(const Message *inMsg)
+{
+    const AbilitySyncAckPacket *packet = inMsg->GetObject<AbilitySyncAckPacket>();
+    if (packet == nullptr) {
+        return -E_INVALID_ARGS;
+    }
+    int ackCode = packet->GetAckCode();
+    if (ackCode != AbilitySync::CHECK_SUCCESS && ackCode != AbilitySync::LAST_NOTIFY) {
+        LOGE("[StateMachine][AbilitySyncRecv] ackCode check failed,ackCode=%d", ackCode);
+        context_->SetTaskErrCode(ackCode);
+        std::lock_guard<std::mutex> lock(stateMachineLock_);
+        SwitchStateAndStep(Event::INNER_ERR_EVENT);
+        return E_OK;
+    }
+    if (ackCode == AbilitySync::LAST_NOTIFY && AbilityMsgSessionIdCheck(inMsg)) {
+        abilitySync_->SetAbilitySyncFinishedStatus(true, *context_);
+        // while recv last notify means ability sync finished,it is better to reset watchDog to avoid timeout.
+        LOGI("[StateMachine][AbilitySyncRecv] ability sync finished,label=%s,dev=%s",
+            dataSync_->GetLabel().c_str(), STR_MASK(context_->GetDeviceId()));
+        context_->SetRemoteSoftwareVersion(packet->GetSoftwareVersion());
+        currentRemoteVersionId_ = context_->GetRemoteSoftwareVersionId();
+        std::lock_guard<std::mutex> lock(stateMachineLock_);
+        (void)ResetWatchDog();
+        JumpStatusAfterAbilitySync(context_->GetMode());
+    } else if (ackCode != AbilitySync::LAST_NOTIFY) {
+        abilitySync_->AckNotifyRecv(inMsg, context_);
+    }
+    return E_OK;
+}
+
+void SingleVerSyncStateMachine::SchemaChange()
+{
+    abilitySync_->SetAbilitySyncFinishedStatus(false, *context_);
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.h
index 57f1ce78acd9ad3f3ef0c4a923e85f169bf0c7e7..abe333fe1df35337fb109469363bdbfe0107d0d6 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_state_machine.h
@@ -66,6 +66,7 @@ public:
         WAIT_TIME_OUT_EVENT,
         RE_SEND_DATA_EVENT,
         CONTROL_CMD_EVENT,
+        NEED_TIME_SYNC_EVENT,
         ANY_EVENT
     };
     SingleVerSyncStateMachine();
@@ -99,6 +100,8 @@ public:
     void InnerErrorAbort(uint32_t sessionId) override;
 
     void NotifyClosing() override;
+
+    void SchemaChange() override;
 protected:
     // Step the SingleVerSyncStateMachine
     void SyncStep() override;
@@ -213,6 +216,8 @@ private:
 
     int AbilitySyncResponseRecv(const Message *inMsg);
 
+    int AbilitySyncNotifyRecv(const Message *inMsg);
+
     DISABLE_COPY_ASSIGN_MOVE(SingleVerSyncStateMachine);
 
     static std::mutex stateSwitchTableLock_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
index 3e64ecdcad59194eed4d3fddfdc3fb9dac335875..70fb1908d207488651bf1f1749d872cb38f23b5e 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_sync_task_context.h
@@ -119,7 +119,7 @@ public:
     bool IsQuerySync() const;
     std::set<CompressAlgorithm> GetRemoteCompressAlgo() const;
     std::string GetRemoteCompressAlgoStr() const;
-    void SetDbAbility(DbAbility &remoteDbAbility);
+    void SetDbAbility(DbAbility &remoteDbAbility) override;
     CompressAlgorithm ChooseCompressAlgo() const;
     bool IsNotSupportAbility(const AbilityItem &abilityItem) const;
 
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_syncer.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_syncer.cpp
index 5ff99ade4abaae9a35329407e472295ae797d743..4512687ef4c8ec1bf8a82816cc846ba2e9250a13 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_syncer.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/singlever/single_ver_syncer.cpp
@@ -21,8 +21,6 @@ namespace DistributedDB {
 void SingleVerSyncer::RemoteDataChanged(const std::string &device)
 {
     LOGI("[SingleVerSyncer] device online dev %s", STR_MASK(device));
-    // while remote db is online again, need to do abilitySync
-    static_cast<SingleVerSyncEngine *>(syncEngine_)->SetIsNeedResetAbilitySync(device, true);
 }
 
 void SingleVerSyncer::RemoteDeviceOffline(const std::string &device)
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b54c5e7a5047d1ec3462a0448b8aa2d970e9946d
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.cpp
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "subscribe_recorder.h"
+
+namespace DistributedDB {
+void SubscribeRecorder::RecordSubscribe(const DistributedDB::DBInfo &dbInfo, const DistributedDB::DeviceID &deviceId,
+    const DistributedDB::QuerySyncObject &query)
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    const auto &findSubscribe = std::find_if(subscribeCache_.begin(), subscribeCache_.end(),
+    [&dbInfo](const SubscribeEntry &entry) {
+        return entry.dbInfo.userId == dbInfo.userId && entry.dbInfo.appId == dbInfo.appId &&
+            entry.dbInfo.storeId == dbInfo.storeId;
+    });
+    if (findSubscribe != subscribeCache_.end()) {
+        findSubscribe->subscribeQuery[deviceId].push_back(query);
+        return;
+    }
+    SubscribeEntry entry;
+    entry.dbInfo = dbInfo;
+    entry.subscribeQuery[deviceId].push_back(query);
+    subscribeCache_.push_back(entry);
+}
+
+void SubscribeRecorder::RemoveAllSubscribe()
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    subscribeCache_.clear();
+}
+
+void SubscribeRecorder::RemoveRemoteSubscribe(const DistributedDB::DeviceID &deviceId)
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    for (auto &entry: subscribeCache_) {
+        entry.subscribeQuery.erase(deviceId);
+    }
+}
+
+void SubscribeRecorder::RemoveRemoteSubscribe(const DBInfo &dbInfo)
+{
+    const auto &findSubscribe = std::find_if(subscribeCache_.begin(), subscribeCache_.end(),
+        [&dbInfo](const SubscribeEntry &entry) {
+            return CheckSameDBInfo(dbInfo, entry.dbInfo);
+        });
+    if (findSubscribe == subscribeCache_.end()) {
+        return;
+    }
+    subscribeCache_.erase(findSubscribe);
+}
+
+void SubscribeRecorder::RemoveRemoteSubscribe(const DistributedDB::DBInfo &dbInfo,
+    const DistributedDB::DeviceID &deviceId)
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    RemoveSubscribeQueries(dbInfo, deviceId);
+}
+
+void SubscribeRecorder::RemoveRemoteSubscribe(const DistributedDB::DBInfo &dbInfo,
+    const DistributedDB::DeviceID &deviceId, const DistributedDB::QuerySyncObject &query)
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    RemoveSubscribeQuery(dbInfo, deviceId, query.GetIdentify());
+}
+
+void SubscribeRecorder::GetSubscribeQuery(const DistributedDB::DBInfo &dbInfo,
+    std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) const
+{
+    std::lock_guard<std::mutex> autoLock(subscribeMutex_);
+    const auto &findSubscribe = std::find_if(subscribeCache_.begin(), subscribeCache_.end(),
+    [&dbInfo](const SubscribeEntry &entry) {
+        return entry.dbInfo.userId == dbInfo.userId && entry.dbInfo.appId == dbInfo.appId &&
+               entry.dbInfo.storeId == dbInfo.storeId;
+    });
+    if (findSubscribe != subscribeCache_.end()) {
+        subscribeQuery = findSubscribe->subscribeQuery;
+    }
+}
+
+void SubscribeRecorder::RemoveSubscribeQueries(const DBInfo &dbInfo, const DeviceID &deviceId)
+{
+    const auto &findSubscribe = std::find_if(subscribeCache_.begin(), subscribeCache_.end(),
+        [&dbInfo](const SubscribeEntry &entry) {
+            return CheckSameDBInfo(dbInfo, entry.dbInfo);
+        });
+    if (findSubscribe == subscribeCache_.end()) {
+        return;
+    }
+    findSubscribe->subscribeQuery.erase(deviceId);
+}
+
+void SubscribeRecorder::RemoveSubscribeQuery(const DBInfo &dbInfo, const DeviceID &deviceId,
+    const std::string &queryId)
+{
+    const auto &findSubscribe = std::find_if(subscribeCache_.begin(), subscribeCache_.end(),
+        [&dbInfo](const SubscribeEntry &entry) {
+            return CheckSameDBInfo(dbInfo, entry.dbInfo);
+        });
+    if (findSubscribe == subscribeCache_.end()) {
+        return;
+    }
+    const auto &queryEntry = findSubscribe->subscribeQuery.find(deviceId);
+    if (queryEntry == findSubscribe->subscribeQuery.end()) {
+        return;
+    }
+    auto removeQuery = std::remove_if(
+        queryEntry->second.begin(), queryEntry->second.end(), [&queryId](const QuerySyncObject &checkQuery) {
+        return checkQuery.GetIdentify() == queryId;
+    });
+    queryEntry->second.erase(removeQuery, queryEntry->second.end());
+}
+
+bool SubscribeRecorder::CheckSameDBInfo(const DBInfo &srcDbInfo, const DBInfo &dtsDbInfo)
+{
+    return srcDbInfo.userId == dtsDbInfo.userId && srcDbInfo.appId == dtsDbInfo.appId &&
+        srcDbInfo.storeId == dtsDbInfo.storeId;
+}
+}
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.h
new file mode 100644
index 0000000000000000000000000000000000000000..e13528a8f23e5ece6be9812a11bc01f36cd8d2c6
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/subscribe_recorder.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SUBSCRIBE_RECORDER_H
+#define SUBSCRIBE_RECORDER_H
+
+#include <map>
+#include <mutex>
+#include "db_types.h"
+#include "query_sync_object.h"
+#include "store_types.h"
+
+namespace DistributedDB {
+class SubscribeRecorder final {
+public:
+    SubscribeRecorder() = default;
+    ~SubscribeRecorder() = default;
+
+    void RecordSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId, const QuerySyncObject &query);
+
+    void RemoveAllSubscribe();
+
+    void RemoveRemoteSubscribe(const DeviceID &deviceId);
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo);
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId);
+
+    void RemoveRemoteSubscribe(const DBInfo &dbInfo, const DeviceID &deviceId, const QuerySyncObject &query);
+
+    void GetSubscribeQuery(const DBInfo &dbInfo,
+        std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) const;
+private:
+
+    void RemoveSubscribeQueries(const DBInfo &dbInfo, const DeviceID &deviceId);
+
+    void RemoveSubscribeQuery(const DBInfo &dbInfo, const DeviceID &deviceId, const std::string &queryId);
+
+    static bool CheckSameDBInfo(const DBInfo &srcDbInfo, const DBInfo &dtsDbInfo);
+
+    struct SubscribeEntry {
+        DBInfo dbInfo;
+        std::map<DeviceID, std::vector<QuerySyncObject>> subscribeQuery;
+    };
+    mutable std::mutex subscribeMutex_;
+    std::vector<SubscribeEntry> subscribeCache_;
+};
+}
+#endif // SUBSCRIBE_RECORDER_H
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.cpp
index 8bd94112a1d33668353513e9a9d653a52ff40ede..addb29b3d0cd416bbb7c27f75481a717327b4a5b 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.cpp
@@ -814,6 +814,10 @@ void SyncEngine::SetEqualIdentifierMap(const std::string &identifier, const std:
 
 void SyncEngine::OfflineHandleByDevice(const std::string &deviceId, ISyncInterface *storage)
 {
+    if (!isActive_) {
+        LOGD("[SyncEngine][OfflineHandleByDevice] ignore offline because not init");
+        return;
+    }
     RemoteExecutor *executor = GetAndIncRemoteExector();
     if (executor != nullptr) {
         executor->NotifyDeviceOffline(deviceId);
@@ -830,11 +834,11 @@ void SyncEngine::OfflineHandleByDevice(const std::string &deviceId, ISyncInterfa
             static_cast<SingleVerKvDBSyncInterface *>(storage)->RemoveSubscribe(queryId);
         }
     }
-    // get context and Inc context if context is not nullprt
+    DBInfo dbInfo;
+    static_cast<SyncGenericInterface *>(storage)->GetDBInfo(dbInfo);
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo, deviceId);
+    // get context and Inc context if context is not nullptr
     ISyncTaskContext *context = GetSyncTaskContextAndInc(deviceId);
-    if (context != nullptr) {
-        context->SetIsNeedResetAbilitySync(true);
-    }
     {
         std::lock_guard<std::mutex> lock(communicatorProxyLock_);
         if (communicatorProxy_ == nullptr) {
@@ -1208,4 +1212,33 @@ int SyncEngine::HandleRemoteExecutorMsg(const std::string &targetDev, Message *i
     RefObject::DecObjRef(executor);
     return errCode;
 }
+
+void SyncEngine::AddSubscribe(SyncGenericInterface *storage,
+    const std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery)
+{
+    for (const auto &[device, queryList]: subscribeQuery) {
+        for (const auto &query: queryList) {
+            AddQuerySubscribe(storage, device, query);
+        }
+    }
+}
+
+void SyncEngine::AddQuerySubscribe(SyncGenericInterface *storage, const std::string &device,
+    const QuerySyncObject &query)
+{
+    int errCode = storage->AddSubscribe(query.GetIdentify(), query, true);
+    if (errCode != E_OK) {
+        LOGW("[SyncEngine][AddSubscribe] Add trigger failed dev = %s queryId = %s",
+            STR_MASK(device), STR_MASK(query.GetIdentify()));
+        return;
+    }
+    errCode = subManager_->ReserveRemoteSubscribeQuery(device, query);
+    if (errCode != E_OK) {
+        if (!subManager_->IsQueryExistSubscribe(query.GetIdentify())) {
+            (void)storage->RemoveSubscribe(query.GetIdentify());
+        }
+        return;
+    }
+    subManager_->ActiveRemoteSubscribeQuery(device, query);
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.h
index 42ab38c61b3378f7c92ef7dc7d5aa9f22b3a96a7..17ff19852da6a86d839b94f9e7e4b5915085b2e5 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_engine.h
@@ -120,6 +120,8 @@ public:
 
     void AbortMachineIfNeed(uint32_t syncId) override;
 
+    void AddSubscribe(SyncGenericInterface *storage,
+        const std::map<std::string, std::vector<QuerySyncObject>> &subscribeQuery) override;
 protected:
     // Create a context
     virtual ISyncTaskContext *CreateSyncTaskContext() = 0;
@@ -207,6 +209,8 @@ private:
 
     int HandleRemoteExecutorMsg(const std::string &targetDev, Message *inMsg);
 
+    void AddQuerySubscribe(SyncGenericInterface *storage, const std::string &device, const QuerySyncObject &query);
+
     ICommunicator *communicator_;
     DeviceManager *deviceManager_;
     std::function<void(const std::string &)> onRemoteDataChanged_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.cpp
index 01badf515ef1fb029fda1a03d7635667987c9335..857213d1b4580037a56509315b6291a1df75ae9b 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.cpp
@@ -509,4 +509,8 @@ void SyncStateMachine::StopFeedDogForGetDataInner(TimerId timerId)
     getDataNotifyTimerId_ = 0;
     getDataNotifyCount_ = 0;
 }
+
+void SyncStateMachine::SchemaChange()
+{
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.h
index 193b585f91f106c83457cd51e98053461dc04984..eed991ef89095448b87a6da82940bb7281692c68 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_state_machine.h
@@ -80,6 +80,8 @@ public:
 
     // Notify machine is closing, should release some lock
     void NotifyClosing() override;
+
+    void SchemaChange() override;
 protected:
 
     // SyncOperation is timeout, step to timeout state
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.cpp
index 7551a49562d5d6fcf4c11f27650b93eebde2deaf..fb01678aa4dea99d7d14eeea19296ced96870e20 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.cpp
@@ -26,6 +26,7 @@
 #include "isync_state_machine.h"
 #include "log_print.h"
 #include "time_helper.h"
+#include "version.h"
 
 namespace DistributedDB {
 std::mutex SyncTaskContext::synTaskContextSetLock_;
@@ -56,8 +57,7 @@ SyncTaskContext::SyncTaskContext()
       syncTaskRetryStatus_(false),
       isSyncRetry_(false),
       negotiationCount_(0),
-      isAutoSubscribe_(false),
-      isNeedResetAbilitySync_(false)
+      isAutoSubscribe_(false)
 {
 }
 
@@ -431,6 +431,11 @@ int SyncTaskContext::StartStateMachine()
 
 int SyncTaskContext::ReceiveMessageCallback(Message *inMsg)
 {
+    if (GetRemoteSoftwareVersion() <= SOFTWARE_VERSION_BASE && inMsg->GetMessageId() != ABILITY_SYNC_MESSAGE) {
+        uint16_t remoteVersion = 0;
+        (void)communicator_->GetRemoteCommunicatorVersion(deviceId_, remoteVersion);
+        SetRemoteSoftwareVersion(SOFTWARE_VERSION_EARLIEST + remoteVersion);
+    }
     int errCode = E_OK;
     if (IncUsedCount() == E_OK) {
         errCode = stateMachine_->ReceiveMessageCallback(inMsg);
@@ -702,16 +707,6 @@ bool SyncTaskContext::IsAutoSubscribe() const
     return isAutoSubscribe_;
 }
 
-bool SyncTaskContext::GetIsNeedResetAbilitySync() const
-{
-    return isNeedResetAbilitySync_;
-}
-
-void SyncTaskContext::SetIsNeedResetAbilitySync(bool isNeedReset)
-{
-    isNeedResetAbilitySync_ = isNeedReset;
-}
-
 bool SyncTaskContext::IsCurrentSyncTaskCanBeSkipped() const
 {
     return false;
@@ -723,7 +718,9 @@ void SyncTaskContext::ResetLastPushTaskStatus()
 
 void SyncTaskContext::SchemaChange()
 {
-    SetIsNeedResetAbilitySync(true);
+    if (stateMachine_ != nullptr) {
+        stateMachine_->SchemaChange();
+    }
 }
 
 void SyncTaskContext::Dump(int fd)
@@ -816,4 +813,13 @@ uint32_t SyncTaskContext::GenerateRequestSessionId()
     lastRequestSessionId_ = sessionId;
     return sessionId;
 }
+
+bool SyncTaskContext::IsSchemaCompatible() const
+{
+    return true;
+}
+
+void SyncTaskContext::SetDbAbility([[gnu::unused]] DbAbility &remoteDbAbility)
+{
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.h
index 983015614705fc52db2dcd99102cf64f6651a854..1577b83dd2a2dbb63eeef17298c0778d77f944cf 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/sync_task_context.h
@@ -203,15 +203,15 @@ public:
 
     virtual void ResetLastPushTaskStatus();
 
-    bool GetIsNeedResetAbilitySync() const;
-
-    void SetIsNeedResetAbilitySync(bool isNeedReset) override;
-
     void SchemaChange() override;
 
     void Dump(int fd) override;
 
     void AbortMachineIfNeed(uint32_t syncId) override;
+
+    bool IsSchemaCompatible() const override;
+
+    void SetDbAbility(DbAbility &remoteDbAbility) override;
 protected:
     const static int KILL_WAIT_SECONDS = INT32_MAX;
 
@@ -285,8 +285,6 @@ protected:
     volatile bool isSyncRetry_;
     volatile uint32_t negotiationCount_;
     volatile bool isAutoSubscribe_;
-    // syncFinished_ need to set false if isNeedResetSyncFinished_ is true when start do abilitySync interface
-    std::atomic<bool> isNeedResetAbilitySync_;
 
     // For global ISyncTaskContext Set, used by CommErrCallback.
     static std::mutex synTaskContextSetLock_;
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/syncer_proxy.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/syncer_proxy.cpp
index 02ca1773f1c6d3c8ad6919f9f26ef93765012207..e2d641c05844355ff082edb461fba4300d9d2627 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/syncer_proxy.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/syncer_proxy.cpp
@@ -239,4 +239,20 @@ int SyncerProxy::GetHashDeviceId(const std::string &clientId, std::string &hashD
     }
     return syncer_->GetHashDeviceId(clientId, hashDevId);
 }
+
+int SyncerProxy::GetWatermarkInfo(const std::string &device, WatermarkInfo &info)
+{
+    if (syncer_ == nullptr) {
+        return -E_NOT_INIT;
+    }
+    return syncer_->GetWatermarkInfo(device, info);
+}
+
+int SyncerProxy::UpgradeSchemaVerInMeta()
+{
+    if (syncer_ == nullptr) {
+        return -E_NOT_INIT;
+    }
+    return syncer_->UpgradeSchemaVerInMeta();
+}
 } // namespace DistributedDB
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.cpp b/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.cpp
index 6c8316ee566b43363b9ad817dcabf4a00edb12c6..6322fe0cfd9ce3397e52279a65ab03403b37824e 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.cpp
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.cpp
@@ -29,6 +29,8 @@ namespace {
     constexpr uint64_t TIME_SYNC_INTERVAL = 24 * 60 * 60 * 1000; // 24h
     constexpr int TRIP_DIV_HALF = 2;
     constexpr int64_t MAX_TIME_OFFSET_NOISE = 1 * 1000 * 10000; // 1s for 100ns
+    constexpr int64_t MAX_TIME_RTT_NOISE = 1 * 1000 * 10000; // 1s for 100ns
+    constexpr uint64_t RTT_NOISE_CHECK_INTERVAL = 30 * 60 * 1000 * 10000u; // 30min for 100ns
 }
 
 // Class TimeSyncPacket
@@ -37,7 +39,9 @@ TimeSyncPacket::TimeSyncPacket()
       sourceTimeEnd_(0),
       targetTimeBegin_(0),
       targetTimeEnd_(0),
-      version_(TIME_SYNC_VERSION_V1)
+      version_(TIME_SYNC_VERSION_V1),
+      requestLocalOffset_(0),
+      responseLocalOffset_(0)
 {
 }
 
@@ -95,14 +99,36 @@ uint32_t TimeSyncPacket::GetVersion() const
     return version_;
 }
 
+TimeOffset TimeSyncPacket::GetRequestLocalOffset() const
+{
+    return requestLocalOffset_;
+}
+
+void TimeSyncPacket::SetRequestLocalOffset(TimeOffset offset)
+{
+    requestLocalOffset_ = offset;
+}
+
+TimeOffset TimeSyncPacket::GetResponseLocalOffset() const
+{
+    return responseLocalOffset_;
+}
+
+void TimeSyncPacket::SetResponseLocalOffset(TimeOffset offset)
+{
+    responseLocalOffset_ = offset;
+}
+
 uint32_t TimeSyncPacket::CalculateLen()
 {
-    uint32_t len = Parcel::GetUInt32Len();
-    len += Parcel::GetUInt64Len();
-    len += Parcel::GetUInt64Len();
-    len += Parcel::GetUInt64Len();
-    len += Parcel::GetUInt64Len();
+    uint32_t len = Parcel::GetUInt32Len(); // version_
+    len += Parcel::GetUInt64Len(); // sourceTimeBegin_
+    len += Parcel::GetUInt64Len(); // sourceTimeEnd_
+    len += Parcel::GetUInt64Len(); // targetTimeBegin_
+    len += Parcel::GetUInt64Len(); // targetTimeEnd_
     len = Parcel::GetEightByteAlign(len);
+    len += Parcel::GetInt64Len(); // requestLocalOffset_
+    len += Parcel::GetInt64Len(); // responseLocalOffset_
     return len;
 }
 
@@ -113,7 +139,6 @@ TimeSync::TimeSync()
       timeHelper_(nullptr),
       retryTime_(0),
       driverTimerId_(0),
-      isSynced_(false),
       isAckReceived_(false),
       timeChangedListener_(nullptr),
       timeDriverLockCount_(0),
@@ -171,7 +196,7 @@ int TimeSync::Initialize(ICommunicator *communicator, const std::shared_ptr<Meta
         LOGE("[TimeSync] timeHelper Init failed, err %d.", errCode);
         return errCode;
     }
-
+    dbId_ = storage->GetIdentifier();
     driverCallback_ = std::bind(&TimeSync::TimeSyncDriver, this, std::placeholders::_1);
     errCode = RuntimeContext::GetInstance()->SetTimer(TIME_SYNC_INTERVAL, driverCallback_, nullptr, driverTimerId_);
     if (errCode != E_OK) {
@@ -202,8 +227,11 @@ int TimeSync::SyncStart(const CommErrHandler &handler,  uint32_t sessionId)
     TimeSyncPacket packet;
     Timestamp startTime = timeHelper_->GetTime();
     packet.SetSourceTimeBegin(startTime);
+    TimeOffset timeOffset = metadata_->GetLocalTimeOffset();
+    packet.SetRequestLocalOffset(timeOffset);
     // send timeSync request
-    LOGD("[TimeSync] startTime = %" PRIu64 ", dev = %s{private}", startTime, deviceId_.c_str());
+    LOGD("[TimeSync] startTime = %" PRIu64 ", offset = % " PRId64 " , dev = %s{private}", startTime, timeOffset,
+        deviceId_.c_str());
 
     Message *message = new (std::nothrow) Message(TIME_SYNC_MESSAGE);
     if (message == nullptr) {
@@ -277,6 +305,8 @@ int TimeSync::Serialization(uint8_t *buffer, uint32_t length, const Message *inM
         return -E_SECUREC_ERROR;
     }
     parcel.EightByteAlign();
+    parcel.WriteInt64(packet->GetRequestLocalOffset());
+    parcel.WriteInt64(packet->GetResponseLocalOffset());
     if (parcel.IsError()) {
         return -E_PARSE_FAIL;
     }
@@ -315,6 +345,19 @@ int TimeSync::DeSerialization(const uint8_t *buffer, uint32_t length, Message *i
     packet.SetSourceTimeEnd(srcEnd);
     packet.SetTargetTimeBegin(targetBegin);
     packet.SetTargetTimeEnd(targetEnd);
+    parcel.EightByteAlign();
+    if (parcel.IsContinueRead()) {
+        TimeOffset requestLocalOffset;
+        TimeOffset responseLocalOffset;
+        parcel.ReadInt64(requestLocalOffset);
+        parcel.ReadInt64(responseLocalOffset);
+        if (parcel.IsError()) {
+            LOGE("[TimeSync] Parse packet failed, message type %u", inMsg->GetMessageType());
+            return -E_PARSE_FAIL;
+        }
+        packet.SetRequestLocalOffset(requestLocalOffset);
+        packet.SetResponseLocalOffset(responseLocalOffset);
+    }
 
     return inMsg->SetCopiedObject<>(packet);
 }
@@ -347,20 +390,7 @@ int TimeSync::AckRecv(const Message *message, uint32_t targetSessionId)
         LOGD("[TimeSync][AckRecv] Time valid check failed.");
         return -E_INVALID_TIME;
     }
-    // calculate timeoffset of two devices
-    TimeOffset offset = CalculateTimeOffset(packetData);
-    LOGD("TimeSync::AckRecv, dev = %s{private}, sEnd = %" PRIu64 ", tEnd = %" PRIu64 ", sBegin = %" PRIu64
-        ", tBegin = %" PRIu64 ", offset = %" PRId64,
-        deviceId_.c_str(),
-        packetData.GetSourceTimeEnd(),
-        packetData.GetTargetTimeEnd(),
-        packetData.GetSourceTimeBegin(),
-        packetData.GetTargetTimeBegin(),
-        offset);
-
-    // save timeoffset into metadata, maybe a block action
-    int errCode = SaveTimeOffset(deviceId_, offset);
-    isSynced_ = true;
+    int errCode = SaveOffsetWithAck(packetData);
     {
         std::lock_guard<std::mutex> lock(cvLock_);
         isAckReceived_ = true;
@@ -375,7 +405,6 @@ int TimeSync::RequestRecv(const Message *message)
     if (!IsPacketValid(message, TYPE_REQUEST)) {
         return -E_INVALID_ARGS;
     }
-    Timestamp targetTimeBegin = timeHelper_->GetTime();
 
     const TimeSyncPacket *packet = message->GetObject<TimeSyncPacket>();
     if (packet == nullptr) {
@@ -383,28 +412,12 @@ int TimeSync::RequestRecv(const Message *message)
     }
 
     // build timeSync ack packet
-    TimeSyncPacket ackPacket = TimeSyncPacket(*packet);
-    ackPacket.SetTargetTimeBegin(targetTimeBegin);
-    Timestamp targetTimeEnd = timeHelper_->GetTime();
-    ackPacket.SetTargetTimeEnd(targetTimeEnd);
-    LOGD("TimeSync::RequestRecv, dev = %s{private}, sTimeEnd = %" PRIu64 ", tTimeEnd = %" PRIu64 ", sbegin = %" PRIu64
-        ", tbegin = %" PRIu64, deviceId_.c_str(), ackPacket.GetSourceTimeEnd(), ackPacket.GetTargetTimeEnd(),
-        ackPacket.GetSourceTimeBegin(), ackPacket.GetTargetTimeBegin());
+    TimeSyncPacket ackPacket = BuildAckPacket(*packet);
     if (ackPacket.GetSourceTimeBegin() > TimeHelper::MAX_VALID_TIME) {
         LOGD("[TimeSync][RequestRecv] Time valid check failed.");
         return -E_INVALID_TIME;
     }
-
-    TimeOffset timeoffsetIgnoreRtt = static_cast<TimeOffset>(ackPacket.GetSourceTimeBegin() - targetTimeBegin);
-    TimeOffset metadataTimeoffset;
-    metadata_->GetTimeOffset(deviceId_, metadataTimeoffset);
-
-    // 2 is half of INT64_MAX
-    if ((std::abs(metadataTimeoffset) >= INT64_MAX / 2) || (std::abs(timeoffsetIgnoreRtt) >= INT64_MAX / 2) ||
-        (std::abs(metadataTimeoffset - timeoffsetIgnoreRtt) > MAX_TIME_OFFSET_NOISE)) {
-        LOGI("[TimeSync][RequestRecv] timeoffSet invalid, should do time sync");
-        isSynced_ = false;
-    }
+    ReTimeSyncIfNeed(ackPacket);
 
     Message *ackMessage = new (std::nothrow) Message(TIME_SYNC_MESSAGE);
     if (ackMessage == nullptr) {
@@ -434,7 +447,7 @@ int TimeSync::SaveTimeOffset(const DeviceID &deviceID, TimeOffset timeOffset)
     return metadata_->SaveTimeOffset(deviceID, timeOffset);
 }
 
-TimeOffset TimeSync::CalculateTimeOffset(const TimeSyncPacket &timeSyncInfo)
+std::pair<TimeOffset, TimeOffset> TimeSync::CalculateTimeOffset(const TimeSyncPacket &timeSyncInfo)
 {
     TimeOffset roundTrip = static_cast<TimeOffset>((timeSyncInfo.GetSourceTimeEnd() -
         timeSyncInfo.GetSourceTimeBegin()) - (timeSyncInfo.GetTargetTimeEnd() - timeSyncInfo.GetTargetTimeBegin()));
@@ -445,7 +458,7 @@ TimeOffset TimeSync::CalculateTimeOffset(const TimeSyncPacket &timeSyncInfo)
     TimeOffset offset = (offset1 / TRIP_DIV_HALF) + (offset2 / TRIP_DIV_HALF);
     LOGD("TimeSync::CalculateTimeOffset roundTrip= %" PRId64 ", offset1 = %" PRId64 ", offset2 = %" PRId64
         ", offset = %" PRId64, roundTrip, offset1, offset2, offset);
-    return offset;
+    return {offset, roundTrip};
 }
 
 bool TimeSync::IsPacketValid(const Message *inMsg, uint16_t messageType)
@@ -501,7 +514,7 @@ int TimeSync::TimeSyncDriver(TimerId timerId)
 
 int TimeSync::GetTimeOffset(TimeOffset &outOffset, uint32_t timeout, uint32_t sessionId)
 {
-    if (!isSynced_) {
+    if (!metadata_->IsTimeSyncFinish(deviceId_)) {
         {
             std::lock_guard<std::mutex> lock(cvLock_);
             isAckReceived_ = false;
@@ -535,7 +548,7 @@ int TimeSync::GetTimeOffset(TimeOffset &outOffset, uint32_t timeout, uint32_t se
 
 bool TimeSync::IsNeedSync() const
 {
-    return !isSynced_;
+    return !metadata_->IsTimeSyncFinish(deviceId_);
 }
 
 void TimeSync::SetOnline(bool isOnline)
@@ -631,4 +644,217 @@ Timestamp TimeSync::GetSourceBeginTime(Timestamp packetBeginTime, uint32_t sessi
     LOGD("[TimeSync] Use packet send time %" PRIu64 " rather than %" PRIu64, sendTime, packetBeginTime);
     return sendTime;
 }
+
+TimeSyncPacket TimeSync::BuildAckPacket(const TimeSyncPacket &request)
+{
+    TimeSyncPacket ackPacket = TimeSyncPacket(request);
+    Timestamp targetTimeBegin = timeHelper_->GetTime();
+    ackPacket.SetTargetTimeBegin(targetTimeBegin);
+    Timestamp targetTimeEnd = timeHelper_->GetTime();
+    ackPacket.SetTargetTimeEnd(targetTimeEnd);
+    TimeOffset requestOffset = request.GetRequestLocalOffset();
+    TimeOffset responseOffset = metadata_->GetLocalTimeOffset();
+    ackPacket.SetRequestLocalOffset(requestOffset);
+    ackPacket.SetResponseLocalOffset(responseOffset);
+    LOGD("TimeSync::RequestRecv, dev = %s{private}, sTimeEnd = %" PRIu64 ", tTimeEnd = %" PRIu64 ", sbegin = %" PRIu64
+        ", tbegin = %" PRIu64 ", request offset = %" PRId64 ", response offset = %" PRId64, deviceId_.c_str(),
+        ackPacket.GetSourceTimeEnd(), ackPacket.GetTargetTimeEnd(), ackPacket.GetSourceTimeBegin(),
+        ackPacket.GetTargetTimeBegin(), requestOffset, responseOffset);
+    return ackPacket;
+}
+
+bool TimeSync::IsRemoteLowVersion(uint32_t checkVersion)
+{
+    uint16_t version = 0;
+    int errCode = communicateHandle_->GetRemoteCommunicatorVersion(deviceId_, version);
+    return errCode == -E_NOT_FOUND || (version < checkVersion - SOFTWARE_VERSION_EARLIEST);
+}
+
+void TimeSync::ReTimeSyncIfNeed(const TimeSyncPacket &ackPacket)
+{
+    TimeOffset timeOffsetIgnoreRtt =
+        static_cast<TimeOffset>(ackPacket.GetSourceTimeBegin() - ackPacket.GetTargetTimeBegin());
+    bool reTimeSync = false;
+    if (IsRemoteLowVersion(SOFTWARE_VERSION_RELEASE_9_0)) {
+        reTimeSync = CheckReTimeSyncIfNeedWithLowVersion(timeOffsetIgnoreRtt);
+    } else {
+        reTimeSync = CheckReTimeSyncIfNeedWithHighVersion(timeOffsetIgnoreRtt, ackPacket);
+    }
+
+    if ((std::abs(timeOffsetIgnoreRtt) >= INT64_MAX / 2) || reTimeSync) { // 2 is half of INT64_MAX
+        LOGI("[TimeSync][RequestRecv] timeOffSet invalid, should do time sync");
+        metadata_->SetTimeSyncFinishMark(deviceId_, false);
+        RuntimeContext::GetInstance()->ClearDeviceTimeInfo(deviceId_);
+    }
+
+    // reset time change by time sync
+    int errCode = metadata_->SetTimeChangeMark(deviceId_, false);
+    if (errCode != E_OK) {
+        LOGW("[TimeSync] Mark dev %.3s no time change failed %d", deviceId_.c_str(), errCode);
+    }
+}
+
+bool TimeSync::CheckReTimeSyncIfNeedWithLowVersion(TimeOffset timeOffsetIgnoreRtt)
+{
+    TimeOffset metadataTimeOffset;
+    metadata_->GetTimeOffset(deviceId_, metadataTimeOffset);
+    return (std::abs(metadataTimeOffset) >= INT64_MAX / 2) || // 2 is half of INT64_MAX
+        (std::abs(metadataTimeOffset - timeOffsetIgnoreRtt) > MAX_TIME_OFFSET_NOISE);
+}
+
+bool TimeSync::CheckReTimeSyncIfNeedWithHighVersion(TimeOffset timeOffsetIgnoreRtt, const TimeSyncPacket &ackPacket)
+{
+    TimeOffset rawTimeOffset = timeOffsetIgnoreRtt - ackPacket.GetRequestLocalOffset() +
+        ackPacket.GetResponseLocalOffset();
+    auto [errCode, info] = RuntimeContext::GetInstance()->GetDeviceTimeInfo(deviceId_);
+    return errCode == -E_NOT_FOUND || (std::abs(info.systemTimeOffset - rawTimeOffset) > MAX_TIME_OFFSET_NOISE);
+}
+
+int TimeSync::SaveOffsetWithAck(const TimeSyncPacket &ackPacket)
+{
+    // calculate timeoffset of two devices
+    auto [offset, rtt] = CalculateTimeOffset(ackPacket);
+    TimeOffset rawOffset = CalculateRawTimeOffset(ackPacket, offset);
+    LOGD("TimeSync::AckRecv, dev = %s{private}, sEnd = %" PRIu64 ", tEnd = %" PRIu64 ", sBegin = %" PRIu64
+        ", tBegin = %" PRIu64 ", offset = %" PRId64 ", rawOffset = %" PRId64 ", requestLocalOffset = %" PRId64
+        ", responseLocalOffset = %" PRId64,
+        deviceId_.c_str(),
+        ackPacket.GetSourceTimeEnd(),
+        ackPacket.GetTargetTimeEnd(),
+        ackPacket.GetSourceTimeBegin(),
+        ackPacket.GetTargetTimeBegin(),
+        offset,
+        rawOffset,
+        ackPacket.GetRequestLocalOffset(),
+        ackPacket.GetResponseLocalOffset());
+
+    // save timeoffset into metadata, maybe a block action
+    int errCode = SaveTimeOffset(deviceId_, offset);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    errCode = metadata_->SetSystemTimeOffset(deviceId_, rawOffset);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    DeviceTimeInfo info;
+    info.systemTimeOffset = rawOffset;
+    info.recordTime = timeHelper_->GetSysCurrentTime();
+    info.rtt = rtt;
+    RuntimeContext::GetInstance()->SetDeviceTimeInfo(deviceId_, info);
+    return metadata_->SetTimeSyncFinishMark(deviceId_, true);
+}
+
+TimeOffset TimeSync::CalculateRawTimeOffset(const TimeSyncPacket &timeSyncInfo, TimeOffset deltaTime)
+{
+    // deltaTime = (t1 + requestLocalOffset + rtt/2) - (t1' + responseLocalOffset)
+    // rawTimeOffset =  (t1 + rtt/2) - t1'
+    // rawTimeOffset = deltaTime - requestLocalOffset + responseLocalOffset
+    return deltaTime - timeSyncInfo.GetRequestLocalOffset() + timeSyncInfo.GetResponseLocalOffset();
+}
+
+bool TimeSync::CheckSkipTimeSync(const DeviceTimeInfo &info)
+{
+    uint64_t currentRawTime = timeHelper_->GetSysCurrentTime();
+    if (currentRawTime < info.recordTime) {
+        LOGW("[TimeSync] current time %" PRIu64 " less than record time %" PRIu64, currentRawTime, info.recordTime);
+        return false;
+    }
+    uint64_t interval = timeHelper_->GetSysCurrentTime() - info.recordTime;
+    if (info.rtt < MAX_TIME_RTT_NOISE) {
+        return true;
+    }
+    if (interval > RTT_NOISE_CHECK_INTERVAL) {
+        LOGI("[TimeSync] rtt %" PRId64 " is greater than noise should re time sync, interval is %" PRIu64, info.rtt,
+            interval);
+        return false;
+    }
+#ifdef DE_DEBUG_ENV
+#ifdef TEST_RTT_NOISE_CHECK_INTERVAL
+    if (interval > TEST_RTT_NOISE_CHECK_INTERVAL) {
+        LOGI("[TimeSync][TEST] rtt %" PRId64 " is greater than noise should re time sync, interval is %" PRIu64,
+            info.rtt, interval);
+        return false;
+    }
+#endif
+#endif
+    return true;
+}
+
+void TimeSync::SetTimeSyncFinishIfNeed()
+{
+    auto [errCode, info] = RuntimeContext::GetInstance()->GetDeviceTimeInfo(deviceId_);
+    if (errCode != E_OK) {
+        return;
+    }
+    int64_t systemTimeOffset = metadata_->GetSystemTimeOffset(deviceId_);
+    LOGD("[TimeSync] Check db offset %" PRId64 " cache offset %" PRId64, systemTimeOffset, info.systemTimeOffset);
+    if (!CheckSkipTimeSync(info) || (metadata_->IsTimeSyncFinish(deviceId_) &&
+         std::abs(systemTimeOffset - info.systemTimeOffset) >= MAX_TIME_OFFSET_NOISE)) {
+        (void)metadata_->SetTimeSyncFinishMark(deviceId_, false);
+        return;
+    }
+    errCode = metadata_->SetTimeSyncFinishMark(deviceId_, true);
+    if (errCode != E_OK) {
+        return;
+    }
+    errCode = metadata_->SetSystemTimeOffset(deviceId_, info.systemTimeOffset);
+    if (errCode != E_OK) {
+        return;
+    }
+    LOGI("[TimeSync] Mark time sync finish success");
+}
+
+void TimeSync::ClearTimeSyncFinish()
+{
+    RuntimeContext::GetInstance()->ClearDeviceTimeInfo(deviceId_);
+    int errCode = metadata_->SetTimeSyncFinishMark(deviceId_, false);
+    if (errCode != E_OK) {
+        LOGW("[TimeSync] Clear %.3s time sync finish mark failed %d", deviceId_.c_str(), errCode);
+    }
+}
+
+int TimeSync::GenerateTimeOffsetIfNeed(TimeOffset systemOffset, TimeOffset senderLocalOffset)
+{
+    if (IsRemoteLowVersion(SOFTWARE_VERSION_RELEASE_9_0)) {
+        return E_OK;
+    }
+    auto [errCode, info] = RuntimeContext::GetInstance()->GetDeviceTimeInfo(deviceId_);
+    bool syncFinish = metadata_->IsTimeSyncFinish(deviceId_);
+    bool timeChange = metadata_->IsTimeChange(deviceId_);
+    // avoid local time change but remote record time sync finish
+    // should return re time sync, after receive time sync request, reset time change mark
+    // we think offset is ok when local time sync to remote
+    if ((timeChange && !syncFinish) ||
+        (errCode == E_OK && (std::abs(info.systemTimeOffset + systemOffset) > MAX_TIME_OFFSET_NOISE))) {
+        LOGI("[TimeSync] time offset is invalid should do time sync again! packet %" PRId64 " cache %" PRId64
+            " time change %d sync finish %d", -systemOffset, info.systemTimeOffset, static_cast<int>(timeChange),
+            static_cast<int>(syncFinish));
+        ClearTimeSyncFinish();
+        RuntimeContext::GetInstance()->ClearDeviceTimeInfo(deviceId_);
+        return -E_NEED_TIME_SYNC;
+    }
+    // Sender's deltaTime = (t1 + requestLocalOffset + rtt/2) - (t1' + responseLocalOffset)
+    // Sender's systemOffset =  (t1 + rtt/2) - t1'
+    // Sender's systemOffset = Sender's deltaTime - requestLocalOffset + responseLocalOffset
+    // Sender's deltaTime = Sender's systemOffset + requestLocalOffset - responseLocalOffset
+    // Receiver's deltaTime = -Sender's deltaTime = -Sender's systemOffset - requestLocalOffset + responseLocalOffset
+    TimeOffset offset = -systemOffset - senderLocalOffset + metadata_->GetLocalTimeOffset();
+    errCode = metadata_->SetSystemTimeOffset(deviceId_, -systemOffset);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    errCode = metadata_->SaveTimeOffset(deviceId_, offset);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    errCode = metadata_->SetTimeSyncFinishMark(deviceId_, true);
+    if (errCode != E_OK) {
+        return errCode;
+    }
+    info.systemTimeOffset = -systemOffset;
+    info.recordTime = timeHelper_->GetSysCurrentTime();
+    RuntimeContext::GetInstance()->SetDeviceTimeInfo(deviceId_, info);
+    return E_OK;
+}
 } // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.h b/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.h
index c683cfde4e0aa0063dc9abb57e891df89beda08a..0e17ea63aad274d2178e5d43b2e32232c6769cea 100644
--- a/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.h
+++ b/kv_store/frameworks/libs/distributeddb/syncer/src/device/time_sync.h
@@ -47,6 +47,14 @@ public:
 
     uint32_t GetVersion() const;
 
+    void SetRequestLocalOffset(TimeOffset offset);
+
+    TimeOffset GetRequestLocalOffset() const;
+
+    void SetResponseLocalOffset(TimeOffset offset);
+
+    TimeOffset GetResponseLocalOffset() const;
+
     static uint32_t CalculateLen();
 private:
     Timestamp sourceTimeBegin_;  // start point time on peer
@@ -54,6 +62,8 @@ private:
     Timestamp targetTimeBegin_;  // start point time on peer
     Timestamp targetTimeEnd_;    // end point time on peer
     uint32_t version_;
+    TimeOffset requestLocalOffset_; // local system time offset in request device
+    TimeOffset responseLocalOffset_; // local system time offset in response device
 };
 
 class TimeSync : public std::enable_shared_from_this<TimeSync> {
@@ -89,13 +99,23 @@ public:
 
     void Close();
 
+    TimeSyncPacket BuildAckPacket(const TimeSyncPacket &request);
+
+    void SetTimeSyncFinishIfNeed();
+
+    void ClearTimeSyncFinish();
+
+    int GenerateTimeOffsetIfNeed(TimeOffset systemOffset, TimeOffset senderLocalOffset);
+
+    bool IsRemoteLowVersion(uint32_t checkVersion);
+
     // Used in send msg, as execution is asynchronous, should use this function to handle result.
     static void CommErrHandlerFunc(int errCode, TimeSync *timeSync);
 
 protected:
     static const int MAX_RETRY_TIME = 1;
 
-    static TimeOffset CalculateTimeOffset(const TimeSyncPacket &timeSyncInfo);
+    static std::pair<TimeOffset, TimeOffset> CalculateTimeOffset(const TimeSyncPacket &timeSyncInfo);
 
     static bool IsPacketValid(const Message *inMsg, uint16_t messageType);
 
@@ -115,6 +135,18 @@ protected:
 
     Timestamp GetSourceBeginTime(Timestamp packetBeginTime, uint32_t sessionId);
 
+    void ReTimeSyncIfNeed(const TimeSyncPacket &ackPacket);
+
+    bool CheckReTimeSyncIfNeedWithLowVersion(TimeOffset timeOffsetIgnoreRtt);
+
+    bool CheckReTimeSyncIfNeedWithHighVersion(TimeOffset timeOffsetIgnoreRtt, const TimeSyncPacket &ackPacket);
+
+    int SaveOffsetWithAck(const TimeSyncPacket &ackPacket);
+
+    bool CheckSkipTimeSync(const DeviceTimeInfo &info);
+
+    static TimeOffset CalculateRawTimeOffset(const TimeSyncPacket &timeSyncInfo, TimeOffset deltaTime);
+
     ICommunicator *communicateHandle_;
     std::shared_ptr<Metadata> metadata_;
     std::unique_ptr<TimeHelper> timeHelper_;
@@ -122,7 +154,6 @@ protected:
     int retryTime_;
     TimerId driverTimerId_;
     TimerAction driverCallback_;
-    bool isSynced_;
     bool isAckReceived_;
     std::condition_variable conditionVar_;
     mutable std::mutex cvLock_;
@@ -134,6 +165,7 @@ protected:
     bool closed_;
     std::mutex beginTimeMutex_;
     std::map<uint32_t, Timestamp> sessionBeginTime_;
+    std::vector<uint8_t> dbId_;
     static std::mutex timeSyncSetLock_;
     static std::set<TimeSync *> timeSyncSet_;
 };
diff --git a/kv_store/frameworks/libs/distributeddb/test/BUILD.gn b/kv_store/frameworks/libs/distributeddb/test/BUILD.gn
index 005023c90931f61293ceb8d704d0e22f7a0f05ab..ad2de3bd7ae166448585e25ab8056ac3b3a12b58 100644
--- a/kv_store/frameworks/libs/distributeddb/test/BUILD.gn
+++ b/kv_store/frameworks/libs/distributeddb/test/BUILD.gn
@@ -749,13 +749,27 @@ distributeddb_unittest("DistributedDBStorageRdSingleVerStorageEngineTest") {
 }
 
 distributeddb_unittest("DistributedDBInterfacesNBDelegateRdTest") {
-  sources = [ "unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test_rd_kernal.cpp" ]
+  sources = [ "unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp" ]
 }
 
 distributeddb_unittest("DistributedDBInterfacesDatabaseRdKernelTest") {
   sources = [ "unittest/common/interfaces/distributeddb_interfaces_database_rd_kernel_test.cpp" ]
 }
 
+distributeddb_unittest("DistributedDBStorageSingleVerDatabaseOperTest") {
+  sources = [ "unittest/common/storage/distributeddb_storage_single_ver_database_oper_test.cpp" ]
+}
+
+distributeddb_unittest("DistributedDBSqliteRelationalUtilsTest") {
+  sources = [
+    "unittest/common/storage/distributeddb_sqlite_relational_utils_test.cpp",
+  ]
+}
+
+distributeddb_unittest("DistributedDBMetaDataTest") {
+  sources = [ "unittest/common/syncer/distributeddb_meta_data_test.cpp" ]
+}
+
 ###############################################################################
 group("unittest") {
   testonly = true
@@ -818,6 +832,7 @@ group("unittest") {
     ":DistributedDBInterfacesTransactionSyncDBTest",
     ":DistributedDBInterfacesTransactionTest",
     ":DistributedDBJsonPrecheckUnitTest",
+    ":DistributedDBMetaDataTest",
     ":DistributedDBMockSyncModuleTest",
     ":DistributedDBMultiVerP2PSyncTest",
     ":DistributedDBMultiVerVacuumTest",
@@ -844,6 +859,7 @@ group("unittest") {
     ":DistributedDBSingleVerP2PSyncCheckTest",
     ":DistributedDBSingleVersionResultSetTest",
     ":DistributedDBSqliteRegisterTest",
+    ":DistributedDBSqliteRelationalUtilsTest",
     ":DistributedDBSqliteUtilsTest",
     ":DistributedDBStorageCommitStorageTest",
     ":DistributedDBStorageDataConnectionTest",
@@ -857,6 +873,7 @@ group("unittest") {
     ":DistributedDBStorageSQLiteSingleVerNaturalExecutorTest",
     ":DistributedDBStorageSQLiteSingleVerNaturalStoreTest",
     ":DistributedDBStorageSQLiteSingleVerStorageEngineTest",
+    ":DistributedDBStorageSingleVerDatabaseOperTest",
     ":DistributedDBStorageSingleVerUpgradeTest",
     ":DistributedDBStorageTransactionDataTest",
     ":DistributedDBStorageTransactionRecordTest",
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp
index 3596b3ec6c7223bc061e4a0be1955f4b3b6bfd34..9c7caf3f856a523c599844563b45d6e9d63db185 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.cpp
@@ -1448,4 +1448,29 @@ int RelationalTestUtils::DeleteRecord(sqlite3 *db, const std::string &tableName,
     }
     return errCode;
 }
+
+bool DBInfoHandleTest::IsSupport()
+{
+    std::lock_guard<std::mutex> autoLock(supportMutex_);
+    return localIsSupport_;
+}
+
+bool DBInfoHandleTest::IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+    const DeviceInfos &devInfo)
+{
+    std::lock_guard<std::mutex> autoLock(autoSyncMutex_);
+    return isNeedAutoSync_;
+}
+
+void DBInfoHandleTest::SetLocalIsSupport(bool isSupport)
+{
+    std::lock_guard<std::mutex> autoLock(supportMutex_);
+    localIsSupport_ = isSupport;
+}
+
+void DBInfoHandleTest::SetNeedAutoSync(bool needAutoSync)
+{
+    std::lock_guard<std::mutex> autoLock(autoSyncMutex_);
+    isNeedAutoSync_ = needAutoSync;
+}
 } // namespace DistributedDBUnitTest
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h
index 4a4efd3ba251ba5ca5e4a4f016c1cd296debea55..97d7293f383dfdcdbe7f19e150a5847bf4d5f58e 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/distributeddb_tools_unit_test.h
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "cloud/virtual_cloud_db.h"
+#include "db_info_handle.h"
 #include "db_types.h"
 #include "kv_store_changed_data.h"
 #include "kv_store_delegate_impl.h"
@@ -351,6 +352,25 @@ public:
     static int DeleteRecord(sqlite3 *db, const std::string &tableName,
         const std::vector<std::map<std::string, std::string>> &conditions);
 };
+
+class DBInfoHandleTest : public DistributedDB::DBInfoHandle {
+public:
+    ~DBInfoHandleTest() override = default;
+
+    bool IsSupport() override;
+
+    bool IsNeedAutoSync(const std::string &userId, const std::string &appId, const std::string &storeId,
+        const DistributedDB::DeviceInfos &devInfo) override;
+
+    void SetLocalIsSupport(bool isSupport);
+
+    void SetNeedAutoSync(bool needAutoSync);
+private:
+    std::mutex supportMutex_;
+    bool localIsSupport_ = true;
+    std::mutex autoSyncMutex_;
+    bool isNeedAutoSync_ = true;
+};
 } // namespace DistributedDBUnitTest
 
 #endif // DISTRIBUTEDDB_TOOLS_UNIT_TEST_H
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp
index 84a6a46685e5d04e218739f7f9ca82a947543a48..c78a86b9e7117d2e4fdd6ce4dc85a5e33ec6a1ff 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/common/evloop_timer_unit_test.cpp
@@ -19,6 +19,8 @@
 
 #include "db_errno.h"
 #include "distributeddb_tools_unit_test.h"
+#include "evloop/src/event_impl.h"
+#include "evloop/src/event_loop_epoll.h"
 #include "evloop/src/ievent.h"
 #include "evloop/src/ievent_loop.h"
 #include "log_print.h"
@@ -31,6 +33,10 @@ namespace {
     IEventLoop *g_loop = nullptr;
     constexpr int MAX_RETRY_TIMES = 1000;
     constexpr int RETRY_TIMES_5 = 5;
+    constexpr int EPOLL_INIT_REVENTS = 32;
+    constexpr int ET_READ = 0x01;
+    constexpr int ET_WRITE = 0x02;
+    constexpr int ET_TIMEOUT = 0x08;
     constexpr EventTime TIME_INACCURACY = 100LL;
     constexpr EventTime TIME_PIECE_1 = 1LL;
     constexpr EventTime TIME_PIECE_10 = 10LL;
@@ -38,7 +44,6 @@ namespace {
     constexpr EventTime TIME_PIECE_100 = 100LL;
     constexpr EventTime TIME_PIECE_1000 = 1000LL;
     constexpr EventTime TIME_PIECE_10000 = 10000LL;
-}
 
 class TimerTester {
 public:
@@ -423,3 +428,335 @@ HWTEST_F(DistributedDBEventLoopTimerTest, EventLoopTimerTest007, TestSize.Level2
     loopThread.join();
     timer->DecObjRef(timer);
 }
+
+/**
+ * @tc.name: EventLoopTest001
+ * @tc.desc: Test Initialize twice
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventLoopTest001, TestSize.Level0)
+{
+    EventLoopEpoll *loop = new (std::nothrow) EventLoopEpoll;
+
+    EXPECT_EQ(loop->Initialize(), E_OK);
+    EXPECT_EQ(loop->Initialize(), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: EventLoopTest002
+ * @tc.desc: Test interface if args is invalid
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventLoopTest002, TestSize.Level0)
+{
+    // ready data
+    ASSERT_NE(g_loop, nullptr);
+
+    /**
+     * @tc.steps: step1. test the loop interface.
+     * @tc.expected: step1. return INVALID_AGRS.
+     */
+    EXPECT_EQ(g_loop->Add(nullptr), -E_INVALID_ARGS);
+    EXPECT_EQ(g_loop->Remove(nullptr), -E_INVALID_ARGS);
+    EXPECT_EQ(g_loop->Stop(), E_OK);
+
+    EventLoopImpl *loopImpl= static_cast<EventLoopImpl *>(g_loop);
+    EventsMask events = 1u;
+    EXPECT_EQ(loopImpl->Modify(nullptr, true, events), -E_INVALID_ARGS);
+    EXPECT_EQ(loopImpl->Modify(nullptr, 0), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: EventTest001
+ * @tc.desc: Test CreateEvent if args is invalid
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. set EventTime = -1 and CreateEvent
+     * @tc.expected: step1. return INVALID_ARGS
+     */
+    EventTime eventTime = -1; // -1 is invalid arg
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventTime, errCode);
+    ASSERT_EQ(event, nullptr);
+    EXPECT_EQ(errCode, -E_INVALID_ARGS);
+
+    /**
+     * @tc.steps:step2. set EventsMask = 0 and CreateEvent
+     * @tc.expected: step2. return INVALID_ARGS
+     */
+    EventFd eventFd = EventFd();
+    EventsMask events = 0u;
+    event = IEvent::CreateEvent(eventFd, events, eventTime, errCode);
+    ASSERT_EQ(event, nullptr);
+    EXPECT_EQ(errCode, -E_INVALID_ARGS);
+
+    /**
+     * @tc.steps:step3. set EventsMask = 4 and EventFd is invalid then CreateEvent
+     * @tc.expected: step3. return INVALID_ARGS
+     */
+    EventsMask eventsMask = 1u; // 1 is ET_READ
+    event = IEvent::CreateEvent(eventFd, eventsMask, eventTime, errCode);
+    ASSERT_EQ(event, nullptr);
+    EXPECT_EQ(errCode, -E_INVALID_ARGS);
+
+    /**
+     * @tc.steps:step4. set EventsMask = 8 and CreateEvent
+     * @tc.expected: step4. return INVALID_ARGS
+     */
+    events |= ET_TIMEOUT;
+    event = IEvent::CreateEvent(eventFd, events, eventTime, errCode);
+    ASSERT_EQ(event, nullptr);
+    EXPECT_EQ(errCode, -E_INVALID_ARGS);
+
+    /**
+     * @tc.steps:step5. set EventTime = 1 and CreateEvent
+     * @tc.expected: step5. return OK
+     */
+    eventTime = TIME_PIECE_1;
+    eventFd = EventFd(epoll_create(EPOLL_INIT_REVENTS));
+    event = IEvent::CreateEvent(eventFd, events, eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+}
+
+/**
+ * @tc.name: EventTest002
+ * @tc.desc: Test SetAction if action is nullptr
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest002, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. SetAction with nullptr
+     * @tc.expected: step2. return INVALID_ARGS
+     */
+    EXPECT_EQ(event->SetAction(nullptr), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: EventTest003
+ * @tc.desc: Test AddEvents and RemoveEvents with fd is invalid
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest003, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. AddEvents and RemoveEvents with events is 0
+     * @tc.expected: step2. return INVALID_ARGS
+     */
+    EventsMask events = 0u;
+    EXPECT_EQ(event->AddEvents(events), -E_INVALID_ARGS);
+    EXPECT_EQ(event->RemoveEvents(events), -E_INVALID_ARGS);
+
+    /**
+     * @tc.steps:step3. AddEvents and RemoveEvents with fd is invalid
+     * @tc.expected: step3. return OK
+     */
+    events |= ET_READ;
+    EXPECT_EQ(event->AddEvents(events), -E_INVALID_ARGS);
+    EXPECT_EQ(event->RemoveEvents(events), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: EventTest004
+ * @tc.desc: Test AddEvents and RemoveEvents with fd is valid
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest004, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    EventFd eventFd = EventFd(epoll_create(EPOLL_INIT_REVENTS));
+    EventsMask events = 1u; // 1 means ET_READ
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventFd, events, eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. AddEvents and RemoveEvents with fd is valid
+     * @tc.expected: step2. return OK
+     */
+    events |= ET_WRITE;
+    EXPECT_EQ(event->AddEvents(events), E_OK);
+    EXPECT_EQ(event->RemoveEvents(events), E_OK);
+
+    /**
+     * @tc.steps:step3. AddEvents and RemoveEvents after set action
+     * @tc.expected: step3. return OK
+     */
+    ASSERT_EQ(g_loop->Add(event), -E_INVALID_ARGS);
+    ASSERT_EQ(event->SetAction([](EventsMask revents) -> int {
+        return E_OK;
+        }), E_OK);
+    ASSERT_EQ(g_loop->Add(event), E_OK);
+    EXPECT_EQ(event->AddEvents(events), E_OK);
+    EXPECT_EQ(event->RemoveEvents(events), E_OK);
+}
+
+/**
+ * @tc.name: EventTest005
+ * @tc.desc: Test constructor method with timeout < 0
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest005, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. instantiation event with eventTime
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = -1; // -1 is invalid arg
+    IEvent *event = new (std::nothrow) EventImpl(eventTime);
+    ASSERT_NE(event, nullptr);
+
+    /**
+     * @tc.steps:step2. instantiation event with eventFd, events, eventTime
+     * @tc.expected: step2. return OK
+     */
+    EventFd eventFd = EventFd();
+    EventsMask events = 1u; // 1 means ET_READ
+    EventImpl *eventImpl = new (std::nothrow) EventImpl(eventFd, events, eventTime);
+    ASSERT_NE(eventImpl, nullptr);
+}
+
+/**
+ * @tc.name: EventTest006
+ * @tc.desc: Test SetTimeout
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest006, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. SetTimeout
+     * @tc.expected: step2. return INVALID_ARGS
+     */
+    event->IgnoreFinalizer();
+    EXPECT_EQ(event->SetTimeout(eventTime), E_OK);
+    eventTime = -1; // -1 is invalid args
+    EXPECT_EQ(event->SetTimeout(eventTime), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: EventTest007
+ * @tc.desc: Test SetEvents and GetEvents
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest007, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    EventFd eventFd = EventFd(epoll_create(EPOLL_INIT_REVENTS));
+    EventsMask events = 1u; // 1 means ET_READ
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventFd, events, eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. Test GetEventFd and GetEvents
+     * @tc.expected: step2. return OK
+     */
+    EventImpl *eventImpl = static_cast<EventImpl *>(event);
+    eventImpl->SetRevents(events);
+    EXPECT_EQ(eventImpl->GetEventFd(), eventFd);
+    EXPECT_EQ(eventImpl->GetEvents(), events);
+    events = 2u; // 2 means ET_WRITE
+    eventImpl->SetEvents(true, events);
+    EXPECT_EQ(eventImpl->GetEvents(), 3u); // 3 means ET_WRITE | ET_READ
+    eventImpl->SetEvents(false, events);
+    EXPECT_EQ(eventImpl->GetEvents(), 1u); // 1 means ET_READ
+    EXPECT_FALSE(eventImpl->GetTimeoutPoint(eventTime));
+}
+
+/**
+ * @tc.name: EventTest008
+ * @tc.desc: Test SetTimeoutPeriod and GetTimeoutPoint
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBEventLoopTimerTest, EventTest008, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. CreateEvent
+     * @tc.expected: step1. return OK
+     */
+    EventTime eventTime = TIME_PIECE_1;
+    int errCode = E_OK;
+    IEvent *event = IEvent::CreateEvent(eventTime, errCode);
+    ASSERT_NE(event, nullptr);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps:step2. SetTimeoutPeriod and GetTimeoutPoint
+     * @tc.expected: step2. return OK
+     */
+    EventImpl *eventImpl = static_cast<EventImpl *>(event);
+    eventTime = -1; // -1 is invalid args
+    eventImpl->SetTimeoutPeriod(eventTime);
+    EXPECT_TRUE(eventImpl->GetTimeoutPoint(eventTime));
+
+    /**
+     * @tc.steps:step3. Dispatch
+     * @tc.expected: step3. return INVALID_ARGS
+     */
+    EXPECT_EQ(eventImpl->Dispatch(), -E_INVALID_ARGS);
+}
+}
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp
index c13619ccdc8e7faea9c40b0bbd4787cfd0b5bf01..bb885604b02c0a8fc3e981a54a71d87c4f3b2888 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.cpp
@@ -23,7 +23,7 @@
 using namespace std;
 using namespace DistributedDB;
 
-bool SetUpEnv(EnvHandle &inEnv, const string &inName)
+bool SetUpEnv(EnvHandle &inEnv, const string &inName, const std::shared_ptr<DBStatusAdapter> &adapter)
 {
     if (inEnv.adapterHandle != nullptr || inEnv.commAggrHandle != nullptr) {
         LOGI("[UT][Common][SetUp] Already Setup for %s", inName.c_str());
@@ -42,7 +42,7 @@ bool SetUpEnv(EnvHandle &inEnv, const string &inName)
         return false;
     }
 
-    int errCode = inEnv.commAggrHandle->Initialize(inEnv.adapterHandle);
+    int errCode = inEnv.commAggrHandle->Initialize(inEnv.adapterHandle, adapter);
     if (errCode != E_OK) {
         LOGI("[UT][Common][SetUp] Init CommunicatorAggregator fail for %s", inName.c_str());
         return false;
@@ -51,6 +51,11 @@ bool SetUpEnv(EnvHandle &inEnv, const string &inName)
     return true;
 }
 
+bool SetUpEnv(EnvHandle &inEnv, const string &inName)
+{
+    return SetUpEnv(inEnv, inName, nullptr);
+}
+
 void TearDownEnv(EnvHandle &inEnv)
 {
     if (inEnv.commAggrHandle != nullptr) {
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.h
index 11be295afdb9763a8771963019dddbd37a7a488b..ecd04684c3f47a45dd8199af5db721d1741b7e0d 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_common.h
@@ -19,12 +19,12 @@
 #include <set>
 #include <string>
 #include <vector>
-#include "endian_convert.h"
-#include "message.h"
 #include "adapter_stub.h"
+#include "communicator_aggregator.h"
+#include "endian_convert.h"
 #include "frame_header.h"
 #include "iprocess_communicator.h"
-#include "communicator_aggregator.h"
+#include "message.h"
 #include "store_types.h"
 
 struct EnvHandle {
@@ -38,6 +38,8 @@ struct OnOfflineDevice {
     std::string latestOfflineDevice;
 };
 
+bool SetUpEnv(EnvHandle &inEnv, const std::string &inName,
+    const std::shared_ptr<DistributedDB::DBStatusAdapter> &adapter);
 bool SetUpEnv(EnvHandle &inEnv, const std::string &inName);
 void TearDownEnv(EnvHandle &inEnv);
 
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp
index 36fbe246cdddb3c83f9ca65f533f90ea7a5939a5..512128b556364cb675963e0b01f469f005daf6e7 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/communicator/distributeddb_communicator_test.cpp
@@ -15,16 +15,20 @@
 
 #include <gtest/gtest.h>
 #include <thread>
+#include "db_common.h"
 #include "db_errno.h"
 #include "distributeddb_communicator_common.h"
+#include "distributeddb_data_generate_unit_test.h"
 #include "distributeddb_tools_unit_test.h"
 #include "endian_convert.h"
 #include "log_print.h"
 #include "thread_pool_test_stub.h"
+#include "virtual_communicator_aggregator.h"
 
 using namespace std;
 using namespace testing::ext;
 using namespace DistributedDB;
+using namespace DistributedDBUnitTest;
 
 namespace {
     EnvHandle g_envDeviceA;
@@ -852,4 +856,504 @@ HWTEST_F(DistributedDBCommunicatorTest, ReDeliverMessage003, TestSize.Level2)
     g_envDeviceB.commAggrHandle->RegCommunicatorLackCallback(nullptr, nullptr);
     AdapterStub::DisconnectAdapterStub(g_envDeviceA.adapterHandle, g_envDeviceB.adapterHandle);
 }
+
+namespace {
+    void SetUpEnv(const std::string &localDev, const std::string &supportDev,
+        const std::shared_ptr<DBStatusAdapter> &adapter, bool isSupport, EnvHandle &envDevice)
+    {
+        std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+        adapter->SetDBInfoHandle(handle);
+        adapter->SetRemoteOptimizeCommunication(supportDev, isSupport);
+        SetUpEnv(envDevice, localDev, adapter);
+    }
+
+    void InitCommunicator(DBInfo &dbInfo, EnvHandle &envDevice, OnOfflineDevice &onlineCallback, ICommunicator *&comm)
+    {
+        dbInfo.userId = USER_ID;
+        dbInfo.appId = APP_ID;
+        dbInfo.storeId = STORE_ID_1;
+        dbInfo.isNeedSync = true;
+        dbInfo.syncDualTupleMode = false;
+        std::string label = DBCommon::GenerateHashLabel(dbInfo);
+        std::vector<uint8_t> commLabel(label.begin(), label.end());
+        int errorNo = E_OK;
+        comm = envDevice.commAggrHandle->AllocCommunicator(commLabel, errorNo);
+        ASSERT_NOT_NULL_AND_ACTIVATE(comm);
+        REG_CONNECT_CALLBACK(comm, onlineCallback);
+    }
+}
+
+/**
+  * @tc.name: CommunicationOptimization001
+  * @tc.desc: Test notify with isSupport true.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, CommunicationOptimization001, TestSize.Level3)
+{
+    auto *pAggregator = new VirtualCommunicatorAggregator();
+    ASSERT_NE(pAggregator, nullptr);
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(pAggregator);
+    /**
+     * @tc.steps: step1. set up env
+     */
+    EnvHandle envDeviceA;
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceA, deviceB, adapterA, true, envDeviceA);
+
+    EnvHandle envDeviceB;
+    std::shared_ptr<DBStatusAdapter> adapterB = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceB, deviceA, adapterB, true, envDeviceB);
+
+    /**
+     * @tc.steps: step2. device alloc communicator using label and register callback
+     */
+    DBInfo dbInfo;
+    ICommunicator *commAA = nullptr;
+    OnOfflineDevice onlineForAA;
+    InitCommunicator(dbInfo, envDeviceA, onlineForAA, commAA);
+
+    ICommunicator *commBB = nullptr;
+    OnOfflineDevice onlineForBB;
+    InitCommunicator(dbInfo, envDeviceB, onlineForBB, commBB);
+
+    /**
+     * @tc.steps: step3. connect device A with device B
+     */
+    AdapterStub::ConnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+
+    /**
+     * @tc.steps: step4. wait for label exchange
+     * @tc.expected: step4. both communicator has no callback;
+     */
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(0));
+    EXPECT_EQ(onlineForBB.onlineDevices.size(), static_cast<size_t>(0));
+
+    /**
+     * @tc.steps: step5. both notify
+     * @tc.expected: step5. both has callback;
+     */
+    adapterA->NotifyDBInfos({ deviceB }, { dbInfo });
+    adapterB->NotifyDBInfos({ deviceA }, { dbInfo });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(1));
+
+    dbInfo.isNeedSync = false;
+    adapterA->NotifyDBInfos({ deviceB }, { dbInfo });
+    adapterB->NotifyDBInfos({ deviceA }, { dbInfo });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(0));
+
+    // Clean up and disconnect
+    envDeviceA.commAggrHandle->ReleaseCommunicator(commAA);
+    envDeviceB.commAggrHandle->ReleaseCommunicator(commBB);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    AdapterStub::DisconnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+
+    TearDownEnv(envDeviceA);
+    TearDownEnv(envDeviceB);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+}
+
+/**
+  * @tc.name: CommunicationOptimization002
+  * @tc.desc: Test notify with isSupport true and can offline by device change.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, CommunicationOptimization002, TestSize.Level3)
+{
+    auto *pAggregator = new VirtualCommunicatorAggregator();
+    ASSERT_NE(pAggregator, nullptr);
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(pAggregator);
+    /**
+     * @tc.steps: step1. set up env
+     */
+    EnvHandle envDeviceA;
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceA, deviceB, adapterA, true, envDeviceA);
+
+    EnvHandle envDeviceB;
+    std::shared_ptr<DBStatusAdapter> adapterB = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceB, deviceA, adapterB, true, envDeviceB);
+
+    /**
+     * @tc.steps: step2. device alloc communicator using label and register callback
+     */
+    DBInfo dbInfo;
+    ICommunicator *commAA = nullptr;
+    OnOfflineDevice onlineForAA;
+    InitCommunicator(dbInfo, envDeviceA, onlineForAA, commAA);
+    /**
+     * @tc.steps: step3. connect device A with device B
+     */
+    AdapterStub::ConnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    /**
+     * @tc.steps: step5. A notify remote
+     * @tc.expected: step5. A has callback;
+     */
+    adapterA->NotifyDBInfos({ deviceB }, { dbInfo });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(1));
+
+    AdapterStub::DisconnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(0));
+
+    // Clean up and disconnect
+    envDeviceA.commAggrHandle->ReleaseCommunicator(commAA);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    TearDownEnv(envDeviceA);
+    TearDownEnv(envDeviceB);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+}
+
+/**
+  * @tc.name: CommunicationOptimization003
+  * @tc.desc: Test notify with isSupport false.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, CommunicationOptimization003, TestSize.Level3)
+{
+    auto *pAggregator = new VirtualCommunicatorAggregator();
+    ASSERT_NE(pAggregator, nullptr);
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(pAggregator);
+    /**
+     * @tc.steps: step1. set up env
+     */
+    EnvHandle envDeviceA;
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceA, deviceB, adapterA, false, envDeviceA);
+    EnvHandle envDeviceB;
+    std::shared_ptr<DBStatusAdapter> adapterB = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceB, deviceA, adapterB, false, envDeviceB);
+    /**
+     * @tc.steps: step2. device alloc communicator using label and register callback
+     */
+    DBInfo dbInfo;
+    ICommunicator *commAA = nullptr;
+    OnOfflineDevice onlineForAA;
+    InitCommunicator(dbInfo, envDeviceA, onlineForAA, commAA);
+    ICommunicator *commBB = nullptr;
+    OnOfflineDevice onlineForBB;
+    InitCommunicator(dbInfo, envDeviceB, onlineForBB, commBB);
+    /**
+     * @tc.steps: step3. connect device A with device B
+     */
+    AdapterStub::ConnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    /**
+     * @tc.steps: step4. wait for label exchange
+     * @tc.expected: step4. both communicator has no callback;
+     */
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(0));
+    EXPECT_EQ(onlineForBB.onlineDevices.size(), static_cast<size_t>(0));
+    /**
+     * @tc.steps: step5. A notify remote
+     * @tc.expected: step5. B has no callback;
+     */
+    adapterA->NotifyDBInfos({ deviceB }, { dbInfo });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForBB.onlineDevices.size(), static_cast<size_t>(0));
+    /**
+     * @tc.steps: step6. A notify local
+     * @tc.expected: step6. B has no callback;
+     */
+    dbInfo.isNeedSync = false;
+    onlineForAA.onlineDevices.clear();
+    adapterA->NotifyDBInfos({ deviceA }, { dbInfo });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForAA.onlineDevices.size(), static_cast<size_t>(0));
+    // Clean up and disconnect
+    envDeviceA.commAggrHandle->ReleaseCommunicator(commAA);
+    envDeviceB.commAggrHandle->ReleaseCommunicator(commBB);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    AdapterStub::DisconnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    TearDownEnv(envDeviceA);
+    TearDownEnv(envDeviceB);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+}
+
+/**
+  * @tc.name: CommunicationOptimization004
+  * @tc.desc: Test notify with isSupport false and it be will changed by communication.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, CommunicationOptimization004, TestSize.Level3)
+{
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    /**
+     * @tc.steps: step1. set up env
+     */
+    EnvHandle envDeviceA;
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceA, deviceB, adapterA, false, envDeviceA);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(envDeviceA.commAggrHandle);
+    EnvHandle envDeviceB;
+    std::shared_ptr<DBStatusAdapter> adapterB = std::make_shared<DBStatusAdapter>();
+    SetUpEnv(deviceB, deviceA, adapterB, false, envDeviceB);
+    /**
+     * @tc.steps: step2. device alloc communicator using label and register callback
+     */
+    DBInfo dbInfo;
+    ICommunicator *commAA = nullptr;
+    OnOfflineDevice onlineForAA;
+    InitCommunicator(dbInfo, envDeviceA, onlineForAA, commAA);
+    ICommunicator *commBB = nullptr;
+    OnOfflineDevice onlineForBB;
+    InitCommunicator(dbInfo, envDeviceB, onlineForBB, commBB);
+    /**
+     * @tc.steps: step3. connect device A with device B
+     */
+    EXPECT_EQ(adapterA->IsSupport(deviceB), false);
+    AdapterStub::ConnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(adapterA->IsSupport(deviceB), true);
+    // Clean up and disconnect
+    envDeviceA.commAggrHandle->ReleaseCommunicator(commAA);
+    envDeviceB.commAggrHandle->ReleaseCommunicator(commBB);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    AdapterStub::DisconnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+    envDeviceA.commAggrHandle = nullptr;
+    TearDownEnv(envDeviceA);
+    TearDownEnv(envDeviceB);
+}
+
+/**
+  * @tc.name: CommunicationOptimization005
+  * @tc.desc: Test notify with isSupport false and send label exchange.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, CommunicationOptimization005, TestSize.Level3)
+{
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    /**
+     * @tc.steps: step1. set up env
+     */
+    EnvHandle envDeviceA;
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    handle->SetLocalIsSupport(false);
+    adapterA->SetDBInfoHandle(handle);
+    SetUpEnv(envDeviceA, deviceA, adapterA);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(envDeviceA.commAggrHandle);
+    EnvHandle envDeviceB;
+    SetUpEnv(envDeviceB, deviceB, nullptr);
+    /**
+     * @tc.steps: step2. connect device A with device B
+     */
+    EXPECT_EQ(adapterA->IsSupport(deviceB), false);
+    AdapterStub::ConnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    /**
+     * @tc.steps: step3. device alloc communicator using label and register callback
+     */
+    DBInfo dbInfo;
+    ICommunicator *commAA = nullptr;
+    OnOfflineDevice onlineForAA;
+    InitCommunicator(dbInfo, envDeviceA, onlineForAA, commAA);
+    ICommunicator *commBB = nullptr;
+    OnOfflineDevice onlineForBB;
+    InitCommunicator(dbInfo, envDeviceB, onlineForBB, commBB);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(onlineForBB.onlineDevices.size(), static_cast<size_t>(1));
+
+    // Clean up and disconnect
+    envDeviceA.commAggrHandle->ReleaseCommunicator(commAA);
+    envDeviceB.commAggrHandle->ReleaseCommunicator(commBB);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    AdapterStub::DisconnectAdapterStub(envDeviceA.adapterHandle, envDeviceB.adapterHandle);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+    envDeviceA.commAggrHandle = nullptr;
+    TearDownEnv(envDeviceA);
+    TearDownEnv(envDeviceB);
+}
+
+/**
+  * @tc.name: DbStatusAdapter001
+  * @tc.desc: Test notify with isSupport false.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, DbStatusAdapter001, TestSize.Level1)
+{
+    auto *pAggregator = new VirtualCommunicatorAggregator();
+    ASSERT_NE(pAggregator, nullptr);
+    const std::string deviceA = "DEVICES_A";
+    const std::string deviceB = "DEVICES_B";
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(pAggregator);
+
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    adapterA->SetDBInfoHandle(handle);
+    adapterA->SetRemoteOptimizeCommunication(deviceB, true);
+    std::string actualRemoteDevInfo;
+    size_t remoteInfoCount = 0u;
+    size_t localCount = 0u;
+    DBInfo dbInfo;
+    adapterA->NotifyDBInfos({ deviceA }, { dbInfo });
+
+    dbInfo = {
+        USER_ID,
+        APP_ID,
+        STORE_ID_1,
+        true,
+        false
+    };
+    adapterA->NotifyDBInfos({ deviceA }, { dbInfo });
+    dbInfo.isNeedSync = false;
+    adapterA->NotifyDBInfos({ deviceA }, { dbInfo });
+    adapterA->NotifyDBInfos({ deviceB }, { dbInfo });
+
+    size_t remoteChangeCount = 0u;
+    adapterA->SetDBStatusChangeCallback(
+        [&actualRemoteDevInfo, &remoteInfoCount](const std::string &devInfo, const std::vector<DBInfo> &dbInfos) {
+            actualRemoteDevInfo = devInfo;
+            remoteInfoCount = dbInfos.size();
+        },
+        [&localCount]() {
+            localCount++;
+        },
+        [&remoteChangeCount, deviceB](const std::string &dev) {
+            remoteChangeCount++;
+            EXPECT_EQ(dev, deviceB);
+        });
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(actualRemoteDevInfo, deviceB);
+    EXPECT_EQ(remoteInfoCount, 1u);
+    adapterA->SetRemoteOptimizeCommunication(deviceB, false);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(remoteChangeCount, 1u);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+}
+
+/**
+  * @tc.name: DbStatusAdapter002
+  * @tc.desc: Test adapter clear cache.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, DbStatusAdapter002, TestSize.Level1) {
+    const std::string deviceB = "DEVICES_B";
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    adapterA->SetDBInfoHandle(handle);
+    adapterA->SetRemoteOptimizeCommunication(deviceB, true);
+    EXPECT_TRUE(adapterA->IsSupport(deviceB));
+    adapterA->SetDBInfoHandle(handle);
+    adapterA->SetRemoteOptimizeCommunication(deviceB, false);
+    EXPECT_FALSE(adapterA->IsSupport(deviceB));
+}
+
+/**
+  * @tc.name: DbStatusAdapter003
+  * @tc.desc: Test adapter get local dbInfo.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, DbStatusAdapter003, TestSize.Level1) {
+    const std::string deviceB = "DEVICES_B";
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    adapterA->SetDBInfoHandle(handle);
+    handle->SetLocalIsSupport(true);
+    std::vector<DBInfo> dbInfos;
+    EXPECT_EQ(adapterA->GetLocalDBInfos(dbInfos), E_OK);
+    handle->SetLocalIsSupport(false);
+    EXPECT_EQ(adapterA->GetLocalDBInfos(dbInfos), E_OK);
+    adapterA->SetDBInfoHandle(handle);
+    EXPECT_EQ(adapterA->GetLocalDBInfos(dbInfos), -E_NOT_SUPPORT);
+}
+
+/**
+  * @tc.name: DbStatusAdapter004
+  * @tc.desc: Test adapter clear cache will get callback.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, DbStatusAdapter004, TestSize.Level1)
+{
+    const std::string deviceB = "DEVICES_B";
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    adapterA->SetDBInfoHandle(handle);
+    handle->SetLocalIsSupport(true);
+    std::vector<DBInfo> dbInfos;
+    DBInfo dbInfo = {
+        USER_ID,
+        APP_ID,
+        STORE_ID_1,
+        true,
+        true
+    };
+    dbInfos.push_back(dbInfo);
+    dbInfo.storeId = STORE_ID_2;
+    dbInfos.push_back(dbInfo);
+    dbInfo.storeId = STORE_ID_3;
+    dbInfo.isNeedSync = false;
+    dbInfos.push_back(dbInfo);
+    adapterA->NotifyDBInfos({"dev"}, dbInfos);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    size_t notifyCount = 0u;
+    adapterA->SetDBStatusChangeCallback([&notifyCount](const std::string &devInfo,
+        const std::vector<DBInfo> &dbInfos) {
+        LOGD("on callback");
+        for (const auto &dbInfo: dbInfos) {
+            EXPECT_FALSE(dbInfo.isNeedSync);
+        }
+        notifyCount = dbInfos.size();
+    }, nullptr, nullptr);
+    adapterA->SetDBInfoHandle(nullptr);
+    EXPECT_EQ(notifyCount, 2u); // 2 dbInfo is need sync now it should be offline
+}
+
+/**
+  * @tc.name: DbStatusAdapter005
+  * @tc.desc: Test adapter is need auto sync.
+  * @tc.type: FUNC
+  * @tc.require: AR000HGD0B
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBCommunicatorTest, DbStatusAdapter005, TestSize.Level1)
+{
+    const std::string deviceB = "DEVICES_B";
+    std::shared_ptr<DBStatusAdapter> adapterA = std::make_shared<DBStatusAdapter>();
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    adapterA->SetDBInfoHandle(handle);
+    handle->SetLocalIsSupport(true);
+    EXPECT_EQ(adapterA->IsNeedAutoSync(USER_ID, APP_ID, STORE_ID_1, deviceB), true);
+    handle->SetNeedAutoSync(false);
+    EXPECT_EQ(adapterA->IsNeedAutoSync(USER_ID, APP_ID, STORE_ID_1, deviceB), false);
+    handle->SetLocalIsSupport(false);
+    EXPECT_EQ(adapterA->IsNeedAutoSync(USER_ID, APP_ID, STORE_ID_1, deviceB), false);
+    adapterA->SetDBInfoHandle(handle);
+    EXPECT_EQ(adapterA->IsNeedAutoSync(USER_ID, APP_ID, STORE_ID_1, deviceB), true);
+    adapterA->SetDBInfoHandle(nullptr);
+    EXPECT_EQ(adapterA->IsNeedAutoSync(USER_ID, APP_ID, STORE_ID_1, deviceB), true);
+}
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_relational_ext_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_relational_ext_test.cpp
index ff7e7325cc8e3a1b5661476ccfe5f50a7a1da74e..7dc02e6a2e97e8ba4b0fc4e36bdaceb993339210 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_relational_ext_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_relational_ext_test.cpp
@@ -21,6 +21,7 @@
 #include "distributeddb_data_generate_unit_test.h"
 #include "distributeddb_tools_unit_test.h"
 #include "relational_store_client.h"
+#include "relational_store_delegate_impl.h"
 #include "relational_store_manager.h"
 
 using namespace testing::ext;
@@ -1227,4 +1228,65 @@ HWTEST_F(DistributedDBCloudInterfacesRelationalExtTest, FfrtTest003, TestSize.Le
     EXPECT_EQ(count, num * num);
 #endif
 }
+
+/**
+ * @tc.name: AbnormalDelegateTest001
+ * @tc.desc: Test delegate interface after delegate is closed
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBCloudInterfacesRelationalExtTest, AbnormalDelegateTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. create db and open store
+     * @tc.expected: step1. return ok.
+     */
+    sqlite3 *db = RelationalTestUtils::CreateDataBase(g_dbDir + STORE_ID + DB_SUFFIX);
+    ASSERT_NE(db, nullptr);
+    EXPECT_EQ(RelationalTestUtils::ExecSql(db, "PRAGMA journal_mode=WAL;"), SQLITE_OK);
+    EXPECT_EQ(sqlite3_close_v2(db), E_OK);
+    RelationalStoreDelegate *delegate = nullptr;
+    DBStatus status = g_mgr.OpenStore(g_dbDir + STORE_ID + DB_SUFFIX, STORE_ID, {}, delegate);
+    EXPECT_EQ(status, OK);
+    ASSERT_NE(delegate, nullptr);
+
+    /**
+     * @tc.steps:step2. close delegate
+     * @tc.expected: step2. return ok.
+     */
+    auto delegateImpl = static_cast<RelationalStoreDelegateImpl *>(delegate);
+    status = delegateImpl->Close();
+    EXPECT_EQ(status, OK);
+
+    /**
+     * @tc.steps:step3. test interface after delegate is closed
+     * @tc.expected: step3. return ok.
+     */
+    const std::string tableName = "sync_data";
+    EXPECT_EQ(delegateImpl->RemoveDeviceData("", tableName), DB_ERROR);
+    EXPECT_EQ(delegate->RemoveDeviceData("", FLAG_AND_DATA), DB_ERROR);
+    EXPECT_EQ(delegate->GetCloudSyncTaskCount(), -1); // -1 is error count
+    EXPECT_EQ(delegate->CreateDistributedTable(tableName, CLOUD_COOPERATION), DB_ERROR);
+    EXPECT_EQ(delegate->UnRegisterObserver(), DB_ERROR);
+    DataBaseSchema dataBaseSchema;
+    EXPECT_EQ(delegate->SetCloudDbSchema(dataBaseSchema), DB_ERROR);
+    EXPECT_EQ(delegate->SetReference({}), DB_ERROR);
+    TrackerSchema trackerSchema;
+    EXPECT_EQ(delegate->SetTrackerTable(trackerSchema), DB_ERROR);
+    EXPECT_EQ(delegate->CleanTrackerData(tableName, 0), DB_ERROR);
+    bool logicDelete = true;
+    auto data = static_cast<PragmaData>(&logicDelete);
+    EXPECT_EQ(delegate->Pragma(LOGIC_DELETE_SYNC_DATA, data), DB_ERROR);
+    std::vector<VBucket> records;
+    RecordStatus recordStatus = RecordStatus::WAIT_COMPENSATED_SYNC;
+    EXPECT_EQ(delegate->UpsertData(tableName, records, recordStatus), DB_ERROR);
+
+    /**
+     * @tc.steps:step4. close store
+     * @tc.expected: step4. return ok.
+     */
+    EXPECT_EQ(g_mgr.CloseStore(delegate), OK);
+    delegate = nullptr;
+}
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_set_cloud_schema_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_set_cloud_schema_test.cpp
index 0dc7a599d179fd0f707633b7ae87fef3dbedd1d1..7a070b590c4b161fceec4bfffd69d83f02208508 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_set_cloud_schema_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_cloud_interfaces_set_cloud_schema_test.cpp
@@ -29,6 +29,7 @@
 #include "virtual_asset_loader.h"
 #include "virtual_cloud_data_translate.h"
 #include "virtual_cloud_db.h"
+#include "cloud_db_sync_utils_test.h"
 
 using namespace testing::ext;
 using namespace DistributedDB;
@@ -121,11 +122,15 @@ namespace {
         void CheckDistributedSharedTable(const std::vector<std::string> &expectedTableName);
         void InsertLocalSharedTableRecords(int64_t begin, int64_t count, const std::string &tableName,
             bool isUpdate = false);
-        void InsertCloudTableRecord(int64_t begin, int64_t count);
-        void BlockSync(const Query &query, RelationalStoreDelegate *delegate, DBStatus errCode = OK);
+        void InsertCloudTableRecord(int64_t begin, int64_t count, bool isShare = true, int64_t beginGid = -1);
+        void DeleteCloudTableRecord(int64_t beginGid, int64_t count, bool isShare = true);
+        void BlockSync(const Query &query, RelationalStoreDelegate *delegate, DBStatus errCode = OK,
+            SyncMode mode = SYNC_MODE_CLOUD_MERGE);
         void CheckCloudTableCount(const std::string &tableName, int64_t expectCount);
         void CloseDb();
+        void InitCloudEnv();
         sqlite3 *db_ = nullptr;
+        std::function<void(int64_t, VBucket &)> forkInsertFunc_;
     };
 
     void DistributedDBCloudInterfacesSetCloudSchemaTest::SetUpTestCase(void)
@@ -242,16 +247,34 @@ namespace {
         }
     }
 
-    void DistributedDBCloudInterfacesSetCloudSchemaTest::InsertCloudTableRecord(int64_t begin, int64_t count)
+    void InsertSharingUri(int64_t index, VBucket &log)
+    {
+        log.insert_or_assign(CloudDbConstant::SHARING_RESOURCE_FIELD, std::string("uri:") + std::to_string(index));
+    }
+
+    std::string QueryResourceCountSql(const std::string &tableName)
+    {
+        return "SELECT COUNT(*) FROM " + DBCommon::GetLogTableName(tableName)
+            + " where sharing_resource like 'uri%'";
+    }
+
+    void DistributedDBCloudInterfacesSetCloudSchemaTest::InsertCloudTableRecord(int64_t begin, int64_t count,
+        bool isShare, int64_t beginGid)
     {
         std::vector<uint8_t> photo(1, 'v');
         std::vector<VBucket> record;
         std::vector<VBucket> extend;
         Timestamp now = TimeHelper::GetSysCurrentTime();
+        std::string tableName = g_tableName2;
+        if (isShare) {
+            tableName = g_sharedTableName1;
+        }
         for (int64_t i = begin; i < begin + count; ++i) {
             VBucket data;
-            data.insert_or_assign("cloud_owner", "ownerA");
-            data.insert_or_assign("cloud_privilege", "true");
+            if (isShare) {
+                data.insert_or_assign("cloud_owner", std::string("ownerA"));
+                data.insert_or_assign("cloud_privilege", std::string("true"));
+            }
             data.insert_or_assign("id", i);
             data.insert_or_assign("name", "Cloud" + std::to_string(i));
             data.insert_or_assign("height", 166.0); // 166.0 is random double value
@@ -262,14 +285,25 @@ namespace {
             log.insert_or_assign(CloudDbConstant::CREATE_FIELD, (int64_t)now / CloudDbConstant::TEN_THOUSAND + i);
             log.insert_or_assign(CloudDbConstant::MODIFY_FIELD, (int64_t)now / CloudDbConstant::TEN_THOUSAND + i);
             log.insert_or_assign(CloudDbConstant::DELETE_FIELD, false);
+            if (beginGid >= 0) {
+                log.insert_or_assign(CloudDbConstant::GID_FIELD, std::to_string(beginGid + i));
+            }
+            if (forkInsertFunc_) {
+                forkInsertFunc_(i, log);
+            }
             extend.push_back(log);
         }
-        ASSERT_EQ(g_virtualCloudDb->BatchInsert(g_sharedTableName1, std::move(record), extend), DBStatus::OK);
+        if (beginGid >= 0) {
+            ASSERT_EQ(g_virtualCloudDb->BatchUpdate(tableName, std::move(record), extend), DBStatus::OK);
+        } else {
+            ASSERT_EQ(g_virtualCloudDb->BatchInsert(tableName, std::move(record), extend), DBStatus::OK);
+        }
+
         std::this_thread::sleep_for(std::chrono::milliseconds(count));
     }
 
     void DistributedDBCloudInterfacesSetCloudSchemaTest::BlockSync(const Query &query,
-        RelationalStoreDelegate *delegate, DBStatus errCode)
+        RelationalStoreDelegate *delegate, DBStatus errCode, SyncMode mode)
     {
         std::mutex dataMutex;
         std::condition_variable cv;
@@ -286,7 +320,7 @@ namespace {
                 }
             }
         };
-        ASSERT_EQ(delegate->Sync({ "CLOUD" }, SYNC_MODE_CLOUD_MERGE, query, callback, g_syncWaitTime), OK);
+        ASSERT_EQ(delegate->Sync({ "CLOUD" }, mode, query, callback, g_syncWaitTime), OK);
         std::unique_lock<std::mutex> uniqueLock(dataMutex);
         cv.wait(uniqueLock, [&finish]() {
             return finish;
@@ -320,6 +354,35 @@ namespace {
         }
     }
 
+    void DistributedDBCloudInterfacesSetCloudSchemaTest::InitCloudEnv()
+    {
+        DataBaseSchema dataBaseSchema;
+        TableSchema tableSchema = {
+            .name = g_tableName2,
+            .sharedTableName = g_sharedTableName1,
+            .fields = g_cloudField2
+        };
+        dataBaseSchema.tables.push_back(tableSchema);
+        ASSERT_EQ(g_delegate->SetCloudDbSchema(dataBaseSchema), DBStatus::OK);
+        ASSERT_EQ(g_delegate->CreateDistributedTable(g_tableName2, CLOUD_COOPERATION), DBStatus::OK);
+    }
+
+    void DistributedDBCloudInterfacesSetCloudSchemaTest::DeleteCloudTableRecord(int64_t beginGid,
+        int64_t count, bool isShare)
+    {
+        Timestamp now = TimeHelper::GetSysCurrentTime();
+        std::vector<VBucket> extend;
+        for (int64_t i = 0; i < count; ++i) {
+            VBucket log;
+            log.insert_or_assign(CloudDbConstant::CREATE_FIELD, (int64_t)now / CloudDbConstant::TEN_THOUSAND + i);
+            log.insert_or_assign(CloudDbConstant::MODIFY_FIELD, (int64_t)now / CloudDbConstant::TEN_THOUSAND + i);
+            log.insert_or_assign(CloudDbConstant::GID_FIELD, std::to_string(beginGid + i));
+            extend.push_back(log);
+        }
+        ASSERT_EQ(g_virtualCloudDb->BatchDelete(isShare ? g_sharedTableName1 : g_tableName2, extend), DBStatus::OK);
+        std::this_thread::sleep_for(std::chrono::milliseconds(count));
+    }
+
     /**
      * @tc.name: SetCloudDbSchemaTest001
      * @tc.desc: Test same table name for set cloud schema interface
@@ -1454,4 +1517,322 @@ namespace {
         dataBaseSchema.tables.push_back(tableSchema);
         ASSERT_EQ(g_delegate->SetCloudDbSchema(dataBaseSchema), DBStatus::INVALID_ARGS);
     }
+
+    /**
+     * @tc.name: SharedTableSync007
+     * @tc.desc: Test the sharing_resource for ins data into the cloud
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync007, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init cloud share data contains sharing_resource
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        int cloudCount = 10;
+        forkInsertFunc_ = InsertSharingUri;
+        InsertCloudTableRecord(0, cloudCount, false);
+        InsertCloudTableRecord(0, cloudCount);
+
+        /**
+         * @tc.steps:step2. sync
+         * @tc.expected: step2. return OK
+         */
+        Query query = Query::Select().FromTable({ g_tableName2, g_sharedTableName1 });
+        BlockSync(query, g_delegate, DBStatus::OK);
+        forkInsertFunc_ = nullptr;
+
+        /**
+         * @tc.steps:step3. check sync insert
+         * @tc.expected: step3. return OK
+         */
+        std::string sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+    }
+
+    /**
+     * @tc.name: SharedTableSync008
+     * @tc.desc: Test the sharing_resource for upd data into the cloud
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync008, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init cloud data and sync
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        int cloudCount = 10;
+        InsertCloudTableRecord(0, cloudCount, false);
+        InsertCloudTableRecord(0, cloudCount);
+        Query query = Query::Select().FromTable({ g_tableName2, g_sharedTableName1 });
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step2. update cloud sharing_resource and sync
+         * @tc.expected: step2. return OK
+         */
+        int beginGid = 0;
+        forkInsertFunc_ = InsertSharingUri;
+        InsertCloudTableRecord(0, cloudCount, false, beginGid);
+        InsertCloudTableRecord(0, cloudCount, true, cloudCount);
+        BlockSync(query, g_delegate, DBStatus::OK);
+        forkInsertFunc_ = nullptr;
+
+        /**
+         * @tc.steps:step3. check sync update
+         * @tc.expected: step3. return OK
+         */
+        std::string sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+
+        /**
+         * @tc.steps:step4. remove cloud sharing_resource and sync
+         * @tc.expected: step4. return OK
+         */
+        InsertCloudTableRecord(0, cloudCount, false, beginGid);
+        InsertCloudTableRecord(0, cloudCount, true, cloudCount);
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step5. check sync update
+         * @tc.expected: step5. return OK
+         */
+        sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(0L), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(0L), nullptr), SQLITE_OK);
+    }
+
+    /**
+     * @tc.name: SharedTableSync009
+     * @tc.desc: Test the sharing_resource when the local data is newer than the cloud
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync009, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init cloud data and sync
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        const std::vector<std::string> tables = { g_tableName2, g_sharedTableName1 };
+        int cloudCount = 10;
+        InsertCloudTableRecord(0, cloudCount, false);
+        InsertCloudTableRecord(0, cloudCount);
+        Query query = Query::Select().FromTable(tables);
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step2. update cloud data, generate share uri
+         * @tc.expected: step2. return OK
+         */
+        int beginGid = 0;
+        forkInsertFunc_ = InsertSharingUri;
+        InsertCloudTableRecord(0, cloudCount, false, beginGid);
+        InsertCloudTableRecord(0, cloudCount, true, cloudCount);
+        forkInsertFunc_ = nullptr;
+
+        /**
+         * @tc.steps:step3. update local data
+         * @tc.expected: step3. return OK
+         */
+        for (const auto &tableName: tables) {
+            std::string sql = "update " + tableName + " SET height='199';";
+            sqlite3_stmt *stmt = nullptr;
+            ASSERT_EQ(SQLiteUtils::GetStatement(db_, sql, stmt), E_OK);
+            EXPECT_EQ(SQLiteUtils::StepWithRetry(stmt), SQLiteUtils::MapSQLiteErrno(SQLITE_DONE));
+            int errCode;
+            SQLiteUtils::ResetStatement(stmt, true, errCode);
+        }
+
+        /**
+         * @tc.steps:step4. sync and check count
+         * @tc.expected: step4. return OK
+         */
+        BlockSync(query, g_delegate, DBStatus::OK);
+        std::string sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = "SELECT COUNT(*) FROM " + g_tableName2 + " where height='199'";
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = "SELECT COUNT(*) FROM " + g_sharedTableName1 + " where height='199'";
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+    }
+
+    /**
+     * @tc.name: SharedTableSync010
+     * @tc.desc: Test the sharing_resource for del data into the cloud
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync010, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init cloud share data and sync
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        int cloudCount = 10;
+        forkInsertFunc_ = InsertSharingUri;
+        InsertCloudTableRecord(0, cloudCount, false);
+        InsertCloudTableRecord(0, cloudCount);
+        Query query = Query::Select().FromTable({ g_tableName2, g_sharedTableName1 });
+        BlockSync(query, g_delegate, DBStatus::OK);
+        forkInsertFunc_ = nullptr;
+
+        /**
+         * @tc.steps:step2. delete cloud data
+         * @tc.expected: step2. return OK
+         */
+        int beginGid = 0;
+        int delCount = 5;
+        DeleteCloudTableRecord(beginGid, delCount, false);
+        DeleteCloudTableRecord(cloudCount, delCount);
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step3. sync and check count
+         * @tc.expected: step3. return OK
+         */
+        std::string sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount - delCount), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount - delCount), nullptr), SQLITE_OK);
+
+        /**
+         * @tc.steps:step4. remove device data and check count
+         * @tc.expected: step4. return OK
+         */
+        g_delegate->RemoveDeviceData("", FLAG_ONLY);
+        sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(0L), nullptr), SQLITE_OK);
+        g_delegate->RemoveDeviceData("", CLEAR_SHARED_TABLE);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(0L), nullptr), SQLITE_OK);
+    }
+
+    /**
+     * @tc.name: SharedTableSync011
+     * @tc.desc: Test the sharing_resource when the local data is newer than the cloud
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync011, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init cloud data and sync
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        const std::vector<std::string> tables = { g_tableName2, g_sharedTableName1 };
+        int cloudCount = 10;
+        InsertCloudTableRecord(0, cloudCount, false);
+        InsertCloudTableRecord(0, cloudCount);
+        Query query = Query::Select().FromTable(tables);
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step2. update cloud data, generate share uri
+         * @tc.expected: step2. return OK
+         */
+        int beginGid = 0;
+        forkInsertFunc_ = InsertSharingUri;
+        InsertCloudTableRecord(0, cloudCount, false, beginGid);
+        InsertCloudTableRecord(0, cloudCount, true, cloudCount);
+        forkInsertFunc_ = nullptr;
+
+        /**
+         * @tc.steps:step3. update local data
+         * @tc.expected: step3. return OK
+         */
+        for (const auto &tableName: tables) {
+            std::string sql = "update " + tableName + " SET height='199';";
+            sqlite3_stmt *stmt = nullptr;
+            ASSERT_EQ(SQLiteUtils::GetStatement(db_, sql, stmt), E_OK);
+            EXPECT_EQ(SQLiteUtils::StepWithRetry(stmt), SQLiteUtils::MapSQLiteErrno(SQLITE_DONE));
+            int errCode;
+            SQLiteUtils::ResetStatement(stmt, true, errCode);
+        }
+
+        /**
+         * @tc.steps:step4. push sync and check count
+         * @tc.expected: step4. return OK
+         */
+        BlockSync(query, g_delegate, DBStatus::OK, SyncMode::SYNC_MODE_CLOUD_FORCE_PUSH);
+        std::string sql = QueryResourceCountSql(g_tableName2);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+        sql = QueryResourceCountSql(g_sharedTableName1);
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+    }
+
+    /**
+     * @tc.name: SharedTableSync012
+     * @tc.desc: Test the flag for uploaded data
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: bty
+    */
+    HWTEST_F(DistributedDBCloudInterfacesSetCloudSchemaTest, SharedTableSync012, TestSize.Level0)
+    {
+        /**
+         * @tc.steps:step1. init local share data and sync
+         * @tc.expected: step1. return OK
+         */
+        InitCloudEnv();
+        int cloudCount = 10;
+        InsertLocalSharedTableRecords(0, 10, g_sharedTableName1);
+        Query query = Query::Select().FromTable({ g_sharedTableName1 });
+        BlockSync(query, g_delegate, DBStatus::OK);
+
+        /**
+         * @tc.steps:step2. update local share uri
+         * @tc.expected: step2. return OK
+         */
+        std::string sql = "update " + DBCommon::GetLogTableName(g_sharedTableName1) + " SET sharing_resource='199';";
+        sqlite3_stmt *stmt = nullptr;
+        ASSERT_EQ(SQLiteUtils::GetStatement(db_, sql, stmt), E_OK);
+        EXPECT_EQ(SQLiteUtils::StepWithRetry(stmt), SQLiteUtils::MapSQLiteErrno(SQLITE_DONE));
+        int errCode;
+        SQLiteUtils::ResetStatement(stmt, true, errCode);
+
+        /**
+         * @tc.steps:step3. sync and check flag
+         * @tc.expected: step3. return OK
+         */
+        BlockSync(query, g_delegate, DBStatus::OK);
+        sql = "SELECT COUNT(*) FROM " + DBCommon::GetLogTableName(g_sharedTableName1) + " where flag&0x02=0x02";
+        EXPECT_EQ(sqlite3_exec(db_, sql.c_str(), CloudDBSyncUtilsTest::QueryCountCallback,
+            reinterpret_cast<void *>(cloudCount), nullptr), SQLITE_OK);
+    }
 } // namespace
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp
index fc3b0484ecc7a34689c72eb456ac9464285c79bb..52f057a45713c0e87e3b1b05844c3a865e1ed99a 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_auto_launch_test.cpp
@@ -65,7 +65,7 @@ namespace {
     class StoreCommunicatorAggregator : public ICommunicatorAggregator {
     public:
         // Return 0 as success. Return negative as error
-        int Initialize(IAdapter *inAdapter) override
+        int Initialize(IAdapter *inAdapter, const std::shared_ptr<DBStatusAdapter> &statusAdapter) override
         {
             return E_OK;
         }
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp
index 6fbee212cde9b731d81a2f651c5b68525b5a1394..b4643a59856a1205b2645611a4a4a2eb0a1f8668 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_local_batch_test.cpp
@@ -248,11 +248,11 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch
     entrysOverSize.push_back(entryTemp);
     /**
      * @tc.steps: step2. PutBatch operates on four sets of data. and use get check the result of Vect3.
-     * @tc.expected: step2. Returns INVALID_ARGS for 129 records, and returns OK for the rest. all get return NOT_FOUND.
+     * @tc.expected: step2. Returns OK for 129 records.
      */
-    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysOverSize), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysOverSize), OK);
     for (size_t i = 0; i < entrysOverSize.size(); i++) {
-        EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysOverSize[i].key, valueTemp), NOT_FOUND);
+        EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysOverSize[i].key, valueTemp), OK);
     }
     /**
      * @tc.steps: step3. Use get check the result of Vect2.
@@ -440,6 +440,187 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch
     g_kvNbDelegatePtr = nullptr;
 }
 
+/**
+  * @tc.name: SingleVerPutLocalBatch005
+  * @tc.desc: Check for legal parameters that the sum size of all entries is smaller than 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch005, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+    vector<Entry> entrysKeyLegal; // size is 512M - 1kB
+    for (int i = 0; i < 524287; i++) { // 524287 * legalKey is equal to 512M - 1KB.
+        entrysKeyLegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixLegal; // size is 511M + 511KB < 512M
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixLegal.push_back({legalKey, legalValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerPutLocalBatch005", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysKeyLegal), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysMixLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerPutLocalBatch005"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutLocalBatch006
+  * @tc.desc: Check for legal parameters that the sum size of all entries is equal to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch006, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysKeyLegal; // size is 512M
+    for (int i = 0; i < 524288; i++) { // 524288 * legalKey is equal to 512M.
+        entrysKeyLegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixLegal; // size is 512M
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixLegal.push_back({legalKey, legalValue});
+    }
+    for (int i = 0; i < 3969; i++) { // 3969 * legalKey is equal to 3969KB.
+        entrysMixLegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerPutLocalBatch006", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysKeyLegal), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysMixLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerPutLocalBatch006"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutLocalBatch007
+  * @tc.desc: Check for illegal parameters that the sum size of all entries is larger to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch007, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysKeyIllegal; // size is 512M + 1KB
+    for (int i = 0; i < 524289; i++) { // 524289 * legalKey is equal to 512M + 1KB.
+        entrysKeyIllegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixIllegal; // size is 512M + 1KB
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixIllegal.push_back({legalKey, legalValue});
+    }
+    for (int i = 0; i < 3970; i++) { // 3970 * legalKey is equal to 3970KB.
+        entrysMixIllegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerPutLocalBatch007", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysKeyIllegal), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysMixIllegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerPutLocalBatch007"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutLocalBatch008
+  * @tc.desc: Check for illegal parameters that the sum size of all entries excced uint32_t limit.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch008, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysIllegal; // size excced to the limit of uint32_t
+    for (int i = 0; i < 4194305; i++) { // 4194305 * legalKey is excced to the limit of uint32_t.
+        entrysIllegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerPutLocalBatch008", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysIllegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerPutLocalBatch008"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
 /**
   * @tc.name: SingleVerDeleteLocalBatch001
   * @tc.desc: Check for illegal parameters.
@@ -475,29 +656,23 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBa
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), OK);
     }
     /**
-     * @tc.steps: step3. Use DeleteBatch interface to transfer 10 + 119 extra keys (total 129).
-     * @tc.expected: step3. Return INVALID_ARGS.
-     */
-    CreatEntrys(DBConstant::MAX_BATCH_SIZE + 1, keys, values, entries);
-    EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keys), INVALID_ARGS);
-    /**
-     * @tc.steps: step4. Use Get to check data in database.
-     * @tc.expected: step4. Key1~10 still in database.
+     * @tc.steps: step3. Use Get to check data in database.
+     * @tc.expected: step3. Key1~10 still in database.
      */
     for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), OK);
     }
     /**
-     * @tc.steps: step5. Use the DeleteBatch interface to pass in 10 included
+     * @tc.steps: step4. Use the DeleteBatch interface to pass in 10 included
      *  keys6 ~ 10 + 123 additional key values ​​(128 in total).
-     * @tc.expected: step5. DeleteBatch OK.
+     * @tc.expected: step4. DeleteBatch OK.
      */
     CreatEntrys(DBConstant::MAX_BATCH_SIZE + DIVIDE_BATCH_PRESET_SIZE, keys, values, entries);
     keys.erase(keys.begin(), keys.begin() + DIVIDE_BATCH_PRESET_SIZE);
     EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keys), OK);
     /**
-     * @tc.steps: step6. Use Get to check key1~10 in database.
-     * @tc.expected: step6. Key1~5 in database, key6~10 have been deleted.
+     * @tc.steps: step5. Use Get to check key1~10 in database.
+     * @tc.expected: step5. Key1~5 in database, key6~10 have been deleted.
      */
     for (size_t i = 0; i < DIVIDE_BATCH_PRESET_SIZE; i++) {
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), OK);
@@ -506,8 +681,8 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBa
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), NOT_FOUND);
     }
     /**
-     * @tc.steps: step7. Repeat Putbatch key1~10, value1~10.
-     * @tc.expected: step7. Return OK.
+     * @tc.steps: step6. Repeat Putbatch key1~10, value1~10.
+     * @tc.expected: step6. Return OK.
      */
     EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrysBase), OK);
 
@@ -515,26 +690,26 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBa
     DistributedDBToolsUnitTest::GetRandomKeyValue(illegalKey, DBConstant::MAX_KEY_SIZE + 1); // 1K + 1
     keysBase.push_back(illegalKey);
     /**
-     * @tc.steps: step8. Use DeleteBatch interface to pass in 10 + 1(larger than 1K) keys.
-     * @tc.expected: step8. Return INVALID_ARGS.
+     * @tc.steps: step7. Use DeleteBatch interface to pass in 10 + 1(larger than 1K) keys.
+     * @tc.expected: step7. Return INVALID_ARGS.
      */
     EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keysBase), INVALID_ARGS);
     /**
-     * @tc.steps: step9. Use Get to check key1~10 in database.
-     * @tc.expected: step9. Delete those data failed.
+     * @tc.steps: step8. Use Get to check key1~10 in database.
+     * @tc.expected: step8. Delete those data failed.
      */
     for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), OK);
     }
     /**
-     * @tc.steps: step10. Use DeleteBatch interface to pass in 10(in database) + 1 valid keys.
-     * @tc.expected: step10. Delete those data successfully.
+     * @tc.steps: step9. Use DeleteBatch interface to pass in 10(in database) + 1 valid keys.
+     * @tc.expected: step9. Delete those data successfully.
      */
     keysBase.back().erase(keysBase.back().begin(), keysBase.back().begin() + 1);
     EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keysBase), OK);
     /**
-     * @tc.steps: step11. Check data.
-     * @tc.expected: step11. DeleteBatch successfully.
+     * @tc.steps: step10. Check data.
+     * @tc.expected: step10. DeleteBatch successfully.
      */
     for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
         EXPECT_EQ(g_kvNbDelegatePtr->GetLocal(entrysBase[i].key, valueRead), NOT_FOUND);
@@ -617,6 +792,150 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBa
     g_kvNbDelegatePtr = nullptr;
 }
 
+/**
+  * @tc.name: SingleVerDeleteLocalBatch003
+  * @tc.desc: Check for legal parameters that the sum size of all Keys is smaller than 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBatch003, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysLegal; // size is 512M - 1kB
+    for (int i = 0; i < 524287; i++) { // 524287 * legalKey is equal to 512M - 1KB.
+        keysLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteLocalBatch003", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteBatch operates on sets of data.
+     * @tc.expected: step2. return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keysLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteLocalBatch003"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteLocalBatch004
+  * @tc.desc: Check for legal parameters that the sum size of all entries is equal to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBatch004, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysLegal; // size is 512M
+    for (int i = 0; i < 524288; i++) { // 524288 * legalKey is equal to 512M.
+        keysLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteLocalBatch004", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteBatch operates on sets of data.
+     * @tc.expected: step2. return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteLocalBatch004"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteLocalBatch005
+  * @tc.desc: Check for illegal parameters that the sum size of all entries is larger to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBatch005, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysIllLegal; // size is 512M + 1kB
+    for (int i = 0; i < 524289; i++) { // 524289 * legalKey is equal to 512M + 1KB.
+        keysIllLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteLocalBatch005", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteLocalBatch operates on sets of data.
+     * @tc.expected: step2. return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keysIllLegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteLocalBatch005"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteLocalBatch006
+  * @tc.desc: Check for illegal parameters that the sum size of all entries excced uint32_t limit.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerDeleteLocalBatch006, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysIllLegal; // size excced to the limit of uint32_t
+    for (int i = 0; i < 4194305; i++) { // 4194305 * legalKey is excced to the limit of uint32_t.
+        keysIllLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteLocalBatch006", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteLocalBatch operates on sets of data.
+     * @tc.expected: step2. return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteLocalBatch(keysIllLegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteLocalBatch006"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
 /**
   * @tc.name: SingleVerPutLocalBatchObserver001
   * @tc.desc: Test the observer function of PutLocalBatch() interface.
@@ -711,21 +1030,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch
     Key key;
     EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_LOCAL_ONLY, observer), OK);
     /**
-     * @tc.steps:step3. Put 129 batch data.
+     * @tc.steps:step3. Put invalid batch data.
      * @tc.expected: step3. Returns INVALID_ARGS.
      */
-    vector<Entry> entrys1;
-    vector<Key> keys1;
-    DistributedDBUnitTest::GenerateRecords(DBConstant::MAX_BATCH_SIZE + 1, entrys1, keys1);
-
-    EXPECT_EQ(entrys1.size(), 129UL);
-    EXPECT_EQ(g_kvNbDelegatePtr->PutLocalBatch(entrys1), INVALID_ARGS);
-    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
-    EXPECT_TRUE(observer->GetEntriesInserted().empty());
-    /**
-     * @tc.steps:step4. Put invalid batch data.
-     * @tc.expected: step4. Returns INVALID_ARGS.
-     */
     vector<Entry> entrys2;
     vector<Key> keys2;
     DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys2, keys2);
@@ -742,8 +1049,8 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch
     std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
     EXPECT_TRUE(observer->GetEntriesInserted().empty());
     /**
-     * @tc.steps:step5. Put MAX valid value batch data.
-     * @tc.expected: step5. Returns OK.
+     * @tc.steps:step4. Put MAX valid value batch data.
+     * @tc.expected: step4. Returns OK.
      */
     vector<Entry> entrys3;
     vector<Key> keys3;
@@ -756,16 +1063,16 @@ HWTEST_F(DistributedDBInterfacesNBDelegateLocalBatchTest, SingleVerPutLocalBatch
     LOGD("sleep end");
     EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrys3, observer->GetEntriesInserted()));
     /**
-     * @tc.steps:step6. UnRegister the observer.
-     * @tc.expected: step6. Returns OK.
+     * @tc.steps:step5. UnRegister the observer.
+     * @tc.expected: step5. Returns OK.
      */
     EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
     delete observer;
     observer = nullptr;
 
     /**
-     * @tc.steps:step7. Close the kv store.
-     * @tc.expected: step7. Results OK and delete successfully.
+     * @tc.steps:step6. Close the kv store.
+     * @tc.expected: step6. Results OK and delete successfully.
      */
     EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutLocalBatchObserver_002"), OK);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..668dd5d39c1746bdfe997ab7ff6359eb582723d9
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp
@@ -0,0 +1,2235 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifdef USE_RD_KERNEL
+#include <gtest/gtest.h>
+#include <thread>
+
+#include "db_common.h"
+#include "db_constant.h"
+#include "db_errno.h"
+#include "distributeddb_data_generate_unit_test.h"
+#include "distributeddb_tools_unit_test.h"
+#include "log_print.h"
+#include "platform_specific.h"
+#include "process_system_api_adapter_impl.h"
+#include "runtime_context.h"
+#include "system_time.h"
+#include "virtual_communicator_aggregator.h"
+
+using namespace testing::ext;
+using namespace DistributedDB;
+using namespace DistributedDBUnitTest;
+using namespace std;
+
+namespace {
+    // define some variables to init a KvStoreDelegateManager object.
+    KvStoreDelegateManager g_mgr(APP_ID, USER_ID);
+    string g_testDir;
+    KvStoreConfig g_config;
+    KvStoreNbDelegate::Option g_option;
+    const int RESULT_SET_COUNT = 9;
+    const int RESULT_SET_INIT_POS = -1;
+    Key g_keyPrefix = {'A', 'B', 'C'};
+    uint8_t g_testDict[RESULT_SET_COUNT] = {'1', '2', '3', '4', '5', '6', '7', '8', '9'};
+
+    // define the g_kvNbDelegateCallback, used to get some information when open a kv store.
+    DBStatus g_kvDelegateStatus = INVALID_ARGS;
+    KvStoreNbDelegate *g_kvNbDelegatePtr = nullptr;
+    const int OBSERVER_SLEEP_TIME = 100;
+    const int BATCH_PRESET_SIZE_TEST = 10;
+    const int DIVIDE_BATCH_PRESET_SIZE = 5;
+    const int VALUE_OFFSET = 5;
+
+    const int DEFAULT_KEY_VALUE_SIZE = 10;
+    VirtualCommunicatorAggregator* g_communicatorAggregator = nullptr;
+    // the type of g_kvNbDelegateCallback is function<void(DBStatus, KvStoreDelegate*)>
+    auto g_kvNbDelegateCallback = bind(&DistributedDBToolsUnitTest::KvStoreNbDelegateCallback, placeholders::_1,
+        placeholders::_2, std::ref(g_kvDelegateStatus), std::ref(g_kvNbDelegatePtr));
+
+    void InitResultSet()
+    {
+        Key testKey;
+        Value testValue;
+        for (int i = 0; i < RESULT_SET_COUNT; i++) {
+            testKey.clear();
+            testValue.clear();
+            // set key
+            testKey = g_keyPrefix;
+            testKey.push_back(g_testDict[i]);
+            // set value
+            testValue.push_back(g_testDict[i]);
+            // insert entry
+            EXPECT_EQ(g_kvNbDelegatePtr->Put(testKey, testValue), OK);
+        }
+    }
+
+    void ReadResultSet(KvStoreResultSet *readResultSet)
+    {
+        if (readResultSet == nullptr) {
+            return;
+        }
+        // index from 0 to 8(first to last)
+        for (int i = 0; i < RESULT_SET_COUNT; i++) {
+            Entry entry;
+            std::vector<uint8_t> cursorKey = g_keyPrefix;
+            cursorKey.push_back(g_testDict[i]);
+            std::vector<uint8_t> cursorValue;
+            cursorValue.push_back(g_testDict[i]);
+            EXPECT_TRUE(readResultSet->MoveToNext());
+            EXPECT_EQ(readResultSet->GetEntry(entry), OK);
+            EXPECT_EQ(entry.key, cursorKey);
+            EXPECT_EQ(entry.value, cursorValue);
+            EXPECT_TRUE(!readResultSet->IsBeforeFirst());
+            EXPECT_TRUE(!readResultSet->IsAfterLast());
+        }
+        // change index to 8(last)
+        EXPECT_EQ(readResultSet->GetPosition(), RESULT_SET_COUNT - 1);
+        EXPECT_TRUE(!readResultSet->IsFirst());
+        EXPECT_TRUE(readResultSet->IsLast());
+        EXPECT_TRUE(!readResultSet->IsBeforeFirst());
+        EXPECT_TRUE(!readResultSet->IsAfterLast());
+    }
+
+    void CheckResultSetValue(KvStoreResultSet *readResultSet, DBStatus errCode, int position)
+    {
+        if (readResultSet == nullptr) {
+            return;
+        }
+        Entry entry;
+        EXPECT_EQ(readResultSet->GetPosition(), position);
+        EXPECT_EQ(readResultSet->GetEntry(entry), errCode);
+        if (errCode == OK) {
+            std::vector<uint8_t> cursorKey;
+            std::vector<uint8_t> cursorValue;
+            if (position > RESULT_SET_INIT_POS && position < RESULT_SET_COUNT) {
+                uint8_t keyPostfix = g_testDict[position];
+                // set key
+                cursorKey = g_keyPrefix;
+                cursorKey.push_back(keyPostfix);
+                // set value
+                cursorValue.push_back(keyPostfix);
+            }
+            // check key and value
+            EXPECT_EQ(entry.key, cursorKey);
+            EXPECT_EQ(entry.value, cursorValue);
+        }
+    }
+
+class DistributedDBInterfacesNBDelegateRdTest : public testing::Test {
+public:
+    static void SetUpTestCase(void);
+    static void TearDownTestCase(void);
+    void SetUp();
+    void TearDown();
+};
+
+void DistributedDBInterfacesNBDelegateRdTest::SetUpTestCase(void)
+{
+    DistributedDBToolsUnitTest::TestDirInit(g_testDir);
+    g_config.dataDir = g_testDir;
+    g_option.storageEngineType = GAUSSDB_RD;
+    g_mgr.SetKvStoreConfig(g_config);
+    if (DistributedDBToolsUnitTest::RemoveTestDbFiles(g_testDir) != 0) {
+        LOGE("rm test db files error!");
+    }
+
+    g_communicatorAggregator = new (std::nothrow) VirtualCommunicatorAggregator();
+    ASSERT_TRUE(g_communicatorAggregator != nullptr);
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(g_communicatorAggregator);
+
+    std::shared_ptr<ProcessSystemApiAdapterImpl> g_adapter = std::make_shared<ProcessSystemApiAdapterImpl>();
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(g_adapter);
+}
+
+void DistributedDBInterfacesNBDelegateRdTest::TearDownTestCase(void)
+{
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
+
+    RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
+}
+
+void DistributedDBInterfacesNBDelegateRdTest::SetUp(void)
+{
+    if (DistributedDBToolsUnitTest::RemoveTestDbFiles(g_testDir) != 0) {
+        LOGE("rm test db files error.");
+    }
+    DistributedDBToolsUnitTest::PrintTestCaseInfo();
+    g_kvDelegateStatus = INVALID_ARGS;
+    g_kvNbDelegatePtr = nullptr;
+}
+
+void DistributedDBInterfacesNBDelegateRdTest::TearDown(void)
+{
+    if (g_kvNbDelegatePtr != nullptr) {
+        g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+        g_kvNbDelegatePtr = nullptr;
+    }
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
+}
+
+/**
+  * @tc.name:
+  * @tc.desc:
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author:
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, CombineTest001, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_nb_delegate_test_rd", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    std::string keyStr("acd");
+    Key key(keyStr.begin(), keyStr.end());
+    std::string valueStr("acd");
+    Value value(valueStr.begin(), valueStr.end());
+    Value valueRead;
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register a non-null but unsupported observer for the special key.
+     * @tc.expected: step2. Register results DB_ERROR.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_LOCAL_ONLY, observer), DB_ERROR);
+    /**
+     * @tc.steps:step3. Try to get the data before putting
+     * @tc.expected: step3. Put returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Get(key, valueRead), NOT_FOUND);
+    /**
+     * @tc.steps:step3. Put the local data.
+     * @tc.expected: step3. Put returns OK.
+     *
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(key, value), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    /**
+     * @tc.steps:step4. Check the local data.
+     * @tc.expected: step4. The get data is equal to the put data.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Get(key, valueRead), OK);
+    /**
+     * @tc.steps:step5. Delete the local data.
+     * @tc.expected: step5. Delete returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Delete(key), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    /**
+     * @tc.steps:step6. Check the local data.
+     * @tc.expected: step6. Couldn't find the deleted data.
+     */
+    LOGD("step6 =========== Get local data again");
+    EXPECT_EQ(g_kvNbDelegatePtr->Get(key, valueRead), NOT_FOUND);
+    /**
+     * @tc.steps:step7. UnRegister the observer.
+     * @tc.expected: step7. Returns NOT_FOUND.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), NOT_FOUND);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step8. Close the kv store.
+     * @tc.expected: step8. Results OK and delete successfully.
+     */
+    LOGD("step8 =========== Close store");
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_nb_delegate_test_rd"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerGetLocalEntries001
+  * @tc.desc: Test GetEntries interface for the single ver database.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wangbingquan
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerGetLocalEntries001, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("concurrentPutTest", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Put one data whose key has prefix 'p' into the local zone.
+     */
+    Entry entry1 = {{'p'}, {'q'}};
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(entry1.key, entry1.value), OK);
+
+    /**
+     * @tc.steps:step3. Get batch data whose key has prefix 'k' from the local zone.
+     * @tc.expected: step3. Get results NOT_FOUND.
+     */
+    std::vector<Entry> entries;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries({'k'}, entries), NOT_FOUND);
+
+    /**
+     * @tc.steps:step4. Put two data whose key have prefix 'k' into the local zone.
+     */
+    Entry entry2 = {{'k', '1'}, {'d'}};
+    Entry entry3 = {{'k', '2'}, {'d'}};
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(entry2.key, entry2.value), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(entry3.key, entry3.value), OK);
+
+    /**
+     * @tc.steps:step5. Get batch data whose key has prefix 'k' from the local zone.
+     * @tc.expected: step5. Get results OK, and the entries size is 2.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries({'k'}, entries), OK);
+    EXPECT_EQ(entries.size(), 2UL);
+
+    /**
+     * @tc.steps:step6. Get batch data whose key has empty prefix from the local zone.
+     * @tc.expected: step6. Get results OK, and the entries size is 3.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries((Key){}, entries), OK);
+    EXPECT_EQ(entries.size(), 3UL);
+
+    /**
+     * @tc.steps:step7. Delete one data whose key has prefix 'k' from the local zone.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Delete(entry3.key), OK);
+
+    /**
+     * @tc.steps:step8. Get batch data whose key has prefix 'k' from the local zone.
+     * @tc.expected: step8. Get results OK, and the entries size is 1.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries({'k'}, entries), OK);
+    EXPECT_EQ(entries.size(), 1UL);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("concurrentPutTest"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: ResultSetTest001
+  * @tc.desc: Test the NbDelegate for result set function.
+  * @tc.type: FUNC
+  * @tc.require: AR000D08KT
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, ResultSetTest001, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1. initialize result set.
+     * @tc.expected: step1. Success.
+     */
+    g_mgr.GetKvStore("distributed_nb_delegate_result_set_test", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    InitResultSet();
+
+    /**
+     * @tc.steps: step2. get entries using result set.
+     * @tc.expected: step2. Success.
+     */
+    KvStoreResultSet *readResultSet = nullptr;
+    Key keyPrefix = { g_keyPrefix };
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(keyPrefix, readResultSet), OK);
+    ASSERT_TRUE(readResultSet != nullptr);
+    EXPECT_EQ(readResultSet->GetCount(), RESULT_SET_COUNT);
+
+    /**
+     * @tc.steps: step3. result function check.
+     * @tc.expected: step3. Success.
+     */
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_INIT_POS);
+    // index from 0 to 8(first to last)
+    ReadResultSet(readResultSet);
+    // change index to 9(after last)
+    EXPECT_TRUE(!readResultSet->MoveToNext());
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_COUNT);
+    // change index to 8(last)
+    EXPECT_TRUE(readResultSet->MoveToPrevious());
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_COUNT - 1);
+    // change index to 0(first)
+    EXPECT_TRUE(readResultSet->MoveToFirst());
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_INIT_POS + 1);
+    // change index to 8(last)
+    EXPECT_TRUE(readResultSet->MoveToLast());
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_COUNT - 1);
+    // move to -4: change index to -1
+    EXPECT_TRUE(!readResultSet->MoveToPosition(RESULT_SET_INIT_POS - 3));
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_INIT_POS);
+    // move to 10: change index to 9
+    EXPECT_TRUE(!readResultSet->MoveToPosition(RESULT_SET_COUNT + 1));
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_COUNT);
+    // change index to 2
+    EXPECT_TRUE(readResultSet->MoveToPosition(RESULT_SET_INIT_POS + 3));
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_INIT_POS + 3);
+    // move 0: change index to 2
+    EXPECT_TRUE(readResultSet->Move(0));
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_INIT_POS + 3);
+    // change index to 6
+    EXPECT_TRUE(readResultSet->Move(RESULT_SET_INIT_POS + 5));
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_INIT_POS + 7);
+    // change index to 3
+    EXPECT_TRUE(readResultSet->Move(RESULT_SET_INIT_POS - 2));
+    CheckResultSetValue(readResultSet, OK, RESULT_SET_INIT_POS + 4);
+    // move -5: change index to -1
+    EXPECT_TRUE(!readResultSet->Move(-5));
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_INIT_POS);
+
+    // move INT_MIN: change index to -1
+    EXPECT_TRUE(!readResultSet->Move(INT_MIN));
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_INIT_POS);
+
+    EXPECT_TRUE(readResultSet->Move(5));
+    EXPECT_TRUE(!readResultSet->Move(INT_MAX));
+    CheckResultSetValue(readResultSet, NOT_FOUND, RESULT_SET_COUNT);
+
+    /**
+     * @tc.steps: step4. clear the result set resource.
+     * @tc.expected: step4. Success.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(readResultSet), OK);
+    EXPECT_TRUE(readResultSet == nullptr);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_nb_delegate_result_set_test"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: PutBatchVerify001
+  * @tc.desc: This test case use to verify the putBatch interface function
+  * @tc.type: FUNC
+  * @tc.require: AR000CCPOM
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, PutBatchVerify001, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1. Get singleVer kvStore by GetKvStore.
+     * @tc.expected: step1. Get database success.
+     */
+    g_mgr.GetKvStore("distributed_PutBatchVerify_001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps: step2. Insert 10 records into database.
+     * @tc.expected: step2. Insert successfully.
+     */
+    vector<Entry> entries;
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i);
+        entries.push_back(entry);
+    }
+
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entries), OK);
+
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Key key;
+        key.push_back(i);
+        Value value;
+        g_kvNbDelegatePtr->Get(key, value);
+        EXPECT_EQ(key, value);
+    }
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch001
+  * @tc.desc: Check for illegal parameters
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatch001, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct three sets of vector <Entry>, each set of three data contains records:
+     *  (K1, V1) It is illegal for K1 to be greater than 1K, and V1 is 1K in size
+     *  (K2, V2) K2 is legal, V2 is greater than 4M
+     *  (K3, V3) are not legal.
+     */
+    Key illegalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(illegalKey, DBConstant::MAX_KEY_SIZE + 1); // 1K + 1
+    Value illegalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(illegalValue, DBConstant::MAX_VALUE_SIZE + 1); // 4M + 1
+    vector<Entry> entrysKeyIllegal = {KV_ENTRY_1, KV_ENTRY_2, {illegalKey, VALUE_3}};
+    vector<Entry> entrysValueIllegal = {KV_ENTRY_1, KV_ENTRY_2, {KEY_3, illegalValue}};
+    vector<Entry> entrysIllegal = {KV_ENTRY_1, KV_ENTRY_2, {illegalKey, illegalValue}};
+
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on three sets of data.
+     * @tc.expected: step2. All three operations return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysKeyIllegal), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysValueIllegal), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysIllegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch002
+  * @tc.desc: PutBatch normal insert function test.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatch002, TestSize.Level1)
+{
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_002", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step1.
+     *  Create and build 4 groups of vector <Entry>, which are:
+     *  Vect of empty objects;
+     *  Vect1 of a legal Entry record;
+     *  128 legal Entry records Vect2;
+     *  129 legal Entry records Vect3;
+     */
+    vector<Entry> entrysMaxNumber;
+    for (size_t i = 0; i < DBConstant::MAX_BATCH_SIZE; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i);
+        entrysMaxNumber.push_back(entry);
+    }
+    Key keyTemp = {'1', '1'};
+    Value valueTemp;
+    Entry entryTemp = {keyTemp, VALUE_1};
+    vector<Entry> entrysOneRecord = {entryTemp};
+    vector<Entry> entrysOverSize = entrysMaxNumber;
+    entrysOverSize.push_back(entryTemp);
+
+    /**
+     * @tc.steps: step2. PutBatch operates on four sets of data. and use get check the result of Vect3.
+     * @tc.expected: step2. Returns INVALID_ARGS for 129 records, and returns OK for the rest. all get return NOT_FOUND.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysOverSize), INVALID_ARGS);
+    for (size_t i = 0; i < entrysOverSize.size(); i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysOverSize[i].key, valueTemp), NOT_FOUND);
+    }
+
+    /**
+     * @tc.steps: step3. Use get check the result of Vect2.
+     * @tc.expected: step3. Return OK and get the correct value.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysOneRecord), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueTemp), OK);
+    EXPECT_EQ(valueTemp, VALUE_1);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysMaxNumber), OK);
+    /**
+    * @tc.steps: step4. Use get check the result of Vect3.
+    * @tc.expected: step4. Return OK and get the correct value.
+    */
+    for (size_t i = 0; i < entrysMaxNumber.size(); i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysMaxNumber[i].key, valueTemp), OK);
+        EXPECT_EQ(valueTemp, entrysMaxNumber[i].value);
+    }
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_002"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch003
+  * @tc.desc: Check interface atomicity
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatch003, TestSize.Level1)
+{
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_003", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step1. Create and construct a set of vector <Entry> with a total of 128 data,
+     * including one illegal data. And call PutBatch interface to insert.
+     */
+    vector<Entry> entrysMaxNumber;
+    for (size_t i = 0; i < DBConstant::MAX_BATCH_SIZE; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i);
+        entrysMaxNumber.push_back(entry);
+    }
+    Key illegalKey;
+    Value valueTemp;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(illegalKey, DBConstant::MAX_KEY_SIZE + 1); // 1K + 1
+    entrysMaxNumber[0].key = illegalKey;
+
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysMaxNumber), INVALID_ARGS);
+    /**
+     * @tc.steps: step2. Use Get interface to query 128 corresponding key values.
+     * @tc.expected: step2. All Get interface return NOT_FOUND.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysMaxNumber[0].key, valueTemp), INVALID_ARGS);
+    for (size_t i = 1; i < entrysMaxNumber.size(); i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysMaxNumber[i].key, valueTemp), NOT_FOUND);
+    }
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_003"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+static void PreparePutBatch004(vector<Entry> &entrys1, vector<Entry> &entrys2, vector<Entry> &entrys3)
+{
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_004", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i);
+        entrys1.push_back(entry);
+    }
+
+    for (int i = 0; i < DIVIDE_BATCH_PRESET_SIZE; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i + VALUE_OFFSET);
+        entrys2.push_back(entry);
+    }
+
+    for (int i = DIVIDE_BATCH_PRESET_SIZE; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Entry entry;
+        entry.key.push_back(i);
+        entry.value.push_back(i - VALUE_OFFSET);
+        entrys3.push_back(entry);
+    }
+}
+
+/**
+  * @tc.name: SingleVerPutBatch004
+  * @tc.desc: Check interface data insertion and update functions.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatch004, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Construct three groups of three vector <Entry>:
+     *  (1) entrys1: key1 ~ 10, corresponding to Value1 ~ 10;
+     *  (2) entrys2: key1 ~ 5, corresponding to Value6 ~ 10;
+     *  (3) entrys3: key6 ~ 10, corresponding to Value1 ~ 5;
+     */
+    vector<Entry> entrys1;
+    vector<Entry> entrys2;
+    vector<Entry> entrys3;
+    PreparePutBatch004(entrys1, entrys2, entrys3);
+    /**
+     * @tc.steps: step2. PutBatch entrys2.
+     * @tc.expected: step2. PutBatch return OK.
+     */
+    Value valueRead;
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys2), OK);
+    /**
+     * @tc.steps: step3. Check PutBatch result.
+     * @tc.expected: step3. Get correct value of key1~5. Key6~10 return NOT_FOUND.
+     */
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Key keyTemp;
+        keyTemp.push_back(i);
+        if (i < DIVIDE_BATCH_PRESET_SIZE) {
+            Value valueTemp;
+            valueTemp.push_back(i + VALUE_OFFSET);
+            EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), OK);
+            EXPECT_EQ(valueRead, valueTemp);
+            continue;
+        }
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), NOT_FOUND);
+    }
+    /**
+     * @tc.steps: step4. PutBatch entrys1.
+     * @tc.expected: step4. PutBatch return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), OK);
+    /**
+     * @tc.steps: step5. Check PutBatch result.
+     * @tc.expected: step5. Update and insert value of key1~10 to value1~10.
+     */
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Key keyTemp;
+        keyTemp.push_back(i);
+        if (i < DIVIDE_BATCH_PRESET_SIZE) {
+            EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), OK);
+            EXPECT_EQ(valueRead, keyTemp);
+            continue;
+        }
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), OK);
+        EXPECT_EQ(valueRead, keyTemp);
+    }
+    /**
+     * @tc.steps: step6. PutBatch entrys3.
+     * @tc.expected: step6. PutBatch return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys3), OK);
+    /**
+     * @tc.steps: step7. Check PutBatch result of key1~10.
+     * @tc.expected: step7. Update value of key5~10 to value1~5.
+     */
+    for (int i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        Key keyTemp;
+        keyTemp.push_back(i);
+        if (i < DIVIDE_BATCH_PRESET_SIZE) {
+            EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), OK);
+            EXPECT_EQ(valueRead, keyTemp);
+            continue;
+        }
+        Value valueTemp;
+        valueTemp.push_back(i - VALUE_OFFSET);
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keyTemp, valueRead), OK);
+        EXPECT_EQ(valueRead, valueTemp);
+    }
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_004"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+static void CreatEntrys(int recordSize, vector<Key> &keys, vector<Value> &values, vector<Entry> &entries)
+{
+    keys.clear();
+    values.clear();
+    entries.clear();
+    for (int i = 0; i < recordSize; i++) {
+        string temp = to_string(i);
+        Entry entry;
+        Key keyTemp;
+        Value valueTemp;
+        for (auto &iter : temp) {
+            entry.key.push_back(iter);
+            entry.value.push_back(iter);
+            keyTemp.push_back(iter);
+            valueTemp.push_back(iter);
+        }
+        keys.push_back(keyTemp);
+        values.push_back(valueTemp);
+        entries.push_back(entry);
+    }
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatch001
+  * @tc.desc: Check for illegal parameters.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerDeleteBatch001, TestSize.Level1)
+{
+    g_mgr.GetKvStore("distributed_SingleVerDeleteBatch_001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step1. Create and construct a set of vector <Entry>, containing a total of 10 data keys1 ~ 10,
+     *  Value1 ~ 10, and call Putbatch interface to insert data.
+     * @tc.expected: step1. PutBatch successfully.
+     */
+    vector<Entry> entries;
+    vector<Key> keys;
+    vector<Value> values;
+    Value valueRead;
+    CreatEntrys(BATCH_PRESET_SIZE_TEST, keys, values, entries);
+    vector<Entry> entrysBase = entries;
+    vector<Key> keysBase = keys;
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysBase), OK);
+    /**
+     * @tc.steps: step2. Use Get to check data in database.
+     * @tc.expected: step2. Get value1~10 by key1~10 successfully.
+     */
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
+    }
+    /**
+     * @tc.steps: step3. Use DeleteBatch interface to transfer 10 + 119 extra keys (total 129).
+     * @tc.expected: step3. Return INVALID_ARGS.
+     */
+    CreatEntrys(DBConstant::MAX_BATCH_SIZE + 1, keys, values, entries);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), INVALID_ARGS);
+    /**
+     * @tc.steps: step4. Use Get to check data in database.
+     * @tc.expected: step4. Key1~10 still in database.
+     */
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
+    }
+    /**
+     * @tc.steps: step5. Use the DeleteBatch interface to pass in 10 included
+     *  keys6 ~ 10 + 123 additional key values ​​(128 in total).
+     * @tc.expected: step5. DeleteBatch OK.
+     */
+    CreatEntrys(DBConstant::MAX_BATCH_SIZE + DIVIDE_BATCH_PRESET_SIZE, keys, values, entries);
+    keys.erase(keys.begin(), keys.begin() + DIVIDE_BATCH_PRESET_SIZE);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), OK);
+    /**
+     * @tc.steps: step6. Use Get to check key1~10 in database.
+     * @tc.expected: step6. Key1~5 in database, key6~10 have been deleted.
+     */
+    for (size_t i = 0; i < DIVIDE_BATCH_PRESET_SIZE; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
+    }
+    for (size_t i = DIVIDE_BATCH_PRESET_SIZE; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), NOT_FOUND);
+    }
+    /**
+     * @tc.steps: step7. Repeat Putbatch key1~10, value1~10.
+     * @tc.expected: step7. Return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysBase), OK);
+
+    Key illegalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(illegalKey, DBConstant::MAX_KEY_SIZE + 1); // 1K + 1
+    keysBase.push_back(illegalKey);
+    /**
+     * @tc.steps: step8. Use DeleteBatch interface to pass in 10 + 1(larger than 1K) keys.
+     * @tc.expected: step8. Return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysBase), INVALID_ARGS);
+    /**
+     * @tc.steps: step9. Use Get to check key1~10 in database.
+     * @tc.expected: step9. Delete those data failed.
+     */
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
+    }
+    /**
+     * @tc.steps: step10. Use DeleteBatch interface to pass in 10(in database) + 1 valid keys.
+     * @tc.expected: step10. Delete those data successfully.
+     */
+    keysBase.back().erase(keysBase.back().begin(), keysBase.back().begin() + 1);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysBase), OK);
+    /**
+     * @tc.steps: step11. Check data.
+     * @tc.expected: step11. DeleteBatch successfully.
+     */
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), NOT_FOUND);
+    }
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerDeleteBatch_001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatch002
+  * @tc.desc: Check normal delete batch ability.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTQ8
+  * @tc.author: sunpeng
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerDeleteBatch002, TestSize.Level1)
+{
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_002", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step1. Create a group of vector <Entry>, containing a total of 10 data keys1 ~ 10, Value1 ~ 10,
+     *  call the Putbatch interface to insert data.
+     * @tc.expected: step1. Insert to database successfully.
+     */
+    vector<Entry> entries;
+    vector<Key> keysBase;
+    vector<Value> values;
+    CreatEntrys(BATCH_PRESET_SIZE_TEST, keysBase, values, entries);
+
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entries), OK);
+    /**
+     * @tc.steps: step2. Check data.
+     * @tc.expected: step2. Get key1~10 successfully.
+     */
+    Value valueRead;
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keysBase[i], valueRead), OK);
+    }
+    /**
+     * @tc.steps: step3. DeleteBatch key1~5.
+     * @tc.expected: step3. Return OK.
+     */
+    vector<Key> keys(keysBase.begin(), keysBase.begin() + DIVIDE_BATCH_PRESET_SIZE);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), OK);
+    /**
+     * @tc.steps: step4. Check key1~10.
+     * @tc.expected: step4. Key1~5 deleted, key6~10 existed.
+     */
+    for (size_t i = 0; i < DIVIDE_BATCH_PRESET_SIZE; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keysBase[i], valueRead), NOT_FOUND);
+    }
+    for (size_t i = DIVIDE_BATCH_PRESET_SIZE; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keysBase[i], valueRead), OK);
+    }
+    /**
+     * @tc.steps: step5. DeleteBatch key1~10.
+     * @tc.expected: step5. Return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysBase), OK);
+    /**
+     * @tc.steps: step6. Check key1~10.
+     * @tc.expected: step6. Key1~10 deleted successfully.
+     */
+    for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(keysBase[i], valueRead), NOT_FOUND);
+    }
+    /**
+     * @tc.steps: step7. DeleteBatch key1~10 once again.
+     * @tc.expected: step7. Return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysBase), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_002"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatchObserver001
+  * @tc.desc: Test the observer function of PutBatch() interface.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatchObserver001, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_SingleVerPutBatchObserver_001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register the non-null observer for the special key.
+     * @tc.expected: step2. Register results OK.
+     */
+    Key key;
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
+    // register same observer twice will return already_set
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), ALREADY_SET);
+    /**
+     * @tc.steps:step3. Put batch data.
+     * @tc.expected: step3. Returns OK.
+     */
+    vector<Entry> entrysBase;
+    vector<Key> keysBase;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST + 1, entrysBase, keysBase);
+
+    vector<Entry> entries(entrysBase.begin(), entrysBase.end() - 1);
+    EXPECT_EQ(entries.size(), 10UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entries), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entries, observer->GetEntriesInserted()));
+    /**
+     * @tc.steps:step4. Delete the batch data.
+     * @tc.expected: step4. Returns OK.
+     */
+    vector<Key> keys(keysBase.begin() + 5, keysBase.end());
+    EXPECT_EQ(keys.size(), 6UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    vector<Entry> entrysDel(entrysBase.begin() + 5, entrysBase.end() - 1);
+    EXPECT_EQ(entrysDel.size(), 5UL);
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrysDel, observer->GetEntriesDeleted()));
+    /**
+     * @tc.steps:step5. UnRegister the observer.
+     * @tc.expected: step5. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step6. Close the kv store.
+     * @tc.expected: step6. Results OK and delete successfully.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatchObserver002
+  * @tc.desc: Test the observer function of PutBatch() for invalid input.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatchObserver002, TestSize.Level4)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_SingleVerPutBatchObserver_002", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register the non-null observer for the special key.
+     * @tc.expected: step2. Register results OK.
+     */
+    Key key;
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
+    /**
+     * @tc.steps:step3. Put 129 batch data.
+     * @tc.expected: step3. Returns INVALID_ARGS.
+     */
+    vector<Entry> entrys1;
+    vector<Key> keys1;
+    DistributedDBUnitTest::GenerateRecords(DBConstant::MAX_BATCH_SIZE + 1, entrys1, keys1);
+
+    EXPECT_EQ(entrys1.size(), 129UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), INVALID_ARGS);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(observer->GetEntriesInserted().empty());
+    /**
+     * @tc.steps:step4. Put invalid batch data.
+     * @tc.expected: step4. Returns INVALID_ARGS.
+     */
+    vector<Entry> entrys2;
+    vector<Key> keys2;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys2, keys2);
+    EXPECT_EQ(entrys2.size(), 10UL);
+
+    vector<Entry> entrysInvalid;
+    vector<Key> keysInvalid;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrysInvalid, keysInvalid,
+        DBConstant::MAX_KEY_SIZE + 10);
+    EXPECT_EQ(entrysInvalid.size(), 10UL);
+    entrys2[0].key = entrysInvalid[0].key;
+
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys2), INVALID_ARGS);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(observer->GetEntriesInserted().empty());
+    /**
+     * @tc.steps:step5. Put MAX valid value batch data.
+     * @tc.expected: step5. Returns OK.
+     */
+    vector<Entry> entrys3;
+    vector<Key> keys3;
+
+    DistributedDBUnitTest::GenerateRecords(DBConstant::MAX_BATCH_SIZE, entrys3, keys3);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys3), OK);
+    LOGD("sleep begin");
+    // sleep 20 seconds
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME * 10));
+    LOGD("sleep end");
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrys3, observer->GetEntriesInserted()));
+    /**
+     * @tc.steps:step6. UnRegister the observer.
+     * @tc.expected: step6. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step7. Close the kv store.
+     * @tc.expected: step7. Results OK and delete successfully.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_002"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatchObserver003
+  * @tc.desc: Test the observer function of PutBatch() update function.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatchObserver003, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_SingleVerPutBatchObserver_003", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register the non-null observer for the special key.
+     * @tc.expected: step2. Register results OK.
+     */
+    Key key;
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
+    /**
+     * @tc.steps:step3. Put batch data.
+     * @tc.expected: step3. Returns OK.
+     */
+    vector<Entry> entrysAdd;
+    vector<Key> keysAdd;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrysAdd, keysAdd);
+
+    EXPECT_EQ(entrysAdd.size(), 10UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysAdd), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrysAdd, observer->GetEntriesInserted()));
+    /**
+     * @tc.steps:step4. Update the batch data.
+     * @tc.expected: step4. Returns OK.
+     */
+    vector<Entry> entrysUpdate;
+    vector<Key> keysUpdate;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrysUpdate, keysUpdate, DEFAULT_KEY_VALUE_SIZE,
+        DEFAULT_KEY_VALUE_SIZE + 10);
+
+    EXPECT_EQ(entrysUpdate.size(), 10UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysUpdate), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrysUpdate, observer->GetEntriesUpdated()));
+    /**
+     * @tc.steps:step5. UnRegister the observer.
+     * @tc.expected: step5. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step6. Close the kv store.
+     * @tc.expected: step6. Results OK and delete successfully.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_003"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatchObserver004
+  * @tc.desc: Test the observer function of PutBatch(), same keys handle.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerPutBatchObserver004, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_SingleVerPutBatchObserver_004", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register the non-null observer for the special key.
+     * @tc.expected: step2. Register results OK.
+     */
+    Key key;
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
+    /**
+     * @tc.steps:step3. Put batch data.
+     * @tc.expected: step3. Returns OK.
+     */
+    vector<Entry> entrys1;
+    vector<Key> keys1;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys1, keys1);
+    vector<Entry> entrys2;
+    vector<Key> keys2;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys2, keys2, DEFAULT_KEY_VALUE_SIZE,
+        DEFAULT_KEY_VALUE_SIZE + 10);
+    entrys1.insert(entrys1.end(), entrys2.begin(), entrys2.end());
+
+    EXPECT_EQ(entrys1.size(), 20UL);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrys2, observer->GetEntriesInserted()));
+    EXPECT_EQ(observer->GetEntriesUpdated().size(), 0UL);
+
+    vector<Entry> entrys3;
+    vector<Key> keys3;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys3, keys3, DEFAULT_KEY_VALUE_SIZE,
+        DEFAULT_KEY_VALUE_SIZE + 20);
+    vector<Entry> entrys4;
+    vector<Key> keys4;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys4, keys4, DEFAULT_KEY_VALUE_SIZE,
+        DEFAULT_KEY_VALUE_SIZE + 30);
+    entrys3.insert(entrys3.end(), entrys4.begin(), entrys4.end());
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys3), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrys4, observer->GetEntriesUpdated()));
+    EXPECT_EQ(observer->GetEntriesInserted().size(), 0UL);
+
+    /**
+     * @tc.steps:step4. UnRegister the observer.
+     * @tc.expected: step4. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step5. Close the kv store.
+     * @tc.expected: step5. Results OK and delete successfully.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_004"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatchObserver001
+  * @tc.desc: Test the observer function of DeleteBatch() interface.
+  * @tc.type: FUNC
+  * @tc.require: AR000DPTTA
+  * @tc.author: wumin
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerDeleteBatchObserver001, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("distributed_SingleVerDeleteBatchObserver_001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    KvStoreObserverUnitTest *observer = new (std::nothrow) KvStoreObserverUnitTest;
+    ASSERT_TRUE(observer != nullptr);
+    /**
+     * @tc.steps:step2. Register the non-null observer for the special key.
+     * @tc.expected: step2. Register results OK.
+     */
+    Key key;
+    EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
+    /**
+     * @tc.steps:step3. Put batch data.
+     * @tc.expected: step3. Returns OK.
+     */
+    vector<Entry> entries;
+    vector<Key> keys;
+    DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entries, keys);
+    EXPECT_EQ(entries.size(), 10UL);
+
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entries), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entries, observer->GetEntriesInserted()));
+    /**
+     * @tc.steps:step4. Delete the batch data.
+     * @tc.expected: step4. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
+    EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entries, observer->GetEntriesDeleted()));
+    /**
+     * @tc.steps:step5. UnRegister the observer.
+     * @tc.expected: step5. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
+    delete observer;
+    observer = nullptr;
+    /**
+     * @tc.steps:step6. Close the kv store.
+     * @tc.expected: step6. Results OK and delete successfully.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerDeleteBatchObserver_001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerGetSecurityOption001
+  * @tc.desc: Test GetSecurityOption interface for the single ver database.
+  * @tc.type: FUNC
+  * @tc.require: AR000EV1G2
+  * @tc.author: liuwenkai
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerGetSecurityOption001, TestSize.Level1)
+{
+    SecurityOption savedOption;
+    std::shared_ptr<IProcessSystemApiAdapter> adapter = std::make_shared<ProcessSystemApiAdapterImpl>();
+    EXPECT_TRUE(adapter);
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(adapter);
+    KvStoreNbDelegate::Option option;
+    option.storageEngineType = GAUSSDB_RD;
+
+    /**
+     * @tc.steps:step1. Create databases without securityOption.
+     * @tc.expected: step2. Returns a non-null kvstore but can not get SecurityOption.
+     */
+    g_mgr.GetKvStore("SingleVerGetSecurityOption001", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    EXPECT_TRUE(g_kvNbDelegatePtr->GetSecurityOption(savedOption) == OK);
+    EXPECT_TRUE(savedOption.securityLabel == 0);
+    EXPECT_TRUE(savedOption.securityFlag == 0);
+    KvStoreNbDelegate *kvNbDelegatePtr1 = g_kvNbDelegatePtr;
+
+    /**
+     * @tc.steps:step2. Create databases with new securityOption(Check ignore the new option).
+     * @tc.expected: step2. Returns non-null kvstore.
+     */
+    option.secOption.securityLabel = S3;
+    option.secOption.securityFlag = 1;
+    g_mgr.GetKvStore("SingleVerGetSecurityOption001", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    EXPECT_TRUE(g_kvNbDelegatePtr->GetSecurityOption(savedOption) == OK);
+    EXPECT_TRUE(savedOption.securityLabel == 0);
+    EXPECT_TRUE(savedOption.securityFlag == 0);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(kvNbDelegatePtr1), OK);
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    g_kvNbDelegatePtr = nullptr;
+    EXPECT_TRUE(g_mgr.DeleteKvStore("SingleVerGetSecurityOption001") == OK);
+}
+
+/**
+  * @tc.name: SingleVerGetSecurityOption002
+  * @tc.desc: Test GetSecurityOption interface for the single ver database.
+  * @tc.type: FUNC
+  * @tc.require: AR000EV1G2
+  * @tc.author: liuwenkai
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, SingleVerGetSecurityOption002, TestSize.Level1)
+{
+    SecurityOption savedOption;
+    std::shared_ptr<IProcessSystemApiAdapter> adapter = std::make_shared<ProcessSystemApiAdapterImpl>();
+    EXPECT_TRUE(adapter != nullptr);
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(adapter);
+    KvStoreNbDelegate::Option option;
+    option.storageEngineType = GAUSSDB_RD;
+
+    /**
+     * @tc.steps:step1. Create databases with securityOption.
+     * @tc.expected: step2. Returns a non-null kvstore and get right SecurityOption.
+     */
+    option.secOption.securityLabel = S3;
+    option.secOption.securityFlag = 1;
+    g_mgr.GetKvStore("SingleVerGetSecurityOption002", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    EXPECT_TRUE(g_kvNbDelegatePtr->GetSecurityOption(savedOption) == OK);
+    EXPECT_TRUE(savedOption.securityLabel == S3);
+    EXPECT_TRUE(savedOption.securityFlag == 1);
+    KvStoreNbDelegate *kvNbDelegatePtr1 = g_kvNbDelegatePtr;
+
+    /**
+     * @tc.steps:step2. Create databases without securityOption.
+     * @tc.expected: step2. Returns a non-null kvstore and get right SecurityOption.
+     */
+    option.secOption.securityLabel = 0;
+    option.secOption.securityFlag = 0;
+    g_mgr.GetKvStore("SingleVerGetSecurityOption002", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    EXPECT_TRUE(g_kvNbDelegatePtr->GetSecurityOption(savedOption) == OK);
+    EXPECT_TRUE(savedOption.securityLabel == S3);
+    EXPECT_TRUE(savedOption.securityFlag == 1);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(kvNbDelegatePtr1), OK);
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    g_kvNbDelegatePtr = nullptr;
+    EXPECT_TRUE(g_mgr.DeleteKvStore("SingleVerGetSecurityOption002") == OK);
+}
+
+/**
+ * @tc.name: MaxLogSize001
+ * @tc.desc: Test the pragma cmd of the max log size limit.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: wangbingquan
+ */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, MaxLogSize001, TestSize.Level2)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("MaxLogSize001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Setting the max log limit for the valid value.
+     * @tc.expected: step2. Returns NOT_SUPPORT.
+     */
+    uint64_t logSize = DBConstant::MAX_LOG_SIZE_HIGH;
+    PragmaData pragLimit = static_cast<PragmaData>(&logSize);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+
+    logSize = DBConstant::MAX_LOG_SIZE_LOW;
+    pragLimit = static_cast<PragmaData>(&logSize);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+
+    logSize = 10 * 1024 * 1024; // 10M
+    pragLimit = static_cast<PragmaData>(&logSize);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+
+    /**
+     * @tc.steps:step3. Setting the max log limit for the invalid value.
+     * @tc.expected: step3. Returns INLIVAD_ARGS.
+     */
+    logSize = DBConstant::MAX_LOG_SIZE_HIGH + 1;
+    pragLimit = static_cast<PragmaData>(&logSize);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+
+    logSize = DBConstant::MAX_LOG_SIZE_LOW - 1;
+    pragLimit = static_cast<PragmaData>(&logSize);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    g_kvNbDelegatePtr = nullptr;
+    EXPECT_TRUE(g_mgr.DeleteKvStore("MaxLogSize001") == OK);
+}
+
+/**
+ * @tc.name: ForceCheckpoint002
+ * @tc.desc: Test the checkpoint of the database.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: wangbingquan
+ */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, MaxLogSize002, TestSize.Level2)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("MaxLogSize002", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Put the random entry into the database.
+     * @tc.expected: step2. Returns OK.
+     */
+    Key key;
+    Value value;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(key, 30); // for 30B random key
+    DistributedDBToolsUnitTest::GetRandomKeyValue(value, 1024); // 1M value
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(key, value), OK);
+    DistributedDBToolsUnitTest::GetRandomKeyValue(key, 40); // for 40B random key
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(key, value), OK);
+
+    DistributedDBToolsUnitTest::GetRandomKeyValue(key, 20); // for 20B random key
+    DistributedDBToolsUnitTest::GetRandomKeyValue(value, 30); // 30B
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(key, value), OK);
+
+    /**
+     * @tc.steps:step3. Get the resultset.
+     * @tc.expected: step3. Returns OK.
+     */
+    KvStoreResultSet *resultSet = nullptr;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(Key{}, resultSet), OK);
+    ASSERT_NE(resultSet, nullptr);
+    EXPECT_EQ(resultSet->GetCount(), 3); // size of all the entries is 3
+    EXPECT_EQ(resultSet->MoveToFirst(), true);
+
+    /**
+     * @tc.steps:step4. Put more data into the database.
+     * @tc.expected: step4. Returns OK.
+     */
+    uint64_t logSize = 6 * 1024 * 1024; // 6M for initial test.
+    PragmaData pragLimit = static_cast<PragmaData>(&logSize);
+    // rd pragma only support checkpoint only
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(SET_MAX_LOG_LIMIT, pragLimit), NOT_SUPPORT);
+
+    g_kvNbDelegatePtr->CloseResultSet(resultSet);
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("MaxLogSize002"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+ * @tc.name: MaxLogCheckPoint001
+ * @tc.desc: Pragma the checkpoint command.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: wangbingquan
+ */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, MaxLogCheckPoint001, TestSize.Level2)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("MaxLogCheckPoint001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Put the random entry into the database.
+     * @tc.expected: step2. Returns OK.
+     */
+    Key key;
+    Value value;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(key, 30); // for 30B random key(different size)
+    DistributedDBToolsUnitTest::GetRandomKeyValue(value, 1 * 1024); // 1M
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(key, value), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Delete(key), OK);
+
+    /**
+     * @tc.steps:step3. Get the disk file size, execute the checkpoint and get the disk file size.
+     * @tc.expected: step3. Returns DB_ERROR because of Getting file size is not currently supported
+     */
+    int param = 0;
+    PragmaData paraData = static_cast<PragmaData>(&param);
+    EXPECT_EQ(g_kvNbDelegatePtr->Pragma(EXEC_CHECKPOINT, paraData), OK);
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("MaxLogCheckPoint001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: OpenStorePathCheckTest001
+  * @tc.desc: Test open store with same label but different path.
+  * @tc.type: FUNC
+  * @tc.require: AR000GK58F
+  * @tc.author: lianhuix
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, OpenStorePathCheckTest001, TestSize.Level1)
+{
+    std::string dir1 = g_testDir + "/dbDir1";
+    EXPECT_EQ(OS::MakeDBDirectory(dir1), E_OK);
+    std::string dir2 = g_testDir + "/dbDir2";
+    EXPECT_EQ(OS::MakeDBDirectory(dir2), E_OK);
+
+    KvStoreDelegateManager mgr1(APP_ID, USER_ID);
+    mgr1.SetKvStoreConfig({dir1});
+
+    KvStoreNbDelegate *delegate1 = nullptr;
+    auto callback1 = bind(&DistributedDBToolsUnitTest::KvStoreNbDelegateCallback, placeholders::_1,
+        placeholders::_2, std::ref(g_kvDelegateStatus), std::ref(delegate1));
+
+    mgr1.GetKvStore(STORE_ID_1, g_option, callback1);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+    ASSERT_NE(delegate1, nullptr);
+
+    KvStoreNbDelegate *delegate2 = nullptr;
+    auto callback2 = bind(&DistributedDBToolsUnitTest::KvStoreNbDelegateCallback, placeholders::_1,
+        placeholders::_2, std::ref(g_kvDelegateStatus), std::ref(delegate2));
+    KvStoreDelegateManager mgr2(APP_ID, USER_ID);
+    mgr2.SetKvStoreConfig({dir2});
+    mgr2.GetKvStore(STORE_ID_1, g_option, callback2);
+    EXPECT_EQ(g_kvDelegateStatus, INVALID_ARGS);
+    ASSERT_EQ(delegate2, nullptr);
+
+    mgr1.CloseKvStore(delegate1);
+    mgr1.DeleteKvStore(STORE_ID_1);
+    mgr2.CloseKvStore(delegate2);
+    mgr2.DeleteKvStore(STORE_ID_1);
+}
+
+/**
+ * @tc.name: GetKeys001
+ * @tc.desc: Test get keys from the database.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, GetKeys001, TestSize.Level1)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("GetKeys001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Put the all keys into the database.
+     * @tc.expected: step2. Returns OK.
+     */
+    std::vector<Key> expectKeys = {
+            {'k', '1', '1'},
+            {'k', '2'},
+            {'k', '3'},
+            {'k', '4'}
+    };
+    for (const auto &key : expectKeys) {
+        EXPECT_EQ(g_kvNbDelegatePtr->Put(key, key), OK);
+    }
+    EXPECT_EQ(g_kvNbDelegatePtr->Put({'k', '2'}, {'k', '2'}), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Delete({'k', '4'}), OK);
+
+    /**
+     * @tc.steps:step3. Get the all keys.
+     * @tc.expected: step3. Returns OK.
+     */
+    Key keyPrefix = {'k', '1'};
+    std::vector<Key> actualKeys;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetKeys(keyPrefix, actualKeys), NOT_SUPPORT);
+    EXPECT_EQ(actualKeys.size(), 0u); // get the k11, but now not support, so it is 0 for now
+    for (const auto &key : actualKeys) {
+        EXPECT_EQ(key, expectKeys[0]);
+    }
+    keyPrefix.clear();
+    EXPECT_EQ(g_kvNbDelegatePtr->GetKeys(keyPrefix, actualKeys), NOT_SUPPORT);
+    EXPECT_EQ(actualKeys.size(), 0u); // size of all the key is 3, but now not support, so it is 0 for now
+
+    keyPrefix = {'k', '4'};
+    EXPECT_EQ(g_kvNbDelegatePtr->GetKeys(keyPrefix, actualKeys), NOT_SUPPORT);
+    EXPECT_EQ(actualKeys.size(), 0u); // not found key and size is 0
+
+    DistributedDBToolsUnitTest::GetRandomKeyValue(keyPrefix, 2048); // for 2048B random key
+    EXPECT_EQ(g_kvNbDelegatePtr->GetKeys(keyPrefix, actualKeys), NOT_SUPPORT);
+    EXPECT_EQ(actualKeys.size(), 0u); // invalid prefix key and size is 0
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("GetKeys001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: TimeChangeWithCloseStoreTest001
+  * @tc.desc: Test close store with time changed
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: lianhuix
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, TimeChangeWithCloseStoreTest001, TestSize.Level3)
+{
+    KvStoreDelegateManager mgr(APP_ID, USER_ID);
+    mgr.SetKvStoreConfig(g_config);
+
+    std::atomic<bool> isFinished(false);
+
+    std::vector<std::thread> slowThreads;
+    for (int i = 0; i < 10; i++) { // 10: thread to slow donw system
+        std::thread th([&isFinished]() {
+            while (!isFinished) {
+                // pass
+            }
+        });
+        slowThreads.emplace_back(std::move(th));
+    }
+
+    std::thread th([&isFinished]() {
+        int timeChangedCnt = 0;
+        while (!isFinished.load()) {
+            OS::SetOffsetBySecond(100 - timeChangedCnt++ * 2); // 100 2 : fake system time change
+            std::this_thread::sleep_for(std::chrono::milliseconds(100)); // 100: wait for a while
+        }
+    });
+
+    for (int i = 0; i < 100; i++) { // run 100 times
+        mgr.GetKvStore(STORE_ID_1, g_option, g_kvNbDelegateCallback);
+        ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+        EXPECT_EQ(g_kvDelegateStatus, OK);
+        EXPECT_EQ(mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+        g_kvNbDelegatePtr = nullptr;
+    }
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(1000)); // 1000: wait for a while
+    isFinished.store(true);
+    th.join();
+    for (auto &it : slowThreads) {
+        it.join();
+    }
+    EXPECT_EQ(mgr.DeleteKvStore(STORE_ID_1), OK);
+}
+
+/**
+  * @tc.name: TimeChangeWithCloseStoreTest002
+  * @tc.desc: Test close store with time changed
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, TimeChangeWithCloseStoreTest002, TestSize.Level3)
+{
+    KvStoreDelegateManager mgr(APP_ID, USER_ID);
+    mgr.SetKvStoreConfig(g_config);
+
+    mgr.GetKvStore(STORE_ID_1, g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+    const int threadPoolMax = 10;
+    for (int i = 0; i < threadPoolMax; ++i) {
+        (void) RuntimeContext::GetInstance()->ScheduleTask([]() {
+            std::this_thread::sleep_for(std::chrono::seconds(10)); // sleep 10s for block thread pool
+        });
+    }
+    OS::SetOffsetBySecond(100); // 100 2 : fake system time change
+    std::this_thread::sleep_for(std::chrono::seconds(1)); // sleep 1s for time tick
+
+    EXPECT_EQ(mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    g_kvNbDelegatePtr = nullptr;
+
+    EXPECT_EQ(mgr.DeleteKvStore(STORE_ID_1), OK);
+    RuntimeContext::GetInstance()->StopTaskPool(); // stop all async task
+}
+
+/**
+  * @tc.name: TimeChangeWithCloseStoreTest003
+  * @tc.desc: Test store close with timechange listener
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: zhangqiquan
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, TimeChangeWithCloseStoreTest003, TestSize.Level3)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("TimeChangeWithCloseStoreTest003", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    std::shared_ptr<bool> timeChange = std::make_shared<bool>(false);
+    int errCode = E_OK;
+    auto *listener = RuntimeContext::GetInstance()->RegisterTimeChangedLister([timeChange](void *) {
+        std::this_thread::sleep_for(std::chrono::seconds(10)); // block close store 10s
+        *timeChange = true;
+    }, nullptr, errCode);
+    /**
+     * @tc.steps:step2. Block time change 10s and trigger time change.
+     * @tc.expected: step2. close store cost time > 5s.
+     */
+    ASSERT_EQ(errCode, E_OK);
+    OS::SetOffsetBySecond(100); // 100 : fake system time change
+    std::this_thread::sleep_for(std::chrono::seconds(1)); // wait 1s for time change
+    Timestamp beginTime;
+    (void)OS::GetCurrentSysTimeInMicrosecond(beginTime);
+    ASSERT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    Timestamp endTime;
+    (void)OS::GetCurrentSysTimeInMicrosecond(endTime);
+    if (*timeChange) {
+        EXPECT_GE(static_cast<int>(endTime - beginTime), 5 * 1000 * 1000); // 5 * 1000 * 1000 = 5s
+    }
+    listener->Drop(true);
+    OS::SetOffsetBySecond(-100); // -100 : fake system time change
+    g_kvNbDelegatePtr = nullptr;
+    EXPECT_EQ(g_mgr.DeleteKvStore("TimeChangeWithCloseStoreTest003"), OK);
+}
+
+/**
+  * @tc.name: ResultSetLimitTest001
+  * @tc.desc: Get result set over limit
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: lianhuix
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, ResultSetLimitTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Create database.
+     * @tc.expected: step1. Returns a non-null kvstore.
+     */
+    g_mgr.GetKvStore("ResultSetLimitTest001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+
+    /**
+     * @tc.steps:step2. Put the random entry into the database.
+     * @tc.expected: step2. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(KEY_1, VALUE_1), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(KEY_2, VALUE_2), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(KEY_3, VALUE_3), OK);
+
+    /**
+     * @tc.steps:step3. Get the resultset overlimit.
+     * @tc.expected: step3. In limit returns OK, else return OVER_MAX_LIMITS.
+     */
+    std::vector<KvStoreResultSet *> dataResultSet;
+    for (int i = 0; i < 8; i++) { // 8: max result set count
+        KvStoreResultSet *resultSet = nullptr;
+        EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(Key{}, resultSet), OK);
+        dataResultSet.push_back(resultSet);
+        EXPECT_NE(resultSet, nullptr);
+    }
+
+    KvStoreResultSet *resultSet = nullptr;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(Key{}, resultSet), OVER_MAX_LIMITS);
+    EXPECT_EQ(resultSet, nullptr);
+    if (resultSet != nullptr) {
+        EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    }
+
+    /**
+     * @tc.steps:step4. Close result set and store.
+     * @tc.expected: step4. Returns OK.
+     */
+    for (auto it : dataResultSet) {
+        EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(it), OK);
+    }
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("ResultSetLimitTest001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+void GetDataFromDatabase()
+{
+    int successTime = 0;
+    for (size_t i = 0; i < 1000; i++) { // cycle 1000 times.
+        Value value;
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(KEY_1, value), OK);
+        EXPECT_EQ(value, VALUE_1);
+        successTime += 1;
+    }
+    LOGD("Succeed times is %d", successTime);
+}
+
+void FreqGet001()
+{
+    /**
+     * @tc.steps:step1. Get KV store connection as well as putting an entry (KEY_1, VALUE_1)
+     * @tc.expected: step1. Returns OK.
+     */
+    g_mgr.GetKvStore("FreqGet001", g_option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(KEY_1, VALUE_1), OK);
+    /**
+     * @tc.steps:step2. multiple threads tring to get the entry
+     * @tc.expected: step2. Returns OK.
+     */
+    std::thread t1(GetDataFromDatabase);
+    std::thread t2(GetDataFromDatabase);
+    std::thread t3(GetDataFromDatabase);
+    std::thread t4(GetDataFromDatabase);
+    t1.join();
+    t2.join();
+    t3.join();
+    t4.join();
+    /**
+     * @tc.steps:step3. Close and delete KV store
+     * @tc.expected: step3. Returns OK.
+     */
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("FreqGet001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: FreqGet001
+  * @tc.desc: Open and close the kv store concurrently.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: wanyi
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, FreqGet001, TestSize.Level2)
+{
+    ASSERT_NO_FATAL_FAILURE(FreqGet001());
+}
+
+void PutRangeDataIntoDB()
+{
+    for (int i = 0; i < 6; i++) { // 6 is the number of data inserted
+        std::vector<uint8_t> keyTemp;
+        std::vector<uint8_t> valTemp;
+        keyTemp.push_back('0' + i);
+        valTemp.push_back('0' + i);
+        Entry entryTmp;
+        entryTmp.key = keyTemp;
+        entryTmp.value = valTemp;
+        EXPECT_EQ(g_kvNbDelegatePtr->Put(entryTmp.key, entryTmp.value), OK);
+    }
+}
+
+/**
+  * @tc.name: RdRangeQuery001
+  * @tc.desc: Test GetEntries and the out of the parameter is entries.
+  * @tc.type: FUNC
+  * @tc.require: AR.SR.IR20230714002092.017.001
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery001, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate, and put key {'0'}, {'1'}, {'2'}, {'3'}, {'4'}, {'5'} into db.
+     * @tc.expected: step1. Get results OK and non-null delegate, put data into db successfully.
+     */
+    g_mgr.GetKvStore("RdRangeQuery001", g_option, g_kvNbDelegateCallback);
+    ASSERT_NE(g_kvNbDelegatePtr, nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+
+    PutRangeDataIntoDB();
+
+    /**
+     * @tc.steps: step2. Use range query conditions to obtain the dataset and check the dataset
+     * @tc.expected: step2. The expected data are 2, 3, 4.
+     */
+    Query query1 = Query::Select().Range({'2'}, {'4'});
+    std::vector<Entry> entries;
+    int ret = g_kvNbDelegatePtr->GetEntries(query1, entries);
+    EXPECT_EQ(entries.size(), 3u);
+    int targetKey = 2; // 2 is the initial key that is expected to be found
+    for (auto item : entries) {
+        std::string keyStr(item.key.begin(), item.key.end());
+        EXPECT_EQ(to_string(targetKey), keyStr);
+        targetKey++;
+    }
+
+    /**
+     * @tc.steps: step3. Use range query conditions to obtain the dataset and check the dataset
+     * @tc.expected: step3. The expected data are 0, 1, 2, 3, 4.
+     */
+    Query query2 = Query::Select().Range({}, {'4'});
+    ret = g_kvNbDelegatePtr->GetEntries(query2, entries);
+    EXPECT_EQ(entries.size(), 5u);
+    targetKey = 0; // 0 is the initial key that is expected to be found
+    for (auto item : entries) {
+        std::string keyStr(item.key.begin(), item.key.end());
+        EXPECT_EQ(to_string(targetKey), keyStr);
+        targetKey++;
+    }
+
+    /**
+     * @tc.steps: step4. Use range query conditions to obtain the dataset and check the dataset
+     * @tc.expected: step4. The expected data are 2, 3, 4, 5.
+     */
+    Query query3 = Query::Select().Range({'2'}, {});
+    ret = g_kvNbDelegatePtr->GetEntries(query3, entries);
+    EXPECT_EQ(entries.size(), 4u);
+    targetKey = 2; // 2 is the initial key that is expected to be found
+    for (auto item : entries) {
+        std::string keyStr(item.key.begin(), item.key.end());
+        EXPECT_EQ(to_string(targetKey), keyStr);
+        targetKey++;
+    }
+
+    /**
+     * @tc.steps:step5. Close and delete KV store
+     * @tc.expected: step5. Returns OK.
+     */
+    g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+    EXPECT_EQ(g_mgr.DeleteKvStore("RdRangeQuery001"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+void ChkRangeResultSet(KvStoreResultSet *resultSet, int beginNum, int EndNum)
+{
+    while (resultSet->MoveToNext()) {
+        Entry entryValue;
+        EXPECT_EQ(resultSet->GetEntry(entryValue), OK);
+        std::string keyStr(entryValue.value.begin(), entryValue.value.end());
+        EXPECT_EQ(to_string(beginNum), keyStr);
+        beginNum++;
+    }
+    EXPECT_EQ(beginNum, EndNum + 1);
+    EXPECT_EQ(resultSet->MoveToNext(), false);
+}
+
+/**
+  * @tc.name: RdRangeQuery002
+  * @tc.desc:Test GetEntries and the out of the parameter is resultSet.
+  * @tc.type: FUNC
+  * @tc.require: AR.SR.IR20230714002092.017.001
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate,  and put key {'0'}, {'1'}, {'2'}, {'3'}, {'4'}, {'5'} into db.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("RdRangeQuery002", g_option, g_kvNbDelegateCallback);
+    ASSERT_NE(g_kvNbDelegatePtr, nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+    PutRangeDataIntoDB();
+
+    /**
+     * @tc.steps: step2. Use range query conditions to obtain the resultset and check the resultset
+     * @tc.expected: step2. The expected data are 2, 3, 4.
+     */
+    Query fullQuery = Query::Select().Range({'2'}, {'4'});
+    KvStoreResultSet *resultSet = nullptr;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    int beginTargetKey = 2; // 2 is the initial key that is expected to be found
+    int endTargetKey = 4; // 4 is the end key that is expected to be found
+    ChkRangeResultSet(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step3. Use range query conditions to obtain the resultset and check the resultset
+     * @tc.expected: step3. The expected data are 0, 1, 2, 3, 4.
+     */
+    Query fullQuery2 = Query::Select().Range({}, {'4'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery2, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    beginTargetKey = 0; // 0 is the initial key that is expected to be found
+    endTargetKey = 4; // 4 is the end key that is expected to be found
+    ChkRangeResultSet(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step4. Use range query conditions to obtain the resultset and check the resultset
+     * @tc.expected: step4. The expected data are 2, 3, 4, 5.
+     */
+    Query fullQuery3 = Query::Select().Range({'2'}, {});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery3, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    beginTargetKey = 2; // 2 is the initial key that is expected to be found
+    endTargetKey = 5; // 5 is the end key that is expected to be found
+    ChkRangeResultSet(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step5. Use range query conditions to obtain the resultset and check the resultset
+     * @tc.expected: step5. The expected data are 0, 1, 2, 3, 4, 5.
+     */
+    Query fullQuery4 = Query::Select().Range({}, {});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery4, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    beginTargetKey = 0; // 0 is the initial key that is expected to be found
+    endTargetKey = 5; // 5 is the end key that is expected to be found
+    ChkRangeResultSet(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps:step5. Close and delete KV store
+     * @tc.expected: step5. Returns OK.
+     */
+    g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+    EXPECT_EQ(g_mgr.DeleteKvStore("RdRangeQuery002"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: RdRangeQuery003
+  * @tc.desc: Test GetEntries and the in put paramter is invalid.
+  * @tc.type: FUNC
+  * @tc.require: AR.SR.IR20230714002092.017.001
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery003, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    std::vector<Entry> entries;
+    g_mgr.GetKvStore("RdRangeQuery003", g_option, g_kvNbDelegateCallback);
+    ASSERT_NE(g_kvNbDelegatePtr, nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+
+    /**
+     * @tc.steps: step2. Use invalid range query conditions to obtain the resultset.
+     * @tc.expected: step2. return INVALID_ARGS.
+     */
+    KvStoreResultSet *resultSet = nullptr;
+    Query inValidQuery = Query::Select().Range({'2'}, {'4'}).Range({'1'}, {'6'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery, resultSet), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery, entries), INVALID_ARGS);
+
+    /**
+     * @tc.steps: step3. Use invalid range query conditions to obtain the resultset.
+     * @tc.expected: step3. return INVALID_ARGS.
+     */
+    Query inValidQuery2 = Query::Select().Range({'2'}, {'4'}).And();
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery2, resultSet), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery2, entries), INVALID_ARGS);
+
+    /**
+     * @tc.steps: step4. Use invalid range query key is longer than limit conditions to obtain the resultset.
+     * @tc.expected: step4. return INVALID_ARGS.
+     */
+    Key keyCan(1024, 'a');
+    Query ValidQuery3 = Query::Select().Range(keyCan, {'4'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(ValidQuery3, resultSet), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(ValidQuery3, entries), NOT_FOUND);
+
+    Key keyInvalid(1025, 'a');
+    Query inValidQuery4 = Query::Select().Range(keyInvalid, {'4'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery4, resultSet), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery4, entries), INVALID_ARGS);
+
+    /**
+     * @tc.steps:step5. Close and delete KV store
+     * @tc.expected: step5. Returns OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+    g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+    EXPECT_EQ(g_mgr.DeleteKvStore("RdRangeQuery003"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+void ChkRangeResultSetMoveFuc(KvStoreResultSet *resultSet, int beginNum, int endNum)
+{
+    EXPECT_EQ(resultSet->MoveToLast(), true);
+    Entry entryValue;
+    EXPECT_EQ(resultSet->GetEntry(entryValue), OK);
+    std::string keyStr(entryValue.value.begin(), entryValue.value.end());
+    EXPECT_EQ(to_string(endNum), keyStr);
+
+    while (resultSet->MoveToPrevious()) {
+        endNum--;
+        Entry entryValue2;
+        EXPECT_EQ(resultSet->GetEntry(entryValue2), OK);
+        std::string keyStr2(entryValue2.value.begin(), entryValue2.value.end());
+        EXPECT_EQ(to_string(endNum), keyStr2);
+    }
+    EXPECT_EQ(endNum, beginNum);
+    EXPECT_EQ(resultSet->MoveToPrevious(), false);
+}
+
+/**
+  * @tc.name: RdRangeQuery004
+  * @tc.desc: Test resultSet fuction.
+  * @tc.type: FUNC
+  * @tc.require: AR.SR.IR20230714002092.017.001
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery004, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate, and put key {'0'}, {'1'}, {'2'}, {'3'}, {'4'}, {'5'} into db.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("RdRangeQuery004", g_option, g_kvNbDelegateCallback);
+    ASSERT_NE(g_kvNbDelegatePtr, nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+
+    PutRangeDataIntoDB();
+    /**
+     * @tc.steps: step2. Use range query conditions to obtain the resultset and check the resultset move fuction.
+     * @tc.expected: step2. move founction is OK and the expected data are 2, 3, 4.
+     */
+    Query fullQuery = Query::Select().Range({'2'}, {'4'});
+    KvStoreResultSet *resultSet = nullptr;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    int beginTargetKey = 2; // 2 is the initial key that is expected to be found
+    int endTargetKey = 4;  // 4 is the end key that is expected to be found
+    ChkRangeResultSetMoveFuc(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step3. Use range query conditions to obtain the resultset and check the resultset move fuction.
+     * @tc.expected: step3. move founction is OK and the expected data are 0, 1, 2, 3, 4.
+     */
+    Query fullQuery2 = Query::Select().Range({}, {'4'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery2, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+
+    beginTargetKey = 0; // 0 is the initial key that is expected to be found
+    endTargetKey = 4;  // 4 is the end key that is expected to be found
+    ChkRangeResultSetMoveFuc(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step3. Use range query conditions to obtain the resultset and check the resultset move fuction.
+     * @tc.expected: step3. move founction is OK and the expected data are 2, 3, 4, 5.
+     */
+    Query fullQuery3 = Query::Select().Range({'2'}, {});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery3, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    beginTargetKey = 2; // 2 is the initial key that is expected to be found
+    endTargetKey = 5;  // 5 is the end key that is expected to be found
+    ChkRangeResultSetMoveFuc(resultSet, beginTargetKey, endTargetKey);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps:step5. Close and delete KV store
+     * @tc.expected: step5. Returns OK.
+     */
+    g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+    EXPECT_EQ(g_mgr.DeleteKvStore("RdRangeQuery004"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: RdRangeQuery005
+  * @tc.desc:Test resultSet fuction, end key is bigger or equal than the biggest data in DB.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery005, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. Get the nb delegate, and put key {'0'}, {'1'}, {'2'}, {'3'}, {'4'}, {'5'} into db.
+     * @tc.expected: step1. Get results OK and non-null delegate.
+     */
+    g_mgr.GetKvStore("RdRangeQuery005", g_option, g_kvNbDelegateCallback);
+    ASSERT_NE(g_kvNbDelegatePtr, nullptr);
+    EXPECT_EQ(g_kvDelegateStatus, OK);
+
+    PutRangeDataIntoDB();
+
+    /**
+     * @tc.steps: step2. Use range query conditions that end key equal with data in db, then move to next.
+     * @tc.expected: step2. move to next four times successfully.
+     */
+    Query fullQuery = Query::Select().Range({'2'}, {'5'});
+    KvStoreResultSet *resultSet = nullptr;
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    int beginTargetKey = 0; // 0 is the initial key that is expected to be found
+    while (resultSet->MoveToNext()) {
+        beginTargetKey++;
+    }
+    EXPECT_EQ(beginTargetKey, 4); // 4 is the end key that is expected to be found
+    EXPECT_EQ(resultSet->MoveToNext(), false);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step2. Use range query conditions that end key equal with data in db, then move to next.
+     * @tc.expected: step2. move to next four times successfully.
+     */
+    Query fullQuery2 = Query::Select().Range({'2'}, {'8'});
+    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery2, resultSet), OK);
+    EXPECT_NE(resultSet, nullptr);
+    beginTargetKey = 0; // 0 is the initial key that is expected to be found
+    while (resultSet->MoveToNext()) {
+        beginTargetKey++;
+    }
+    EXPECT_EQ(beginTargetKey, 4); // 4 is the end key that is expected to be found
+    EXPECT_EQ(resultSet->MoveToNext(), false);
+    EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK);
+    EXPECT_EQ(resultSet, nullptr);
+
+    /**
+     * @tc.steps:step5. Close and delete KV store
+     * @tc.expected: step5. Returns OK.
+     */
+    g_mgr.CloseKvStore(g_kvNbDelegatePtr);
+    EXPECT_EQ(g_mgr.DeleteKvStore("RdRangeQuery005"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+}
+#endif // USE_RD_KERNEL
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
index b80dcb107c5c75dfb66f497126ddef24940cb686..cb5594fd336874bfec51b571c61ab82fb8309523 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
@@ -792,11 +792,11 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch002, TestSize.L
     entrysOverSize.push_back(entryTemp);
     /**
      * @tc.steps: step2. PutBatch operates on four sets of data. and use get check the result of Vect3.
-     * @tc.expected: step2. Returns INVALID_ARGS for 129 records, and returns OK for the rest. all get return NOT_FOUND.
+     * @tc.expected: step2. Returns OK for 129 records, and returns OK for the rest. all get return OK.
      */
-    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysOverSize), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysOverSize), OK); // 128 restrictions have been lifted
     for (size_t i = 0; i < entrysOverSize.size(); i++) {
-        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysOverSize[i].key, valueTemp), NOT_FOUND);
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysOverSize[i].key, valueTemp), OK);
     }
     /**
      * @tc.steps: step3. Use get check the result of Vect2.
@@ -1006,6 +1006,187 @@ static void CreatEntrys(int recordSize, vector<Key> &keys, vector<Value> &values
     }
 }
 
+/**
+  * @tc.name: SingleVerPutBatch005
+  * @tc.desc: Check for legal parameters that the sum size of all entries is smaller than 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch005, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+    vector<Entry> entrysKeyLegal; // size is 512M - 1kB
+    for (int i = 0; i < 524287; i++) { // 524287 * legalKey is equal to 512M - 1KB.
+        entrysKeyLegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixLegal; // size is 511M + 511KB < 512M
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixLegal.push_back({legalKey, legalValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_005", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysKeyLegal), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysMixLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_005"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch006
+  * @tc.desc: Check for legal parameters that the sum size of all entries is equal to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch006, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysKeyLegal; // size is 512M
+    for (int i = 0; i < 524288; i++) { // 524288 * legalKey is equal to 512M.
+        entrysKeyLegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixLegal; // size is 512M
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixLegal.push_back({legalKey, legalValue});
+    }
+    for (int i = 0; i < 3969; i++) { // 3969 * legalKey is equal to 3969KB.
+        entrysMixLegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_006", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysKeyLegal), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysMixLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_006"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch007
+  * @tc.desc: Check for illegal parameters that the sum size of all entries is larger to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch007, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysKeyIllegal; // size is 512M + 1KB
+    for (int i = 0; i < 524289; i++) { // 524289 * legalKey is equal to 512M + 1KB.
+        entrysKeyIllegal.push_back({legalKey, emptyValue});
+    }
+
+    vector<Entry> entrysMixIllegal; // size is 512M + 1KB
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        entrysMixIllegal.push_back({legalKey, legalValue});
+    }
+    for (int i = 0; i < 3970; i++) { // 3970 * legalKey is equal to 3970KB.
+        entrysMixIllegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("distributed_SingleVerPutBatch_007", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysKeyIllegal), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysMixIllegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_007"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerPutBatch008
+  * @tc.desc: Check for illegal parameters that the sum size of all entries excced uint32_t limit.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch008, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct two sets of vector <Entry>, each set of two data contains records:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value emptyValue; // 0k
+
+    vector<Entry> entrysIllegal; // size excced to the limit of uint32_t
+    for (int i = 0; i < 4194305; i++) { // 4194305 * legalKey is excced to the limit of uint32_t.
+        entrysIllegal.push_back({legalKey, emptyValue});
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerPutBatch008", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. PutBatch operates on two sets of data.
+     * @tc.expected: step2. two operations return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrysIllegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerPutBatch008"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
 /**
   * @tc.name: SingleVerDeleteBatch001
   * @tc.desc: Check for illegal parameters.
@@ -1042,16 +1223,16 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch001, TestSiz
     }
     /**
      * @tc.steps: step3. Use DeleteBatch interface to transfer 10 + 119 extra keys (total 129).
-     * @tc.expected: step3. Return INVALID_ARGS.
+     * @tc.expected: step3. Return OK.
      */
     CreatEntrys(DBConstant::MAX_BATCH_SIZE + 1, keys, values, entries);
-    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), INVALID_ARGS);
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys), OK); // 128 restrictions have been lifted
     /**
      * @tc.steps: step4. Use Get to check data in database.
      * @tc.expected: step4. Key1~10 still in database.
      */
     for (size_t i = 0; i < BATCH_PRESET_SIZE_TEST; i++) {
-        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
+        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), NOT_FOUND);
     }
     /**
      * @tc.steps: step5. Use the DeleteBatch interface to pass in 10 included
@@ -1065,9 +1246,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch001, TestSiz
      * @tc.steps: step6. Use Get to check key1~10 in database.
      * @tc.expected: step6. Key1~5 in database, key6~10 have been deleted.
      */
-    for (size_t i = 0; i < DIVIDE_BATCH_PRESET_SIZE; i++) {
-        EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), OK);
-    }
     for (size_t i = DIVIDE_BATCH_PRESET_SIZE; i < BATCH_PRESET_SIZE_TEST; i++) {
         EXPECT_EQ(g_kvNbDelegatePtr->Get(entrysBase[i].key, valueRead), NOT_FOUND);
     }
@@ -1183,6 +1361,150 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch002, TestSiz
     g_kvNbDelegatePtr = nullptr;
 }
 
+/**
+  * @tc.name: SingleVerDeleteBatch003
+  * @tc.desc: Check for legal parameters that the sum size of all Keys is smaller than 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch003, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysLegal; // size is 512M - 1kB
+    for (int i = 0; i < 524287; i++) { // 524287 * legalKey is equal to 512M - 1KB.
+        keysLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteBatch003", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteBatch operates on sets of data.
+     * @tc.expected: step2. return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteBatch003"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatch004
+  * @tc.desc: Check for legal parameters that the sum size of all entries is equal to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch004, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysLegal; // size is 512M
+    for (int i = 0; i < 524288; i++) { // 524288 * legalKey is equal to 512M.
+        keysLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteBatch004", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteBatch operates on sets of data.
+     * @tc.expected: step2. return OK.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysLegal), OK);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteBatch004"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatch005
+  * @tc.desc: Check for illegal parameters that the sum size of all entries is larger to 512M.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch005, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysIllLegal; // size is 512M + 1kB
+    for (int i = 0; i < 524289; i++) { // 524289 * legalKey is equal to 512M + 1KB.
+        keysIllLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteBatch005", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteBatch operates on sets of data.
+     * @tc.expected: step2. return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysIllLegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteBatch005"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
+/**
+  * @tc.name: SingleVerDeleteBatch006
+  * @tc.desc: Check for illegal parameters that the sum size of all entries excced uint32_t limit.
+  * @tc.type: FUNC
+  * @tc.require:
+  * @tc.author: mazhao
+  */
+HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerDeleteBatch006, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1.
+     *  Create and construct one sets of vector <Key>:
+     */
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    vector<Key> keysIllLegal; // size excced to the limit of uint32_t
+    for (int i = 0; i < 4194305; i++) { // 4194305 * legalKey is excced to the limit of uint32_t.
+        keysIllLegal.push_back(legalKey);
+    }
+
+    const KvStoreNbDelegate::Option option = {true, false};
+    g_mgr.SetKvStoreConfig(g_config);
+    g_mgr.GetKvStore("SingleVerDeleteBatch006", option, g_kvNbDelegateCallback);
+    ASSERT_TRUE(g_kvNbDelegatePtr != nullptr);
+    EXPECT_TRUE(g_kvDelegateStatus == OK);
+    /**
+     * @tc.steps: step2. DeleteLocalBatch operates on sets of data.
+     * @tc.expected: step2. return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keysIllLegal), INVALID_ARGS);
+
+    EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore("SingleVerDeleteBatch006"), OK);
+    g_kvNbDelegatePtr = nullptr;
+}
+
 /**
   * @tc.name: SingleVerPutBatchObserver001
   * @tc.desc: Test the observer function of PutBatch() interface.
@@ -1278,21 +1600,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatchObserver002, Te
     Key key;
     EXPECT_EQ(g_kvNbDelegatePtr->RegisterObserver(key, OBSERVER_CHANGES_NATIVE, observer), OK);
     /**
-     * @tc.steps:step3. Put 129 batch data.
+     * @tc.steps:step3. Put invalid batch data.
      * @tc.expected: step3. Returns INVALID_ARGS.
      */
-    vector<Entry> entrys1;
-    vector<Key> keys1;
-    DistributedDBUnitTest::GenerateRecords(DBConstant::MAX_BATCH_SIZE + 1, entrys1, keys1);
-
-    EXPECT_EQ(entrys1.size(), 129UL);
-    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), INVALID_ARGS);
-    std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
-    EXPECT_TRUE(observer->GetEntriesInserted().empty());
-    /**
-     * @tc.steps:step4. Put invalid batch data.
-     * @tc.expected: step4. Returns INVALID_ARGS.
-     */
     vector<Entry> entrys2;
     vector<Key> keys2;
     DistributedDBUnitTest::GenerateRecords(BATCH_PRESET_SIZE_TEST, entrys2, keys2);
@@ -1309,8 +1619,8 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatchObserver002, Te
     std::this_thread::sleep_for(std::chrono::milliseconds(OBSERVER_SLEEP_TIME));
     EXPECT_TRUE(observer->GetEntriesInserted().empty());
     /**
-     * @tc.steps:step5. Put MAX valid value batch data.
-     * @tc.expected: step5. Returns OK.
+     * @tc.steps:step4. Put MAX valid value batch data.
+     * @tc.expected: step4. Returns OK.
      */
     vector<Entry> entrys3;
     vector<Key> keys3;
@@ -1323,15 +1633,15 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatchObserver002, Te
     LOGD("sleep end");
     EXPECT_TRUE(DistributedDBToolsUnitTest::CheckObserverResult(entrys3, observer->GetEntriesInserted()));
     /**
-     * @tc.steps:step6. UnRegister the observer.
-     * @tc.expected: step6. Returns OK.
+     * @tc.steps:step5. UnRegister the observer.
+     * @tc.expected: step5. Returns OK.
      */
     EXPECT_EQ(g_kvNbDelegatePtr->UnRegisterObserver(observer), OK);
     delete observer;
     observer = nullptr;
     /**
-     * @tc.steps:step7. Close the kv store.
-     * @tc.expected: step7. Results OK and delete successfully.
+     * @tc.steps:step6. Close the kv store.
+     * @tc.expected: step6. Results OK and delete successfully.
      */
     EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_002"), OK);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
index 2c8618d66f3a0cb408f741d5ec4bc29077e071af..0df4a6c9c740598ae21eb9bd05add11394fb6bf9 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
@@ -440,56 +440,54 @@ HWTEST_F(DistributedDBInterfacesNBTransactionTest, commit003, TestSize.Level1)
      */
     EXPECT_EQ(g_kvNbDelegatePtr->StartTransaction(), OK);
     /**
-     * @tc.steps:step2. Put (key1,value1)
+     * @tc.steps:step2. Put (key1,value1) and Delete key1, sum size is 2KB
      * @tc.expected: step2. return OK.
      */
-    EXPECT_EQ(g_kvNbDelegatePtr->Put(KEY_1, VALUE_1), OK);
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_KEY_SIZE); // 1K
+    Value emptyValue;
+    EXPECT_EQ(g_kvNbDelegatePtr->Put(legalKey, emptyValue), OK);
+    EXPECT_EQ(g_kvNbDelegatePtr->Delete(legalKey), OK);
     /**
-     * @tc.steps:step3. Delete key1
+     * @tc.steps:step3. PutBatch 262143 records, each recode's key size is 1K, value size is 1k,
+     * the sum size is 512M - 4KB.
      * @tc.expected: step3. return OK.
      */
-    EXPECT_EQ(g_kvNbDelegatePtr->Delete(KEY_1), OK);
-    /**
-     * @tc.steps:step4. PutBatch 64 records (from key2 to key65)
-     * @tc.expected: step4. return OK.
-     */
-    vector<Entry> entrysBase;
-    vector<Key> keysBase;
-    DistributedDBUnitTest::GenerateRecords(BATCH_BASE_SIZE + 5, entrysBase, keysBase);
 
-    vector<Entry> entrys1(entrysBase.begin() + 1, entrysBase.end());
-    EXPECT_EQ(entrys1.size(), 64UL);
-    EXPECT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), OK);
+    vector<Entry> entrysBase; // size is 512M - 4KB
+    for (int i = 0; i < 262142; i++) { // 262143 * (legalValue + legalKey) is equal to 512M - 4KB.
+        entrysBase.push_back({legalKey, legalValue});
+    }
+
+    vector<Key> keysBase; // size is 3KB
+    for (int i = 0; i < 3; i++) { // 3 * legalKey is equal to 3KB.
+        keysBase.push_back(legalKey);
+    }
+
+    ASSERT_EQ(g_kvNbDelegatePtr->PutBatch(entrysBase), OK); // put 512M - 2KB size data into db.
     /**
-     * @tc.steps:step5. DeleteBatch 63 records (from key2 to key64)
-     * @tc.expected: step5. return OK.
+     * @tc.steps:step4. PutBatch which entries size is 4KB and DeleteBatch record which keys size 3KB,
+     * and the sum size is 512M + 1KB
+     * @tc.expected: step4. return OVER_MAX_LIMITS.
      */
-    vector<Key> keys1(keysBase.begin() + 1, keysBase.end() - 1);
-    EXPECT_EQ(keys1.size(), 63UL);
-    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys1), OVER_MAX_LIMITS);
+    vector<Entry> entrys1(entrysBase.begin(), entrysBase.begin() + 2); // 4KB
+    ASSERT_EQ(g_kvNbDelegatePtr->PutBatch(entrys1), OVER_MAX_LIMITS);
+
+    vector<Key> keys1(keysBase.begin(), keysBase.end());
+    ASSERT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys1), OVER_MAX_LIMITS);
     /**
-     * @tc.steps:step6. DeleteBatch 60 records (from key1 to key60)
-     * @tc.expected: step6. return OK.
+     * @tc.steps:step5. DeleteBatch record which keys size is 2KB, and the sum size is 512M
+     * @tc.expected:step5. return OK.
      */
-    vector<Key> keys2(keysBase.begin(), keysBase.begin() + 60);
-    EXPECT_EQ(keys2.size(), 60UL);
-    EXPECT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys2), OK);
+    vector<Key> keys2(keysBase.begin(), keysBase.end() - 1);
+    ASSERT_EQ(g_kvNbDelegatePtr->DeleteBatch(keys2), OK);
     /**
      * @tc.steps:step6. Commit.
-     * @tc.expected: step6. return OK.
+     * @tc.expected:step6. return OK.
      */
     EXPECT_EQ(g_kvNbDelegatePtr->Commit(), OK);
-    /**
-     * @tc.steps:step7. GetEntries.
-     * @tc.expected: step7. return OK.
-     */
-    vector<Entry> entriesExpect(entrysBase.begin() + 60, entrysBase.end());
-    EXPECT_EQ(entriesExpect.size(), 5UL);
-    const Key prefix;
-    vector<Entry> entriesRet;
-    EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(prefix, entriesRet), OK);
-    EXPECT_TRUE(DistributedDBToolsUnitTest::IsEntriesEqual(entriesExpect, entriesRet));
-
     // finilize
     EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_nb_transaction_commit003"), OK);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
index 1d0e47d02bab47692964364b6f68e29cc077872a..4e78e503d8ff4f960af4e1a2595fa7aecb561f84 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
@@ -552,7 +552,7 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, UpgradeTriggerTest001, TestS
         " flag=0x03 WHERE hash_key=calc_hash(OLD.'id', 0) AND flag&0x02=0x02;\n"
         "\t INSERT OR REPLACE INTO naturalbase_rdb_aux_student_1_log VALUES (NEW._rowid_, '', '', get_sys_time(0), "
         "get_last_time(), CASE WHEN (calc_hash(NEW.'id', 0) != calc_hash(NEW.'id', 0)) " \
-        "THEN 0x02 ELSE 0x22 END, calc_hash(NEW.'id', 0), '', '', '', '');\n"
+        "THEN 0x02 ELSE 0x22 END, calc_hash(NEW.'id', 0), '', '', '', '', '');\n"
         "END";
     EXPECT_TRUE(resultTrigger == expectTrigger);
 }
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
index 2db1315bf4c73ab82d34a93714d4bad701f8e23c..71cf01ee3f2ad7053a01351a3e07bb2be2b42004 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
@@ -658,7 +658,7 @@ void CreateDistributedTableWithHistoryDataTest(TableSyncType tableSyncType)
     EXPECT_EQ(status, OK);
     ASSERT_NE(delegate, nullptr);
 
-    EXPECT_EQ(delegate->CreateDistributedTable("sync_data"), NOT_SUPPORT);
+    EXPECT_EQ(delegate->CreateDistributedTable("sync_data"), OK);
     status = g_mgr.CloseStore(delegate);
     EXPECT_EQ(status, OK);
 }
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
index 2de3e83bcb9d3a9172140856e98378dd60ca9418..d9205021038fc97edd5299649a0e1b11ca4a98de 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
@@ -780,8 +780,7 @@ HWTEST_F(DistributedDBInterfacesRelationalTrackerTableTest, TrackerTableTest013,
      * @tc.steps:step2. CreateDistributedTable on table2
      * @tc.expected: step2. Return NOT_SUPPORT.
      */
-    EXPECT_EQ(g_delegate->CreateDistributedTable(TABLE_NAME2, CLOUD_COOPERATION), DBStatus::NOT_SUPPORT);
-    EXPECT_EQ(g_delegate->CreateDistributedTable(TABLE_NAME2, CLOUD_COOPERATION), DBStatus::NOT_SUPPORT);
+    EXPECT_EQ(g_delegate->CreateDistributedTable(TABLE_NAME2, CLOUD_COOPERATION), OK);
 
     /**
      * @tc.steps:step3. delete all data but keep the log , then CreateDistributedTable
@@ -963,7 +962,7 @@ HWTEST_F(DistributedDBInterfacesRelationalTrackerTableTest, TrackerTableTest017,
      * @tc.steps:step5. There is still data in the table
      * @tc.expected: step5. Return NOT_SUPPORT.
      */
-    EXPECT_EQ(g_delegate->CreateDistributedTable(TABLE_NAME2, DEVICE_COOPERATION), DBStatus::NOT_SUPPORT);
+    EXPECT_EQ(g_delegate->CreateDistributedTable(TABLE_NAME2, DEVICE_COOPERATION), OK);
 
     /**
      * @tc.steps:step6. clear all data and create DEVICE_COOPERATION table
@@ -1698,7 +1697,8 @@ HWTEST_F(DistributedDBInterfacesRelationalTrackerTableTest, ExecuteSql010, TestS
     condition.sql = "create temp table AA as select * from " + TABLE_NAME2;
     condition.bindArgs = {};
     EXPECT_EQ(g_delegate->ExecuteSql(condition, records), OK);
-    condition.sql = "select * from AA";
+    condition.sql = "select * from " + TABLE_NAME2;
+    condition.readOnly = true;
     EXPECT_EQ(g_delegate->ExecuteSql(condition, records), OK);
     EXPECT_EQ(records.size(), num);
     CloseStore();
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/cloud/distributeddb_cloud_check_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/cloud/distributeddb_cloud_check_sync_test.cpp
index e22114cdfe2ca5d78b08cac68a1caa51737e8f2d..f5632c743bafbd56d5bec0b3bec344994778fc08 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/cloud/distributeddb_cloud_check_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/cloud/distributeddb_cloud_check_sync_test.cpp
@@ -146,6 +146,8 @@ protected:
     void CloseDb();
     void InsertUserTableRecord(const std::string &tableName, int64_t recordCounts, int64_t begin = 0);
     void InsertCloudTableRecord(int64_t begin, int64_t count, int64_t photoSize, bool assetIsNull);
+    void InsertCloudTableRecord(const std::string &tableName, int64_t begin, int64_t count, int64_t photoSize,
+        bool assetIsNull);
     void DeleteUserTableRecord(int64_t id);
     void DeleteCloudTableRecord(int64_t gid);
     void CheckCloudTableCount(const std::string &tableName, int64_t expectCount);
@@ -270,6 +272,12 @@ void DistributedDBCloudCheckSyncTest::InsertUserTableRecord(const std::string &t
 
 void DistributedDBCloudCheckSyncTest::InsertCloudTableRecord(int64_t begin, int64_t count, int64_t photoSize,
     bool assetIsNull)
+{
+    InsertCloudTableRecord(tableName_, begin, count, photoSize, assetIsNull);
+}
+
+void DistributedDBCloudCheckSyncTest::InsertCloudTableRecord(const std::string &tableName, int64_t begin, int64_t count,
+    int64_t photoSize, bool assetIsNull)
 {
     std::vector<uint8_t> photo(photoSize, 'v');
     std::vector<VBucket> record1;
@@ -309,7 +317,7 @@ void DistributedDBCloudCheckSyncTest::InsertCloudTableRecord(int64_t begin, int6
         record2.push_back(data);
         extend2.push_back(log);
     }
-    ASSERT_EQ(virtualCloudDb_->BatchInsert(tableName_, std::move(record1), extend1), DBStatus::OK);
+    ASSERT_EQ(virtualCloudDb_->BatchInsert(tableName, std::move(record1), extend1), DBStatus::OK);
     std::this_thread::sleep_for(std::chrono::milliseconds(count));
 }
 
@@ -1504,6 +1512,24 @@ HWTEST_F(DistributedDBCloudCheckSyncTest, LogicDeleteSyncTest004, TestSize.Level
     CheckLogCleaned(0);
 }
 
+/**
+ * @tc.name: LogicDeleteSyncTest005
+ * @tc.desc: test pragma when set cmd is not logic delete
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBCloudCheckSyncTest, LogicDeleteSyncTest005, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. set cmd is auto sync
+     * @tc.expected: step1. ok.
+     */
+    bool logicDelete = true;
+    auto data = static_cast<PragmaData>(&logicDelete);
+    EXPECT_EQ(delegate_->Pragma(AUTO_SYNC, data), DBStatus::NOT_SUPPORT);
+}
+
 /**
  * @tc.name: LogicCreateRepeatedTableNameTest001
  * @tc.desc: test create repeated table name with different cases
@@ -1628,5 +1654,42 @@ HWTEST_F(DistributedDBCloudCheckSyncTest, SaveCursorTest003, TestSize.Level0)
     BlockSync(query, delegate_);
     CheckCloudTableCount(tableName_, actualCount);
 }
+
+/*
+ * @tc.name: CreateDistributedTable001
+ * @tc.desc: Test create distributed table when table not empty.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zqq
+ */
+HWTEST_F(DistributedDBCloudCheckSyncTest, CreateDistributedTable001, TestSize.Level0)
+{
+    const std::string table = "CreateDistributedTable001";
+    const std::string createSQL =
+        "CREATE TABLE IF NOT EXISTS " + table + "(" \
+        "id TEXT PRIMARY KEY," \
+        "name TEXT," \
+        "height REAL ," \
+        "photo BLOB," \
+        "age INT);";
+    ASSERT_EQ(RelationalTestUtils::ExecSql(db_, createSQL), SQLITE_OK);
+    int actualCount = 10;
+    InsertUserTableRecord(table, actualCount);
+    InsertCloudTableRecord(table, 0, actualCount, 0, true);
+    ASSERT_EQ(delegate_->CreateDistributedTable(table, CLOUD_COOPERATION), DBStatus::OK);
+    DataBaseSchema dataBaseSchema = GetSchema();
+    TableSchema schema = dataBaseSchema.tables.at(0);
+    schema.name = table;
+    schema.sharedTableName = "";
+    dataBaseSchema.tables.push_back(schema);
+    ASSERT_EQ(delegate_->SetCloudDbSchema(dataBaseSchema), DBStatus::OK);
+    /**
+     * @tc.steps:step2. call sync, local has one batch id:0-4
+     * @tc.expected: step2. OK
+     */
+    Query query = Query::Select().FromTable({ table });
+    BlockSync(query, delegate_);
+    CheckCloudTableCount(table, actualCount);
+}
 }
 #endif
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_result_set_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_result_set_test.cpp
index 701e86c80220a1a20bc949c55f7644b0e003a372..2309574b6401b5ae6e200922cb84e70f5874be40 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_result_set_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_result_set_test.cpp
@@ -360,4 +360,80 @@ HWTEST_F(DistributedDBRelationalResultSetTest, Test001, TestSize.Level1)
 
     delete resultSet;
 }
+
+/**
+ * @tc.name: ResultSetTest001
+ * @tc.desc: Test get rowData and close
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBRelationalResultSetTest, ResultSetTest001, TestSize.Level0)
+{
+    auto *resultSet = new (std::nothrow) RelationalResultSetImpl;
+    ASSERT_NE(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step1. Create a result set which contains five row data;
+     * @tc.expected: OK.
+     */
+    RelationalRowDataSet rowDataSet1;
+    RowData rowData = {g_blobValue, g_doubleValue, g_int64Value, g_nullValue, g_strValue};
+    rowDataSet1.SetColNames({"column 1", "column 2", "column 3", "column 4", "column 5"});
+    EXPECT_EQ(rowDataSet1.Insert(new (std::nothrow) RelationalRowDataImpl(std::move(rowData))), E_OK);
+    EXPECT_EQ(resultSet->Put("", 1, std::move(rowDataSet1)), E_OK);  // the first one
+    EXPECT_EQ(resultSet->MoveToFirst(), true);
+
+    /**
+     * @tc.steps: step2. Check data
+     * @tc.expected: OK.
+     */
+    std::map<std::string, VariantData> data;
+    EXPECT_EQ(resultSet->GetRow(data), DBStatus::OK);
+    EXPECT_EQ(std::get<std::vector<uint8_t>>(data["column 1"]), BLOB_VALUE);
+    EXPECT_EQ(std::get<double>(data["column 2"]), DOUBLE_VALUE);
+    EXPECT_EQ(std::get<int64_t>(data["column 3"]), INT64_VALUE);
+    EXPECT_EQ(std::get<std::string>(data["column 5"]), STR_VALUE);
+
+    /**
+     * @tc.steps: step3. Check close twice
+     * @tc.expected: OK.
+     */
+    resultSet->Close();
+    EXPECT_EQ(resultSet->GetCount(), 0);
+    resultSet->Close();
+    EXPECT_EQ(resultSet->GetCount(), 0);
+
+    delete resultSet;
+}
+
+/**
+ * @tc.name: ResultSetTest002
+ * @tc.desc: Test get data in null resultSet
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBRelationalResultSetTest, ResultSetTest002, TestSize.Level0)
+{
+    auto *resultSet = new (std::nothrow) RelationalResultSetImpl;
+    ASSERT_NE(resultSet, nullptr);
+
+    /**
+     * @tc.steps: step1. check whether status is not found when get null resultSet
+     * @tc.expected: OK.
+     */
+    std::vector<uint8_t> blob;
+    EXPECT_EQ(resultSet->Get(0, blob), DBStatus::NOT_FOUND);
+    std::string strValue = "";
+    EXPECT_EQ(resultSet->Get(0, strValue), DBStatus::NOT_FOUND);
+    int64_t intValue = 0;
+    EXPECT_EQ(resultSet->Get(0, intValue), DBStatus::NOT_FOUND);
+    double doubleValue = 0.0;
+    EXPECT_EQ(resultSet->Get(0, doubleValue), DBStatus::NOT_FOUND);
+    bool isNull = true;
+    EXPECT_EQ(resultSet->IsColumnNull(0, isNull), DBStatus::NOT_FOUND);
+
+    delete resultSet;
+}
 #endif
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_sqlite_relational_utils_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_sqlite_relational_utils_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e44dfab7e4d6047ca7eec357181a3f11e364be6e
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_sqlite_relational_utils_test.cpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include "cloud_db_types.h"
+#include "distributeddb_tools_unit_test.h"
+#include "runtime_config.h"
+#include "sqlite_relational_utils.h"
+#include "virtual_cloud_data_translate.h"
+
+using namespace testing::ext;
+using namespace DistributedDB;
+using namespace DistributedDBUnitTest;
+
+namespace {
+    constexpr const char *CREATE_TABLE_SQL =
+        "CREATE TABLE IF NOT EXISTS worker1(" \
+        "id INT PRIMARY KEY,"
+        "name TEXT," \
+        "height REAL ," \
+        "married BOOLEAN ," \
+        "photo BLOB," \
+        "asset BLOB," \
+        "assets BLOB);";
+    const Asset g_localAsset = {
+        .version = 1, .name = "Phone", .assetId = "", .subpath = "/local/sync", .uri = "/local/sync",
+        .modifyTime = "123456", .createTime = "", .size = "256", .hash = "ASE"
+    };
+    std::string g_testDir;
+    std::string g_dbDir;
+    sqlite3 *g_db = nullptr;
+
+class DistributedDBSqliteRelationalUtilsTest : public testing::Test {
+public:
+    static void SetUpTestCase(void);
+    static void TearDownTestCase(void);
+    void SetUp();
+    void TearDown();
+protected:
+    void CreateUserDBAndTable();
+    void PrepareStatement(const std::string &sql, sqlite3_stmt *&statement, bool hasCloudDataTranslate);
+    std::shared_ptr<VirtualCloudDataTranslate> virtualCloudDataTranslate_ = nullptr;
+};
+
+void DistributedDBSqliteRelationalUtilsTest::SetUpTestCase(void)
+{
+    DistributedDBToolsUnitTest::TestDirInit(g_testDir);
+    LOGI("The test db is:%s", g_testDir.c_str());
+    g_dbDir = g_testDir + "/";
+}
+
+void DistributedDBSqliteRelationalUtilsTest::TearDownTestCase(void)
+{
+}
+
+void DistributedDBSqliteRelationalUtilsTest::SetUp()
+{
+    DistributedDBToolsUnitTest::PrintTestCaseInfo();
+    g_db = RelationalTestUtils::CreateDataBase(g_dbDir + "test.db");
+    CreateUserDBAndTable();
+}
+
+void DistributedDBSqliteRelationalUtilsTest::TearDown()
+{
+    sqlite3_close_v2(g_db);
+    g_db = nullptr;
+    if (DistributedDBToolsUnitTest::RemoveTestDbFiles(g_testDir) != 0) {
+        LOGE("rm test db files error.");
+    }
+}
+
+void DistributedDBSqliteRelationalUtilsTest::CreateUserDBAndTable()
+{
+    ASSERT_EQ(RelationalTestUtils::ExecSql(g_db, "PRAGMA journal_mode=WAL;"), SQLITE_OK);
+    ASSERT_EQ(RelationalTestUtils::ExecSql(g_db, CREATE_TABLE_SQL), SQLITE_OK);
+}
+
+void DistributedDBSqliteRelationalUtilsTest::PrepareStatement(const std::string &sql, sqlite3_stmt *&statement,
+    bool hasCloudDataTranslate)
+{
+    ASSERT_EQ(SQLiteUtils::GetStatement(g_db, sql, statement), E_OK);
+    VBucket data;
+    data.insert_or_assign("id", 1L);
+    data.insert_or_assign("name", "lihua");
+    data.insert_or_assign("height", 166.0); // 166.0 is random double value
+    data.insert_or_assign("married", true);
+    std::vector<uint8_t> photo(1, 'v');
+    data.insert_or_assign("photo", photo);
+    data.insert_or_assign("asset", g_localAsset);
+    Assets assets = { g_localAsset };
+    data.insert_or_assign("assets", assets);
+    EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 1, data["id"]), E_OK); // 1 is id cid
+    EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 2, data["name"]), E_OK); // 2 is name cid
+    EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 3, data["height"]), E_OK); // 3 is height cid
+    EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 4, data["married"]), E_OK); // 4 is married cid
+    EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 5, data["photo"]), E_OK); // 5 is photo cid
+    if (hasCloudDataTranslate) {
+        EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 6, data["asset"]), E_OK); // 6 is asset cid
+        EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 7, data["assets"]), E_OK); // 7 is assets cid
+    } else {
+        RuntimeConfig::SetCloudTranslate(nullptr);
+        EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 6, data["asset"]), -E_NOT_INIT); // 6 is asset
+        EXPECT_EQ(SQLiteRelationalUtils::BindStatementByType(statement, 7, data["assets"]), -E_NOT_INIT); // 7 is assets
+    }
+}
+
+/**
+ * @tc.name: SqliteRelationalUtilsTest001
+ * @tc.desc: Test interfaces when statement is nullptr
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBSqliteRelationalUtilsTest, SqliteRelationalUtilsTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. statement is nullptr
+     * @tc.expected: step1. return OK
+     */
+    sqlite3_stmt *statement = nullptr;
+
+    /**
+     * @tc.steps:step2. test interface
+     * @tc.expected: step2. return OK
+     */
+    DataValue dataValue;
+    EXPECT_EQ(SQLiteRelationalUtils::GetDataValueByType(statement, 0, dataValue), -E_INVALID_ARGS);
+    Type typeValue;
+    EXPECT_EQ(SQLiteRelationalUtils::GetCloudValueByType(statement, TYPE_INDEX<Nil>, 0, typeValue), -E_INVALID_ARGS);
+    EXPECT_EQ(SQLiteRelationalUtils::StepNext(false, statement), -E_INVALID_ARGS);
+    std::string tableName = "worker1";
+    EXPECT_NE(SQLiteRelationalUtils::SelectServerObserver(g_db, tableName, false), E_OK);
+
+    /**
+     * @tc.steps:step3. close db and test interface
+     * @tc.expected: step3. return OK
+     */
+    sqlite3_close_v2(g_db);
+    g_db = nullptr;
+    std::string fileName = "";
+    EXPECT_FALSE(SQLiteRelationalUtils::GetDbFileName(g_db, fileName));
+    EXPECT_EQ(SQLiteRelationalUtils::SelectServerObserver(g_db, tableName, false), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: SqliteRelationalUtilsTest002
+ * @tc.desc: Test BindStatementByType if dataTranselate is nullptr
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBSqliteRelationalUtilsTest, SqliteRelationalUtilsTest002, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. prepare sql and bind statement
+     * @tc.expected: step1. return OK
+     */
+    std::string sql = "INSERT OR REPLACE INTO worker1(id, name, height, married, photo, asset, assets)" \
+        "VALUES (?,?,?,?,?,?,?);";
+    sqlite3_stmt *statement = nullptr;
+    PrepareStatement(sql, statement, false);
+    int errCode = E_OK;
+    SQLiteUtils::ResetStatement(statement, true, errCode);
+    ASSERT_EQ(statement, nullptr);
+}
+
+/**
+ * @tc.name: SqliteRelationalUtilsTest003
+ * @tc.desc: Test GetSelectVBucket
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBSqliteRelationalUtilsTest, SqliteRelationalUtilsTest003, TestSize.Level0)
+{
+    /**
+     * @tc.steps:step1. set CloudDataTranslate
+     * @tc.expected: step1. return OK
+     */
+    virtualCloudDataTranslate_ = std::make_shared<VirtualCloudDataTranslate>();
+    RuntimeConfig::SetCloudTranslate(virtualCloudDataTranslate_);
+
+    /**
+     * @tc.steps:step2. insert data
+     * @tc.expected: step2. return OK
+     */
+    std::string sql = "INSERT OR REPLACE INTO worker1(id, name, height, married, photo, asset, assets)" \
+        "VALUES (?,?,?,?,?,?,?);";
+    sqlite3_stmt *statement = nullptr;
+    PrepareStatement(sql, statement, true);
+    EXPECT_EQ(SQLiteUtils::StepWithRetry(statement), SQLiteUtils::MapSQLiteErrno(SQLITE_DONE));
+    int errCode = E_OK;
+    SQLiteUtils::ResetStatement(statement, true, errCode);
+    ASSERT_EQ(statement, nullptr);
+
+    /**
+     * @tc.steps:step3. test GetSelectVBucket
+     * @tc.expected: step3. return OK
+     */
+    VBucket data;
+    ASSERT_EQ(SQLiteRelationalUtils::GetSelectVBucket(statement, data), -E_INVALID_ARGS);
+    sql = "SELECT id, name, height, married, photo, asset, assets from worker1;";
+    ASSERT_EQ(SQLiteUtils::GetStatement(g_db, sql, statement), E_OK);
+    EXPECT_EQ(SQLiteRelationalUtils::GetSelectVBucket(statement, data), E_OK);
+    SQLiteUtils::ResetStatement(statement, true, errCode);
+    ASSERT_EQ(statement, nullptr);
+}
+}
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_database_oper_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_database_oper_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d07f909b0789c6c389f16b73eb34e51eda994c54
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_storage_single_ver_database_oper_test.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <gtest/gtest.h>
+
+#include "db_errno.h"
+#include "distributeddb_tools_unit_test.h"
+#include "log_print.h"
+#include "single_ver_database_oper.h"
+#include "storage_engine_manager.h"
+
+using namespace testing::ext;
+using namespace DistributedDB;
+using namespace DistributedDBUnitTest;
+using namespace testing;
+
+namespace {
+class DistributedDBStorageSingleVerDatabaseOperTest : public testing::Test {
+public:
+    static void SetUpTestCase();
+    static void TearDownTestCase();
+    void SetUp();
+    void TearDown();
+protected:
+    std::string testDir_;
+    SQLiteSingleVerNaturalStore *singleVerNaturalStore_ = nullptr;
+    SQLiteSingleVerStorageEngine *singleVerStorageEngine_ = nullptr;
+};
+
+void DistributedDBStorageSingleVerDatabaseOperTest::SetUpTestCase(void)
+{
+}
+
+void DistributedDBStorageSingleVerDatabaseOperTest::TearDownTestCase(void)
+{
+}
+
+void DistributedDBStorageSingleVerDatabaseOperTest::SetUp(void)
+{
+    DistributedDBToolsUnitTest::PrintTestCaseInfo();
+    DistributedDBToolsUnitTest::TestDirInit(testDir_);
+    singleVerNaturalStore_ = new (std::nothrow) SQLiteSingleVerNaturalStore();
+    ASSERT_NE(singleVerNaturalStore_, nullptr);
+    KvDBProperties property;
+    property.SetStringProp(KvDBProperties::DATA_DIR, "");
+    property.SetStringProp(KvDBProperties::STORE_ID, "TestDatabaseOper");
+    property.SetStringProp(KvDBProperties::IDENTIFIER_DIR, "TestDatabaseOper");
+    property.SetIntProp(KvDBProperties::DATABASE_TYPE, KvDBProperties::SINGLE_VER_TYPE_SQLITE);
+    int errCode = E_OK;
+    singleVerStorageEngine_ =
+        static_cast<SQLiteSingleVerStorageEngine *>(StorageEngineManager::GetStorageEngine(property, errCode));
+    ASSERT_EQ(errCode, E_OK);
+    ASSERT_NE(singleVerStorageEngine_, nullptr);
+}
+
+void DistributedDBStorageSingleVerDatabaseOperTest::TearDown(void)
+{
+    delete singleVerNaturalStore_;
+    singleVerNaturalStore_ = nullptr;
+    singleVerStorageEngine_ = nullptr;
+    if (DistributedDBToolsUnitTest::RemoveTestDbFiles(testDir_) != E_OK) {
+        LOGE("rm test db files error.");
+    }
+}
+
+/**
+ * @tc.name: DatabaseOperationTest001
+ * @tc.desc: test Rekey, Import and Export interface in abnormal condition
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBStorageSingleVerDatabaseOperTest, DatabaseOperationTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Create singleVerDatabaseOper with nullptr;
+     * @tc.expected: OK.
+     */
+    std::unique_ptr<SingleVerDatabaseOper> singleVerDatabaseOper =
+        std::make_unique<SingleVerDatabaseOper>(singleVerNaturalStore_, nullptr);
+    ASSERT_NE(singleVerDatabaseOper, nullptr);
+
+    /**
+     * @tc.steps: step2. Test Rekey, Import and Export interface;
+     * @tc.expected: OK.
+     */
+    CipherPassword passwd;
+    EXPECT_EQ(singleVerDatabaseOper->Rekey(passwd), -E_INVALID_DB);
+    EXPECT_EQ(singleVerDatabaseOper->Import("", passwd), -E_INVALID_DB);
+    EXPECT_EQ(singleVerDatabaseOper->Export("", passwd), -E_INVALID_DB);
+    KvDBProperties properties;
+    EXPECT_EQ(singleVerDatabaseOper->RekeyRecover(properties), -E_INVALID_ARGS);
+    EXPECT_EQ(singleVerDatabaseOper->ClearImportTempFile(properties), -E_INVALID_ARGS);
+    EXPECT_EQ(singleVerDatabaseOper->ClearExportedTempFiles(properties), -E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: DatabaseOperationTest002
+ * @tc.desc: test Import and Export interface in abnormal condition
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: chenchaohao
+ */
+HWTEST_F(DistributedDBStorageSingleVerDatabaseOperTest, DatabaseOperationTest002, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Create singleVerDatabaseOper;
+     * @tc.expected: OK.
+     */
+    std::unique_ptr<SingleVerDatabaseOper> singleVerDatabaseOper =
+        std::make_unique<SingleVerDatabaseOper>(singleVerNaturalStore_, singleVerStorageEngine_);
+    ASSERT_NE(singleVerDatabaseOper, nullptr);
+
+    /**
+     * @tc.steps: step2. Test Import and Export interface;
+     * @tc.expected: OK.
+     */
+    CipherPassword passwd;
+    EXPECT_EQ(singleVerDatabaseOper->Export("", passwd), -E_NOT_INIT);
+    singleVerDatabaseOper->SetLocalDevId("device");
+    EXPECT_EQ(singleVerDatabaseOper->Export("", passwd), -E_INVALID_ARGS);
+}
+}
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_asset_compare_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_asset_compare_test.cpp
index 544517e0f87a5be7509ba49ce5e40162fc106b7d..fbefe23d2e68e93b68daff92ee0a64fe7b15ad87 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_asset_compare_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_asset_compare_test.cpp
@@ -845,6 +845,19 @@ namespace {
         ASSERT_TRUE(g_cloudSyncer->TestIsDataContainDuplicateAsset(assetFields, DATA_BASELINE) == false);
     }
 
+    /**
+     * @tc.name: AssetCmpTest030
+     * @tc.desc: Check operator == in the asset structure
+     * @tc.type: FUNC
+     * @tc.require:
+     * @tc.author: chenchaohao
+     */
+    HWTEST_F(DistributedDBCloudAssetCompareTest, AssetCmpTest030, TestSize.Level0)
+    {
+        Asset asset = GenAsset("mansion", "mansion1");
+        EXPECT_TRUE(std::get<Asset>(DATA_BASELINE[FIELD_HOUSE]) == asset);
+    }
+
     /**
      * @tc.name: AssetOperation001
      * @tc.desc: Different opType with end download action and assets
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_db_proxy_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_db_proxy_test.cpp
index 7cf54acd8bea9275dbe5368ae673cba6b506eef9..f7f87a7494e453e32ce73e3cffee437381c854fa 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_db_proxy_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_db_proxy_test.cpp
@@ -440,62 +440,6 @@ HWTEST_F(DistributedDBCloudDBProxyTest, CloudDBProxyTest006, TestSize.Level3)
     RefObject::KillAndDecObjRef(cloudSyncer);
 }
 
-/**
- * @tc.name: CloudDBProxyTest007
- * @tc.desc: Verify syncer close after notify finish.
- * @tc.type: FUNC
- * @tc.require:
- * @tc.author: zhangqiquan
- */
-HWTEST_F(DistributedDBCloudDBProxyTest, CloudDBProxyTest007, TestSize.Level4)
-{
-    /**
-     * @tc.steps: step1. set cloud db to proxy
-     * @tc.expected: step1. E_OK
-     */
-    auto iCloud = std::make_shared<MockICloudSyncStorageInterface>();
-    auto cloudSyncer = new(std::nothrow) VirtualCloudSyncer(StorageProxy::GetCloudDb(iCloud.get()));
-    EXPECT_CALL(*iCloud, StartTransaction).WillRepeatedly(testing::Return(E_OK));
-    EXPECT_CALL(*iCloud, Commit).WillRepeatedly(testing::Return(E_OK));
-    ASSERT_NE(cloudSyncer, nullptr);
-    cloudSyncer->SetCloudDB(virtualCloudDb_);
-    cloudSyncer->SetSyncAction(false, false);
-    /**
-     * @tc.steps: step2. call sync and wait sync finish
-     * @tc.expected: step2. notify before close finished
-     */
-    std::atomic<bool> close = false;
-    int callCount = 0;
-    std::mutex callMutex;
-    std::condition_variable cv;
-    const auto callback = [&close, &callCount, &callMutex, &cv](
-        const std::map<std::string, SyncProcess> &) {
-        std::this_thread::sleep_for(std::chrono::seconds(5)); // block notify 5s
-        {
-            std::lock_guard<std::mutex> autoLock(callMutex);
-            callCount++;
-        }
-        cv.notify_all();
-        EXPECT_EQ(close, false);
-    };
-    EXPECT_EQ(cloudSyncer->Sync({ "cloud" }, SyncMode::SYNC_MODE_CLOUD_MERGE, { TABLE_NAME }, callback, 0), E_OK);
-    /**
-     * @tc.steps: step3. wait notify finished
-     */
-    std::this_thread::sleep_for(std::chrono::seconds(2)); // block 2s
-    cloudSyncer->Close();
-    close = true;
-    {
-        LOGI("begin to wait sync");
-        std::unique_lock<std::mutex> uniqueLock(callMutex);
-        cv.wait(uniqueLock, [&callCount]() {
-            return callCount > 0;
-        });
-        LOGI("end to wait sync");
-    }
-    RefObject::KillAndDecObjRef(cloudSyncer);
-}
-
 /**
  * @tc.name: CloudDBProxyTest008
  * @tc.desc: Verify cloud db heartbeat with diff status.
@@ -598,7 +542,7 @@ HWTEST_F(DistributedDBCloudDBProxyTest, CloudDBProxyTest009, TestSize.Level3)
     {
         LOGI("[CloudDBProxyTest009] begin to wait sync");
         std::unique_lock<std::mutex> uniqueLock(processMutex);
-        cv.wait(uniqueLock, [&finished]() {
+        cv.wait_for(uniqueLock, std::chrono::milliseconds(DBConstant::MIN_TIMEOUT), [&finished]() {
             return finished;
         });
         LOGI("[CloudDBProxyTest009] end to wait sync");
@@ -696,18 +640,25 @@ HWTEST_F(DistributedDBCloudDBProxyTest, CloudSyncerTest001, TestSize.Level2)
     EXPECT_CALL(*iCloud, GetIdentify).WillRepeatedly(testing::Return("CloudSyncerTest001"));
     auto cloudSyncer = new(std::nothrow) VirtualCloudSyncer(StorageProxy::GetCloudDb(iCloud.get()));
     std::atomic<int> callCount = 0;
-    cloudSyncer->SetCurrentTaskInfo([&callCount](const std::map<std::string, SyncProcess> &) {
+    std::condition_variable cv;
+    cloudSyncer->SetCurrentTaskInfo([&callCount, &cv](const std::map<std::string, SyncProcess> &) {
         callCount++;
         int before = callCount;
         LOGD("on callback %d", before);
         std::this_thread::sleep_for(std::chrono::seconds(1));
         EXPECT_EQ(before, callCount);
+        cv.notify_all();
     }, 1u);
     const int notifyCount = 2;
     for (int i = 0; i < notifyCount; ++i) {
         cloudSyncer->Notify();
     }
     cloudSyncer->SetCurrentTaskInfo(nullptr, 0); // 0 is invalid task id
+    std::mutex processMutex;
+    std::unique_lock<std::mutex> uniqueLock(processMutex);
+    cv.wait_for(uniqueLock, std::chrono::milliseconds(DBConstant::MIN_TIMEOUT), [&callCount]() {
+        return callCount == notifyCount;
+    });
     cloudSyncer->Close();
     RefObject::KillAndDecObjRef(cloudSyncer);
 }
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp
index 3df7aab692eb9d831cf25ef10cbccc8f105ca1b0..d4c4985cf2e5ce85238268bdbe5319359608673d 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_anti_dos_sync_test.cpp
@@ -278,7 +278,7 @@ HWTEST_F(DistributeddbAntiDosSyncTest, AntiDosAttackSync003, TestSize.Level3)
      * @tc.steps: step1. set block in function DispatchMessage as true.
      */
     g_communicatorAggregator->SetBlockValue(true);
-
+    g_communicator->SetRemoteVersion(0u);
     /**
      * @tc.steps: step2. control MessageReceiveCallback to send messages that are more than maximum size of queue.
      */
@@ -314,6 +314,7 @@ HWTEST_F(DistributeddbAntiDosSyncTest, AntiDosAttackSync003, TestSize.Level3)
     /**
      * @tc.expected: step2. after part of messages are enqueued, the rest of the messages are discarded.
      */
+    g_communicator->SetRemoteVersion(UINT16_MAX);
     EXPECT_TRUE(g_syncEngine->GetDiscardMsgNum() > 0);
     EXPECT_TRUE(g_syncEngine->GetQueueCacheSize() > 0);
     g_communicatorAggregator->SetBlockValue(false);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_meta_data_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_meta_data_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c4e2f23408c20ed54239a8acb51c9908f4d45124
--- /dev/null
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_meta_data_test.cpp
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <gtest/gtest.h>
+
+#include "db_constant.h"
+#include "distributeddb_tools_unit_test.h"
+#include "meta_data.h"
+#include "virtual_single_ver_sync_db_Interface.h"
+
+using namespace testing::ext;
+using namespace testing;
+using namespace DistributedDB;
+using namespace DistributedDBUnitTest;
+
+namespace {
+constexpr const char *DEVICE_A = "deviceA";
+constexpr const char *DEVICE_B = "deviceB";
+class DistributedDBMetaDataTest : public testing::Test {
+public:
+    static void SetUpTestCase();
+    static void TearDownTestCase();
+    void SetUp();
+    void TearDown();
+protected:
+    std::shared_ptr<Metadata> metadata_ = nullptr;
+    VirtualSingleVerSyncDBInterface *storage_ = nullptr;
+};
+
+void DistributedDBMetaDataTest::SetUpTestCase()
+{
+}
+
+void DistributedDBMetaDataTest::TearDownTestCase()
+{
+}
+
+void DistributedDBMetaDataTest::SetUp()
+{
+    DistributedDBToolsUnitTest::PrintTestCaseInfo();
+    metadata_ = std::make_shared<Metadata>();
+    ASSERT_NE(metadata_, nullptr);
+    storage_ = new(std::nothrow) VirtualSingleVerSyncDBInterface();
+    ASSERT_NE(storage_, nullptr);
+    metadata_->Initialize(storage_);
+}
+
+void DistributedDBMetaDataTest::TearDown()
+{
+    metadata_ = nullptr;
+    if (storage_ != nullptr) {
+        delete storage_;
+        storage_ = nullptr;
+    }
+}
+
+/**
+ * @tc.name: MetadataTest001
+ * @tc.desc: Test metadata set and get ability sync mark.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMetaDataTest, MetadataTest001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Check ability sync finish before set mark.
+     * @tc.expected: step1. Default all ability sync finish is false.
+     */
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step2. Set A ability sync finish.
+     * @tc.expected: step2. A is finish B is not finish.
+     */
+    EXPECT_EQ(metadata_->SetAbilitySyncFinishMark(DEVICE_A, true), E_OK);
+    EXPECT_TRUE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step3. Set B ability sync finish.
+     * @tc.expected: step3. A and B is finish.
+     */
+    EXPECT_EQ(metadata_->SetAbilitySyncFinishMark(DEVICE_B, true), E_OK);
+    EXPECT_TRUE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_TRUE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step4. Set A ability sync not finish.
+     * @tc.expected: step4. A is not finish B is finish.
+     */
+    EXPECT_EQ(metadata_->SetAbilitySyncFinishMark(DEVICE_A, false), E_OK);
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_TRUE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step5. Clear all time sync finish.
+     * @tc.expected: step5. A and B is finish.
+     */
+    EXPECT_EQ(metadata_->ClearAllTimeSyncFinishMark(), E_OK);
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_TRUE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step6. Clear all ability sync finish.
+     * @tc.expected: step6. A and B is not finish.
+     */
+    EXPECT_EQ(metadata_->ClearAllAbilitySyncFinishMark(), E_OK);
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsAbilitySyncFinish(DEVICE_B));
+}
+
+/**
+ * @tc.name: MetadataTest002
+ * @tc.desc: Test metadata set and get time sync mark.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMetaDataTest, MetadataTest002, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Check time sync finish before set mark.
+     * @tc.expected: step1. Default all time sync finish is false.
+     */
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step2. Set A time sync finish.
+     * @tc.expected: step2. A is finish B is not finish.
+     */
+    EXPECT_EQ(metadata_->SetTimeSyncFinishMark(DEVICE_A, true), E_OK);
+    EXPECT_TRUE(metadata_->IsTimeSyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step3. Set B time sync finish.
+     * @tc.expected: step3. A and B is finish.
+     */
+    EXPECT_EQ(metadata_->SetTimeSyncFinishMark(DEVICE_B, true), E_OK);
+    EXPECT_TRUE(metadata_->IsTimeSyncFinish(DEVICE_A));
+    EXPECT_TRUE(metadata_->IsTimeSyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step4. Set A time sync not finish.
+     * @tc.expected: step4. A is not finish B is finish.
+     */
+    EXPECT_EQ(metadata_->SetTimeSyncFinishMark(DEVICE_A, false), E_OK);
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_A));
+    EXPECT_TRUE(metadata_->IsTimeSyncFinish(DEVICE_B));
+    /**
+     * @tc.steps: step5. Clear all time sync finish.
+     * @tc.expected: step5. A and B is not finish.
+     */
+    EXPECT_EQ(metadata_->ClearAllTimeSyncFinishMark(), E_OK);
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_A));
+    EXPECT_FALSE(metadata_->IsTimeSyncFinish(DEVICE_B));
+}
+
+/**
+ * @tc.name: MetadataTest003
+ * @tc.desc: Test metadata set remote schema version.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMetaDataTest, MetadataTest003, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Check remote schema version before set version.
+     * @tc.expected: step1. Default all version is zero.
+     */
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_A), 0u);
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_B), 0u);
+    /**
+     * @tc.steps: step2. Set A schema version.
+     * @tc.expected: step2. A is finish B is not finish.
+     */
+    EXPECT_EQ(metadata_->SetRemoteSchemaVersion(DEVICE_A, SOFTWARE_VERSION_CURRENT), E_OK);
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_A), SOFTWARE_VERSION_CURRENT);
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_B), 0u);
+    /**
+     * @tc.steps: step3. Clear all ability sync finish.
+     * @tc.expected: step3. A and B version is zero.
+     */
+    EXPECT_EQ(metadata_->ClearAllAbilitySyncFinishMark(), E_OK);
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_A), 0u);
+    EXPECT_EQ(metadata_->GetRemoteSchemaVersion(DEVICE_B), 0u);
+}
+
+/**
+ * @tc.name: MetadataTest004
+ * @tc.desc: Test metadata set remote system time off set.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMetaDataTest, MetadataTest004, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Check remote schema version before set version.
+     * @tc.expected: step1. Default all version is zero.
+     */
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_A), 0u);
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_B), 0u);
+    /**
+     * @tc.steps: step2. Set A schema version.
+     * @tc.expected: step2. A is finish B is not finish.
+     */
+    const int64_t offset = 100u;
+    EXPECT_EQ(metadata_->SetSystemTimeOffset(DEVICE_A, offset), E_OK);
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_A), offset);
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_B), 0u);
+    /**
+     * @tc.steps: step3. Clear all time sync finish.
+     * @tc.expected: step3. A and B system time offset is zero.
+     */
+    EXPECT_EQ(metadata_->ClearAllTimeSyncFinishMark(), E_OK);
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_A), 0u);
+    EXPECT_EQ(metadata_->GetSystemTimeOffset(DEVICE_B), 0u);
+}
+
+/**
+ * @tc.name: MetadataTest005
+ * @tc.desc: Test metadata set local schema version.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMetaDataTest, MetadataTest005, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. Check local schema version before set version.
+     * @tc.expected: step1. Default all version is zero.
+     */
+    auto res = metadata_->GetLocalSchemaVersion();
+    EXPECT_EQ(res.first, E_OK);
+    EXPECT_EQ(res.second, 1u);
+    /**
+     * @tc.steps: step2. Set local schema version.
+     * @tc.expected: step2. set success.
+     */
+    EXPECT_EQ(metadata_->SetLocalSchemaVersion(SOFTWARE_VERSION_CURRENT), E_OK);
+    res = metadata_->GetLocalSchemaVersion();
+    EXPECT_EQ(res.first, E_OK);
+    EXPECT_EQ(res.second, SOFTWARE_VERSION_CURRENT);
+}
+}
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp
index 282c8d888610487a4cb2573be18aa0fe7f19a2b8..c9ace1fd986d4f95bdaab9d0ae75458aae7f48de 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_mock_sync_module_test.cpp
@@ -992,7 +992,8 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AbilitySync002, TestSize.Level1)
     ASSERT_TRUE(message != nullptr);
     AbilitySyncAckPacket packet;
     packet.SetAckCode(E_OK);
-    packet.SetSoftwareVersion(SOFTWARE_VERSION_CURRENT);
+    // should set version less than 108 avoid ability sync with 2 packet
+    packet.SetSoftwareVersion(SOFTWARE_VERSION_RELEASE_7_0);
     message->SetCopiedObject(packet);
     /**
      * @tc.steps: step2. set syncDBInterface busy for save data return -E_BUSY
@@ -1027,7 +1028,6 @@ HWTEST_F(DistributedDBMockSyncModuleTest, AbilitySync003, TestSize.Level1)
     /**
      * @tc.steps: step2. set table is need reset ability sync but it still permit sync
      */
-    context->SetIsNeedResetAbilitySync(true);
     EXPECT_EQ(context->GetSchemaSyncStatus(query).first, true);
     /**
      * @tc.steps: step3. set table is schema change now it don't permit sync
@@ -1131,19 +1131,27 @@ HWTEST_F(DistributedDBMockSyncModuleTest, SyncLifeTest005, TestSize.Level3)
     RuntimeContext::GetInstance()->SetCommunicatorAggregator(virtualCommunicatorAggregator);
     auto syncDBInterface = new MockKvSyncInterface();
     int incRefCount = 0;
+    int dbInfoCount = 0;
     EXPECT_CALL(*syncDBInterface, IncRefCount()).WillRepeatedly([&incRefCount]() {
         incRefCount++;
     });
     EXPECT_CALL(*syncDBInterface, DecRefCount()).WillRepeatedly(Return());
+    EXPECT_CALL(*syncDBInterface, GetDBInfo(_)).WillRepeatedly([&dbInfoCount](DBInfo &) {
+        dbInfoCount++;
+    });
     std::vector<uint8_t> identifier(COMM_LABEL_LENGTH, 1u);
     syncDBInterface->SetIdentifier(identifier);
     syncer->Initialize(syncDBInterface, true);
+    syncer->Close(true);
+    incRefCount = 0;
+    dbInfoCount = 0;
     syncer->RemoteDeviceOffline("dev");
     std::this_thread::sleep_for(std::chrono::seconds(1));
+    EXPECT_EQ(incRefCount, 1); // refCount is 1 when remote dev offline
+    EXPECT_EQ(dbInfoCount, 0); // dbInfoCount is 0 when remote dev offline
     syncer = nullptr;
     RuntimeContext::GetInstance()->SetCommunicatorAggregator(nullptr);
     delete syncDBInterface;
-    EXPECT_EQ(incRefCount, 2); // refCount is 2
 }
 
 /**
@@ -2035,6 +2043,51 @@ HWTEST_F(DistributedDBMockSyncModuleTest, SyncerCheck007, TestSize.Level1)
     delete syncDBInterface;
 }
 
+/**
+ * @tc.name: SyncerCheck008
+ * @tc.desc: Test syncer call set sync retry before init.
+ * @tc.type: FUNC
+ * @tc.require: AR000CCPOM
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBMockSyncModuleTest, SyncerCheck008, TestSize.Level1)
+{
+    MockSingleVerKVSyncer syncer;
+    auto syncDBInterface = new(std::nothrow) MockKvSyncInterface();
+    ASSERT_NE(syncDBInterface, nullptr);
+    auto engine = new (std::nothrow) MockSyncEngine();
+    ASSERT_NE(engine, nullptr);
+    engine->InitSubscribeManager();
+    syncer.SetSyncEngine(engine);
+    int incRefCount = 0;
+    int decRefCount = 0;
+    EXPECT_CALL(*syncDBInterface, GetDBInfo(_)).WillRepeatedly([](DBInfo &) {
+    });
+    EXPECT_CALL(*syncDBInterface, IncRefCount()).WillRepeatedly([&incRefCount]() {
+        incRefCount++;
+    });
+    EXPECT_CALL(*syncDBInterface, DecRefCount()).WillRepeatedly([&decRefCount]() {
+        decRefCount++;
+    });
+    DBInfo info;
+    QuerySyncObject querySyncObject;
+    std::shared_ptr<DBInfoHandleTest> handleTest = std::make_shared<DBInfoHandleTest>();
+    RuntimeContext::GetInstance()->SetDBInfoHandle(handleTest);
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(info, "DEVICE", querySyncObject);
+
+    syncer.CallTriggerAddSubscribeAsync(syncDBInterface);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
+    RuntimeContext::GetInstance()->StopTaskPool();
+    RuntimeContext::GetInstance()->SetDBInfoHandle(nullptr);
+    syncer.SetSyncEngine(nullptr);
+
+    EXPECT_EQ(incRefCount, 1);
+    EXPECT_EQ(decRefCount, 1);
+    RefObject::KillAndDecObjRef(engine);
+    delete syncDBInterface;
+}
+
 /**
  * @tc.name: SessionId001
  * @tc.desc: Test syncer call set sync retry before init.
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_multi_user_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_multi_user_test.cpp
index bea2e5271a3f9c6b023d991388b6a08b2e95f2f4..4e067da81c86deb8c5a643951e7704b461eed804 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_multi_user_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_multi_user_test.cpp
@@ -131,6 +131,13 @@ namespace {
         EXPECT_EQ(sqlite3_close_v2(db), SQLITE_OK);
     }
 
+    void PrepareVirtualDeviceBEnv(const std::string &tableName)
+    {
+        std::vector<RelationalVirtualDevice *> remoteDev;
+        remoteDev.push_back(g_deviceB);
+        PrepareVirtualDeviceEnv(tableName, g_storePath1, remoteDev);
+    }
+
     void PrepareData(const std::string &tableName, const std::string &dbPath)
     {
         sqlite3 *db = nullptr;
@@ -182,7 +189,9 @@ namespace {
         EXPECT_EQ(GetDB(db, dbPath), SQLITE_OK);
         EXPECT_EQ(DropTable(db, tableName), SQLITE_OK);
         EXPECT_EQ(CreateTable(db, tableName), SQLITE_OK);
-        EXPECT_EQ(rdbDelegate->CreateDistributedTable(tableName), OK);
+        if (rdbDelegate != nullptr) {
+            EXPECT_EQ(rdbDelegate->CreateDistributedTable(tableName), OK);
+        }
         sqlite3_close(db);
     }
 
@@ -400,6 +409,20 @@ namespace {
         sqlite3_finalize(statement);
         EXPECT_EQ(sqlite3_close_v2(db), SQLITE_OK);
     }
+
+    void RegOnDispatchWithoutDataPacket(std::atomic<int> &messageCount, bool checkVirtual = true)
+    {
+        g_communicatorAggregator->RegOnDispatch([&messageCount, checkVirtual](const std::string &dev, Message *msg) {
+            if (msg->GetMessageId() != TIME_SYNC_MESSAGE && msg->GetMessageId() != ABILITY_SYNC_MESSAGE) {
+                return;
+            }
+            if (((checkVirtual && dev != DEVICE_B) || (!checkVirtual && dev != "real_device")) ||
+                msg->GetMessageType() != TYPE_REQUEST) {
+                return;
+            }
+            messageCount++;
+        });
+    }
 }
 
 class DistributedDBRelationalMultiUserTest : public testing::Test {
@@ -475,6 +498,7 @@ void DistributedDBRelationalMultiUserTest::TearDown(void)
     }
     SyncActivationCheckCallback callback = nullptr;
     RuntimeConfig::SetSyncActivationCheckCallback(callback);
+    RuntimeContext::GetInstance()->ClearAllDeviceTimeInfo();
 }
 
 /**
@@ -1007,4 +1031,217 @@ HWTEST_F(DistributedDBRelationalMultiUserTest, RdbMultiUser014, TestSize.Level0)
     g_communicatorAggregator->EnableCommunicator();
     SyncActivationCheckCallbackV2 callbackV2 = nullptr;
     RuntimeConfig::SetSyncActivationCheckCallback(callbackV2);
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+}
+
+/**
+ * @tc.name: RDBSyncOpt001
+ * @tc.desc: check time sync and ability sync once
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBRelationalMultiUserTest, RDBSyncOpt001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. openStore in dual tuple sync mode and call remote query
+     */
+    OpenStore1(true);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    PrepareVirtualDeviceBEnv(g_tableName);
+    /**
+     * @tc.steps: step3. call sync to DEVICES_B
+     * @tc.expected: step3. should return OK
+     */
+    Query query = Query::Select(g_tableName);
+    SyncStatusCallback callback = nullptr;
+    EXPECT_EQ(g_rdbDelegatePtr1->Sync({DEVICE_B}, SYNC_MODE_PUSH_ONLY, query, callback, true), OK);
+    CloseStore();
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step4. re open store and sync again
+     * @tc.expected: step4. reopen OK and sync success, no negotiation packet
+     */
+    OpenStore1(true);
+    messageCount = 0;
+    EXPECT_EQ(g_rdbDelegatePtr1->Sync({DEVICE_B}, SYNC_MODE_PUSH_ONLY, query, callback, true), OK);
+    EXPECT_EQ(messageCount, 0);
+    CloseStore();
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: RDBSyncOpt002
+ * @tc.desc: check re ability sync after create distributed table
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBRelationalMultiUserTest, RDBSyncOpt002, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. openStore in dual tuple sync mode and call remote query
+     */
+    OpenStore1(true);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    PrepareVirtualDeviceBEnv(g_tableName);
+    /**
+     * @tc.steps: step3. call sync to DEVICES_B
+     * @tc.expected: step3. should return OK
+     */
+    Query query = Query::Select(g_tableName);
+    SyncStatusCallback callback = nullptr;
+    EXPECT_EQ(g_rdbDelegatePtr1->Sync({DEVICE_B}, SYNC_MODE_PUSH_ONLY, query, callback, true), OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step4. create distributed table and sync again
+     * @tc.expected: step4. reopen OK and sync success, only ability packet
+     */
+    PrepareEnvironment("table2", g_storePath1, g_rdbDelegatePtr1);
+    messageCount = 0;
+    EXPECT_EQ(g_rdbDelegatePtr1->Sync({DEVICE_B}, SYNC_MODE_PUSH_ONLY, query, callback, true), OK);
+    EXPECT_EQ(messageCount, 1);
+    CloseStore();
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: RDBSyncOpt003
+ * @tc.desc: check re ability sync after create distributed table
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBRelationalMultiUserTest, RDBSyncOpt003, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount, false);
+    /**
+     * @tc.steps: step2. openStore in dual tuple sync mode and call remote query
+     */
+    OpenStore1(true);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    PrepareVirtualDeviceBEnv(g_tableName);
+    /**
+     * @tc.steps: step3. call sync to DEVICES_B
+     * @tc.expected: step3. should return OK
+     */
+    Query query = Query::Select(g_tableName);
+    SyncStatusCallback callback = nullptr;
+    EXPECT_EQ(g_deviceB->GenericVirtualDevice::Sync(SYNC_MODE_PUSH_ONLY, query, true), OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step4. create distributed table and sync again
+     * @tc.expected: step4. reopen OK and sync success, only ability packet
+     */
+    PrepareEnvironment("table2", g_storePath1, g_rdbDelegatePtr1);
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->GenericVirtualDevice::Sync(SYNC_MODE_PUSH_ONLY, query, true), OK);
+    EXPECT_EQ(messageCount, 1);
+    CloseStore();
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: RDBSyncOpt004
+ * @tc.desc: check ability sync once after reopen
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBRelationalMultiUserTest, RDBSyncOpt004, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount, false);
+    /**
+     * @tc.steps: step2. openStore in dual tuple sync mode and call remote query
+     */
+    OpenStore1(true);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    PrepareVirtualDeviceBEnv(g_tableName);
+    /**
+     * @tc.steps: step3. call sync to DEVICES_B
+     * @tc.expected: step3. should return OK
+     */
+    Query query = Query::Select(g_tableName);
+    g_deviceB->GenericVirtualDevice::Sync(DistributedDB::SYNC_MODE_PUSH_ONLY, query, true);
+    CloseStore();
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step4. re open store and sync again
+     * @tc.expected: step4. reopen OK and sync success, no negotiation packet
+     */
+    OpenStore1(true);
+    messageCount = 0;
+    g_deviceB->GenericVirtualDevice::Sync(DistributedDB::SYNC_MODE_PUSH_ONLY, query, true);
+    EXPECT_EQ(messageCount, 0);
+    CloseStore();
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: RDBSyncOpt005
+ * @tc.desc: check re time sync after time change
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBRelationalMultiUserTest, RDBSyncOpt005, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount, false);
+    /**
+     * @tc.steps: step2. openStore in dual tuple sync mode and call remote query
+     */
+    OpenStore1(true);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    PrepareVirtualDeviceBEnv(g_tableName);
+    /**
+     * @tc.steps: step3. call sync to DEVICES_B
+     * @tc.expected: step3. should return OK
+     */
+    Query query = Query::Select(g_tableName);
+    SyncStatusCallback callback = nullptr;
+    EXPECT_EQ(g_deviceB->GenericVirtualDevice::Sync(SYNC_MODE_PUSH_ONLY, query, true), OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step4. notify time change and sync again
+     * @tc.expected: step4. sync success, only time sync packet
+     */
+    RuntimeContext::GetInstance()->NotifyTimestampChanged(100);
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->GenericVirtualDevice::Sync(SYNC_MODE_PUSH_ONLY, query, true), OK);
+    EXPECT_EQ(messageCount, 1);
+    CloseStore();
+    OS::RemoveFile(g_storePath1);
+    PrepareEnvironment(g_tableName, g_storePath1, g_rdbDelegatePtr1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp
index aea7f05257e642aa3bb97508534062b22307af89..e7e1a4b4f329b8e035a9ae84238347b1641a0c89 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_relational_ver_p2p_sync_test.cpp
@@ -735,6 +735,7 @@ namespace {
         }
         RuntimeConfig::SetProcessSystemAPIAdapter(nullptr);
         LOGD("CloseStore Start");
+        EXPECT_EQ(g_rdbDelegatePtr->RemoveDeviceData(), E_OK);
         ASSERT_EQ(g_mgr.CloseStore(g_rdbDelegatePtr), OK);
         g_rdbDelegatePtr = nullptr;
         OpenStore();
@@ -1452,13 +1453,18 @@ HWTEST_F(DistributedDBRelationalVerP2PSyncTest, AbilitySync003, TestSize.Level1)
      * @tc.steps: step3. change local table to (BOOL, INTEGER, REAL, TEXT, BLOB)
      * @tc.expected: sync fail
      */
-    g_communicatorAggregator->RegOnDispatch([](const std::string &target, Message *inMsg) {
+    bool alter = false;
+    g_communicatorAggregator->RegOnDispatch([&alter](const std::string &target, Message *inMsg) {
         if (target != "real_device") {
             return;
         }
         if (inMsg->GetMessageType() != TYPE_NOTIFY || inMsg->GetMessageId() != ABILITY_SYNC_MESSAGE) {
             return;
         }
+        if (alter) {
+            return;
+        }
+        alter = true;
         sqlite3 *db = nullptr;
         EXPECT_EQ(GetDB(db), SQLITE_OK);
         ASSERT_NE(db, nullptr);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
index f93360dbc52e3d4a64793d2e6321119512f54bb8..4de8c7edffad9557f5b0e1c44564beac8fd24ee4 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
@@ -153,6 +153,7 @@ void DistributedDBSingleVerMultiUserTest::TearDown(void)
     }
     SyncActivationCheckCallback callback = nullptr;
     g_mgr1.SetSyncActivationCheckCallback(callback);
+    RuntimeContext::GetInstance()->ClearAllDeviceTimeInfo();
 }
 
 namespace {
@@ -556,6 +557,7 @@ HWTEST_F(DistributedDBSingleVerMultiUserTest, MultiUser004, TestSize.Level0)
      * @tc.expected: step6. success.
      */
     EXPECT_TRUE(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true) == OK);
+    std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_TIME));
     EXPECT_TRUE(observer->GetCallCount() == 1); // only A
     /**
      * @tc.steps: step7. deviceA have {k1,v1}
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_simple_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_simple_sync_test.cpp
index 20c4d463e3e1473ba882810c611c5f0cec384319..6aec6ffd43b0b508dc4872b41bedc064ed90ddb4 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_simple_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_simple_sync_test.cpp
@@ -24,6 +24,7 @@
 #include "kv_store_nb_delegate.h"
 #include "kv_virtual_device.h"
 #include "platform_specific.h"
+#include "runtime_config.h"
 #include "single_ver_data_sync.h"
 #include "single_ver_kv_sync_task_context.h"
 
@@ -76,7 +77,6 @@ namespace {
         ASSERT_GE(static_cast<uint32_t>(dataSize), itemCount * expectedDataSize);
         ASSERT_LE(static_cast<uint32_t>(dataSize), serialHeadLen + itemCount * (expectedDataSize + externalSize));
     }
-}
 
 class DistributedDBSingleVerP2PSimpleSyncTest : public testing::Test {
 public:
@@ -172,6 +172,23 @@ void DistributedDBSingleVerP2PSimpleSyncTest::TearDown(void)
     EXPECT_EQ(g_mgr.SetPermissionCheckCallback(nullCallback), OK);
 }
 
+void CheckWatermark(const std::string &dev, KvStoreNbDelegate *kvDelegatePtr, WatermarkInfo expectInfo,
+    bool sendEqual = true, bool receiveEqual = true)
+{
+    auto [status, watermarkInfo] = kvDelegatePtr->GetWatermarkInfo(dev);
+    EXPECT_EQ(status, OK);
+    if (sendEqual) {
+        EXPECT_EQ(watermarkInfo.sendMark, expectInfo.sendMark);
+    } else {
+        EXPECT_NE(watermarkInfo.sendMark, expectInfo.sendMark);
+    }
+    if (receiveEqual) {
+        EXPECT_EQ(watermarkInfo.receiveMark, expectInfo.receiveMark);
+    } else {
+        EXPECT_NE(watermarkInfo.receiveMark, expectInfo.receiveMark);
+    }
+}
+
 /**
  * @tc.name: Normal Sync 001
  * @tc.desc: Test normal push sync for add data.
@@ -191,6 +208,10 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync001, TestSize.Level1
      */
     Key key = {'1'};
     Value value = {'1'};
+
+    WatermarkInfo info;
+    CheckWatermark(g_deviceB->GetDeviceId(), g_kvDelegatePtr, info);
+    CheckWatermark(g_deviceC->GetDeviceId(), g_kvDelegatePtr, info);
     status = g_kvDelegatePtr->Put(key, value);
     ASSERT_TRUE(status == OK);
 
@@ -201,6 +222,8 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync001, TestSize.Level1
     std::map<std::string, DBStatus> result;
     status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_ONLY, result);
     ASSERT_TRUE(status == OK);
+    CheckWatermark(g_deviceB->GetDeviceId(), g_kvDelegatePtr, info, false);
+    CheckWatermark(g_deviceC->GetDeviceId(), g_kvDelegatePtr, info, false);
 
     /**
      * @tc.expected: step2. onComplete should be called, DeviceB,C have {k1,v1}
@@ -335,6 +358,9 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync004, TestSize.Level1
     devices.push_back(g_deviceB->GetDeviceId());
     devices.push_back(g_deviceC->GetDeviceId());
 
+    WatermarkInfo info;
+    CheckWatermark(g_deviceB->GetDeviceId(), g_kvDelegatePtr, info);
+    CheckWatermark(g_deviceC->GetDeviceId(), g_kvDelegatePtr, info);
     /**
      * @tc.steps: step1. deviceB put {k1, v1}
      */
@@ -357,6 +383,8 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync004, TestSize.Level1
     std::map<std::string, DBStatus> result;
     status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PULL_ONLY, result);
     ASSERT_TRUE(status == OK);
+    CheckWatermark(g_deviceB->GetDeviceId(), g_kvDelegatePtr, info, true, false);
+    CheckWatermark(g_deviceC->GetDeviceId(), g_kvDelegatePtr, info, true, false);
 
     /**
      * @tc.expected: step3. onComplete should be called, DeviceA have {k1, VALUE_1}, {K2. VALUE_2}
@@ -760,6 +788,56 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync010, TestSize.Level1
     EXPECT_EQ(result[DEVICE_B], OK);
 }
 
+/**
+ * @tc.name: Normal Sync 011
+ * @tc.desc: Test sync with translated id.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, NormalSync011, TestSize.Level0)
+{
+    DBStatus status = OK;
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+
+    /**
+     * @tc.steps: step1. deviceA put {k1, v1}
+     */
+    Key key = {'1'};
+    Value value = {'1'};
+    status = g_kvDelegatePtr->Put(key, value);
+    ASSERT_TRUE(status == OK);
+
+    /**
+     * @tc.steps: step2. ori dev will be append test
+     * @tc.expected: step2. sync should return OK.
+     */
+    RuntimeConfig::SetTranslateToDeviceIdCallback([](const std::string &oriDevId, const StoreInfo &) {
+        std::string dev = oriDevId + "test";
+        LOGI("translate %s to %s", oriDevId.c_str(), dev.c_str());
+        return dev;
+    });
+    std::map<std::string, DBStatus> result;
+    status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_PULL, result);
+    ASSERT_TRUE(status == OK);
+    RuntimeConfig::SetTranslateToDeviceIdCallback(nullptr);
+
+    /**
+     * @tc.expected: step2. onComplete should be called, Send watermark should not be zero
+     */
+    ASSERT_TRUE(result.size() == devices.size());
+    for (const auto &pair : result) {
+        LOGD("dev %s, status %d", pair.first.c_str(), pair.second);
+        EXPECT_TRUE(pair.second == OK);
+    }
+    WatermarkInfo info;
+    CheckWatermark(g_deviceB->GetDeviceId(), g_kvDelegatePtr, info, false);
+    info = {};
+    std::string checkDev = g_deviceB->GetDeviceId() + "test";
+    CheckWatermark(checkDev, g_kvDelegatePtr, info, false);
+}
+
 /**
  * @tc.name: Limit Data Sync 001
  * @tc.desc: Test sync limit key and value data
@@ -841,6 +919,51 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, LimitDataSync001, TestSize.Lev
     EXPECT_TRUE(valueRead == value2);
 }
 
+/**
+ * @tc.name: Limit Data Sync 002
+ * @tc.desc: Test PutBatch with invalid entries and then call sync.
+ * @tc.type: FUNC
+ * @tc.require: DTS2024012914038
+ * @tc.author: mazhao
+ */
+HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, LimitDataSync002, TestSize.Level1)
+{
+    DBStatus status = OK;
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    devices.push_back(g_deviceC->GetDeviceId());
+    Key legalKey;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalKey, DBConstant::MAX_KEY_SIZE); // 1K
+    Value legalValue;
+    DistributedDBToolsUnitTest::GetRandomKeyValue(legalValue, DBConstant::MAX_VALUE_SIZE); // 4M
+    Value emptyValue; // 0k
+    vector<Entry> illegalEntrys; // size is 512M + 1KB
+    for (int i = 0; i < 127; i++) { // 127 * (legalValue + legalKey) is equal to 508M + 127KB < 512M.
+        illegalEntrys.push_back({legalKey, legalValue});
+    }
+    for (int i = 0; i < 3970; i++) { // 3970 * legalKey is equal to 3970KB.
+        illegalEntrys.push_back({legalKey, emptyValue});
+    }
+    /**
+     * @tc.steps: step1. PutBatch with invalid entries inside which total length of the key and valud is more than 512M
+     * @tc.expected: step1. PutBatch should return INVALID_ARGS.
+     */
+    EXPECT_EQ(g_kvDelegatePtr->PutBatch(illegalEntrys), INVALID_ARGS);
+    /**
+     * @tc.steps: step2. deviceA call push_pull sync
+     * @tc.expected: step2. sync return OK and all statuses is OK.
+     */
+    std::map<std::string, DBStatus> result;
+    status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_PULL, result);
+    ASSERT_TRUE(status == OK);
+    ASSERT_TRUE(result.size() == devices.size());
+    for (const auto &pair : result) {
+        LOGD("dev %s, status %d", pair.first.c_str(), pair.second);
+        printf("dev %s, status %d", pair.first.c_str(), pair.second);
+        EXPECT_TRUE(pair.second == OK);
+    }
+}
+
 /**
  * @tc.name: Auto Sync 001
  * @tc.desc: Verify auto sync enable function.
@@ -1570,4 +1693,27 @@ HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, CalculateSyncData005, TestSize
     });
     thread1.join();
     thread2.join();
-}
\ No newline at end of file
+}
+
+/**
+ * @tc.name: GetWaterMarkInfo001
+ * @tc.desc: Test invalid dev for get water mark info.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSimpleSyncTest, GetWaterMarkInfo001, TestSize.Level0)
+{
+    std::string dev;
+    auto res = g_kvDelegatePtr->GetWatermarkInfo(dev);
+    EXPECT_EQ(res.first, INVALID_ARGS);
+    EXPECT_EQ(res.second.sendMark, 0u);
+    EXPECT_EQ(res.second.receiveMark, 0u);
+
+    dev = std::string(DBConstant::MAX_DEV_LENGTH + 1, 'a');
+    res = g_kvDelegatePtr->GetWatermarkInfo(dev);
+    EXPECT_EQ(res.first, INVALID_ARGS);
+    EXPECT_EQ(res.second.sendMark, 0u);
+    EXPECT_EQ(res.second.receiveMark, 0u);
+}
+} // namespace
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_subscribe_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_subscribe_sync_test.cpp
index f6a9777767717c25b7c1c2a313d8cc39d2c11afa..cabce1e53d38903b461486499ad7733823013548 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_subscribe_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_subscribe_sync_test.cpp
@@ -24,9 +24,11 @@
 #include "platform_specific.h"
 #include "query.h"
 #include "query_sync_object.h"
+#include "runtime_config.h"
 #include "single_ver_data_sync.h"
 #include "single_ver_serialize_manager.h"
 #include "subscribe_manager.h"
+#include "subscribe_recorder.h"
 #include "sync_types.h"
 
 using namespace testing::ext;
@@ -1036,6 +1038,58 @@ HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, subscribeSync007, TestSize.
     EXPECT_TRUE(g_schemaKvDelegatePtr->UnSubscribeRemoteQuery(devices, nullptr, query, true) == NOT_SUPPORT);
 }
 
+/**
+ * @tc.name: SubscribeSync008
+ * @tc.desc: test subscribe with reopen db
+ * @tc.type: FUNC
+ * @tc.require: AR000HGD0B
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync008, TestSize.Level1)
+{
+    /**
+     * @tc.steps: step1. InitSchemaDb
+     */
+    std::shared_ptr<DBInfoHandleTest> handleTest = std::make_shared<DBInfoHandleTest>();
+    RuntimeConfig::SetDBInfoHandle(handleTest);
+
+    LOGI("============step 1============");
+    InitSubSchemaDb();
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+
+    /**
+     * @tc.steps: step2. deviceB subscribe query to deviceA
+     */
+    LOGI("============step 2============");
+    Key key6 { 'k', '6' };
+    Query query = Query::Select();
+    g_deviceB->Subscribe(QuerySyncObject(query), true, 3);
+
+    /**
+     * @tc.steps: step3. deviceA put k1,key6 and wait
+     */
+    LOGI("============step 3============");
+    EXPECT_EQ(OK, g_schemaKvDelegatePtr->PutBatch({
+        {key6, Value(SCHEMA_VALUE1.begin(), SCHEMA_VALUE1.end())},
+    }));
+    EXPECT_EQ(g_schemaMgr.CloseKvStore(g_schemaKvDelegatePtr), OK);
+    g_schemaKvDelegatePtr = nullptr;
+    InitSubSchemaDb();
+    g_deviceB->Online();
+    std::this_thread::sleep_for(std::chrono::seconds(1)); // sleep 1s for auto sync
+
+    /**
+     * @tc.steps: step4. deviceB has key6
+     */
+    LOGI("============step 4============");
+    VirtualDataItem item;
+    if (g_deviceB->GetData(key6, item) == E_OK) {
+        EXPECT_EQ(item.value, Value(SCHEMA_VALUE1.begin(), SCHEMA_VALUE1.end()));
+    }
+    RuntimeConfig::SetDBInfoHandle(nullptr);
+}
+
 namespace {
 KvVirtualDevice *CreateKvVirtualDevice(const std::string &deviceName)
 {
@@ -1106,7 +1160,114 @@ HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync009, TestSize.
     };
     for (const auto &dev: devices) {
         dev->UnSubscribe(QuerySyncObject(query), true, 1, callback); // sync id is 1
+        delete dev;
+    }
+}
+
+/*
+ * @tc.name: SubscribeSync010
+ * @tc.desc: test subscribe query cache
+ * @tc.type: FUNC
+ * @tc.require: AR000H5VLO
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync010, TestSize.Level1)
+{
+    SubscribeRecorder recorder;
+    DBInfo dbInfo = {
+        USER_ID,
+        APP_ID,
+        STORE_ID_1,
+        false,
+        true
+    };
+    Query query = Query::Select();
+    QuerySyncObject querySyncObject(query);
+    /**
+     * @tc.steps: step1. Insert one record twice and remove
+     */
+    recorder.RecordSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    recorder.RecordSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    recorder.RemoveRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    std::map<std::string, std::vector<QuerySyncObject>> subscribeQuery;
+    recorder.GetSubscribeQuery(dbInfo, subscribeQuery);
+    for (const auto &entry: subscribeQuery) {
+        EXPECT_EQ(entry.second.size(), 0u);
+    }
+    /**
+     * @tc.steps: step2. Remove no exist data
+     */
+    recorder.RemoveRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    recorder.GetSubscribeQuery(dbInfo, subscribeQuery);
+    for (const auto &entry: subscribeQuery) {
+        EXPECT_EQ(entry.second.size(), 0u);
+    }
+    /**
+     * @tc.steps: step3. insert two data and remove one data
+     */
+    recorder.RecordSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    Query query2 = Query::Select().EqualTo("test", "test");
+    recorder.RecordSubscribe(dbInfo, DEVICE_A, QuerySyncObject(query2));
+    recorder.RemoveRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    recorder.GetSubscribeQuery(dbInfo, subscribeQuery);
+    for (const auto &entry: subscribeQuery) {
+        EXPECT_EQ(entry.second.size(), 1u);
     }
+    /**
+     * @tc.steps: step4. remove no exist data
+     */
+    dbInfo.storeId = STORE_ID_2;
+    recorder.RemoveRemoteSubscribe(dbInfo, DEVICE_A);
+    dbInfo.storeId = STORE_ID_1;
+    recorder.GetSubscribeQuery(dbInfo, subscribeQuery);
+    for (const auto &entry: subscribeQuery) {
+        EXPECT_EQ(entry.second.size(), 1u);
+    }
+}
+
+/*
+ * @tc.name: SubscribeSync011
+ * @tc.desc: test subscribe query cache
+ * @tc.type: FUNC
+ * @tc.require: AR000H5VLO
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync011, TestSize.Level1)
+{
+    SubscribeRecorder recorder;
+    DBInfo dbInfo = {
+            USER_ID,
+            APP_ID,
+            STORE_ID_1,
+            false,
+            true
+    };
+    /**
+     * @tc.steps: step1. Insert 2 record in db1 and 1 record in db2
+     */
+    Query query = Query::Select();
+    QuerySyncObject querySyncObject(query);
+    recorder.RecordSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    recorder.RecordSubscribe(dbInfo, DEVICE_B, querySyncObject);
+    DBInfo dbInfo2 = dbInfo;
+    dbInfo2.storeId = STORE_ID_2;
+    recorder.RecordSubscribe(dbInfo2, DEVICE_B, querySyncObject);
+    /**
+     * @tc.steps: step2. Insert 2 record in db1
+     */
+    recorder.RemoveRemoteSubscribe(dbInfo);
+    std::map<std::string, std::vector<QuerySyncObject>> subscribeQuery;
+    recorder.GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 0u);
+    recorder.GetSubscribeQuery(dbInfo2, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 1u);
+    /**
+     * @tc.steps: step3. Insert 1 record in db2
+     */
+    recorder.RemoveRemoteSubscribe(dbInfo2);
+    subscribeQuery.clear();
+    recorder.GetSubscribeQuery(dbInfo2, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 0u);
 }
 
 /**
@@ -1167,6 +1328,64 @@ HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync012, TestSize.
     }
 }
 
+/*
+ * @tc.name: SubscribeSync013
+ * @tc.desc: test subscribe query cache with remote support false
+ * @tc.type: FUNC
+ * @tc.require: AR000H5VLO
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSubscribeSyncTest, SubscribeSync013, TestSize.Level1)
+{
+    std::shared_ptr<DBInfoHandleTest> handle = std::make_shared<DBInfoHandleTest>();
+    RuntimeConfig::SetDBInfoHandle(handle);
+    handle->SetLocalIsSupport(true);
+    DBInfo dbInfo = {
+        USER_ID,
+        APP_ID,
+        STORE_ID_1,
+        false,
+        true
+    };
+    RuntimeContext::GetInstance()->SetRemoteOptimizeCommunication(DEVICE_A, false);
+    Query query = Query::Select();
+    QuerySyncObject querySyncObject(query);
+    /**
+     * @tc.steps: step1. Insert one record
+     */
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    std::map<std::string, std::vector<QuerySyncObject>> subscribeQuery;
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 1u);
+    /**
+     * @tc.steps: step2. Remove one record
+     */
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery[DEVICE_A].size(), 0u);
+    /**
+     * @tc.steps: step3. Record again and remove by dbInfo and device
+     */
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo, DEVICE_A);
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 0u);
+    /**
+     * @tc.steps: step4. Record again and remove by device
+     */
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(DEVICE_A);
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 0u);
+    /**
+     * @tc.steps: step5. Record again and remove by dbInfo
+     */
+    RuntimeContext::GetInstance()->RecordRemoteSubscribe(dbInfo, DEVICE_A, querySyncObject);
+    RuntimeContext::GetInstance()->RemoveRemoteSubscribe(dbInfo);
+    RuntimeContext::GetInstance()->GetSubscribeQuery(dbInfo, subscribeQuery);
+    EXPECT_EQ(subscribeQuery.size(), 0u);
+    RuntimeConfig::SetDBInfoHandle(nullptr);
+}
 /**
  * @tc.name: SubscribeSync014
  * @tc.desc: test device subscribe with put a lot of times
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp
index 7a11e5a3d7708d660269f4d94ce819527ad8e496..0db86b02064d644dbe5426dc2b6a2686f45cb8aa 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_p2p_sync_check_test.cpp
@@ -15,6 +15,7 @@
 
 #include <gtest/gtest.h>
 
+#include "ability_sync.h"
 #include "distributeddb_data_generate_unit_test.h"
 #include "distributeddb_tools_unit_test.h"
 #include "kv_virtual_device.h"
@@ -137,6 +138,7 @@ void DistributedDBSingleVerP2PSyncCheckTest::SetUp(void)
     ASSERT_TRUE(g_syncInterfaceC != nullptr);
     ASSERT_EQ(g_deviceC->Initialize(g_communicatorAggregator, g_syncInterfaceC), E_OK);
     g_syncInterfaceC->SetSecurityOption(virtualOption);
+    RuntimeContext::GetInstance()->ClearAllDeviceTimeInfo();
 }
 
 void DistributedDBSingleVerP2PSyncCheckTest::TearDown(void)
@@ -297,7 +299,7 @@ HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, SecOptionCheck003, TestSize.Lev
     std::map<std::string, DBStatus> result;
     status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_ONLY, result);
     EXPECT_EQ(status, OK);
-    EXPECT_EQ(messageCount, 6); // 6 = 2 time sync + 4 ability sync
+    EXPECT_EQ(messageCount, 4); // 4 = 2 time sync + 2 ability sync
     for (const auto &pair : result) {
         LOGD("dev %s, status %d", pair.first.c_str(), pair.second);
         EXPECT_TRUE(pair.second == SECURITY_OPTION_CHECK_ERROR);
@@ -387,6 +389,52 @@ HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, SecOptionCheck005, TestSize.Lev
     g_syncInterfaceB->ForkGetSecurityOption(nullptr);
 }
 
+/**
+ * @tc.name: sec option check Sync 006
+ * @tc.desc: memory db not check device security
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, SecOptionCheck006, TestSize.Level0)
+{
+    ASSERT_EQ(g_mgr.CloseKvStore(g_kvDelegatePtr), OK);
+    ASSERT_EQ(g_mgr.DeleteKvStore(STORE_ID), OK);
+    g_kvDelegatePtr = nullptr;
+    KvStoreNbDelegate::Option option;
+    option.secOption.securityLabel = SecurityLabel::S1;
+    g_mgr.GetKvStore(STORE_ID, option, g_kvDelegateCallback);
+    ASSERT_TRUE(g_kvDelegateStatus == OK);
+    ASSERT_TRUE(g_kvDelegatePtr != nullptr);
+
+    auto adapter = std::make_shared<ProcessSystemApiAdapterImpl>();
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(adapter);
+    adapter->ForkCheckDeviceSecurityAbility([](const std::string &, const SecurityOption &) {
+        return true;
+    });
+    adapter->ForkGetSecurityOption([](const std::string &, SecurityOption &securityOption) {
+        securityOption.securityLabel = S1;
+        return OK;
+    });
+    g_syncInterfaceB->ForkGetSecurityOption([](SecurityOption &option) {
+        option.securityLabel = SecurityLabel::S0;
+        return E_OK;
+    });
+
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    std::map<std::string, DBStatus> result;
+    DBStatus status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_PULL, result);
+    EXPECT_EQ(status, OK);
+    for (const auto &pair : result) {
+        LOGD("dev %s, status %d", pair.first.c_str(), pair.second);
+        EXPECT_TRUE(pair.second == OK);
+    }
+
+    RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
+    g_syncInterfaceB->ForkGetSecurityOption(nullptr);
+}
+
 #ifndef LOW_LEVEL_MEM_DEV
 /**
  * @tc.name: BigDataSync001
@@ -693,16 +741,21 @@ void PrepareEnv(vector<std::string> &devices, Key &key, Query &query)
     ASSERT_TRUE(result[g_deviceB->GetDeviceId()] == OK);
 }
 
-void Sync(vector<std::string> &devices, const DBStatus &targetStatus)
+void Sync(KvStoreNbDelegate *kvDelegatePtr, vector<std::string> &devices, const DBStatus &targetStatus)
 {
     std::map<std::string, DBStatus> result;
-    DBStatus status = g_tool.SyncTest(g_kvDelegatePtr, devices, DistributedDB::SYNC_MODE_PUSH_ONLY, result);
+    DBStatus status = g_tool.SyncTest(kvDelegatePtr, devices, DistributedDB::SYNC_MODE_PUSH_ONLY, result);
     EXPECT_TRUE(status == OK);
     for (const auto &deviceId : devices) {
         ASSERT_TRUE(result[deviceId] == targetStatus);
     }
 }
 
+void Sync(vector<std::string> &devices, const DBStatus &targetStatus)
+{
+    Sync(g_kvDelegatePtr, devices, targetStatus);
+}
+
 void SyncWithQuery(vector<std::string> &devices, const Query &query, const SyncMode &mode,
     const DBStatus &targetStatus)
 {
@@ -710,7 +763,7 @@ void SyncWithQuery(vector<std::string> &devices, const Query &query, const SyncM
     DBStatus status = g_tool.SyncTest(g_kvDelegatePtr, devices, mode, result, query);
     EXPECT_TRUE(status == OK);
     for (const auto &deviceId : devices) {
-        ASSERT_TRUE(result[deviceId] == targetStatus);
+        ASSERT_EQ(result[deviceId], targetStatus);
     }
 }
 
@@ -768,6 +821,31 @@ void PrepareWaterMarkError(std::vector<std::string> &devices, Query &query)
     Sync(devices, TIME_OUT);
     g_communicatorAggregator->RegOnDispatch(nullptr);
 }
+
+void RegOnDispatchWithoutDataPacket(std::atomic<int> &messageCount, bool calResponse = false)
+{
+    g_communicatorAggregator->RegOnDispatch([calResponse, &messageCount](const std::string &dev, Message *msg) {
+        if (msg->GetMessageId() != TIME_SYNC_MESSAGE && msg->GetMessageId() != ABILITY_SYNC_MESSAGE) {
+            return;
+        }
+        if (dev != DEVICE_B || (!calResponse && msg->GetMessageType() != TYPE_REQUEST)) {
+            return;
+        }
+        messageCount++;
+    });
+}
+
+void ReOpenDB()
+{
+    ASSERT_EQ(g_mgr.CloseKvStore(g_kvDelegatePtr), OK);
+    g_kvDelegatePtr = nullptr;
+    KvStoreNbDelegate::Option option;
+    option.secOption.securityLabel = SecurityLabel::S3;
+    option.secOption.securityFlag = SecurityFlag::SECE;
+    g_mgr.GetKvStore(STORE_ID, option, g_kvDelegateCallback);
+    ASSERT_TRUE(g_kvDelegateStatus == OK);
+    ASSERT_TRUE(g_kvDelegatePtr != nullptr);
+}
 }
 
 /**
@@ -847,7 +925,7 @@ HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, AckSafeCheck001, TestSize.Level
         std::unique_lock<std::mutex> lck(offlineMtx);
         conditionOffline.wait(lck, [&offlineFlag]{ return offlineFlag; });
         g_deviceB->Offline();
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        std::this_thread::sleep_for(std::chrono::seconds(1));
         g_deviceB->Online();
         onlineFlag = true;
         conditionOnline.notify_all();
@@ -1552,4 +1630,323 @@ HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, GetDataNotify002, TestSize.Leve
     asyncThread.join();
     std::this_thread::sleep_for(std::chrono::seconds(TEN_SECONDS));
 }
-}
\ No newline at end of file
+
+/**
+ * @tc.name: KVAbilitySyncOpt001
+ * @tc.desc: check ability sync 2 packet
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVAbilitySyncOpt001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet
+     * @tc.expected: step1. sync should failed in source.
+     */
+    std::atomic<int> messageCount = 0;
+    g_communicatorAggregator->RegOnDispatch([&messageCount](const std::string &dev, Message *msg) {
+        if (msg->GetMessageId() != ABILITY_SYNC_MESSAGE) {
+            return;
+        }
+        messageCount++;
+    });
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return SECURITY_OPTION_CHECK_ERROR.
+     */
+    DBStatus status = OK;
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    std::map<std::string, DBStatus> result;
+    status = g_tool.SyncTest(g_kvDelegatePtr, devices, SYNC_MODE_PUSH_ONLY, result);
+    EXPECT_EQ(status, OK);
+    EXPECT_EQ(messageCount, 2); // 2 ability sync
+    for (const auto &pair : result) {
+        EXPECT_EQ(pair.second, OK);
+    }
+}
+
+/**
+ * @tc.name: KVSyncOpt001
+ * @tc.desc: check time sync and ability sync once
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step3. reopen kv store
+     * @tc.expected: step3. reopen OK.
+     */
+    ReOpenDB();
+    /**
+     * @tc.steps: step4. reopen kv store and sync again
+     * @tc.expected: step4. reopen OK and sync success, no negotiation packet.
+     */
+    messageCount = 0;
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 0);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: KVSyncOpt002
+ * @tc.desc: check device time sync once
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt002, TestSize.Level0)
+{
+/**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    // close kv store avoid packet dispatch error
+    ASSERT_EQ(g_mgr.CloseKvStore(g_kvDelegatePtr), OK);
+    g_kvDelegatePtr = nullptr;
+    ASSERT_EQ(g_mgr.DeleteKvStore(STORE_ID), OK);
+    /**
+     * @tc.steps: step3. open new kv store
+     * @tc.expected: step3. open OK.
+     */
+    KvStoreNbDelegate::Option option;
+    option.secOption.securityLabel = SecurityLabel::S3;
+    option.secOption.securityFlag = SecurityFlag::SECE;
+    KvStoreNbDelegate *delegate2 = nullptr;
+    g_mgr.GetKvStore(STORE_ID_2, option, [&delegate2](DBStatus status, KvStoreNbDelegate *delegate) {
+        delegate2 = delegate;
+        EXPECT_EQ(status, OK);
+    });
+    /**
+     * @tc.steps: step4. sync again
+     * @tc.expected: step4. sync success, only ability sync packet.
+     */
+    messageCount = 0;
+    Sync(delegate2, devices, OK);
+    EXPECT_EQ(messageCount, 1); // 1 contain ability sync packet
+    EXPECT_EQ(g_mgr.CloseKvStore(delegate2), OK);
+    EXPECT_EQ(g_mgr.DeleteKvStore(STORE_ID_2), OK);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: KVSyncOpt003
+ * @tc.desc: check time sync and ability sync once
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt003, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step3. reopen kv store
+     * @tc.expected: step3. reopen OK.
+     */
+    ReOpenDB();
+    /**
+     * @tc.steps: step4. reopen kv store and sync again
+     * @tc.expected: step4. reopen OK and sync success, no negotiation packet.
+     */
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 0);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: KVSyncOpt004
+ * @tc.desc: check sync in keys after reopen db
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt004, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. deviceA call sync and wait
+     * @tc.expected: step1. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    Sync(devices, OK);
+    /**
+     * @tc.steps: step2. reopen kv store
+     * @tc.expected: step2. reopen OK.
+     */
+    ReOpenDB();
+    /**
+     * @tc.steps: step3. sync with in keys
+     * @tc.expected: step3. sync OK.
+     */
+    std::map<std::string, DBStatus> result;
+    std::set<Key> condition;
+    condition.insert({'k'});
+    Query query = Query::Select().InKeys(condition);
+    DBStatus status = g_tool.SyncTest(g_kvDelegatePtr, devices, DistributedDB::SYNC_MODE_PUSH_ONLY, result, query);
+    EXPECT_EQ(status, OK);
+    for (const auto &deviceId : devices) {
+        EXPECT_EQ(result[deviceId], OK);
+    }
+}
+
+/**
+ * @tc.name: KVSyncOpt005
+ * @tc.desc: check record ability finish after receive ability sync
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt005, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount, true);
+    /**
+     * @tc.steps: step2. deviceB call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 2); // DEV_A send negotiation 2 ack packet.
+    /**
+     * @tc.steps: step3. reopen kv store
+     * @tc.expected: step3. reopen OK.
+     */
+    ReOpenDB();
+    /**
+     * @tc.steps: step4. reopen kv store and sync again
+     * @tc.expected: step4. reopen OK and sync success, no negotiation packet.
+     */
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 0);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: KVSyncOpt006
+ * @tc.desc: check time sync and ability sync once after rebuild
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVSyncOpt006, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount, true);
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step3. rebuild kv store
+     * @tc.expected: step3. rebuild OK.
+     */
+    ASSERT_EQ(g_mgr.CloseKvStore(g_kvDelegatePtr), OK);
+    g_kvDelegatePtr = nullptr;
+    g_mgr.DeleteKvStore(STORE_ID);
+    KvStoreNbDelegate::Option option;
+    option.secOption.securityLabel = SecurityLabel::S3;
+    option.secOption.securityFlag = SecurityFlag::SECE;
+    g_mgr.GetKvStore(STORE_ID, option, g_kvDelegateCallback);
+    ASSERT_TRUE(g_kvDelegateStatus == OK);
+    ASSERT_TRUE(g_kvDelegatePtr != nullptr);
+    /**
+     * @tc.steps: step4. rebuild kv store and sync again
+     * @tc.expected: step4. rebuild OK and sync success, re ability sync.
+     */
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 1);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+
+/**
+ * @tc.name: KVTimeChange001
+ * @tc.desc: check time sync and ability sync once
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBSingleVerP2PSyncCheckTest, KVTimeChange001, TestSize.Level0)
+{
+    /**
+     * @tc.steps: step1. record packet which send to B
+     */
+    std::atomic<int> messageCount = 0;
+    RegOnDispatchWithoutDataPacket(messageCount);
+    /**
+     * @tc.steps: step2. deviceA call sync and wait
+     * @tc.expected: step2. sync should return OK.
+     */
+    std::vector<std::string> devices;
+    devices.push_back(g_deviceB->GetDeviceId());
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 2); // 2 contain time sync request packet and ability sync packet
+    /**
+     * @tc.steps: step3. sync again
+     * @tc.expected: step3. sync success, no negotiation packet.
+     */
+    messageCount = 0;
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 0);
+    /**
+     * @tc.steps: step4. modify time offset and sync again
+     * @tc.expected: step4. sync success, only time sync packet.
+     */
+    RuntimeContext::GetInstance()->NotifyTimestampChanged(100);
+    messageCount = 0;
+    Sync(devices, OK);
+    EXPECT_EQ(messageCount, 1); // 1 contain time sync request packet
+    messageCount = 0;
+    EXPECT_EQ(g_deviceB->Sync(SYNC_MODE_PUSH_ONLY, true), OK);
+    EXPECT_EQ(messageCount, 0);
+    g_communicatorAggregator->RegOnDispatch(nullptr);
+}
+} // namespace
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp
index bc977cd2c045f90610a887d3110c17f54b2dc9f8..68d4d664552786840125b6b8738cf7484dfdca87 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_time_sync_test.cpp
@@ -21,6 +21,7 @@
 #include "single_ver_sync_state_machine.h"
 #include "single_ver_kv_sync_task_context.h"
 #include "sync_types.h"
+#include "version.h"
 #include "virtual_single_ver_sync_db_Interface.h"
 #include "virtual_time_sync_communicator.h"
 
@@ -467,4 +468,32 @@ HWTEST_F(DistributedDBTimeSyncTest, SyncTimeout001, TestSize.Level2)
     TimeOffset offset;
     errCode = g_timeSyncA->GetTimeOffset(offset, TIME_SYNC_WAIT_TIME);
     EXPECT_TRUE(errCode == -E_TIMEOUT);
+}
+
+/**
+ * @tc.name: CheckRemoteVersion001
+ * @tc.desc: Verify the timeout scenario for time sync.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author: zhangqiquan
+ */
+HWTEST_F(DistributedDBTimeSyncTest, CheckRemoteVersion001, TestSize.Level0)
+{
+    // initialize timeSyncA
+    g_metadataA->Initialize(g_syncInterfaceA);
+    int errCode = g_timeSyncA->Initialize(g_virtualCommunicator, g_metadataA, g_syncInterfaceA, DEVICE_B);
+    EXPECT_EQ(errCode, E_OK);
+
+    /**
+     * @tc.steps: step1. Initialize the syncTaskContext
+     * @tc.expected: step1. Initialize syncTaskContext successfully
+     */
+    errCode = g_syncTaskContext->Initialize(DEVICE_B, g_syncInterfaceA, g_metadataA, g_virtualCommunicator);
+    EXPECT_EQ(errCode, E_OK);
+    /**
+     * @tc.steps: step2. Check remote version
+     */
+    EXPECT_TRUE(g_timeSyncA->IsRemoteLowVersion(SOFTWARE_VERSION_RELEASE_9_0));
+    g_virtualCommunicator->SetRemoteVersion(SOFTWARE_VERSION_RELEASE_9_0);
+    EXPECT_FALSE(g_timeSyncA->IsRemoteLowVersion(SOFTWARE_VERSION_RELEASE_9_0));
 }
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_kv_sync_interface.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_kv_sync_interface.h
index 1aacb5351f755d586dde6bf98b8df5682f0bc3ff..7d9c3fa01e90be20d01f27f56c09f3a0d6482942 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_kv_sync_interface.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_kv_sync_interface.h
@@ -24,6 +24,7 @@ class MockKvSyncInterface : public VirtualSingleVerSyncDBInterface {
 public:
     MOCK_METHOD0(IncRefCount, void(void));
     MOCK_METHOD0(DecRefCount, void(void));
+    MOCK_CONST_METHOD1(GetDBInfo, void(DBInfo &));
 };
 } // namespace DistributedDB
 #endif  // #define MOCK_KV_SYNC_INTERFACE_H
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_single_ver_kv_syncer.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_single_ver_kv_syncer.h
index 4bb7d46e7be858e898a7c72d3905f697293228a4..69b775ba9598485863d561180c17dc7410ba8961 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_single_ver_kv_syncer.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_single_ver_kv_syncer.h
@@ -26,6 +26,16 @@ public:
         RecordTimeChangeOffset(changedOffset);
     }
 
+    void CallTriggerAddSubscribeAsync(ISyncInterface *syncInterface)
+    {
+        SingleVerKVSyncer::TriggerAddSubscribeAsync(syncInterface);
+    }
+
+    void SetSyncEngine(ISyncEngine *engine)
+    {
+        syncEngine_ = engine;
+    }
+
     void CallQueryAutoSync(const InternalSyncParma &param)
     {
         SingleVerKVSyncer::QueryAutoSync(param);
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_sync_engine.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_sync_engine.h
index 1be10d2bc38cfea4766e98db9925451e49ad17f9..d1c44fb3dce851743a0a73c59791d21755084246 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_sync_engine.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/mock_sync_engine.h
@@ -23,6 +23,11 @@ namespace DistributedDB {
 class MockSyncEngine : public SyncEngine {
 public:
     MOCK_METHOD0(CreateSyncTaskContext, ISyncTaskContext *(void));
+
+    void InitSubscribeManager()
+    {
+        subManager_ = std::make_shared<SubscribeManager>();
+    }
 };
 } // namespace DistributedDB
 #endif  // #define MOCK_SYNC_ENGINE_H
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
index c037eddf826adc6c23bb4046cd5216d9e0faa113..85ff9c9bbaefbfc44f9c9a47b91db0a1c61a568c 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.cpp
@@ -81,9 +81,14 @@ int VirtualCommunicator::SendMessage(const std::string &dstTarget, const Message
     return E_OK;
 }
 
+void VirtualCommunicator::SetRemoteVersion(uint16_t remoteVersion)
+{
+    remoteVersion_ = remoteVersion;
+}
+
 int VirtualCommunicator::GetRemoteCommunicatorVersion(const std::string &deviceId, uint16_t &version) const
 {
-    version = UINT16_MAX;
+    version = remoteVersion_;
     return E_OK;
 }
 
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.h
index e79af68791f79bb8a0143da14c4ccc6eaf94c597..7da559fd883eae7788eb6bcb0edbaf9f5f0daae7 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator.h
@@ -81,6 +81,8 @@ public:
 
     void SetDropMessageTypeByDevice(MessageId msgid, uint32_t dropTimes = 1);
 
+    void SetRemoteVersion(uint16_t remoteVersion);
+
 private:
     int TimeSync();
     int DataSync();
@@ -108,6 +110,8 @@ private:
     MessageId dropMsgId_ = MessageId::UNKNOW_MESSAGE;
     uint32_t dropMsgTimes_ = 0;
     uint32_t mtuSize_ = 5 * 1024 * 1024; // 5 * 1024 * 1024B
+
+    uint16_t remoteVersion_ = UINT16_MAX;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.cpp
index 50b46eae47b73a065c9ceb6070be860234d926ba..20764e07946cbc3305f54311603a3d3a27e219f1 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.cpp
@@ -24,7 +24,8 @@
 #include "runtime_context.h"
 
 namespace DistributedDB {
-int VirtualCommunicatorAggregator::Initialize(IAdapter *inAdapter)
+int VirtualCommunicatorAggregator::Initialize(IAdapter *inAdapter,
+    const std::shared_ptr<DBStatusAdapter> &statusAdapter)
 {
     return E_OK;
 }
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.h
index 7cad9d98acbad8399bf6ca87c6a3cc5f740fe395..de75b3133f70c4f2007f1290188e8e3f431bf703 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_communicator_aggregator.h
@@ -28,7 +28,7 @@ class ICommunicator;  // Forward Declaration
 class VirtualCommunicatorAggregator : public ICommunicatorAggregator {
 public:
     // Return 0 as success. Return negative as error
-    int Initialize(IAdapter *inAdapter) override;
+    int Initialize(IAdapter *inAdapter, const std::shared_ptr<DBStatusAdapter> &statusAdapter) override;
 
     void Finalize() override;
 
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp
index 5c42b4261a144e82f75e3b01e9cb004b26c071bf..4049dbac4f77d25dc7ddb42f0c74acd7324d589a 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.cpp
@@ -124,7 +124,7 @@ int VirtualTimeSyncCommunicator::SendMessage(const std::string &dstTarget, const
 
 int VirtualTimeSyncCommunicator::GetRemoteCommunicatorVersion(const std::string &deviceId, uint16_t &version) const
 {
-    version = 0;
+    version = version_;
     return E_OK;
 }
 
@@ -146,4 +146,9 @@ void VirtualTimeSyncCommunicator::Disable()
 {
     isEnable_ = false;
 }
+
+void VirtualTimeSyncCommunicator::SetRemoteVersion(uint16_t remoteVersion)
+{
+    version_ = remoteVersion;
+}
 } // namespace DistributedDB
\ No newline at end of file
diff --git a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.h b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.h
index e3165a464c9ce9ae7ee7a8cf1b69df4ba7305ee6..aa8b5889a31956e0bdbe403a7e13138c3801c6c8 100644
--- a/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.h
+++ b/kv_store/frameworks/libs/distributeddb/test/unittest/common/syncer/virtual_time_sync_communicator.h
@@ -70,6 +70,8 @@ public:
 
     void Disable();
 
+    void SetRemoteVersion(uint16_t remoteVersion);
+
 private:
     TimeSync *srcTimeSync_;
     TimeSync *dstTimeSync_;
@@ -77,6 +79,7 @@ private:
     std::string deviceID_;
     SyncTaskContext *syncTaskcontext_;
     bool isEnable_ = true;
+    uint16_t version_ = 0;
 };
 } // namespace DistributedDB
 
diff --git a/kv_store/interfaces/innerkits/distributeddata/BUILD.gn b/kv_store/interfaces/innerkits/distributeddata/BUILD.gn
index 8f76292438ee1278539183bd7183f99ac325948e..5dcf138fc84a6abd5bc422041be341ef922dd616 100644
--- a/kv_store/interfaces/innerkits/distributeddata/BUILD.gn
+++ b/kv_store/interfaces/innerkits/distributeddata/BUILD.gn
@@ -96,6 +96,7 @@ deps_config = [
   "../../../frameworks/libs/distributeddb:distributeddb",
   "../distributeddatamgr:distributeddata_mgr",
   "../distributeddata:distributeddata_client_sync",
+  "../../../databaseutils:database_utils",
 ]
 
 external_deps_config = [
diff --git a/kv_store/interfaces/innerkits/distributeddata/include/single_kvstore.h b/kv_store/interfaces/innerkits/distributeddata/include/single_kvstore.h
index b732dc0a1d6e8b25fb9a7f8f77ee1620763d66bf..da446f4eb5703f3714b444e1ff95d777116fbfe5 100644
--- a/kv_store/interfaces/innerkits/distributeddata/include/single_kvstore.h
+++ b/kv_store/interfaces/innerkits/distributeddata/include/single_kvstore.h
@@ -48,6 +48,21 @@ public:
     */
     virtual Status Get(const Key &key, Value &value) = 0;
 
+    /**
+     * @brief Get value from KvStore by its key.
+     * If key is not found, a compensation synchronization will be automatically
+     * triggered to the specified device only when the networkId is valid.
+     *
+     * @param key   Key of this entry.
+     * @param networkId The networkId of online device.
+     * @param value Value will be returned in this parameter.
+     * @return Return SUCCESS for success, others for failure.
+    */
+    virtual Status Get(const Key &key, const std::string &networkId, Value &value)
+    {
+        return Status::SUCCESS;
+    }
+
     /**
      * @brief Get all entries in this store which key start with prefixKey.
      * @param prefix  The prefix to be searched.
diff --git a/kv_store/interfaces/innerkits/distributeddata/include/store_errno.h b/kv_store/interfaces/innerkits/distributeddata/include/store_errno.h
index 5b471c64fd69a51f02bf929e7c598d9b3c246932..e314482728b211293112cb1df0bca3e0abbf681f 100644
--- a/kv_store/interfaces/innerkits/distributeddata/include/store_errno.h
+++ b/kv_store/interfaces/innerkits/distributeddata/include/store_errno.h
@@ -189,6 +189,11 @@ enum Status : int32_t {
      * Session is opening.
     */
     RATE_LIMIT = DISTRIBUTEDDATAMGR_ERR_OFFSET + 38,
+
+    /**
+     * Data is being synchronized.
+    */
+    SYNC_ACTIVATED = DISTRIBUTEDDATAMGR_ERR_OFFSET + 39,
 };
 } // namespace OHOS::DistributedKv
 #endif // OHOS_DISTRIBUTED_DATA_INTERFACES_DISTRIBUTEDDATA_STORE_ERRNO_H
diff --git a/kv_store/interfaces/innerkits/distributeddata/include/types.h b/kv_store/interfaces/innerkits/distributeddata/include/types.h
index 69ed1fe5893d2434605c7941fe688afb96c181c3..9b03cd751b1aa9cc65da0b6a5d553e28b0a6e359 100644
--- a/kv_store/interfaces/innerkits/distributeddata/include/types.h
+++ b/kv_store/interfaces/innerkits/distributeddata/include/types.h
@@ -381,7 +381,7 @@ struct Options {
      * It is not automatically synchronized by default.
      * 'ohos.permission.DISTRIBUTED_DATASYNC' permission is necessary.
     */
-    bool autoSync = true;
+    bool autoSync = false;
     /**
      * True if is distributed store, false if is local store
     */
diff --git a/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h b/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
index 1c2d1efdd026f4eb336036b68fc37e2b86c526df..282b63b2e9393dbe93eef50387fdf7d0c8f6943c 100644
--- a/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
+++ b/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/include/single_store_impl.h
@@ -48,6 +48,7 @@ public:
     Status SubscribeKvStore(SubscribeType type, std::shared_ptr<Observer> observer) override;
     Status UnSubscribeKvStore(SubscribeType type, std::shared_ptr<Observer> observer) override;
     Status Get(const Key &key, Value &value) override;
+    Status Get(const Key &key, const std::string &networkId, Value &value) override;
     Status GetEntries(const Key &prefix, std::vector<Entry> &entries) const override;
     Status GetEntries(const DataQuery &query, std::vector<Entry> &entries) const override;
     Status GetResultSet(const Key &prefix, std::shared_ptr<ResultSet> &resultSet) const override;
diff --git a/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp b/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
index 8bfc7dc8b1be62ac9c9544a09a666f865db40599..bd9c814dc48c3b6449456cbe9fcd8bdf48dac3b4 100644
--- a/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
+++ b/kv_store/kvstoremock/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp
@@ -214,6 +214,11 @@ Status SingleStoreImpl::Get(const Key &key, Value &value)
     return status;
 }
 
+Status SingleStoreImpl::Get(const Key &key, const std::string &networkId, Value &value)
+{
+    return Get(key, value);
+}
+
 Status SingleStoreImpl::GetEntries(const Key &prefix, std::vector<Entry> &entries) const
 {
     DBKey dbPrefix = convertor_.GetPrefix(prefix);
diff --git a/mock/innerkits/ipc/ipc_core/include/napi_remote_object_internal.h b/mock/innerkits/ipc/ipc_core/include/napi_remote_object_internal.h
index c1a5e482f903c4dd2057473deb4fa6b04aa0c980..5dd6d5f31d088bd972a15c393a9f9f6bb3d86309 100644
--- a/mock/innerkits/ipc/ipc_core/include/napi_remote_object_internal.h
+++ b/mock/innerkits/ipc/ipc_core/include/napi_remote_object_internal.h
@@ -82,4 +82,4 @@ struct SendRequestParam {
 
 napi_value MakeSendRequestResult(SendRequestParam *param);
 } // namespace OHOS
-#endif // NAPI_IPC_OHOS_REMOTE_OBJECT_H
+#endif // NAPI_IPC_OHOS_REMOTE_OBJECT_INTERNAL_H
diff --git a/mock/innerkits/napi/ace_napi/include/napi/common.h b/mock/innerkits/napi/ace_napi/include/napi/common.h
index 15a9ef90ede6c9fd71327e65e81da204618c05c0..3f0aa76c8d34240ed91239a5c35c0076eede653f 100644
--- a/mock/innerkits/napi/ace_napi/include/napi/common.h
+++ b/mock/innerkits/napi/ace_napi/include/napi/common.h
@@ -21,6 +21,7 @@ typedef enum {
    napi_qos_utility = 1,
    napi_qos_default = 2,
    napi_qos_user_initiated = 3,
+   uv_qos_user_initiated = 4,
 } napi_qos_t;
 
 #endif /* FOUNDATION_ACE_NAPI_INTERFACES_KITS_NAPI_NATIVE_API_H */
\ No newline at end of file
diff --git a/mock/libuv/include/uv.h b/mock/libuv/include/uv.h
index defc0ac44b180c719c528aec74b6eb5ad02ac7d9..de96a563562e727a8869e37fec108652e191e9d0 100644
--- a/mock/libuv/include/uv.h
+++ b/mock/libuv/include/uv.h
@@ -1060,6 +1060,11 @@ UV_EXTERN int uv_queue_work(uv_loop_t* loop,
                             uv_work_t* req,
                             uv_work_cb work_cb,
                             uv_after_work_cb after_work_cb);
+UV_EXTERN int uv_queue_work_with_qos(uv_loop_t* loop,
+    uv_work_t* req,
+    uv_work_cb work_cb,
+    uv_after_work_cb after_work_cb,
+    int num);
 
 UV_EXTERN int uv_cancel(uv_req_t* req);
 
diff --git a/mock/src/mock_iremote_object.cpp b/mock/src/mock_iremote_object.cpp
index 868a3b82ffaaa8ce8e04e2d27463121d3f67b693..3dd34cf31b81136d942b936702fbd57807622a4d 100644
--- a/mock/src/mock_iremote_object.cpp
+++ b/mock/src/mock_iremote_object.cpp
@@ -16,6 +16,7 @@
 #include "iremote_object.h"
 #include "iremote_stub.h"
 #include "iremote_proxy.h"
+#include "napi_remote_object.h"
 namespace OHOS {
 bool IRemoteObject::IsProxyObject() const { return true;}
 bool IRemoteObject::CheckObjectLegality() const
@@ -46,7 +47,15 @@ IRemoteObject::IRemoteObject(std::u16string descriptor)
  : descriptor_(descriptor)
 {
 
+
 }
+
+void NAPI_RemoteObject_saveOldCallingInfo(napi_env env, NAPI_CallingInfo& oldCallingInfo) {}
+
+void NAPI_RemoteObject_setNewCallingInfo(napi_env env, const CallingInfo& newCallingInfoParam) {}
+
+void NAPI_RemoteObject_resetOldCallingInfo(napi_env env, NAPI_CallingInfo& oldCallingInfo) {}
+
 //IRemoteObject::IRemoteObject()
 //{
 //}
diff --git a/mock/src/mock_js_napi.cpp b/mock/src/mock_js_napi.cpp
index 1b77acf1771458cc04f4606a16bc300367daf99f..20607e36e2337eceec44da96eaddcd5eded645cf 100644
--- a/mock/src/mock_js_napi.cpp
+++ b/mock/src/mock_js_napi.cpp
@@ -91,6 +91,7 @@ napi_status napi_create_error(napi_env env, napi_value code, napi_value msg, nap
 napi_status napi_resolve_deferred(napi_env env, napi_deferred deferred, napi_value resolution) { return napi_ok; }
 napi_status napi_reject_deferred(napi_env env, napi_deferred deferred, napi_value resolution) { return napi_ok; }
 napi_status napi_queue_async_work(napi_env env, napi_async_work work) { return napi_ok; }
+napi_status napi_queue_async_work_with_qos(napi_env env, napi_async_work work, napi_qos_t qos) {return napi_ok;}
 napi_status napi_create_promise(napi_env env, napi_deferred *deferred, napi_value *promise) { return napi_ok; }
 napi_status napi_create_object(napi_env env, napi_value* result) { return napi_ok; }
 napi_status napi_define_properties(napi_env env, napi_value object, size_t property_count,
@@ -354,10 +355,17 @@ napi_status napi_adjust_external_memory(napi_env env, int64_t change_in_bytes, i
 {
     return napi_escape_called_twice;
 }
+
+
 UV_EXTERN int uv_queue_work(uv_loop_t* loop,
     uv_work_t* req,
     uv_work_cb work_cb,
-    uv_after_work_cb after_work_cb) { return 0; };
+    uv_after_work_cb after_work_cb) { return 0; }
+UV_EXTERN int uv_queue_work_with_qos(uv_loop_t* loop,
+    uv_work_t* req,
+    uv_work_cb work_cb,
+    uv_after_work_cb after_work_cb,
+    int num) { return 0; }
 
 NAPI_EXTERN napi_status napi_object_freeze(napi_env env,
     napi_value object)
diff --git a/preferences/frameworks/js/napi/common/include/js_ability.h b/preferences/frameworks/js/napi/common/include/js_ability.h
index fb114b557759ee56116fe8b25c974607eaed8fe9..556d98d1a44898e487a5eb9cbf531ddada6ea24b 100644
--- a/preferences/frameworks/js/napi/common/include/js_ability.h
+++ b/preferences/frameworks/js/napi/common/include/js_ability.h
@@ -18,6 +18,8 @@
 #include <iostream>
 #include <string>
 
+#include "napi_preferences_error.h"
+
 #include "ability.h"
 #include "napi/native_api.h"
 #include "napi/native_common.h"
@@ -34,7 +36,8 @@ struct ContextInfo {
 };
 static CONTEXT_MODE gContextNode = INIT;
 CONTEXT_MODE GetContextMode(napi_env env, napi_value value);
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo);
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo);
 } // namespace JSAbility
 } // namespace PreferencesJsKit
 } // namespace OHOS
diff --git a/preferences/frameworks/js/napi/common/include/js_utils.h b/preferences/frameworks/js/napi/common/include/js_utils.h
index 8d62cc4ee1445644e61f28ff082d64d9ece93aaa..54b86bee06c5716f8bddd6fa7f9ac508501c42ce 100644
--- a/preferences/frameworks/js/napi/common/include/js_utils.h
+++ b/preferences/frameworks/js/napi/common/include/js_utils.h
@@ -32,13 +32,13 @@
 namespace OHOS {
 namespace PreferencesJsKit {
 namespace JSUtils {
-constexpr int OK = 0;
-constexpr int ERR = -1;
-constexpr int EXCEED_MAX_LENGTH = -2;
+constexpr int32_t OK = 0;
+constexpr int32_t ERR = -1;
+constexpr int32_t EXCEED_MAX_LENGTH = -2;
 constexpr int32_t DEFAULT_BUF_SIZE = 1024;
 constexpr int32_t BUF_CACHE_MARGIN = 4;
 constexpr int32_t ASYNC_RST_SIZE = 2;
-constexpr int32_t MAX_VALUE_LENGTH = 8 * 1024;
+constexpr int32_t MAX_VALUE_LENGTH = 8 * DEFAULT_BUF_SIZE;
 constexpr int32_t SYNC_RESULT_ELEMNT_NUM = 2;
 
 bool Equals(napi_env env, napi_value value, napi_ref copy);
diff --git a/preferences/frameworks/js/napi/common/include/napi_preferences_error.h b/preferences/frameworks/js/napi/common/include/napi_preferences_error.h
index 28cee038508ddc484f6a8956b97229922ed058fe..d833587104bc21f351b7384b61e1cc51c348e032 100644
--- a/preferences/frameworks/js/napi/common/include/napi_preferences_error.h
+++ b/preferences/frameworks/js/napi/common/include/napi_preferences_error.h
@@ -91,10 +91,10 @@ public:
 
 class ParamTypeError : public JSError {
 public:
-    ParamTypeError(const std::string &name, const std::string &wantType) : name(name), wantType(wantType){};
+    ParamTypeError(const std::string &errmsg) : errmsg_(errmsg){};
     std::string GetMsg() override
     {
-        return "Parameter error. The type of '" + name + "' must be " + wantType;
+        return "Parameter error. " + errmsg_;
     };
     int GetCode() override
     {
@@ -102,8 +102,7 @@ public:
     };
 
 private:
-    std::string name;
-    std::string wantType;
+    std::string errmsg_;
 };
 
 class InnerError : public JSError {
diff --git a/preferences/frameworks/js/napi/common/include/uv_queue.h b/preferences/frameworks/js/napi/common/include/uv_queue.h
index 14c7fbdf6d506fad74e57a9b63483ca5dc80b259..21d5da887ac42b4fa43d05f897136982ae0632d7 100644
--- a/preferences/frameworks/js/napi/common/include/uv_queue.h
+++ b/preferences/frameworks/js/napi/common/include/uv_queue.h
@@ -31,6 +31,7 @@ public:
     napi_env GetEnv();
     void AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs = NapiArgsGenerator());
 private:
+    static void Work(uv_work_t* work, int uvstatus);
     struct UvEntry {
         napi_env env;
         NapiCallbackGetter callback;
diff --git a/preferences/frameworks/js/napi/common/mock/cross_platform/include/js_ability.h b/preferences/frameworks/js/napi/common/mock/cross_platform/include/js_ability.h
index d6b864cdab580e117ad5f8ee4ed6e944eea8bbed..b8c2130254d910175e3ca3671384cf2b176acb96 100644
--- a/preferences/frameworks/js/napi/common/mock/cross_platform/include/js_ability.h
+++ b/preferences/frameworks/js/napi/common/mock/cross_platform/include/js_ability.h
@@ -18,6 +18,8 @@
 
 #include <string>
 
+#include "napi_preferences_error.h"
+
 #include "context.h"
 #include "napi/native_api.h"
 #include "napi/native_common.h"
@@ -34,7 +36,8 @@ struct ContextInfo {
 };
 static CONTEXT_MODE gContextNode = INIT;
 CONTEXT_MODE GetContextMode(napi_env env, napi_value value);
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo);
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo);
 } // namespace JSAbility
 } // namespace PreferencesJsKit
 } // namespace OHOS
diff --git a/preferences/frameworks/js/napi/common/mock/cross_platform/src/js_ability.cpp b/preferences/frameworks/js/napi/common/mock/cross_platform/src/js_ability.cpp
index eec988af07743b9c44d6506e369292acc75445aa..955655c58b7c32608b8da6d2a9f7a3f20beebf7d 100644
--- a/preferences/frameworks/js/napi/common/mock/cross_platform/src/js_ability.cpp
+++ b/preferences/frameworks/js/napi/common/mock/cross_platform/src/js_ability.cpp
@@ -16,7 +16,6 @@
 #include "js_ability.h"
 
 #include "log_print.h"
-#include "napi_preferences_error.h"
 
 namespace OHOS {
 namespace PreferencesJsKit {
@@ -26,18 +25,19 @@ CONTEXT_MODE GetContextMode(napi_env env, napi_value value)
     return STAGE;
 }
 
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo)
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo)
 {
     if (!dataGroupId.empty()) {
-        return NativePreferences::E_NOT_SUPPORTED;
+        return std::make_shared<InnerError>(NativePreferences::E_NOT_SUPPORTED);
     }
     auto stageContext = AbilityRuntime::Platform::GetStageModeContext(env, value);
     if (stageContext == nullptr) {
         LOG_ERROR("GetStageModeContext failed.");
-        return E_INVALID_PARAM;
+        return std::make_shared<InnerError>("The context is invalid.");
     }
     contextInfo.preferencesDir = stageContext->GetPreferencesDir();
-    return OK;
+    return nullptr;
 }
 } // namespace JSAbility
 } // namespace PreferencesJsKit
diff --git a/preferences/frameworks/js/napi/common/mock/include/js_ability.h b/preferences/frameworks/js/napi/common/mock/include/js_ability.h
index 14b37a476a5690bb237e74942e34b9a8c932af2b..0e13eadca61a8fe87dad94b4f902e033586524d7 100644
--- a/preferences/frameworks/js/napi/common/mock/include/js_ability.h
+++ b/preferences/frameworks/js/napi/common/mock/include/js_ability.h
@@ -18,6 +18,8 @@
 #include <iostream>
 #include <string>
 
+#include "napi_preferences_error.h"
+
 #include "napi/native_api.h"
 #include "napi/native_common.h"
 #include "napi/native_node_api.h"
@@ -32,7 +34,8 @@ struct ContextInfo {
 };
 static CONTEXT_MODE gContextNode = INIT;
 CONTEXT_MODE GetContextMode(napi_env env, napi_value value);
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo);
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo);
 } // namespace JSAbility
 } // namespace PreferencesJsKit
 } // namespace OHOS
diff --git a/preferences/frameworks/js/napi/common/mock/src/js_ability.cpp b/preferences/frameworks/js/napi/common/mock/src/js_ability.cpp
index 1271c741463ebdabe11b0f4e919858657ee0f0a8..ea4e9bd4c1ba711771899325045e32a47b861ac6 100644
--- a/preferences/frameworks/js/napi/common/mock/src/js_ability.cpp
+++ b/preferences/frameworks/js/napi/common/mock/src/js_ability.cpp
@@ -18,7 +18,6 @@
 #include <cstdlib>
 
 #include "log_print.h"
-#include "napi_preferences_error.h"
 
 namespace OHOS {
 namespace PreferencesJsKit {
@@ -28,10 +27,11 @@ CONTEXT_MODE GetContextMode(napi_env env, napi_value value)
     return STAGE;
 }
 
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo)
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo)
 {
     if (!dataGroupId.empty()) {
-        return NativePreferences::E_NOT_SUPPORTED;
+        return std::make_shared<InnerError>(NativePreferences::E_NOT_SUPPORTED);
     }
     std::string baseDir = "";
 #ifdef WINDOWS_PLATFORM
@@ -48,7 +48,7 @@ int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupI
         contextInfo.preferencesDir = baseDir + "/HuaweiDevEcoStudioPreferences";
     }
 #endif
-    return OK;
+    return nullptr;
 }
 } // namespace JSAbility
 } // namespace PreferencesJsKit
diff --git a/preferences/frameworks/js/napi/common/src/js_ability.cpp b/preferences/frameworks/js/napi/common/src/js_ability.cpp
index af23daa3581c7261238dfd2b5324ff39941d5c69..bc73c5308237370d7446c7073dd13a4af6ee0831 100644
--- a/preferences/frameworks/js/napi/common/src/js_ability.cpp
+++ b/preferences/frameworks/js/napi/common/src/js_ability.cpp
@@ -16,7 +16,6 @@
 
 #include "extension_context.h"
 #include "log_print.h"
-#include "napi_preferences_error.h"
 
 namespace OHOS {
 namespace PreferencesJsKit {
@@ -27,46 +26,47 @@ CONTEXT_MODE GetContextMode(napi_env env, napi_value value)
         bool isStageMode;
         napi_status status = AbilityRuntime::IsStageContext(env, value, isStageMode);
         gContextNode = (status == napi_ok && isStageMode) ? STAGE : FA;
-        LOG_INFO("set gContextNode = %{public}d", gContextNode);
+        LOG_INFO("set gContextNode: %{public}d, status: %{public}d,", gContextNode, status);
     }
     return gContextNode;
 }
 
-int GetContextInfo(napi_env env, napi_value value, const std::string &dataGroupId, ContextInfo &contextInfo)
+std::shared_ptr<JSError> GetContextInfo(napi_env env, napi_value value,
+    const std::string &dataGroupId, ContextInfo &contextInfo)
 {
     if (GetContextMode(env, value) == STAGE) {
         if (auto stageContext = AbilityRuntime::GetStageModeContext(env, value)) {
             int errcode = stageContext->GetSystemPreferencesDir(dataGroupId, false, contextInfo.preferencesDir);
             if (errcode != 0) {
                 LOG_ERROR("GetSystemPreferencesDir fails, rc = %{public}d", errcode);
-                return E_DATA_GROUP_ID_INVALID;
+                return std::make_shared<InnerError>(E_DATA_GROUP_ID_INVALID);
             }
             contextInfo.bundleName = stageContext->GetBundleName();
-            return OK;
+            return nullptr;
         } else {
-            LOG_ERROR("failed to get stage mode context.");
-            return E_INNER_ERROR;
+            LOG_ERROR("failed to get the context of the stage model.");
+            return std::make_shared<ParamTypeError>("The context is invalid.");
         }
     }
 
     if (!dataGroupId.empty()) {
         LOG_ERROR("dataGroupId should be empty in fa mode");
-        return E_NOT_STAGE_MODE;
+        return std::make_shared<InnerError>(E_NOT_STAGE_MODE);
     }
 
     auto ability = AbilityRuntime::GetCurrentAbility(env);
     if (ability == nullptr) {
         LOG_ERROR("failed to get current ability.");
-        return E_INNER_ERROR;
+        return std::make_shared<ParamTypeError>("The context is invalid.");
     }
 
     auto abilityContext = ability->GetAbilityContext();
     if (ability == nullptr) {
         LOG_ERROR("failed to get ability context.");
-        return E_INNER_ERROR;
+        return std::make_shared<ParamTypeError>("The context is invalid.");
     }
     abilityContext->GetSystemPreferencesDir("", false, contextInfo.preferencesDir);
-    return OK;
+    return nullptr;
 }
 } // namespace JSAbility
 } // namespace PreferencesJsKit
diff --git a/preferences/frameworks/js/napi/common/src/napi_async_call.cpp b/preferences/frameworks/js/napi/common/src/napi_async_call.cpp
index 31e01cc822d8f5f1a61bcda86c06301dc8621b36..f4639bd60c4ec5b30c9f9127585294394ccb4825 100644
--- a/preferences/frameworks/js/napi/common/src/napi_async_call.cpp
+++ b/preferences/frameworks/js/napi/common/src/napi_async_call.cpp
@@ -110,12 +110,13 @@ napi_value AsyncCall::Async(napi_env env, std::shared_ptr<BaseContext> context,
     }
     context->keep_ = context;
     napi_value resource = nullptr;
-    napi_create_string_utf8(env, "PreferencesAsyncCall", NAPI_AUTO_LENGTH, &resource);
+    const std::string name_resource = "Preferences" + name;
+    napi_create_string_utf8(env, name_resource.c_str(), NAPI_AUTO_LENGTH, &resource);
     // create async work, execute function is OnExecute, complete function is OnComplete
     napi_create_async_work(env, nullptr, resource, AsyncCall::OnExecute, AsyncCall::OnComplete,
                            reinterpret_cast<void *>(context.get()), &context->work_);
     // add async work to execute queue
-    napi_queue_async_work(env, context->work_);
+    napi_queue_async_work_with_qos(env, context->work_, napi_qos_user_initiated);
     auto end_time = std::chrono::steady_clock::now();
     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
     if (duration.count() > ASYNC_PROCESS_WARING_TIME) {
@@ -145,6 +146,7 @@ void AsyncCall::OnComplete(napi_env env, void *data)
     BaseContext *context = reinterpret_cast<BaseContext *>(data);
     if (context->execCode_ != NativePreferences::E_OK) {
         context->SetError(std::make_shared<InnerError>(context->execCode_));
+        LOG_ERROR("The async execute status is %{public}d", context->execCode_);
     }
     // if async execute status is not napi_ok then un-execute out function
     if ((context->error == nullptr) && context->output_) {
diff --git a/preferences/frameworks/js/napi/common/src/uv_queue.cpp b/preferences/frameworks/js/napi/common/src/uv_queue.cpp
index 5b66ba6a8cdfae239bd38274d5fbddd887a7c51b..f1f044d8994b716eb4c306c98b2d4f87dec4a495 100644
--- a/preferences/frameworks/js/napi/common/src/uv_queue.cpp
+++ b/preferences/frameworks/js/napi/common/src/uv_queue.cpp
@@ -43,44 +43,53 @@ void UvQueue::AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs)
 
     uv_work_t* work = new (std::nothrow) uv_work_t;
     if (work == nullptr) {
-        LOG_ERROR("no memory for uv_work_t");
         return;
     }
-    work->data = new UvEntry{ env_, getter, std::move(genArgs) };
-    uv_queue_work(
-        loop_, work, [](uv_work_t* work) {},
-        [](uv_work_t* work, int uvstatus) {
-            std::shared_ptr<UvEntry> entry(static_cast<UvEntry *>(work->data), [work](UvEntry *data) {
-                delete data;
-                delete work;
-            });
-            napi_handle_scope scope = nullptr;
-            napi_open_handle_scope(entry->env, &scope);
-            if (scope == nullptr) {
-                return;
-            }
-            napi_value method = entry->callback(entry->env);
-            if (method == nullptr) {
-                LOG_WARN("the callback is invalid, maybe is cleared!");
-                napi_close_handle_scope(entry->env, scope);
-                return ;
-            }
-            int argc = 0;
-            napi_value argv[MAX_CALLBACK_ARG_NUM] = { nullptr };
-            if (entry->args) {
-                argc = MAX_CALLBACK_ARG_NUM;
-                entry->args(entry->env, argc, argv);
-            }
-            LOG_DEBUG("queue uv_after_work_cb");
-            napi_value global = nullptr;
-            napi_get_global(entry->env, &global);
-            napi_value result;
-            napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
-            if (status != napi_ok) {
-                LOG_ERROR("notify data change failed status:%{public}d.", status);
-            }
-            napi_close_handle_scope(entry->env, scope);
-        });
+    work->data = new (std::nothrow) UvEntry{ env_, getter, std::move(genArgs) };
+    if (work->data == nullptr) {
+        delete work;
+        return;
+    }
+    int ret = uv_queue_work(loop_, work, [](uv_work_t* work) {}, UvQueue::Work);
+    if (ret != 0) {
+        LOG_ERROR("Failed to uv_queue_work.");
+        delete static_cast<UvEntry *>(work->data);
+        delete work;
+    }
+}
+
+void UvQueue::Work(uv_work_t* work, int uvstatus)
+{
+    std::shared_ptr<UvEntry> entry(static_cast<UvEntry *>(work->data), [work](UvEntry *data) {
+        delete data;
+        delete work;
+    });
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(entry->env, &scope);
+    if (scope == nullptr) {
+        return;
+    }
+    napi_value method = entry->callback(entry->env);
+    if (method == nullptr) {
+        LOG_WARN("the callback is invalid, maybe is cleared!");
+        napi_close_handle_scope(entry->env, scope);
+        return ;
+    }
+    int argc = 0;
+    napi_value argv[MAX_CALLBACK_ARG_NUM] = { nullptr };
+    if (entry->args) {
+        argc = MAX_CALLBACK_ARG_NUM;
+        entry->args(entry->env, argc, argv);
+    }
+    LOG_DEBUG("queue uv_after_work_cb");
+    napi_value global = nullptr;
+    napi_get_global(entry->env, &global);
+    napi_value result;
+    napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result);
+    if (status != napi_ok) {
+        LOG_ERROR("notify data change failed status:%{public}d.", status);
+    }
+    napi_close_handle_scope(entry->env, scope);
 }
 
 napi_env UvQueue::GetEnv()
diff --git a/preferences/frameworks/js/napi/preferences/src/napi_preferences.cpp b/preferences/frameworks/js/napi/preferences/src/napi_preferences.cpp
index c1c7d7faf790c1759ab35a90651185962616e16a..fe83ea9422f55f85262fa58f1e5abd1fd57962d1 100644
--- a/preferences/frameworks/js/napi/preferences/src/napi_preferences.cpp
+++ b/preferences/frameworks/js/napi/preferences/src/napi_preferences.cpp
@@ -145,16 +145,16 @@ napi_value PreferencesProxy::New(napi_env env, napi_callback_info info)
 int ParseKey(napi_env env, const napi_value arg, std::shared_ptr<PreferencesAysncContext> context)
 {
     int32_t rc = JSUtils::Convert2NativeValue(env, arg, context->key);
-    PRE_CHECK_RETURN_ERR_SET(rc == napi_ok, std::make_shared<ParamTypeError>("value", "string."));
+    PRE_CHECK_RETURN_ERR_SET(rc == napi_ok, std::make_shared<ParamTypeError>("The key must be string."));
     PRE_CHECK_RETURN_ERR_SET(context->key.length() <= MAX_KEY_LENGTH,
-        std::make_shared<ParamTypeError>("key", "less than 80 bytes."));
+        std::make_shared<ParamTypeError>("The key must be less than 80 bytes."));
     return OK;
 }
 
 int ParseDefValue(const napi_env env, const napi_value jsVal, std::shared_ptr<PreferencesAysncContext> context)
 {
     int32_t rc = JSUtils::Convert2NativeValue(env, jsVal, context->defValue.value_);
-    PRE_CHECK_RETURN_ERR_SET(rc == napi_ok, std::make_shared<ParamTypeError>("value", "ValueType."));
+    PRE_CHECK_RETURN_ERR_SET(rc == napi_ok, std::make_shared<ParamTypeError>("The type of value mast be ValueType."));
     return OK;
 }
 
@@ -372,14 +372,14 @@ napi_value PreferencesProxy::RegisterObserver(napi_env env, napi_callback_info i
     napi_valuetype type;
     NAPI_CALL(env, napi_typeof(env, args[0], &type));
     PRE_NAPI_ASSERT(env, type == napi_string,
-        std::make_shared<ParamTypeError>("registerMode", "string 'change or multiProcessChange'."));
+        std::make_shared<ParamTypeError>("The registerMode must be string."));
     std::string registerMode;
     JSUtils::Convert2NativeValue(env, args[0], registerMode);
     PRE_NAPI_ASSERT(env, registerMode == STR_CHANGE || registerMode == STR_MULTI_PRECESS_CHANGE,
-        std::make_shared<ParamTypeError>("registerMode", "string 'change or multiProcessChange'."));
+        std::make_shared<ParamTypeError>("The registerMode must be 'change' or 'multiProcessChange'."));
 
     NAPI_CALL(env, napi_typeof(env, args[1], &type));
-    PRE_NAPI_ASSERT(env, type == napi_function, std::make_shared<ParamTypeError>("callback", "function type."));
+    PRE_NAPI_ASSERT(env, type == napi_function, std::make_shared<ParamTypeError>("The callback must be function."));
 
     PreferencesProxy *obj = nullptr;
     NAPI_CALL(env, napi_unwrap(env, thiz, reinterpret_cast<void **>(&obj)));
@@ -402,17 +402,17 @@ napi_value PreferencesProxy::UnRegisterObserver(napi_env env, napi_callback_info
     napi_valuetype type;
     NAPI_CALL(env, napi_typeof(env, args[0], &type));
     PRE_NAPI_ASSERT(env, type == napi_string,
-        std::make_shared<ParamTypeError>("registerMode", "string change or multiProcessChange."));
+        std::make_shared<ParamTypeError>("The registerMode must be string."));
 
     std::string registerMode;
     JSUtils::Convert2NativeValue(env, args[0], registerMode);
     PRE_NAPI_ASSERT(env, registerMode == STR_CHANGE || registerMode == STR_MULTI_PRECESS_CHANGE,
-        std::make_shared<ParamTypeError>("registerMode", "string change or multiProcessChange."));
+        std::make_shared<ParamTypeError>("The registerMode must be 'change' or 'multiProcessChange'."));
 
     if (argc == requireArgc) {
         NAPI_CALL(env, napi_typeof(env, args[1], &type));
         PRE_NAPI_ASSERT(env, type == napi_function || type == napi_undefined || type == napi_null,
-            std::make_shared<ParamTypeError>("callback", "function type."));
+            std::make_shared<ParamTypeError>("The callback must be function."));
     }
 
     PreferencesProxy *obj = nullptr;
diff --git a/preferences/frameworks/js/napi/preferences/src/napi_preferences_helper.cpp b/preferences/frameworks/js/napi/preferences/src/napi_preferences_helper.cpp
index 941bceaa73d72fa71bd79f0bf9a5033d5ef8bba2..6af833ac5a0d1ae3cc55b958621803b7983581cc 100644
--- a/preferences/frameworks/js/napi/preferences/src/napi_preferences_helper.cpp
+++ b/preferences/frameworks/js/napi/preferences/src/napi_preferences_helper.cpp
@@ -19,7 +19,6 @@
 #include "js_ability.h"
 #include "js_utils.h"
 #include "napi_async_call.h"
-#include "napi_preferences_error.h"
 #include "napi_preferences.h"
 #include "preferences_errno.h"
 #include "preferences.h"
@@ -51,7 +50,7 @@ int ParseParameters(const napi_env env, napi_value *argv, std::shared_ptr<Helper
         napi_value temp = nullptr;
         napi_get_named_property(env, argv[1], NAME, &temp);
         PRE_CHECK_RETURN_ERR_SET(temp && JSUtils::Convert2NativeValue(env, temp, context->name) == napi_ok,
-            std::make_shared<ParamTypeError>(NAME, "a string."));
+            std::make_shared<ParamTypeError>("The name must be string."));
 
         bool hasGroupId = false;
         napi_has_named_property(env, argv[1], DATA_GROUP_ID, &hasGroupId);
@@ -62,17 +61,17 @@ int ParseParameters(const napi_env env, napi_value *argv, std::shared_ptr<Helper
             napi_status status = napi_typeof(env, temp, &type);
             if (status == napi_ok && (type != napi_null && type != napi_undefined)) {
                 PRE_CHECK_RETURN_ERR_SET(JSUtils::Convert2NativeValue(env, temp, context->dataGroupId) == napi_ok,
-                    std::make_shared<ParamTypeError>(DATA_GROUP_ID, "a string."));
+                    std::make_shared<ParamTypeError>("The dataGroupId must be string."));
             }
         }
     }
     JSAbility::ContextInfo contextInfo;
-    int errCode = JSAbility::GetContextInfo(env, argv[0], context->dataGroupId, contextInfo);
-    PRE_CHECK_RETURN_ERR_SET(errCode == OK, std::make_shared<InnerError>(errCode));
+    std::shared_ptr<JSError> err = JSAbility::GetContextInfo(env, argv[0], context->dataGroupId, contextInfo);
+    PRE_CHECK_RETURN_ERR_SET(err == nullptr, err);
 
     context->bundleName = contextInfo.bundleName;
     context->path = contextInfo.preferencesDir.append("/").append(context->name);
-    return errCode;
+    return OK;
 }
 
 napi_value GetPreferences(napi_env env, napi_callback_info info)
diff --git a/preferences/frameworks/js/napi/storage/src/napi_storage.cpp b/preferences/frameworks/js/napi/storage/src/napi_storage.cpp
index c665cd939b4fda0e4c8a1941be27600e3ff8a54f..d8bdbc85844a6c5adb4409002f6c73113de7acbb 100644
--- a/preferences/frameworks/js/napi/storage/src/napi_storage.cpp
+++ b/preferences/frameworks/js/napi/storage/src/napi_storage.cpp
@@ -254,7 +254,7 @@ int ParseKey(const napi_env env, const napi_value arg, std::shared_ptr<StorageAy
     napi_typeof(env, arg, &keyType);
     if (keyType != napi_string) {
         LOG_ERROR("ParseKey: key type must be string.");
-        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "string type.");
+        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("The key must be string.");
         asyncContext->SetError(paramError);
         return ERR;
     }
@@ -262,13 +262,13 @@ int ParseKey(const napi_env env, const napi_value arg, std::shared_ptr<StorageAy
     napi_status status = napi_get_value_string_utf8(env, arg, nullptr, 0, &keyBufferSize);
     if (status != napi_ok) {
         LOG_ERROR("ParseKey: get keyBufferSize failed");
-        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("Failed to get keyBufferSize.");
         asyncContext->SetError(paramError);
         return ERR;
     }
     if (keyBufferSize > MAX_KEY_LENGTH) {
         LOG_ERROR("the length of the key is over maximum length.");
-        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("key", "less than 80 bytes.");
+        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("The key must be less than 80 bytes.");
         asyncContext->SetError(paramError);
         return ERR;
     }
@@ -281,7 +281,7 @@ int ParseKey(const napi_env env, const napi_value arg, std::shared_ptr<StorageAy
     status = napi_get_value_string_utf8(env, arg, key, keyBufferSize + 1, &keySize);
     if (status != napi_ok) {
         LOG_ERROR("ParseKey: get keySize failed");
-        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("Failed to get keySize.");
         asyncContext->SetError(paramError);
         delete[] key;
         return ERR;
@@ -300,7 +300,8 @@ int ParseDefValue(const napi_env env, const napi_value jsVal, std::shared_ptr<St
         double number = 0.0;
         if (JSUtils::Convert2NativeValue(env, jsVal, number) != E_OK) {
             LOG_ERROR("ParseDefValue Convert2NativeValue error");
-            std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+            std::shared_ptr<JSError> paramError =
+                std::make_shared<ParamTypeError>("The type of value must be ValueType.");
             asyncContext->SetError(paramError);
             return ERR;
         }
@@ -312,11 +313,12 @@ int ParseDefValue(const napi_env env, const napi_value jsVal, std::shared_ptr<St
             LOG_ERROR("ParseDefValue Convert2NativeValue error");
             if (ret == EXCEED_MAX_LENGTH) {
                 std::shared_ptr<JSError> paramError =
-                    std::make_shared<ParamTypeError>("value", "less than 8192 bytes.");
+                    std::make_shared<ParamTypeError>("The value must be less than 8192 bytes.");
                 asyncContext->SetError(paramError);
                 return ERR;
             }
-            std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+            std::shared_ptr<JSError> paramError =
+                std::make_shared<ParamTypeError>("The type of value must be ValueType.");
             asyncContext->SetError(paramError);
             return ERR;
         }
@@ -325,14 +327,16 @@ int ParseDefValue(const napi_env env, const napi_value jsVal, std::shared_ptr<St
         bool bValue = false;
         if (JSUtils::Convert2NativeValue(env, jsVal, bValue) != E_OK) {
             LOG_ERROR("ParseDefValue Convert2NativeValue error");
-            std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+            std::shared_ptr<JSError> paramError =
+                std::make_shared<ParamTypeError>("The type of value must be ValueType.");
             asyncContext->SetError(paramError);
             return ERR;
         }
         asyncContext->defValue = bValue;
     } else {
         LOG_ERROR("Wrong second parameter type");
-        std::shared_ptr<JSError> paramError = std::make_shared<ParamTypeError>("value", "a ValueType.");
+        std::shared_ptr<JSError> paramError =
+            std::make_shared<ParamTypeError>("The type of value must be ValueType.");
         asyncContext->SetError(paramError);
         return ERR;
     }
diff --git a/preferences/frameworks/native/src/preferences_impl.cpp b/preferences/frameworks/native/src/preferences_impl.cpp
index 49848050b437e2e2020b3b9b063c5c81741c4549..c8297c91932275e86d0722f5216e6f1a32726c76 100644
--- a/preferences/frameworks/native/src/preferences_impl.cpp
+++ b/preferences/frameworks/native/src/preferences_impl.cpp
@@ -404,7 +404,7 @@ int PreferencesImpl::UnRegisterObserver(std::shared_ptr<PreferencesObserver> pre
             }
             int errcode = dataObsMgrClient->UnregisterObserver(MakeUri(), *it);
             if (errcode != 0) {
-                LOG_ERROR("RegisterObserver multiProcessChange failed, errCode %{public}d", errcode);
+                LOG_ERROR("UnRegisterObserver multiProcessChange failed, errCode %{public}d", errcode);
                 return errcode;
             }
             multiProcessObservers_.erase(it);
@@ -423,7 +423,7 @@ int PreferencesImpl::Put(const std::string &key, const PreferencesValue &value)
     if (value.IsString()) {
         errCode = CheckStringValue(value);
         if (errCode != E_OK) {
-            LOG_ERROR("PreferencesImpl::Put string value length should shorter than 8*1024");
+            LOG_ERROR("PreferencesImpl::Put string value length should shorter than 8192");
             return errCode;
         }
     }
diff --git a/preferences/frameworks/native/src/preferences_xml_utils.cpp b/preferences/frameworks/native/src/preferences_xml_utils.cpp
index e52ed7e2c712ad1f4f7f52d4e7158fb775579425..4e1ae3d6fdbffcdef3db6c226c3aad5b71de5974 100644
--- a/preferences/frameworks/native/src/preferences_xml_utils.cpp
+++ b/preferences/frameworks/native/src/preferences_xml_utils.cpp
@@ -222,7 +222,7 @@ bool ParseStringNodeElement(const xmlNode *node, Element &element)
         element.value_ = std::string(reinterpret_cast<char *>(text));
         success = true;
     } else {
-        LOG_ERROR("Failed to obtain a valid key or value when parsing a String element.");
+        LOG_ERROR("Failed to obtain a valid key or value when parsing string element.");
     }
 
     if (key != nullptr) {
diff --git a/preferences/interfaces/inner_api/BUILD.gn b/preferences/interfaces/inner_api/BUILD.gn
index 833059024b59ea7efee4130fb87a6b40a09eaf92..62613e883788d3f9880cd6c36542b996b45414f8 100644
--- a/preferences/interfaces/inner_api/BUILD.gn
+++ b/preferences/interfaces/inner_api/BUILD.gn
@@ -163,7 +163,7 @@ if (is_ohos) {
     deps = [
       "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog_${target_os}",
       "//commonlibrary/c_utils/base:utilsbase",
-      "//third_party/libxml2:static_libxml2",
+      "//third_party/libxml2:libxml2",
     ]
     public_configs = [ ":native_preferences_public_config" ]
     subsystem_name = "distributeddatamgr"
diff --git a/preferences/interfaces/inner_api/include/preferences.h b/preferences/interfaces/inner_api/include/preferences.h
index 2a34fd081d5f4de05dd9b8882c1c7b71992aa990..541cb84e3c80025715397915df4dcf0637381642 100644
--- a/preferences/interfaces/inner_api/include/preferences.h
+++ b/preferences/interfaces/inner_api/include/preferences.h
@@ -106,12 +106,12 @@ public:
     /**
      * @brief Obtains the string value of a preferences.
      *
-     * This function is used to get a string value of the corresponding key in the preference.
+     * This function is used to get string value of the corresponding key in the preference.
      *
      * @param key Indicates the key of the preferences. It cannot be empty.
      * @param defValue Indicates the default value of the preferences.
      *
-     * @return Returns a string value matching the specified key if it is found; returns the default value otherwise.
+     * @return Returns string value matching the specified key if it is found; returns the default value otherwise.
      */
     virtual std::string GetString(const std::string &key, const std::string &defValue = {}) = 0;
 
@@ -198,7 +198,7 @@ public:
     /**
      * @brief Put or update an string value for the key.
      *
-     * This function is used to put or update a string value of the corresponding key in the preference.
+     * This function is used to put or update string value of the corresponding key in the preference.
      *
      * @param key Indicates the key of the preferences. It cannot be empty.
      * @param value Indicates the value of preferences to put or update.
diff --git a/preferences/interfaces/inner_api/include/preferences_value.h b/preferences/interfaces/inner_api/include/preferences_value.h
index 2907e61498bd877f4e4598d5a46fe4f671c98e81..a5120a2b103012b3d2b16a891386d69298b94142 100644
--- a/preferences/interfaces/inner_api/include/preferences_value.h
+++ b/preferences/interfaces/inner_api/include/preferences_value.h
@@ -94,7 +94,7 @@ public:
      *
      * This constructor is used to convert the string input parameter to a value of type PreferencesValue.
      *
-     * @param value Indicates a string input parameter.
+     * @param value Indicates string input parameter.
      */
     PREF_API_EXPORT PreferencesValue(std::string value);
 
diff --git a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesCallBacktest.ets b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesCallBacktest.ets
index 480a9449828219a321b2b0529b3acb496f039edb..a814e2a0f6f4428a3f4a9014f6b87aca2dccca26 100644
--- a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesCallBacktest.ets
+++ b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesCallBacktest.ets
@@ -23,7 +23,7 @@ export default function stagePreferencesCallbackJsTest() {
   describe('stagePreferencesCallbackJsTest', ():void =>{
     console.log(TAG + "*************Unit Test Begin*************");
     beforeAll(():void => {
-      console.log('stagePreferencesCallbackJsTest lrui TestAbility context' + globalThis.abilityContext);
+      console.log('stagePreferencesCallbackJsTest TestAbility context' + globalThis.abilityContext);
       console.info('beforeAll')
     })
     afterAll(():void =>{
diff --git a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesPromisetest.ets b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesPromisetest.ets
index ad74167e8c19039f924280e44f6753535f0f35e1..ab5c49516eaf73601e18b607d27933ab61c63a70 100644
--- a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesPromisetest.ets
+++ b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesPromisetest.ets
@@ -22,7 +22,7 @@ export default function stagePreferencesPromiseJsTest() {
   describe('stagePreferencesPromiseJsTest', function () {
     console.log(TAG + "*************Unit Test Begin*************");
     beforeAll(function() {
-      console.log('stagePreferencesPromiseJsTest lrui TestAbility context' + globalThis.abilityContext);
+      console.log('stagePreferencesPromiseJsTest TestAbility context' + globalThis.abilityContext);
       console.info('beforeAll')
     })
     afterAll(async function () {
diff --git a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesSynctest.ets b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesSynctest.ets
index e323175c3ca21d6971aedf2eba4308e8b1839bbc..9bd70c6ff8349744fc24f669c2d874faa2fcfcb1 100644
--- a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesSynctest.ets
+++ b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/ets/test/StagePreferencesSynctest.ets
@@ -22,7 +22,7 @@ let mPreferences;
 export default function stagePreferencesSyncJsTest() {
   describe('stagePreferencesSyncJsTest', () =>{
     beforeAll(() => {
-      console.log('stagePreferencesSyncJsTest lrui TestAbility context' + globalThis.abilityContext);
+      console.log('stagePreferencesSyncJsTest TestAbility context' + globalThis.abilityContext);
       console.info('beforeAll');
     })
     afterAll(() => {
diff --git a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/module.json b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/module.json
index 55c6ce55ed2c9b70956ea07a1cff6fcfb4beeec0..094b74cafe50cb7157140ecfa5f53d3243041094 100644
--- a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/module.json
+++ b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/module.json
@@ -4,7 +4,7 @@
         "type": "entry",
         "srcEntrance": "./ets/Application/AbilityStage.ts",
         "description": "$string:testModule_entry_dsc",
-        "mainElement": "MainAbility",
+        "mainElement": "com.example.myapplication.MainAbility",
         "deviceTypes": [
             "default",
             "tablet",
diff --git a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/resources/base/element/string.json b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/resources/base/element/string.json
index a4e9ba5b8d282aa4e86eb9389bf7c535226fd1c4..1da5bb7fa54f804a447121e7168ba548766d5f62 100644
--- a/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/resources/base/element/string.json
+++ b/preferences/test/js/unittest/stage_unittest/preferences/src/entry/src/main/resources/base/element/string.json
@@ -10,7 +10,7 @@
         },
         {
             "name": "entry_label",
-            "value": "ActsContextTest"
+            "value": "stagePreferencesJsTest"
         },
         {
             "name": "form_description",
diff --git a/relational_store/bundle.json b/relational_store/bundle.json
index cc7c0831428256269e1ca771214323ff66f74eab..5938ab8ab92178f8ae9ab098d600a7018c655a31 100644
--- a/relational_store/bundle.json
+++ b/relational_store/bundle.json
@@ -38,6 +38,9 @@
         "name": "relational_store",
         "subsystem": "distributeddatamgr",
         "syscap": [
+            "SystemCapability.DistributedDataManager.CloudSync.Client",
+            "SystemCapability.DistributedDataManager.CloudSync.Server",
+            "SystemCapability.DistributedDataManager.CloudSync.Config",
             "SystemCapability.DistributedDataManager.RelationalStore.Core",
             "SystemCapability.DistributedDataManager.CommonType"
         ],
diff --git a/relational_store/frameworks/js/napi/cloud_data/include/js_error_utils.h b/relational_store/frameworks/js/napi/cloud_data/include/js_error_utils.h
index f40f5a9aad08cd796b2b794c50cfa36a9928dd69..c82bed05474450db52c2a1871751d28e550213ec 100644
--- a/relational_store/frameworks/js/napi/cloud_data/include/js_error_utils.h
+++ b/relational_store/frameworks/js/napi/cloud_data/include/js_error_utils.h
@@ -35,7 +35,7 @@ struct JsErrorCode {
 
 const std::optional<JsErrorCode> GetJsErrorCode(int32_t errorCode);
 Status GenerateNapiError(int32_t status, int32_t &errCode, std::string &errMessage);
-void ThrowNapiError(napi_env env, int32_t errCode, const std::string &errMessage, bool isParamsCheck = true);
+void ThrowNapiError(napi_env env, int32_t errCode, const std::string &errMessage);
 napi_value GenerateErrorMsg(napi_env env, JsErrorCode jsInfo);
 
 #define ASSERT_ERR(env, assertion, errorCode, message) \
@@ -59,7 +59,7 @@ napi_value GenerateErrorMsg(napi_env env, JsErrorCode jsInfo);
     do {                                                            \
         if (!(assertion)) {                                         \
             (ctxt)->isThrowError = true;                            \
-            ThrowNapiError((ctxt)->env, errorCode, message, false); \
+            ThrowNapiError((ctxt)->env, errorCode, message); \
             return;                                                 \
         }                                                           \
     } while (0)
diff --git a/relational_store/frameworks/js/napi/cloud_data/src/js_cloud_share.cpp b/relational_store/frameworks/js/napi/cloud_data/src/js_cloud_share.cpp
index 586bf6f76f37c04a5e6ea93cd6a0ae14324ad1d2..f2b29fb2ac50c5289d76ad0e941d4e3664a9d474 100644
--- a/relational_store/frameworks/js/napi/cloud_data/src/js_cloud_share.cpp
+++ b/relational_store/frameworks/js/napi/cloud_data/src/js_cloud_share.cpp
@@ -83,8 +83,7 @@ napi_value AllocResourceAndShare(napi_env env, napi_callback_info info)
                 status = CloudService::NOT_SUPPORT;
             }
             ctxt->status = (GenerateNapiError(status, ctxt->jsCode, ctxt->error) == Status::SUCCESS)
-                               ? napi_ok
-                               : napi_generic_failure;
+                               ? napi_ok: napi_generic_failure;
             return;
         }
 
diff --git a/relational_store/frameworks/js/napi/cloud_data/src/js_config.cpp b/relational_store/frameworks/js/napi/cloud_data/src/js_config.cpp
index 533d87f62e5e26a00cd903e5d52b7e5b736b70df..63484e873fcf41d99f5e813da29460827811c295 100644
--- a/relational_store/frameworks/js/napi/cloud_data/src/js_config.cpp
+++ b/relational_store/frameworks/js/napi/cloud_data/src/js_config.cpp
@@ -154,14 +154,16 @@ napi_value JsConfig::ChangeAppCloudSwitch(napi_env env, napi_callback_info info)
     ctxt->GetCbInfo(env, info, [env, ctxt](size_t argc, napi_value *argv) {
         // required 3 arguments :: <accountId> <bundleName> <state>
         ASSERT_BUSINESS_ERR(ctxt, argc >= 3, Status::INVALID_ARGUMENT, "The number of parameters is incorrect.");
-        // 0 is the index of argument accountId, 1 is the index of argument bundleName, 2 is the index of argument state
+        // 0 is the index of argument accountId
         int status = JSUtils::Convert2Value(env, argv[0], ctxt->accountId);
         ASSERT_BUSINESS_ERR(
             ctxt, status == JSUtils::OK, Status::INVALID_ARGUMENT, "The type of accountId must be string.");
+        // 1 is the index of argument bundleName
         status = JSUtils::Convert2Value(env, argv[1], ctxt->bundleName);
         ASSERT_BUSINESS_ERR(
             ctxt, status == JSUtils::OK, Status::INVALID_ARGUMENT, "The type of bundleName must be string.");
         bool state = false;
+        // 2 is the index of argument state
         status = JSUtils::Convert2Value(env, argv[2], state);
         ASSERT_BUSINESS_ERR(
             ctxt, status == JSUtils::OK, Status::INVALID_ARGUMENT, "The type of status must be boolean.");
diff --git a/relational_store/frameworks/js/napi/cloud_data/src/js_error_utils.cpp b/relational_store/frameworks/js/napi/cloud_data/src/js_error_utils.cpp
index 11d797be3bcd04dc2acf42833b4281a58b5c5551..85a23334ad6dd066e6b453a794fcdaa056be0b28 100644
--- a/relational_store/frameworks/js/napi/cloud_data/src/js_error_utils.cpp
+++ b/relational_store/frameworks/js/napi/cloud_data/src/js_error_utils.cpp
@@ -64,7 +64,7 @@ Status GenerateNapiError(int32_t status, int32_t &errCode, std::string &errMessa
     return static_cast<Status>(status);
 }
 
-void ThrowNapiError(napi_env env, int32_t status, const std::string &errMessage, bool isParamsCheck)
+void ThrowNapiError(napi_env env, int32_t status, const std::string &errMessage)
 {
     LOG_DEBUG("ThrowNapiError message: %{public}s", errMessage.c_str());
     if (status == Status::SUCCESS) {
@@ -80,10 +80,8 @@ void ThrowNapiError(napi_env env, int32_t status, const std::string &errMessage,
     }
 
     std::string message(napiError.message);
-    if (isParamsCheck) {
-        napiError.jsCode = 401;
-        message += errMessage;
-    }
+
+    message += errMessage;
 
     std::string jsCode;
     if (napiError.jsCode == -1) {
diff --git a/relational_store/frameworks/js/napi/cloud_data/src/napi_queue.cpp b/relational_store/frameworks/js/napi/cloud_data/src/napi_queue.cpp
index c3a18d87407be7754c6e40842eec9b6e483ad822..5d782a4bbd77e0ed23a9b9a84fbfc1ae61c7887b 100644
--- a/relational_store/frameworks/js/napi/cloud_data/src/napi_queue.cpp
+++ b/relational_store/frameworks/js/napi/cloud_data/src/napi_queue.cpp
@@ -123,7 +123,7 @@ napi_value NapiQueue::AsyncWork(napi_env env, std::shared_ptr<ContextBase> ctxt,
             delete actx;
         },
         reinterpret_cast<void *>(aCtx), &aCtx->work);
-    auto status = napi_queue_async_work(env, aCtx->work);
+    auto status = napi_queue_async_work_with_qos(env, aCtx->work, napi_qos_user_initiated);
     if (status != napi_ok) {
         napi_get_undefined(env, &promise);
         delete aCtx;
diff --git a/relational_store/frameworks/js/napi/common/src/js_utils.cpp b/relational_store/frameworks/js/napi/common/src/js_utils.cpp
index c7aa56bb77274ccb651a849c6706939345922a21..b004efdd13c99e3e4cc061fcb7d9bfd9be8b1735 100644
--- a/relational_store/frameworks/js/napi/common/src/js_utils.cpp
+++ b/relational_store/frameworks/js/napi/common/src/js_utils.cpp
@@ -60,7 +60,7 @@ napi_value JSUtils::GetNamedProperty(napi_env env, napi_value object, const char
     return jsItem;
 }
 
-std::pair<int32_t , napi_value> JSUtils::GetOptionalNamedProperty(napi_env env, napi_value input, const char *name)
+std::pair<int32_t, napi_value> JSUtils::GetOptionalNamedProperty(napi_env env, napi_value input, const char *name)
 {
     bool hasProp = false;
     napi_status status = napi_has_named_property(env, input, name, &hasProp);
diff --git a/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp b/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp
index 7a751c07c5a4ee0f5c06925c2659db18170415d4..a951f6cbd286a52ed98ea954bde6d4be33e54ef0 100644
--- a/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp
+++ b/relational_store/frameworks/js/napi/common/src/js_uv_queue.cpp
@@ -59,7 +59,12 @@ void UvQueue::AsyncCall(UvCallback callback, Args args, Result result)
     entry->args_ = std::move(args);
     entry->result_ = std::move(result);
     work->data = entry;
-    uv_queue_work(loop_, work, DoWork, DoUvCallback);
+    int ret = uv_queue_work(loop_, work, DoWork, DoUvCallback);
+    if (ret < 0) {
+        LOG_ERROR("uv_queue_work failed, errCode:%{public}d", ret);
+        delete entry;
+        delete work;
+    }
 }
 
 void UvQueue::AsyncPromise(UvPromise promise, UvQueue::Args args)
@@ -83,7 +88,12 @@ void UvQueue::AsyncPromise(UvPromise promise, UvQueue::Args args)
     entry->defer_ = promise.defer_;
     entry->args_ = std::move(args);
     work->data = entry;
-    uv_queue_work(loop_, work, DoWork, DoUvPromise);
+    int ret = uv_queue_work(loop_, work, DoWork, DoUvPromise);
+    if (ret < 0) {
+        LOG_ERROR("uv_queue_work failed, errCode:%{public}d", ret);
+        delete entry;
+        delete work;
+    }
 }
 
 void UvQueue::Execute(UvQueue::Task task)
@@ -105,7 +115,12 @@ void UvQueue::Execute(UvQueue::Task task)
     }
     *entry = task;
     work->data = entry;
-    uv_queue_work(loop_, work, DoExecute, [](uv_work_t *work, int status) { delete work; });
+    int ret = uv_queue_work(loop_, work, DoExecute, [](uv_work_t *work, int status) { delete work; });
+    if (ret < 0) {
+        LOG_ERROR("uv_queue_work failed, errCode:%{public}d", ret);
+        delete entry;
+        delete work;
+    }
 }
 
 napi_env UvQueue::GetEnv()
@@ -265,6 +280,7 @@ void UvQueue::UvEntry::BindPromise(napi_value promise)
     napi_create_function(env_, RESOLVED, RESOLVED_SIZE, Resolved, object, &argv[0]);
     napi_create_function(env_, REJECTED, REJECTED_SIZE, Rejected, object, &argv[1]);
     napi_value result = nullptr;
+    // Enter 2 parameters argv[0] and argv[1]
     napi_call_function(env_, promise, then, 2, argv, &result);
 }
 
diff --git a/relational_store/frameworks/js/napi/dataability/src/napi_predicates_utils.cpp b/relational_store/frameworks/js/napi/dataability/src/napi_predicates_utils.cpp
index cf21363cd77699549a24b5ce67da05c944f1e863..14dbd2fa85b3bbe7239698a364f8ce02b2fbdc25 100644
--- a/relational_store/frameworks/js/napi/dataability/src/napi_predicates_utils.cpp
+++ b/relational_store/frameworks/js/napi/dataability/src/napi_predicates_utils.cpp
@@ -63,7 +63,6 @@ napi_value InitPredicatesUtils(napi_env env, napi_value exports)
         DECLARE_NAPI_FUNCTION("createRdbPredicates", CreateRdbPredicates),
     };
     NAPI_CALL(env, napi_define_properties(env, exports, sizeof(properties) / sizeof(*properties), properties));
-    LOG_INFO("Init InitPredicatesUtils end");
     return exports;
 }
 } // namespace DataAbilityJsKit
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_async_call.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_async_call.cpp
index 5d63128eb3bc5bcf248380385f82ed124756e862..71935f7c81e3af18517ae46dcf0e8d7120d34fde 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_async_call.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_async_call.cpp
@@ -103,7 +103,10 @@ napi_value AsyncCall::Call(napi_env env, std::shared_ptr<BaseContext> context)
     napi_create_async_work(env, nullptr, resource, AsyncCall::OnExecute, AsyncCall::OnComplete,
         reinterpret_cast<void *>(context.get()), &context->work_);
     // add async work to execute queue
-    napi_queue_async_work(env, context->work_);
+    auto status = napi_queue_async_work_with_qos(env, context->work_, napi_qos_user_initiated);
+    if (status != napi_ok) {
+        napi_get_undefined(env, &promise);
+    }
     return promise;
 }
 
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_predicates.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_predicates.cpp
index 25cb4b37d9a5632713dc4bd1e4b32e74bab72dd8..3cb02dc988904570fab9d66e451f8612525711d1 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_predicates.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_predicates.cpp
@@ -276,6 +276,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldAndValueArray(napi_env env, na
     RdbPredicatesProxy *predicatesProxy = nullptr;
     napi_unwrap(env, thiz, reinterpret_cast<void **>(&predicatesProxy));
     int version = predicatesProxy->apiversion;
+    // Ensure that argc contains 2 parameters
     RDB_NAPI_ASSERT_FROMV9(env, argc == 2, std::make_shared<ParamNumError>("2"), version);
 
     field = JSUtils::Convert2String(env, args[0]);
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store.cpp
index 53e7bc64cc8ebba3d5467e6c9bb6077d323555b3..176e2af55d112e4df17f3219195d74f1405ba52b 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store.cpp
@@ -145,8 +145,6 @@ void RdbStoreProxy::Init(napi_env env, napi_value exports)
     NAPI_CALL_RETURN_VOID(env, napi_define_class(env, "RdbStoreV9", NAPI_AUTO_LENGTH, InitializeV9, nullptr,
                                    sizeof(descriptors) / sizeof(napi_property_descriptor), descriptors, &cons));
     NAPI_CALL_RETURN_VOID(env, napi_create_reference(env, cons, 1, &constructorV9_));
-
-    LOG_DEBUG("Init RdbStoreProxy end");
 }
 
 napi_value RdbStoreProxy::InnerInitialize(napi_env env, napi_callback_info info, int version)
@@ -574,7 +572,8 @@ napi_value RdbStoreProxy::BatchInsert(napi_env env, napi_callback_info info)
     };
     auto output = [context](napi_env env, napi_value &result) -> int {
         napi_status status = napi_create_int64(env, context->insertNum, &result);
-        LOG_DEBUG("RdbStoreProxy::BatchInsert end.");
+        LOG_DEBUG("RdbStoreProxy::BatchInsert end. tableName is: %{public}s",
+            context->tableName.c_str());
         return (status == napi_ok) ? OK : ERR;
     };
     context->SetAction(env, info, input, exec, output);
@@ -1223,7 +1222,7 @@ void RdbStoreProxy::OnDataChangeEvent(napi_env env, size_t argc, napi_value *arg
         return;
     }
     observers_[mode].push_back(observer);
-    LOG_ERROR("RdbStoreProxy::OnDataChangeEvent: subscribe success");
+    LOG_INFO("RdbStoreProxy::OnDataChangeEvent: subscribe success, mode is: %{public}d", mode);
 }
 
 void RdbStoreProxy::OffDataChangeEvent(napi_env env, size_t argc, napi_value *argv)
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_helper.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_helper.cpp
index a785161afa9f30de01da3ae288c0c0d5a7c7f50c..bf4440751573aed4e9cbeb8471db1d8114edeba8 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_helper.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_helper.cpp
@@ -548,7 +548,6 @@ napi_value DeleteRdbStoreV9(napi_env env, napi_callback_info info)
 
 napi_value InitRdbHelper(napi_env env, napi_value exports)
 {
-    LOG_INFO("RdbJsKit::InitRdbHelper begin");
     napi_property_descriptor properties[] = {
         DECLARE_NAPI_FUNCTION("getRdbStore", GetRdbStore),
         DECLARE_NAPI_FUNCTION("deleteRdbStore", DeleteRdbStore),
@@ -556,7 +555,6 @@ napi_value InitRdbHelper(napi_env env, napi_value exports)
         DECLARE_NAPI_FUNCTION("deleteRdbStoreV9", DeleteRdbStoreV9),
     };
     NAPI_CALL(env, napi_define_properties(env, exports, sizeof(properties) / sizeof(*properties), properties));
-    LOG_INFO("RdbJsKit::InitRdbHelper end");
     return exports;
 }
 } // namespace RdbJsKit
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_observer.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_observer.cpp
index ca46ae7f28bd825518d36d1cc4b444365a347edf..c8f60edd0334f35b4f232738183986530ebecba2 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_observer.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_rdb_store_observer.cpp
@@ -24,12 +24,10 @@ using namespace OHOS::AppDataMgrJsKit;
 namespace OHOS::RdbJsKit {
 NapiRdbStoreObserver::NapiRdbStoreObserver(napi_env env, napi_value callback) : NapiUvQueue(env, callback)
 {
-    LOG_INFO("NapiRdbStoreObserver construct");
 }
 
 NapiRdbStoreObserver::~NapiRdbStoreObserver() noexcept
 {
-    LOG_INFO("NapiRdbStoreObserver destroy");
 }
 
 void NapiRdbStoreObserver::OnChange(const std::vector<std::string> &devices)
@@ -43,6 +41,5 @@ void NapiRdbStoreObserver::OnChange(const std::vector<std::string> &devices)
         }
         argv[0] = JSUtils::Convert2JSValue(env, devices);
     });
-    LOG_INFO("NapiRdbStoreObserver::OnChange end");
 }
 } // namespace OHOS::RdbJsKit
\ No newline at end of file
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_result_set.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_result_set.cpp
index 7349d9c812bd85b461d72c9cc0dea842c9c5291a..3d836c937bdcc9b39a4d978b28988d00e13631ca 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_result_set.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_result_set.cpp
@@ -123,7 +123,6 @@ napi_value ResultSetProxy::GetConstructor(napi_env env, int version)
         return cons;
     }
 
-    LOG_INFO("GetConstructor result set constructor");
     napi_property_descriptor clzDes[] = {
         DECLARE_NAPI_FUNCTION("goToRow", GoToRow),
         DECLARE_NAPI_FUNCTION("getLong", GetLong),
diff --git a/relational_store/frameworks/js/napi/rdb/src/napi_uv_queue.cpp b/relational_store/frameworks/js/napi/rdb/src/napi_uv_queue.cpp
index 2b31f06ef0c7929346a764ccb053901d2fb94293..118769c84a61a80a2459854549edff0898804c32 100644
--- a/relational_store/frameworks/js/napi/rdb/src/napi_uv_queue.cpp
+++ b/relational_store/frameworks/js/napi/rdb/src/napi_uv_queue.cpp
@@ -52,11 +52,12 @@ void NapiUvQueue::CallFunction(NapiArgsGenerator genArgs)
     work->data = this;
     this->args = std::move(genArgs);
 
-    uv_queue_work(loop_, work, [](uv_work_t* work) {}, [](uv_work_t* work, int st) {
+    int ret = uv_queue_work(loop_, work, [](uv_work_t* work) {}, [](uv_work_t* work, int st) {
             auto queue = static_cast<NapiUvQueue*>(work->data);
             napi_handle_scope scope = nullptr;
             napi_open_handle_scope(queue->env_, &scope);
             if (scope == nullptr) {
+                delete work;
                 return;
             }
             int argc = 0;
@@ -77,5 +78,10 @@ void NapiUvQueue::CallFunction(NapiArgsGenerator genArgs)
             napi_close_handle_scope(queue->env_, scope);
             delete work;
         });
+    if (ret < 0) {
+        LOG_ERROR("uv_queue_work failed, errCode:%{public}d", ret);
+        delete static_cast<NapiUvQueue *>(work->data);
+        delete work;
+    }
 }
 } // namespace OHOS::RdbJsKit
\ No newline at end of file
diff --git a/relational_store/frameworks/js/napi/relationalstore/include/napi_async_call.h b/relational_store/frameworks/js/napi/relationalstore/include/napi_async_call.h
index 16e0190150757483268dcf0ccef99a08d0fa427d..426fbf2a41745a8cc0a83af9138bcdd5df3ef60c 100644
--- a/relational_store/frameworks/js/napi/relationalstore/include/napi_async_call.h
+++ b/relational_store/frameworks/js/napi/relationalstore/include/napi_async_call.h
@@ -30,10 +30,10 @@ namespace RelationalStoreJsKit {
 using InputAction = std::function<void(napi_env, size_t, napi_value *, napi_value)>;
 using OutputAction = std::function<void(napi_env, napi_value &)>;
 using ExecuteAction = std::function<int()>;
-extern bool async;
-extern bool sync;
-#define ASYNC &async
-#define SYNC &sync
+extern bool g_async;
+extern bool g_sync;
+#define ASYNC &g_async
+#define SYNC &g_sync
 
 class Context {
 public:
diff --git a/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_error.h b/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_error.h
index 15472626716c56c08b2a450f6b8282518f7f8e7e..40ce9e4b7bafad6ae476a15e1238ef1a2cef9909 100644
--- a/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_error.h
+++ b/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_error.h
@@ -16,7 +16,7 @@
 #define RDB_JS_NAPI_ERROR_H
 
 #include <map>
-
+#include <string>
 #include "logger.h"
 #include "rdb_errno.h"
 
@@ -30,7 +30,6 @@ constexpr int E_PARAM_ERROR = 401;
 constexpr int E_NON_SYSTEM_APP_ERROR = 202;
 constexpr int E_INNER_ERROR = 14800000;
 constexpr int E_RESULT_GOTO_ERROR = 14800012;
-constexpr int E_RESULT_GET_ERROR = 14800013;
 constexpr int E_NOT_STAGE_MODE = 14801001;
 constexpr int E_DATA_GROUP_ID_INVALID = 14801002;
 
@@ -44,7 +43,8 @@ const static std::map<int, std::string> ERROR_MAPS = {
     { E_NOT_STAGE_MODE, "Only supported in stage mode." },
     { E_DATA_GROUP_ID_INVALID, "The data group id is invalid." },
     { NativeRdb::E_GET_DATAOBSMGRCLIENT_FAIL, "Failed to get DataObsMgrClient." },
-    { NativeRdb::E_TYPE_MISMATCH, "The type of the distributed table does not match"},
+    { NativeRdb::E_TYPE_MISMATCH, "The type of the distributed table does not match" },
+    { NativeRdb::E_DATABASE_FULL, "database or disk is full." }
 };
 
 #define RDB_REVT_NOTHING
@@ -57,9 +57,9 @@ const static std::map<int, std::string> ERROR_MAPS = {
                 napi_throw_error((env), nullptr, "error message is empty");                                 \
                 return retVal;                                                                              \
             }                                                                                               \
-            LOG_ERROR("throw error: code = %{public}d , message = %{public}s", error->GetCode(),            \
-                error->GetMessage().c_str());                                                               \
-            napi_throw_error((env), std::to_string(error->GetCode()).c_str(), error->GetMessage().c_str()); \
+            LOG_ERROR("throw error: code = %{public}d , message = %{public}s", (error)->GetCode(),            \
+                (error)->GetMessage().c_str());                                                               \
+            napi_throw_error((env), std::to_string((error)->GetCode()).c_str(), (error)->GetMessage().c_str()); \
             return retVal;                                                                                  \
         }                                                                                                   \
     } while (0)
@@ -111,6 +111,12 @@ public:
         }
     }
 
+    InnerError(const std::string &msg)
+    {
+        code_ = E_INNER_ERROR;
+        msg_ = std::string("Inner error. ") + msg;
+    }
+
     std::string GetMessage() override
     {
         return msg_;
diff --git a/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_store.h b/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_store.h
index fa693c174315c6d7db855b35a03957989d1b82fb..fb84aff12ac589ee67ac2562191ab4d011ac4ddf 100644
--- a/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_store.h
+++ b/relational_store/frameworks/js/napi/relationalstore/include/napi_rdb_store.h
@@ -50,6 +50,7 @@ private:
     static napi_value RemoteQuery(napi_env env, napi_callback_info info);
     static napi_value QuerySql(napi_env env, napi_callback_info info);
     static napi_value ExecuteSql(napi_env env, napi_callback_info info);
+    static napi_value Execute(napi_env env, napi_callback_info info);
     static napi_value Backup(napi_env env, napi_callback_info info);
     static napi_value Count(napi_env env, napi_callback_info info);
     static napi_value Replace(napi_env env, napi_callback_info info);
diff --git a/relational_store/frameworks/js/napi/relationalstore/mock/include/napi_rdb_store.h b/relational_store/frameworks/js/napi/relationalstore/mock/include/napi_rdb_store.h
index 71aae8c5f0b3a56e4af6c5423b046a955c0c665c..927ad1ab27fe7a16c74906d353c7ec61cac8273a 100644
--- a/relational_store/frameworks/js/napi/relationalstore/mock/include/napi_rdb_store.h
+++ b/relational_store/frameworks/js/napi/relationalstore/mock/include/napi_rdb_store.h
@@ -47,6 +47,7 @@ private:
     static napi_value Query(napi_env env, napi_callback_info info);
     static napi_value QuerySql(napi_env env, napi_callback_info info);
     static napi_value ExecuteSql(napi_env env, napi_callback_info info);
+    static napi_value Execute(napi_env env, napi_callback_info info);
     static napi_value Backup(napi_env env, napi_callback_info info);
     static napi_value Count(napi_env env, napi_callback_info info);
     static napi_value Replace(napi_env env, napi_callback_info info);
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_async_call.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_async_call.cpp
index 45fba43f48d77d95ade2086cc4ce994663b441f1..c20caaef63eec05c54fc6d61a8a61e2537104053 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_async_call.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_async_call.cpp
@@ -24,8 +24,8 @@ using namespace OHOS::AppDataMgrJsKit;
 
 namespace OHOS {
 namespace RelationalStoreJsKit {
-bool async = true; // do not reset the value, used in DECLARE_NAPI_FUNCTION_WITH_DATA only
-bool sync = !async; // do not reset the value, used in DECLARE_NAPI_FUNCTION_WITH_DATA only
+bool g_async = true; // do not reset the value, used in DECLARE_NAPI_FUNCTION_WITH_DATA only
+bool g_sync = false; // do not reset the value, used in DECLARE_NAPI_FUNCTION_WITH_DATA only
 void Context::SetAction(
     napi_env env, napi_callback_info info, InputAction input, ExecuteAction exec, OutputAction output)
 {
@@ -122,7 +122,9 @@ napi_value AsyncCall::Async(napi_env env, std::shared_ptr<Context> context)
 {
     napi_value promise = nullptr;
     if (context->callback_ == nullptr) {
-        napi_create_promise(env, &context->defer_, &promise);
+        napi_status status = napi_create_promise(env, &context->defer_, &promise);
+        RDB_NAPI_ASSERT_BASE(env, status == napi_ok,
+            std::make_shared<InnerError>("failed(" + std::to_string(status) + ") to create promise"), nullptr);
     } else {
         napi_get_undefined(env, &promise);
     }
@@ -133,7 +135,10 @@ napi_value AsyncCall::Async(napi_env env, std::shared_ptr<Context> context)
     napi_create_async_work(env, nullptr, resource, AsyncCall::OnExecute, AsyncCall::OnComplete,
         reinterpret_cast<void *>(context.get()), &context->work_);
     // add async work to execute queue
-    napi_queue_async_work(env, context->work_);
+    auto status = napi_queue_async_work_with_qos(env, context->work_, napi_qos_user_initiated);
+    if (status != napi_ok) {
+        napi_get_undefined(env, &promise);
+    }
     return promise;
 }
 
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp
index 27fafe9ce4b742f8c87215d093a6eb341f78bb6a..beab3755cda73df26d8a3b9eb3f96ba5b06148b6 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp
@@ -187,6 +187,7 @@ napi_value Convert2JSValue(napi_env env, const DistributedRdb::TableDetails &tab
     int index = 0;
     for (const auto &[device, result] : tableDetails) {
         napi_value jsElement = nullptr;
+        // The length of the converted JavaScript array is 2
         status = napi_create_array_with_length(env, 2, &jsElement);
         if (status != napi_ok) {
             return nullptr;
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_predicates.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_predicates.cpp
index b84a5d0787e4e546fffc3f1498e5508f0e262012..56aff92503a80db8745b5030b90e221f14bd59a4 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_predicates.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_predicates.cpp
@@ -30,7 +30,6 @@ static __thread napi_ref constructor_ = nullptr;
 
 void RdbPredicatesProxy::Init(napi_env env, napi_value exports)
 {
-    LOG_INFO("RdbPredicatesProxy::Init");
     napi_property_descriptor descriptors[] = {
         DECLARE_NAPI_FUNCTION("equalTo", EqualTo),
         DECLARE_NAPI_FUNCTION("notEqualTo", NotEqualTo),
@@ -244,6 +243,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldAndValueArray(napi_env env, na
     size_t argc = 2;
     napi_value args[2] = { 0 };
     napi_get_cb_info(env, info, &argc, args, &thiz, nullptr);
+    // Ensure that argc contains 2 parameters
     RDB_NAPI_ASSERT(env, argc == 2, std::make_shared<ParamNumError>("2"));
 
     field = JSUtils::Convert2String(env, args[0]);
@@ -265,6 +265,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldAndValue(napi_env env, napi_ca
     size_t argc = 2;
     napi_value args[2] = { 0 };
     napi_get_cb_info(env, info, &argc, args, &thiz, nullptr);
+    // Ensure that argc contains 2 parameters
     RDB_NAPI_ASSERT(env, argc == 2, std::make_shared<ParamNumError>("2"));
 
     field = JSUtils::Convert2String(env, args[0]);
@@ -286,6 +287,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldAndStringValue(napi_env env, n
     size_t argc = 2;
     napi_value args[2] = { 0 };
     napi_get_cb_info(env, info, &argc, args, &thiz, nullptr);
+    // Ensure that argc contains 2 parameters
     RDB_NAPI_ASSERT(env, argc == 2, std::make_shared<ParamNumError>("2"));
 
     field = JSUtils::Convert2String(env, args[0]);
@@ -304,6 +306,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldLowAndHigh(
     napi_env env, napi_callback_info info, napi_value &thiz, std::string &field, ValueObject &low, ValueObject &high)
 {
     size_t argc = 3;
+    // 3 parameters need to converte to field, low, high
     napi_value args[3] = { 0 };
     napi_get_cb_info(env, info, &argc, args, &thiz, nullptr);
     RDB_NAPI_ASSERT(env, argc == 3, std::make_shared<ParamNumError>("3"));
@@ -314,6 +317,7 @@ RdbPredicatesProxy *RdbPredicatesProxy::ParseFieldLowAndHigh(
     int32_t ret = JSUtils::Convert2Value(env, args[1], low);
     RDB_NAPI_ASSERT(env, ret == napi_ok, std::make_shared<ParamError>("low", "a valueType."));
 
+    // 2 is the index of argument high
     ret = JSUtils::Convert2Value(env, args[2], high);
     RDB_NAPI_ASSERT(env, ret == napi_ok, std::make_shared<ParamError>("high", "a valueType."));
 
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp
index 7c7e4298b99dd315371cd3ba984e45c62d50a7bd..2320ca6585cc2a426e5aed33ec099482d1348194 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp
@@ -70,6 +70,7 @@ struct RdbStoreContext : public Context {
     std::vector<ValueObject> bindArgs;
     int64_t int64Output;
     int intOutput;
+    ValueObject sqlExeOutput;
     std::vector<uint8_t> newKey;
     std::shared_ptr<ResultSet> resultSet;
     std::string aliasName;
@@ -160,36 +161,21 @@ void RdbStoreProxy::Init(napi_env env, napi_value exports)
 {
     napi_property_descriptor descriptors[] = {
         DECLARE_NAPI_FUNCTION_WITH_DATA("delete", Delete, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("deleteSync", Delete, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("update", Update, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("updateSync", Update, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("insert", Insert, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("insertSync", Insert, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("batchInsert", BatchInsert, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("batchInsertSync", BatchInsert, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("querySql", QuerySql, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("querySqlSync", QuerySql, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("query", Query, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("querySync", Query, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("executeSql", ExecuteSql, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("executeSqlSync", ExecuteSql, SYNC),
+        DECLARE_NAPI_FUNCTION_WITH_DATA("execute", Execute, ASYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("replace", Replace, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("replaceSync", Replace, SYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("queryByStep", QueryByStep, ASYNC),
-        DECLARE_NAPI_FUNCTION_WITH_DATA("queryByStepSync", QueryByStep, SYNC),
         DECLARE_NAPI_FUNCTION("backup", Backup),
-        DECLARE_NAPI_FUNCTION("count", Count),
-        DECLARE_NAPI_FUNCTION("addAttach", Attach),
         DECLARE_NAPI_FUNCTION("beginTransaction", BeginTransaction),
         DECLARE_NAPI_FUNCTION("rollBack", RollBack),
         DECLARE_NAPI_FUNCTION("commit", Commit),
         DECLARE_NAPI_FUNCTION("restore", Restore),
         DECLARE_NAPI_GETTER_SETTER("version", GetVersion, SetVersion),
-        DECLARE_NAPI_GETTER("isInTransaction", IsInTransaction),
-        DECLARE_NAPI_GETTER("isOpen", IsOpen),
-        DECLARE_NAPI_GETTER("path", GetPath),
-        DECLARE_NAPI_GETTER("isReadOnly", IsReadOnly),
-        DECLARE_NAPI_GETTER("isMemoryRdb", IsMemoryRdb),
 #if !defined(WINDOWS_PLATFORM) && !defined(MAC_PLATFORM) && !defined(ANDROID_PLATFORM) && !defined(IOS_PLATFORM)
         DECLARE_NAPI_FUNCTION("remoteQuery", RemoteQuery),
         DECLARE_NAPI_FUNCTION("setDistributedTables", SetDistributedTables),
@@ -208,8 +194,6 @@ void RdbStoreProxy::Init(napi_env env, napi_value exports)
     NAPI_CALL_RETURN_VOID(env, napi_define_class(env, "RdbStore", NAPI_AUTO_LENGTH, Initialize, nullptr,
                                    sizeof(descriptors) / sizeof(napi_property_descriptor), descriptors, &cons));
     NAPI_CALL_RETURN_VOID(env, napi_create_reference(env, cons, 1, &constructor_));
-
-    LOG_DEBUG("Init RdbStoreProxy end");
 }
 
 napi_value RdbStoreProxy::Initialize(napi_env env, napi_callback_info info)
@@ -358,6 +342,7 @@ int ParseDistributedConfigArg(const napi_env &env, size_t argc, napi_value * arg
     std::shared_ptr<RdbStoreContext> context)
 {
     context->distributedConfig = { false };
+    // '2' Ensure that the incoming argv contains 3 parameter
     if (argc > 2) {
         auto status = JSUtils::Convert2Value(env, argv[2], context->distributedConfig);
         bool checked = status == napi_ok || JSUtils::IsNull(env, argv[2]);
@@ -798,6 +783,34 @@ napi_value RdbStoreProxy::ExecuteSql(napi_env env, napi_callback_info info)
     return AsyncCall::Call(env, context);
 }
 
+napi_value RdbStoreProxy::Execute(napi_env env, napi_callback_info info)
+{
+    auto context = std::make_shared<RdbStoreContext>();
+    auto input = [context](napi_env env, size_t argc, napi_value *argv, napi_value self) {
+        CHECK_RETURN_SET_E(argc == 1 || argc == 2, std::make_shared<ParamNumError>("1 to 2"));
+        CHECK_RETURN(OK == ParserThis(env, self, context));
+        CHECK_RETURN(OK == ParseSql(env, argv[0], context));
+        if (argc == 2) {
+            CHECK_RETURN(OK == ParseBindArgs(env, argv[1], context));
+        }
+    };
+    auto exec = [context]() -> int {
+        RdbStoreProxy *obj = reinterpret_cast<RdbStoreProxy *>(context->boundObj);
+        CHECK_RETURN_ERR(obj != nullptr && obj->rdbStore_ != nullptr);
+        auto status = E_ERROR;
+        std::tie(status, context->sqlExeOutput) = obj->rdbStore_->Execute(context->sql, context->bindArgs);
+        return status;
+    };
+    auto output = [context](napi_env env, napi_value &result) {
+        result = JSUtils::Convert2JSValue(env, context->sqlExeOutput);
+        CHECK_RETURN_SET_E(result != nullptr, std::make_shared<InnerError>(E_ERROR));
+    };
+    context->SetAction(env, info, input, exec, output);
+
+    CHECK_RETURN_NULL(context->error == nullptr || context->error->GetCode() == OK);
+    return AsyncCall::Call(env, context);
+}
+
 napi_value RdbStoreProxy::Count(napi_env env, napi_callback_info info)
 {
     auto context = std::make_shared<RdbStoreContext>();
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_helper.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_helper.cpp
index b8172f54e014b71ef1a0885c6c7dd83a11ff6b09..9213627034af6eff06d295cea82b7e144d397628 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_helper.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_helper.cpp
@@ -319,7 +319,6 @@ napi_value DeleteRdbStore(napi_env env, napi_callback_info info)
 
 napi_value InitRdbHelper(napi_env env, napi_value exports)
 {
-    LOG_INFO("RelationalStoreJsKit::InitRdbHelper begin");
     napi_property_descriptor properties[] = {
         DECLARE_NAPI_FUNCTION_WITH_DATA("getRdbStore", GetRdbStore, ASYNC),
         DECLARE_NAPI_FUNCTION_WITH_DATA("getRdbStoreSync", GetRdbStore, SYNC),
@@ -327,7 +326,6 @@ napi_value InitRdbHelper(napi_env env, napi_value exports)
         DECLARE_NAPI_FUNCTION_WITH_DATA("deleteRdbStoreSync", DeleteRdbStore, SYNC),
     };
     NAPI_CALL(env, napi_define_properties(env, exports, sizeof(properties) / sizeof(*properties), properties));
-    LOG_INFO("RelationalStoreJsKit::InitRdbHelper end");
     return exports;
 }
 } // namespace RelationalStoreJsKit
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_observer.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_observer.cpp
index 1daa2b88884797ce4041ec13171fb69c80e8adf6..99dcdc82ebc4b8302ba6aeb0eea1c7edc84a0cf4 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_observer.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_rdb_store_observer.cpp
@@ -25,12 +25,10 @@ namespace OHOS::RelationalStoreJsKit {
 NapiRdbStoreObserver::NapiRdbStoreObserver(napi_env env, napi_value callback, int32_t mode)
     : NapiUvQueue(env, callback), mode_(mode)
 {
-    LOG_INFO("NapiRdbStoreObserver construct");
 }
 
 NapiRdbStoreObserver::~NapiRdbStoreObserver() noexcept
 {
-    LOG_INFO("NapiRdbStoreObserver destroy");
 }
 
 void NapiRdbStoreObserver::OnChange(const std::vector<std::string> &devices)
@@ -40,7 +38,6 @@ void NapiRdbStoreObserver::OnChange(const std::vector<std::string> &devices)
         argc = 1;
         argv[0] = JSUtils::Convert2JSValue(env, devices);
     });
-    LOG_INFO("NapiRdbStoreObserver::OnChange end");
 }
 
 void NapiRdbStoreObserver::OnChange(const Origin &origin, const PrimaryFields &fields, ChangeInfo &&changeInfo)
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_result_set.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_result_set.cpp
index 9d26dd5e2b2e0c2eb8450308f5af380fcf5bdef3..c88539d778ba95cacf954309867ccfccf52a3abd 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_result_set.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_result_set.cpp
@@ -469,11 +469,7 @@ napi_value ResultSetProxy::GetColumnIndex(napi_env env, napi_callback_info info)
     CHECK_RETURN_NULL(resultSetProxy && resultSetProxy->GetInstance());
 
     int32_t result = -1;
-    int errCode = resultSetProxy->GetInstance()->GetColumnIndex(input, result);
-    if (errCode != E_OK) {
-        LOG_ERROR("IsAtLastRow failed code:%{public}d columnName:%{public}d", errCode, result);
-    }
-
+    resultSetProxy->GetInstance()->GetColumnIndex(input, result);
     return JSUtils::Convert2JSValue(env, result);
 }
 
@@ -527,7 +523,6 @@ napi_value ResultSetProxy::IsClosed(napi_env env, napi_callback_info info)
 
 void ResultSetProxy::Init(napi_env env, napi_value exports)
 {
-    LOG_INFO("ResultSetProxy::Init");
     auto lambda = []() -> std::vector<napi_property_descriptor> {
         std::vector<napi_property_descriptor> properties = {
             DECLARE_NAPI_FUNCTION("goToRow", GoToRow),
diff --git a/relational_store/frameworks/js/napi/relationalstore/src/napi_uv_queue.cpp b/relational_store/frameworks/js/napi/relationalstore/src/napi_uv_queue.cpp
index f73cf226b9568dbf16194fe459e226c0cf9abc73..a30a3047acbd50a538ba7c097ac4e68ccf0433a4 100644
--- a/relational_store/frameworks/js/napi/relationalstore/src/napi_uv_queue.cpp
+++ b/relational_store/frameworks/js/napi/relationalstore/src/napi_uv_queue.cpp
@@ -52,7 +52,7 @@ void NapiUvQueue::CallFunction(NapiArgsGenerator genArgs)
     work->data = this;
     this->args = std::move(genArgs);
 
-    uv_queue_work(loop_, work, [](uv_work_t* work) {}, [](uv_work_t* work, int st) {
+    int ret = uv_queue_work(loop_, work, [](uv_work_t* work) {}, [](uv_work_t* work, int st) {
             auto queue = static_cast<NapiUvQueue*>(work->data);
             napi_handle_scope scope = nullptr;
             if (queue == nullptr) {
@@ -60,6 +60,7 @@ void NapiUvQueue::CallFunction(NapiArgsGenerator genArgs)
             }
             napi_open_handle_scope(queue->env_, &scope);
             if (scope == nullptr) {
+                delete work;
                 return;
             }
             int argc = 0;
@@ -80,5 +81,10 @@ void NapiUvQueue::CallFunction(NapiArgsGenerator genArgs)
             napi_close_handle_scope(queue->env_, scope);
             delete work;
         });
+    if (ret < 0) {
+        LOG_ERROR("uv_queue_work failed, errCode:%{public}d", ret);
+        delete static_cast<NapiUvQueue *>(work->data);
+        delete work;
+    }
 }
 } // namespace OHOS::RelationalStoreJsKit
\ No newline at end of file
diff --git a/relational_store/frameworks/native/cloud_data/src/cloud_manager.cpp b/relational_store/frameworks/native/cloud_data/src/cloud_manager.cpp
index b138cbdebbf6888b90023225163c17986e022157..700c11886370a71c7e1ee4b30094e6d83cae337d 100644
--- a/relational_store/frameworks/native/cloud_data/src/cloud_manager.cpp
+++ b/relational_store/frameworks/native/cloud_data/src/cloud_manager.cpp
@@ -102,7 +102,6 @@ std::pair<int32_t, std::shared_ptr<CloudService>> CloudManager::GetCloudService(
 
 DataMgrService::DataMgrService(const sptr<IRemoteObject> &impl) : IRemoteProxy<CloudData::IKvStoreDataService>(impl)
 {
-    LOG_INFO("init proxy");
 }
 
 sptr<IRemoteObject> DataMgrService::GetFeatureInterface(const std::string &name)
diff --git a/relational_store/frameworks/native/rdb/include/delay_notify.h b/relational_store/frameworks/native/rdb/include/delay_notify.h
index 0883adb11be8f0f0b5ca9068213ff52e75205129..72ad318c2e1f536fbeebef7405b2e6c3aadcd031 100644
--- a/relational_store/frameworks/native/rdb/include/delay_notify.h
+++ b/relational_store/frameworks/native/rdb/include/delay_notify.h
@@ -31,10 +31,8 @@ public:
     void UpdateNotify(const DistributedRdb::RdbChangedData &changedData);
     void SetAutoSyncInterval(uint32_t autoSyncInterval);
 private:
-    static constexpr uint32_t FORCE_SYNC_INTERVAL = 100;
-    static constexpr uint32_t AUTO_SYNC_INTERVAL = 50;
+    static constexpr uint32_t AUTO_SYNC_INTERVAL = 200;
     ExecutorPool::TaskId delaySyncTaskId_ = ExecutorPool::INVALID_TASK_ID;
-    ExecutorPool::TaskId forceSyncTaskId_ = ExecutorPool::INVALID_TASK_ID;
     Task task_;
     std::shared_ptr<ExecutorPool> pool_ = nullptr;
     std::mutex mutex_;
diff --git a/relational_store/frameworks/native/rdb/include/rdb_platform.h b/relational_store/frameworks/native/rdb/include/rdb_platform.h
new file mode 100644
index 0000000000000000000000000000000000000000..2279b79599b425ae2e5852a3a3aaa7118b4f0e1d
--- /dev/null
+++ b/relational_store/frameworks/native/rdb/include/rdb_platform.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DISTRIBUTEDDATAMGR_NATIVERDB_RDB_PLATFORM_H
+#define DISTRIBUTEDDATAMGR_NATIVERDB_RDB_PLATFORM_H
+
+#include <cstdint>
+#include <string>
+#include <sys/stat.h>
+#include "unistd.h"
+#ifdef WINDOWS_PLATFORM
+#include <dir.h>
+#endif
+#define UNUSED_FUNCTION __attribute__((unused))
+namespace OHOS {
+namespace NativeRdb {
+static constexpr mode_t DIR_RIGHT = 0771;
+static UNUSED_FUNCTION uint32_t GetUid()
+{
+#ifdef WINDOWS_PLATFORM
+    return 0;
+#else
+    return getuid();
+#endif
+}
+
+static UNUSED_FUNCTION int MkDir(const std::string &filePath)
+{
+#ifdef WINDOWS_PLATFORM
+    return mkdir(filePath.c_str());
+#else
+    return mkdir(filePath.c_str(), DIR_RIGHT);
+#endif
+}
+
+} // namespace NativeRdb
+} // namespace OHOS
+#endif
\ No newline at end of file
diff --git a/relational_store/frameworks/native/rdb/include/rdb_store_impl.h b/relational_store/frameworks/native/rdb/include/rdb_store_impl.h
index 7c6f5c074d118c8f65a6bb297b29241b0f7fc044..00d1fd9e82a867583865c4d35c313d57034a7ade 100644
--- a/relational_store/frameworks/native/rdb/include/rdb_store_impl.h
+++ b/relational_store/frameworks/native/rdb/include/rdb_store_impl.h
@@ -105,6 +105,7 @@ public:
         const std::vector<ValueObject> &bindArgs) override;
     int ExecuteSql(
         const std::string &sql, const std::vector<ValueObject> &bindArgs = std::vector<ValueObject>()) override;
+    std::pair<int32_t, ValueObject> Execute(const std::string &sql, const std::vector<ValueObject> &bindArgs) override;
     int ExecuteAndGetLong(int64_t &outValue, const std::string &sql, const std::vector<ValueObject> &bindArgs) override;
     int ExecuteAndGetString(std::string &outValue, const std::string &sql,
         const std::vector<ValueObject> &bindArgs) override;
@@ -210,6 +211,7 @@ private:
     int UnSubscribeRemote(const SubscribeOption& option, RdbStoreObserver *observer);
     int RegisterDataChangeCallback();
     void InitDelayNotifier();
+    bool ColHasSpecificField(const std::vector<std::string> &columns);
 
     const RdbStoreConfig rdbStoreConfig;
     SqliteConnectionPool *connectionPool;
@@ -226,7 +228,7 @@ private:
     std::shared_ptr<DelayNotify> delayNotifier_ = nullptr;
 
     mutable std::shared_mutex rwMutex_;
-    static inline constexpr uint32_t INTERVAL = 200;
+    static inline constexpr uint32_t INTERVAL = 10;
     static constexpr const char *ROW_ID = "ROWID";
     std::set<std::string> cloudTables_;
 
@@ -236,7 +238,7 @@ private:
     std::map<std::string, std::list<std::shared_ptr<RdbStoreLocalObserver>>> localObservers_;
     std::map<std::string, std::list<sptr<RdbStoreLocalSharedObserver>>> localSharedObservers_;
     static constexpr uint32_t EXPANSION = 2;
-    static constexpr uint32_t AUTO_SYNC_MAX_INTERVAL = 20000;
+    static constexpr uint32_t AUTO_SYNC_MAX_INTERVAL = 3000;
 };
 } // namespace OHOS::NativeRdb
 #endif
diff --git a/relational_store/frameworks/native/rdb/include/sqlite_connection_pool.h b/relational_store/frameworks/native/rdb/include/sqlite_connection_pool.h
index e42fea1f4d7fae32b35d9745e06ef48d1e58d7c7..44a5d253384b7c129301bcd37c7986f5dd21c34c 100644
--- a/relational_store/frameworks/native/rdb/include/sqlite_connection_pool.h
+++ b/relational_store/frameworks/native/rdb/include/sqlite_connection_pool.h
@@ -77,6 +77,8 @@ private:
     std::condition_variable transCondition_;
     std::mutex transMutex_;
     bool transactionUsed_;
+    std::chrono::seconds writeTimeout_ = std::chrono::seconds(2);
+    std::chrono::seconds readTimeout_ = std::chrono::seconds(1);
 };
 
 } // namespace NativeRdb
diff --git a/relational_store/frameworks/native/rdb/include/sqlite_errno.h b/relational_store/frameworks/native/rdb/include/sqlite_errno.h
index b1428f80b7d069e16c21183344a2ae1f57ca56f3..550a5685ec73c32424c0c6c3ed050481c382e85d 100644
--- a/relational_store/frameworks/native/rdb/include/sqlite_errno.h
+++ b/relational_store/frameworks/native/rdb/include/sqlite_errno.h
@@ -16,13 +16,25 @@
 #ifndef NATIVE_RDB_SQLITE_ERRNO_H
 #define NATIVE_RDB_SQLITE_ERRNO_H
 
+#include <sqlite3sym.h>
+
+#include <map>
+
+#include "rdb_errno.h"
+
 namespace OHOS {
 namespace NativeRdb {
-
+const static std::map<int, int> ERROR_CODE_MAPPINT_TABLE = {
+    { SQLITE_FULL, E_DATABASE_FULL },
+};
 class SQLiteError {
 public:
     static int ErrNo(int sqliteErr)
     {
+        auto iter = ERROR_CODE_MAPPINT_TABLE.find(sqliteErr);
+        if (iter != ERROR_CODE_MAPPINT_TABLE.end()) {
+            return iter->second;
+        }
         return -sqliteErr;
     }
 };
diff --git a/relational_store/frameworks/native/rdb/include/sqlite_sql_builder.h b/relational_store/frameworks/native/rdb/include/sqlite_sql_builder.h
index f068ae3ee268a3a25ebe7863c300c93851127f90..83f6b3c881815a0f5046f3e1c4c66ff4e92421a6 100644
--- a/relational_store/frameworks/native/rdb/include/sqlite_sql_builder.h
+++ b/relational_store/frameworks/native/rdb/include/sqlite_sql_builder.h
@@ -47,14 +47,16 @@ public:
     static std::string BuildQueryString(const AbsRdbPredicates &predicates, const std::vector<std::string> &columns);
     static std::string BuildCountString(const AbsRdbPredicates &predicates);
     static std::string BuildSqlStringFromPredicates(const AbsPredicates &predicates);
-    static std::string BuildCursorQueryString(
-        const AbsRdbPredicates &predicates, const std::vector<std::string> &columns, const std::string &logTable);
+    static std::string BuildCursorQueryString(const AbsRdbPredicates &predicates,
+        const std::vector<std::string> &columns, const std::string &logTable, const std::pair<bool, bool> &queryStatus);
 
 private:
     static void AppendClause(std::string &builder, const std::string &name,
         const std::string &clause, const std::string &table = "");
     static void AppendColumns(
         std::string &builder, const std::vector<std::string> &columns, const std::string &table = "");
+
+    static constexpr const char *SHARING_RESOURCE = "sharing_resource";
 };
 } // namespace NativeRdb
 } // namespace OHOS
diff --git a/relational_store/frameworks/native/rdb/include/sqlite_utils.h b/relational_store/frameworks/native/rdb/include/sqlite_utils.h
index 84f4029f22d78624db3b36fba88982f1997b25d1..8dea084148b11660095cf3ed5cf5b7c4e60ea2ff 100644
--- a/relational_store/frameworks/native/rdb/include/sqlite_utils.h
+++ b/relational_store/frameworks/native/rdb/include/sqlite_utils.h
@@ -25,6 +25,7 @@ namespace NativeRdb {
 class SqliteUtils {
 public:
     static const int STATEMENT_SELECT;
+    static const int STATEMENT_INSERT;
     static const int STATEMENT_UPDATE;
     static const int STATEMENT_ATTACH;
     static const int STATEMENT_DETACH;
diff --git a/relational_store/frameworks/native/rdb/mock/include/acl.h b/relational_store/frameworks/native/rdb/mock/include/acl.h
new file mode 100644
index 0000000000000000000000000000000000000000..6f7d9e20821a2d00873afb4879093904619b1222
--- /dev/null
+++ b/relational_store/frameworks/native/rdb/mock/include/acl.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
+#define OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
+
+#include <stdint.h>
+#include <string>
+namespace OHOS {
+namespace DATABASE_UTILS {
+
+class Acl {
+public:
+    static constexpr uint16_t R_RIGHT = 4;
+    static constexpr uint16_t W_RIGHT = 2;
+    static constexpr uint16_t E_RIGHT = 1;
+    Acl(const std::string &path)
+    {
+    }
+
+    int32_t SetDefaultGroup(const uint32_t gid, const uint16_t mode)
+    {
+        return 0;
+    }
+
+    int32_t SetDefaultUser(const uint32_t uid, const uint16_t mode)
+    {
+        return 0;
+    }
+};
+} // DATABASE_UTILS
+} // namespace OHOS
+
+#endif // OHOS_DISTRIBUTED_DATA_DATABASE_UTILS_ACL_H
\ No newline at end of file
diff --git a/relational_store/frameworks/native/rdb/mock/include/rdb_store_impl.h b/relational_store/frameworks/native/rdb/mock/include/rdb_store_impl.h
index 4e33ac1150740c10d819ab72118ebd930d1065ae..e9c425b28daadf27abfffb239988303feee904d7 100644
--- a/relational_store/frameworks/native/rdb/mock/include/rdb_store_impl.h
+++ b/relational_store/frameworks/native/rdb/mock/include/rdb_store_impl.h
@@ -58,6 +58,7 @@ public:
         const std::vector<ValueObject> &bindArgs) override;
     int ExecuteSql(
         const std::string &sql, const std::vector<ValueObject> &bindArgs = std::vector<ValueObject>()) override;
+    std::pair<int32_t, ValueObject> Execute(const std::string &sql, const std::vector<ValueObject> &bindArgs) override;
     int ExecuteAndGetLong(int64_t &outValue, const std::string &sql, const std::vector<ValueObject> &bindArgs) override;
     int ExecuteAndGetString(std::string &outValue, const std::string &sql,
         const std::vector<ValueObject> &bindArgs) override;
diff --git a/relational_store/frameworks/native/rdb/mock/include/sqlite_connection_pool.h b/relational_store/frameworks/native/rdb/mock/include/sqlite_connection_pool.h
index 3e3c45c20d3ab3196f7b9c5020b45cbc5696d93c..85616bd44984be862f567f2e85ab312b1b75f1fb 100644
--- a/relational_store/frameworks/native/rdb/mock/include/sqlite_connection_pool.h
+++ b/relational_store/frameworks/native/rdb/mock/include/sqlite_connection_pool.h
@@ -76,6 +76,8 @@ private:
     std::condition_variable transCondition_;
     std::mutex transMutex_;
     bool transactionUsed_;
+    std::chrono::seconds writeTimeout_ = std::chrono::seconds(2);
+    std::chrono::seconds readTimeout_ = std::chrono::seconds(1);
 };
 
 } // namespace NativeRdb
diff --git a/relational_store/frameworks/native/rdb/mock/include/traits.h b/relational_store/frameworks/native/rdb/mock/include/traits.h
index 4a24bafca89e92ce8e03508fcd33db18493752e5..4da630e861af361f2644eed361eccbef3fffac53 100644
--- a/relational_store/frameworks/native/rdb/mock/include/traits.h
+++ b/relational_store/frameworks/native/rdb/mock/include/traits.h
@@ -98,7 +98,8 @@ std::enable_if_t<same_in_v<T, Types...>, const T *> get_if(const std::variant<Ty
     return std::get_if<T>(input);
 }
 
-template<typename T, typename... Types, size_t NP = convertible_in_v<T, Types...> ? convertible_index_of_v<T, Types...> : 0>
+template<typename T, typename... Types,
+size_t NP = convertible_in_v<T, Types...> ? convertible_index_of_v<T, Types...> : 0>
 constexpr std::enable_if_t<!same_in_v<T, Types...> && convertible_in_v<T, Types...>,
 std::add_pointer_t<std::variant_alternative_t<NP, std::variant<Types...>>>>
 get_if(std::variant<Types...> *input)
@@ -106,7 +107,8 @@ get_if(std::variant<Types...> *input)
 return std::get_if<NP>(input);
 }
 
-template<typename T, typename... Types, size_t NP = convertible_in_v<T, Types...> ? convertible_index_of_v<T, Types...> : 0>
+template<typename T, typename... Types,
+size_t NP = convertible_in_v<T, Types...> ? convertible_index_of_v<T, Types...> : 0>
 constexpr std::enable_if_t<!same_in_v<T, Types...> && convertible_in_v<T, Types...>,
 std::add_pointer_t<const std::variant_alternative_t<NP, std::variant<Types...>>>>
 get_if(const std::variant<Types...> *input)
diff --git a/relational_store/frameworks/native/rdb/src/abs_predicates.cpp b/relational_store/frameworks/native/rdb/src/abs_predicates.cpp
index 739df578c7501c0406e26f0c338b9089c3166ce0..48e6427e78717bbd7466a77f15155b23620d1909 100644
--- a/relational_store/frameworks/native/rdb/src/abs_predicates.cpp
+++ b/relational_store/frameworks/native/rdb/src/abs_predicates.cpp
@@ -53,7 +53,7 @@ bool AbsPredicates::IsNeedAnd() const
  */
 AbsPredicates *AbsPredicates::EqualTo(const std::string &field, const ValueObject &value)
 {
-    if (!CheckParameter("equalTo", field, { value })) {
+    if (!CheckParameter("equalTo", field, {})) {
         return this;
     }
     hasSpecificField = hasSpecificField || IsSpecificField(field);
@@ -89,7 +89,7 @@ AbsPredicates *AbsPredicates::EqualTo(const std::string &field, const ValueObjec
  */
 AbsPredicates *AbsPredicates::NotEqualTo(const std::string &field, const ValueObject &value)
 {
-    if (!CheckParameter("notEqualTo", field, { value })) {
+    if (!CheckParameter("notEqualTo", field, {})) {
         return this;
     }
     hasSpecificField = hasSpecificField || IsSpecificField(field);
diff --git a/relational_store/frameworks/native/rdb/src/abs_result_set.cpp b/relational_store/frameworks/native/rdb/src/abs_result_set.cpp
index ac8f78db10132780f5b0a920dc7c23e6551ddf78..1244c70451bc985eff3181aeeb5475c36be6c392 100644
--- a/relational_store/frameworks/native/rdb/src/abs_result_set.cpp
+++ b/relational_store/frameworks/native/rdb/src/abs_result_set.cpp
@@ -307,7 +307,7 @@ int AbsResultSet::GetColumnCount(int &count)
     std::vector<std::string> columnNames;
     int ret = GetAllColumnNames(columnNames);
     if (ret != E_OK) {
-        LOG_ERROR("Failed to GetAllColumnNames, ret is %{public}d", ret);
+        LOG_DEBUG("Failed to GetAllColumnNames, ret is %{public}d", ret);
         return ret;
     }
     columnCount_ = static_cast<int>(columnNames.size());
@@ -329,7 +329,7 @@ int AbsResultSet::GetColumnIndex(const std::string &columnName, int &columnIndex
     if (periodIndex != std::string::npos) {
         columnNameLower = columnNameLower.substr(periodIndex + 1);
     }
-    std::transform(columnNameLower.begin(), columnNameLower.end(), columnNameLower.begin(), ::tolower);
+    transform(columnNameLower.begin(), columnNameLower.end(), columnNameLower.begin(), ::tolower);
     std::vector<std::string> columnNames;
     int ret = GetAllColumnNames(columnNames);
     if (ret != E_OK) {
@@ -348,6 +348,7 @@ int AbsResultSet::GetColumnIndex(const std::string &columnName, int &columnIndex
         columnIndex++;
     }
     columnIndex = -1;
+    LOG_ERROR("GetColumnIndex failed, columnName is: %{public}s", columnName.c_str());
     return E_ERROR;
 }
 
diff --git a/relational_store/frameworks/native/rdb/src/abs_shared_result_set.cpp b/relational_store/frameworks/native/rdb/src/abs_shared_result_set.cpp
index 5c84ad44f704c7019c573147ebbb8cdb02e93a61..869836e235f8b27eb73d0ddeb96e2d9f86990b99 100644
--- a/relational_store/frameworks/native/rdb/src/abs_shared_result_set.cpp
+++ b/relational_store/frameworks/native/rdb/src/abs_shared_result_set.cpp
@@ -177,13 +177,13 @@ int AbsSharedResultSet::GetBlob(int columnIndex, std::vector<uint8_t> &value)
         }
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_INTEGER) {
-        LOG_ERROR("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_INTEGER!");
+        LOG_DEBUG("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_INTEGER!");
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL) {
-        LOG_ERROR("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL!");
+        LOG_DEBUG("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL!");
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_FLOAT) {
-        LOG_ERROR("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_FLOAT!");
+        LOG_DEBUG("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_FLOAT!");
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_ASSET) {
         LOG_ERROR("AbsSharedResultSet::GetBlob AppDataFwk::SharedBlock::CELL_UNIT_TYPE_ASSET!");
@@ -330,11 +330,9 @@ int AbsSharedResultSet::GetDouble(int columnIndex, double &value)
         value = cellUnit->cell.longValue;
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL) {
-        LOG_ERROR("AbsSharedResultSet::GetDouble AppDataFwk::SharedBlock::CELL_UNIT_TYPE_NULL!");
         value = 0.0;
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_BLOB) {
-        LOG_ERROR("AbsSharedResultSet::GetDouble AppDataFwk::SharedBlock::CELL_UNIT_TYPE_BLOB!");
         value = 0.0;
         return E_OK;
     } else if (type == AppDataFwk::SharedBlock::CELL_UNIT_TYPE_ASSET) {
diff --git a/relational_store/frameworks/native/rdb/src/delay_notify.cpp b/relational_store/frameworks/native/rdb/src/delay_notify.cpp
index 4a39b0bdc22b71f98f5f87afcb9ac24e9cc1ad9b..31e0903d16acbb48cac6c6a9f65e0046139bee47 100644
--- a/relational_store/frameworks/native/rdb/src/delay_notify.cpp
+++ b/relational_store/frameworks/native/rdb/src/delay_notify.cpp
@@ -22,9 +22,6 @@ DelayNotify::~DelayNotify()
     if (pool_ == nullptr) {
         return;
     }
-    if (forceSyncTaskId_ != Executor::INVALID_TASK_ID) {
-        pool_->Remove(forceSyncTaskId_);
-    }
     if (delaySyncTaskId_ != Executor::INVALID_TASK_ID) {
         pool_->Remove(delaySyncTaskId_);
     }
@@ -43,10 +40,11 @@ void DelayNotify::UpdateNotify(const DistributedRdb::RdbChangedData &changedData
     LOG_DEBUG("Update changed data.");
     std::lock_guard<std::mutex> lock(mutex_);
     for (auto& [k, v] : changedData.tableData) {
+        if (!v.isTrackedDataChange) {
+            continue;
+        }
         auto it = changedData_.tableData.find(k);
-        if (it != changedData_.tableData.end()) {
-            it->second.isTrackedDataChange |= v.isTrackedDataChange;
-        } else {
+        if (it == changedData_.tableData.end()) {
             changedData_.tableData.insert_or_assign(k, v);
         }
     }
@@ -68,10 +66,6 @@ void DelayNotify::StartTimer()
     if (pool_ == nullptr) {
         return;
     }
-    if (forceSyncTaskId_ == Executor::INVALID_TASK_ID && autoSyncInterval_ == AUTO_SYNC_INTERVAL) {
-        forceSyncTaskId_ = pool_->Schedule(std::chrono::milliseconds(FORCE_SYNC_INTERVAL),
-            [this]() { ExecuteTask(); });
-    }
     if (delaySyncTaskId_ == Executor::INVALID_TASK_ID) {
         delaySyncTaskId_ = pool_->Schedule(std::chrono::milliseconds(autoSyncInterval_),
             [this]() { ExecuteTask(); });
@@ -84,27 +78,32 @@ void DelayNotify::StartTimer()
 void DelayNotify::StopTimer()
 {
     if (pool_ != nullptr) {
-        pool_->Remove(forceSyncTaskId_);
         pool_->Remove(delaySyncTaskId_);
     }
-    forceSyncTaskId_ = Executor::INVALID_TASK_ID;
     delaySyncTaskId_ = Executor::INVALID_TASK_ID;
 }
 
 void DelayNotify::ExecuteTask()
 {
     LOG_DEBUG("Notify data change.");
-    std::lock_guard<std::mutex> lock(mutex_);
-    RestoreDefaultSyncInterval();
-    StopTimer();
-    if (task_ != nullptr && changedData_.tableData.size() > 0) {
-        int errCode = task_(changedData_);
+    DistributedRdb::RdbChangedData changedData;
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        changedData.tableData = std::move(changedData_.tableData);
+        RestoreDefaultSyncInterval();
+        StopTimer();
+    }
+    if (task_ != nullptr && changedData.tableData.size() > 0) {
+        int errCode = task_(changedData);
         if (errCode != 0) {
             LOG_ERROR("NotifyDataChange is failed, err is %{public}d.", errCode);
+            std::lock_guard<std::mutex> lock(mutex_);
+            for (auto& [k, v] : changedData.tableData) {
+                changedData_.tableData.insert_or_assign(k, v);
+            }
             return;
         }
     }
-    changedData_.tableData.clear();
 }
 
 void DelayNotify::SetAutoSyncInterval(uint32_t interval)
diff --git a/relational_store/frameworks/native/rdb/src/rdb_helper.cpp b/relational_store/frameworks/native/rdb/src/rdb_helper.cpp
index 4bd1b22bedc04f91d89430375edf21ec2febbeb9..9dc3202096e9242e2ad1ab720014083cab76867d 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_helper.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_helper.cpp
@@ -21,7 +21,6 @@
 #include "rdb_trace.h"
 #include "sqlite_global_config.h"
 #include "unistd.h"
-
 #if !defined(WINDOWS_PLATFORM) && !defined(MAC_PLATFORM) && !defined(ANDROID_PLATFORM) && !defined(IOS_PLATFORM)
 #include "rdb_security_manager.h"
 #include "security_policy.h"
diff --git a/relational_store/frameworks/native/rdb/src/rdb_manager_impl.cpp b/relational_store/frameworks/native/rdb/src/rdb_manager_impl.cpp
index 563b218565054031e075c46334a7f3a3c2e1742d..caff8780b6f4f8a34f9a6044953bd8a44ca530f0 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_manager_impl.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_manager_impl.cpp
@@ -77,7 +77,6 @@ static void LinkToDeath(const sptr<IRemoteObject>& remote)
 
 RdbManagerImpl::RdbManagerImpl()
 {
-    LOG_INFO("construct");
 }
 
 RdbManagerImpl::~RdbManagerImpl()
@@ -170,7 +169,6 @@ void RdbManagerImpl::ResetServiceHandle()
 RdbStoreDataServiceProxy::RdbStoreDataServiceProxy(const sptr<IRemoteObject> &impl)
     : IRemoteProxy<DistributedRdb::IKvStoreDataService>(impl)
 {
-    LOG_INFO("init data service proxy.");
 }
 
 sptr<IRemoteObject> RdbStoreDataServiceProxy::GetFeatureInterface(const std::string &name)
diff --git a/relational_store/frameworks/native/rdb/src/rdb_notifier_stub.cpp b/relational_store/frameworks/native/rdb/src/rdb_notifier_stub.cpp
index 0f606d8ad024116397609a2efbf8f65392b62907..b785ab65ed8d3bada34c8b146845e21773bbacad 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_notifier_stub.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_notifier_stub.cpp
@@ -28,12 +28,10 @@ RdbNotifierStub::RdbNotifierStub(const SyncCompleteHandler &completeNotifier,
     : IRemoteStub<RdbNotifierStubBroker>(), completeNotifier_(completeNotifier),
       autoSyncCompleteHandler_(autoSyncCompleteHandler), changeNotifier_(changeNotifier)
 {
-    LOG_INFO("construct");
 }
 
 RdbNotifierStub::~RdbNotifierStub() noexcept
 {
-    LOG_INFO("destroy");
 }
 
 bool RdbNotifierStub::CheckInterfaceToken(MessageParcel& data)
diff --git a/relational_store/frameworks/native/rdb/src/rdb_security_manager.cpp b/relational_store/frameworks/native/rdb/src/rdb_security_manager.cpp
index 01adea638ae02c9ba3cd594d14e796bb2b2a5ac1..0ac16757c4c320af97ebe63df550385c581db825 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_security_manager.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_security_manager.cpp
@@ -248,7 +248,6 @@ bool RdbSecurityManager::SaveSecretKeyToFile(const std::string &dbPath, RdbSecur
 bool RdbSecurityManager::SaveSecretKeyToDisk(const std::string &keyPath, RdbSecretKeyData &keyData)
 {
     LOG_INFO("SaveSecretKeyToDisk begin.");
-
     std::vector<uint8_t> distributedInByte = { &keyData.distributed, &keyData.distributed + sizeof(uint8_t) };
     std::vector<uint8_t> timeInByte = { reinterpret_cast<uint8_t *>(&keyData.timeValue),
         reinterpret_cast<uint8_t *>(&keyData.timeValue) + sizeof(time_t) };
@@ -452,7 +451,9 @@ int32_t RdbSecurityManager::Init(const std::string &bundleName)
             usleep(RETRY_TIME_INTERVAL_MILLISECOND);
         }
     }
-    LOG_INFO("retry:%{public}u, error:%{public}d", retryCount, ret);
+    if (ret != HKS_SUCCESS) {
+        LOG_ERROR("retry:%{public}u, error:%{public}d", retryCount, ret);
+    }
     return ret;
 }
 
diff --git a/relational_store/frameworks/native/rdb/src/rdb_service_proxy.cpp b/relational_store/frameworks/native/rdb/src/rdb_service_proxy.cpp
index a210f59fbbb3c0e325812cd8afdd14466b82ed16..e01b459219d07efd69fccbddcc908fa76a667d44 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_service_proxy.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_service_proxy.cpp
@@ -80,10 +80,10 @@ int32_t RdbServiceProxy::InitNotifier(const RdbSyncerParam &param)
 
     if (InitNotifier(param, notifier_->AsObject()) != RDB_OK) {
         notifier_ = nullptr;
+        LOG_ERROR("init notifier error");
         return RDB_ERROR;
     }
 
-    LOG_INFO("success");
     return RDB_OK;
 }
 
@@ -137,7 +137,6 @@ int32_t RdbServiceProxy::DoSync(const RdbSyncerParam &param, const Option &optio
         return RDB_ERROR;
     }
     LOG_INFO("success");
-
     if (async != nullptr) {
         async(std::move(details));
     }
@@ -310,7 +309,6 @@ RdbServiceProxy::Observers RdbServiceProxy::ExportObservers()
 
 void RdbServiceProxy::ImportObservers(Observers &observers)
 {
-    LOG_INFO("enter");
     observers.ForEach([this](const std::string &key, const std::list<ObserverParam> &value) {
         RdbSyncerParam syncerParam;
         for (const auto &param : value) {
diff --git a/relational_store/frameworks/native/rdb/src/rdb_sql_utils.cpp b/relational_store/frameworks/native/rdb/src/rdb_sql_utils.cpp
index ecd001e497e5de987493000889b0f70cc63b19b1..af04e83163ce7a058fc60b7e9cddea41bcf319bd 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_sql_utils.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_sql_utils.cpp
@@ -13,27 +13,22 @@
  * limitations under the License.
  */
 
+#include "rdb_sql_utils.h"
+
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
 #include <cstdio>
-#ifdef WINDOWS_PLATFORM
-#include <dir.h>
-#endif
 
+#include "acl.h"
 #include "rdb_errno.h"
-#include "rdb_sql_utils.h"
+#include "rdb_platform.h"
 #include "sqlite_sql_builder.h"
-
-#ifdef WINDOWS_PLATFORM
-#define MKDIR(filePath) (mkdir(filePath))
-#else
-#define MKDIR(filePath) (mkdir(filePath, 0771))
-#endif
-
 namespace OHOS {
 namespace NativeRdb {
+using namespace OHOS::DATABASE_UTILS;
+constexpr int32_t SERVICE_GID = 3012;
 int RdbSqlUtils::CreateDirectory(const std::string &databaseDir)
 {
     std::string tempDirectory = databaseDir;
@@ -52,9 +47,14 @@ int RdbSqlUtils::CreateDirectory(const std::string &databaseDir)
     for (const std::string& directory : directories) {
         databaseDirectory = databaseDirectory + "/" + directory;
         if (access(databaseDirectory.c_str(), F_OK) != 0) {
-            if (MKDIR(databaseDirectory.c_str())) {
+            if (MkDir(databaseDirectory)) {
                 return E_CREATE_FOLDER_FAIL;
             }
+            // Set the default ACL attribute to the database root directory to ensure that files created by the server
+            // also have permission to operate on the client side.
+            Acl acl(databaseDirectory);
+            acl.SetDefaultUser(GetUid(), Acl::R_RIGHT | Acl::W_RIGHT);
+            acl.SetDefaultGroup(SERVICE_GID, Acl::R_RIGHT | Acl::W_RIGHT);
         }
     }
     return E_OK;
diff --git a/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp b/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp
index 34ca126af3f55b59881023719069eb9dda1bdf11..1ab7c39c4f979807ad9318bb2fa1a00d42648a51 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_store_config.cpp
@@ -24,7 +24,7 @@ using namespace OHOS::Rdb;
 RdbStoreConfig::RdbStoreConfig(const std::string &name, StorageMode storageMode, bool isReadOnly,
     const std::vector<uint8_t> &encryptKey, const std::string &journalMode, const std::string &syncMode,
     const std::string &databaseFileType, SecurityLevel securityLevel, bool isCreateNecessary, bool autoCheck,
-    int journalSize, int pageSize, const std::string &encryptAlgo)
+    int journalSize, int pageSize, const std::string& encryptAlgo)
     : name(name),
       path(name),
       storageMode(storageMode),
@@ -428,4 +428,24 @@ void RdbStoreConfig::SetSearchable(bool isSearchable)
 {
     isSearchable_ = isSearchable;
 }
+
+int RdbStoreConfig::GetWriteTime() const
+{
+    return writeTimeout_;
+}
+
+void RdbStoreConfig::SetWriteTime(int timeout)
+{
+    writeTimeout_ = timeout;
+}
+
+int RdbStoreConfig::GetReadTime() const
+{
+    return readTimeout_;
+}
+
+void RdbStoreConfig::SetReadTime(int timeout)
+{
+    readTimeout_ = timeout;
+}
 } // namespace OHOS::NativeRdb
diff --git a/relational_store/frameworks/native/rdb/src/rdb_store_impl.cpp b/relational_store/frameworks/native/rdb/src/rdb_store_impl.cpp
index b661e204b6e92c2d7afb1e55aef32d8040b9a6a1..aa9fbea1e3ff87e255aa20196ebc29720f824d40 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_store_impl.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_store_impl.cpp
@@ -19,7 +19,8 @@
 
 #include <algorithm>
 #include <sstream>
-
+#include <chrono>
+#include <cinttypes>
 #include "logger.h"
 #include "cache_result_set.h"
 #include "rdb_errno.h"
@@ -60,7 +61,7 @@
 
 namespace OHOS::NativeRdb {
 using namespace OHOS::Rdb;
-
+using namespace std::chrono;
 int RdbStoreImpl::InnerOpen()
 {
     LOG_DEBUG("open %{public}s.", SqliteUtils::Anonymous(rdbStoreConfig.GetPath()).c_str());
@@ -131,6 +132,15 @@ RdbStore::ModifyTime::ModifyTime(std::shared_ptr<ResultSet> result, std::map<std
     bool isFromRowId)
     : result_(std::move(result)), hash_(std::move(hashKeys)), isFromRowId_(isFromRowId)
 {
+    for (auto &[_, priKey] : hash_) {
+        if (priKey.index() != Traits::variant_index_of_v<std::string, PRIKey>) {
+            break;
+        }
+        auto *val = Traits::get_if<std::string>(&priKey);
+        if (val != nullptr && maxOriginKeySize_ <= val->length()) {
+            maxOriginKeySize_ = val->length() + 1;
+        }
+    }
 }
 
 RdbStore::ModifyTime::operator std::map<PRIKey, Date>()
@@ -150,8 +160,8 @@ RdbStore::ModifyTime::operator std::map<PRIKey, Date>()
         result_->GetLong(1, timeStamp);
         PRIKey index = 0;
         if (isFromRowId_) {
-            int rowid = 0;
-            result_->GetInt(0, rowid);
+            int64_t rowid = 0;
+            result_->GetLong(0, rowid);
             index = rowid;
         } else {
             std::vector<uint8_t> hashKey;
@@ -174,6 +184,16 @@ RdbStore::PRIKey RdbStore::ModifyTime::GetOriginKey(const std::vector<uint8_t> &
     return it != hash_.end() ? it->second : std::monostate();
 }
 
+size_t RdbStore::ModifyTime::GetMaxOriginKeySize()
+{
+    return maxOriginKeySize_;
+}
+
+bool RdbStore::ModifyTime::NeedConvert() const
+{
+    return !hash_.empty();
+}
+
 RdbStore::ModifyTime RdbStoreImpl::GetModifyTime(const std::string &table, const std::string &columnName,
     std::vector<PRIKey> &keys)
 {
@@ -204,7 +224,7 @@ RdbStore::ModifyTime RdbStoreImpl::GetModifyTime(const std::string &table, const
     }
 
     std::string sql;
-    sql.append("select hash_key, timestamp/10000 from ");
+    sql.append("select hash_key as key, timestamp/10000 as modify_time from ");
     sql.append(logTable);
     sql.append(" where hash_key in (");
     sql.append(GetSqlArgs(hashKeys.size()));
@@ -221,7 +241,7 @@ RdbStore::ModifyTime RdbStoreImpl::GetModifyTime(const std::string &table, const
 RdbStore::ModifyTime RdbStoreImpl::GetModifyTimeByRowId(const std::string &logTable, std::vector<PRIKey> &keys)
 {
     std::string sql;
-    sql.append("select data_key, timestamp/10000 from ");
+    sql.append("select data_key as key, timestamp/10000 as modify_time from ");
     sql.append(logTable);
     sql.append(" where data_key in (");
     sql.append(GetSqlArgs(keys.size()));
@@ -653,10 +673,11 @@ std::shared_ptr<AbsSharedResultSet> RdbStoreImpl::Query(
 {
     DISTRIBUTED_DATA_HITRACE(std::string(__FUNCTION__));
     std::string sql;
-    if (predicates.HasSpecificField()) {
+    std::pair<bool, bool> queryStatus = {ColHasSpecificField(columns), predicates.HasSpecificField()};
+    if (queryStatus.first || queryStatus.second) {
         std::string table = predicates.GetTableName();
         std::string logTable = DistributedDB::RelationalStoreManager::GetDistributedLogTableName(table);
-        sql = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable);
+        sql = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
     } else {
         sql = SqliteSqlBuilder::BuildQueryString(predicates, columns);
     }
@@ -779,12 +800,49 @@ int RdbStoreImpl::ExecuteSql(const std::string &sql, const std::vector<ValueObje
         errCode = connectionPool->ReOpenAvailableReadConnections();
     }
 
-    if (errCode == E_OK) {
+    if (errCode == E_OK && (sqlType == SqliteUtils::STATEMENT_UPDATE || sqlType == SqliteUtils::STATEMENT_INSERT)) {
         DoCloudSync("");
     }
     return errCode;
 }
 
+std::pair<int32_t, ValueObject> RdbStoreImpl::Execute(const std::string &sql, const std::vector<ValueObject> &bindArgs)
+{
+    int errCode = E_OK;
+    ValueObject outValue;
+    int sqlType = SqliteUtils::GetSqlStatementType(sql);
+    if (sqlType == SqliteUtils::STATEMENT_SELECT) {
+        LOG_ERROR("Not support the sql: %{public}s", SqliteUtils::Anonymous(sql).c_str());
+        return { E_NOT_SUPPORT_THE_SQL, outValue };
+    }
+
+    if (sqlType == SqliteUtils::STATEMENT_INSERT) {
+        int64_t intOutValue = -1;
+        errCode = ExecuteForLastInsertedRowId(intOutValue, sql, bindArgs);
+        return { errCode, ValueObject(intOutValue) };
+    }
+
+    if (sqlType == SqliteUtils::STATEMENT_UPDATE) {
+        int64_t intOutValue = -1;
+        errCode = ExecuteForChangedRowCount(intOutValue, sql, bindArgs);
+        return { errCode, ValueObject(intOutValue) };
+    }
+
+    if (sqlType == SqliteUtils::STATEMENT_PRAGMA) {
+        std::string strOutValue;
+        errCode = ExecuteAndGetString(strOutValue, sql, bindArgs);
+        return { errCode, ValueObject(strOutValue) };
+    }
+
+    if (sqlType == SqliteUtils::STATEMENT_DDL) {
+        errCode = ExecuteSql(sql, bindArgs);
+        return { errCode, outValue };
+    } else {
+        LOG_ERROR("Not support the sql: %{public}s", SqliteUtils::Anonymous(sql).c_str());
+        return { E_NOT_SUPPORT_THE_SQL, outValue } ;
+    }
+}
+
 int RdbStoreImpl::ExecuteAndGetLong(int64_t &outValue, const std::string &sql, const std::vector<ValueObject> &bindArgs)
 {
     std::shared_ptr<SqliteConnection> connection;
@@ -1092,24 +1150,27 @@ int RdbStoreImpl::BeginTransaction()
     // size + 1 means the number of transactions in process
     size_t transactionId = connectionPool->GetTransactionStack().size() + 1;
 
+    auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
     BaseTransaction transaction(connectionPool->GetTransactionStack().size());
     auto connection = connectionPool->AcquireConnection(false);
     if (connection == nullptr) {
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s times:%{public}" PRIu64 ".",
+            transactionId, name.c_str(), time);
         return E_CON_OVER_LIMIT;
     }
 
     int errCode = connection->ExecuteSql(transaction.GetTransactionStr());
     connectionPool->ReleaseConnection(connection);
     if (errCode != E_OK) {
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s, errCode: %{public}d",
-            transactionId, name.c_str(), errCode);
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s, errCode: %{public}d times:%{public}" PRIu64 ".",
+            transactionId, name.c_str(), errCode, time);
         return errCode;
     }
 
     connection->SetInTransaction(true);
     connectionPool->GetTransactionStack().push(transaction);
-    LOG_INFO("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+    LOG_INFO("transaction id: %{public}zu, storeName: %{public}s times:%{public}" PRIu64 ".",
+        transactionId, name.c_str(), time);
     return E_OK;
 }
 
@@ -1122,8 +1183,10 @@ int RdbStoreImpl::RollBack()
     std::lock_guard<std::mutex> lockGuard(connectionPool->GetTransactionStackMutex());
     size_t transactionId = connectionPool->GetTransactionStack().size();
 
+    auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
     if (connectionPool->GetTransactionStack().empty()) {
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s time:%{public}" PRIu64 ".",
+            transactionId, name.c_str(), time);
         return E_NO_TRANSACTION_IN_SESSION;
     }
     BaseTransaction transaction = connectionPool->GetTransactionStack().top();
@@ -1134,7 +1197,8 @@ int RdbStoreImpl::RollBack()
     auto connection = connectionPool->AcquireConnection(false);
     if (connection == nullptr) {
         // size + 1 means the number of transactions in process
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s", transactionId + 1, name.c_str());
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s time:%{public}" PRIu64 ".",
+            transactionId + 1, name.c_str(), time);
         return E_CON_OVER_LIMIT;
     }
 
@@ -1143,10 +1207,10 @@ int RdbStoreImpl::RollBack()
     if (connectionPool->GetTransactionStack().empty()) {
         connection->SetInTransaction(false);
     }
-	
+
     // size + 1 means the number of transactions in process
-    LOG_INFO("transaction id: %{public}zu, , storeName: %{public}s, errCode:%{public}d",
-        transactionId + 1, name.c_str(), errCode);
+    LOG_INFO("transaction id: %{public}zu, , storeName: %{public}s, errCode:%{public}d time:%{public}" PRIu64 ".",
+        transactionId + 1, name.c_str(), errCode, time);
     return E_OK;
 }
 
@@ -1159,30 +1223,33 @@ int RdbStoreImpl::Commit()
     std::lock_guard<std::mutex> lockGuard(connectionPool->GetTransactionStackMutex());
     size_t transactionId = connectionPool->GetTransactionStack().size();
 
+    auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
     if (connectionPool->GetTransactionStack().empty()) {
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s time:%{public}" PRIu64 ".",
+            transactionId, name.c_str(), time);
         return E_OK;
     }
     BaseTransaction transaction = connectionPool->GetTransactionStack().top();
     std::string sqlStr = transaction.GetCommitStr();
     if (sqlStr.size() <= 1) {
-        LOG_INFO("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+        LOG_INFO("transaction id: %{public}zu, storeName: %{public}s time:%{public}" PRIu64 ".",
+            transactionId, name.c_str(), time);
         connectionPool->GetTransactionStack().pop();
         return E_OK;
     }
 
     auto connection = connectionPool->AcquireConnection(false);
     if (connection == nullptr) {
-        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s", transactionId, name.c_str());
+        LOG_ERROR("transaction id: %{public}zu, storeName: %{public}s time:%{public}" PRIu64 ".",
+           transactionId, name.c_str(), time);
         return E_CON_OVER_LIMIT;
     }
 
     int errCode = connection->ExecuteSql(sqlStr);
     connectionPool->ReleaseConnection(connection);
     connection->SetInTransaction(false);
-
-    LOG_INFO("transaction id: %{public}zu, storeName: %{public}s errCode:%{public}d",
-        transactionId, name.c_str(), errCode);
+    LOG_INFO("transaction id: %{public}zu, storeName: %{public}s errCode:%{public}d time:%{public}" PRIu64 ".",
+        transactionId, name.c_str(), errCode, time);
     connectionPool->GetTransactionStack().pop();
     return E_OK;
 }
@@ -1458,9 +1525,6 @@ int RdbStoreImpl::SetDistributedTables(const std::vector<std::string> &tables, i
         std::unique_lock<decltype(rwMutex_)> lock(rwMutex_);
         cloudTables_.insert(tables.begin(), tables.end());
     }
-    for (auto &table : tables) {
-        DoCloudSync(table);
-    }
     return E_OK;
 }
 
@@ -1811,5 +1875,15 @@ int RdbStoreImpl::RegisterDataChangeCallback()
     connectionPool->ReleaseConnection(connection);
     return code;
 }
+
+bool RdbStoreImpl::ColHasSpecificField(const std::vector<std::string> &columns)
+{
+    for (const std::string &column : columns) {
+        if (column.find(SqliteUtils::REP) != std::string::npos) {
+            return true;
+        }
+    }
+    return false;
+}
 #endif
 } // namespace OHOS::NativeRdb
\ No newline at end of file
diff --git a/relational_store/frameworks/native/rdb/src/rdb_store_manager.cpp b/relational_store/frameworks/native/rdb/src/rdb_store_manager.cpp
index f5343731d821971252d26d09e50cd0c3acfcfd0a..5c6007568562805317a7d219f6831da118e013a8 100644
--- a/relational_store/frameworks/native/rdb/src/rdb_store_manager.cpp
+++ b/relational_store/frameworks/native/rdb/src/rdb_store_manager.cpp
@@ -46,7 +46,6 @@ RdbStoreManager &RdbStoreManager::GetInstance()
 
 RdbStoreManager::~RdbStoreManager()
 {
-    LOG_INFO("Start");
     Clear();
 }
 
@@ -58,21 +57,19 @@ std::shared_ptr<RdbStore> RdbStoreManager::GetRdbStore(const RdbStoreConfig &con
     int &errCode, int version, RdbOpenCallback &openCallback)
 {
     std::string path = config.GetPath();
-    std::lock_guard<std::mutex> lock(mutex_); // TOD this lock should only work on storeCache_, add one more lock for connectionpool
+    // TOD this lock should only work on storeCache_, add one more lock for connectionpool
+    std::lock_guard<std::mutex> lock(mutex_);
     bundleName_ = config.GetBundleName();
     if (storeCache_.find(path) != storeCache_.end()) {
         std::shared_ptr<RdbStoreImpl> rdbStore = storeCache_[path].lock();
         if (rdbStore != nullptr && rdbStore->GetConfig() == config) {
             return rdbStore;
         }
-        storeCache_.erase(path); // TOD reconfigure store should be repeated this
+        // TOD reconfigure store should be repeated this
+        storeCache_.erase(path);
     }
 
-    std::shared_ptr<RdbStoreImpl> rdbStore(new (std::nothrow) RdbStoreImpl(config, errCode),
-        [](RdbStoreImpl *ptr) {
-            LOG_DEBUG("delete %{public}s as no more used.", SqliteUtils::Anonymous(ptr->GetPath()).c_str());
-            delete ptr;
-        });
+    std::shared_ptr<RdbStoreImpl> rdbStore = std::make_shared<RdbStoreImpl>(config, errCode);
     if (errCode != E_OK) {
         LOG_ERROR("RdbStoreManager GetRdbStore fail to open RdbStore as memory issue, rc=%{public}d", errCode);
         return nullptr;
diff --git a/relational_store/frameworks/native/rdb/src/result_set_proxy.cpp b/relational_store/frameworks/native/rdb/src/result_set_proxy.cpp
index 38273ef3cc35ec23e207d4af4a5f807e4000f1ed..8b4fbb81ba80ec60e9fa7ef81cb8ca0482cffdf6 100644
--- a/relational_store/frameworks/native/rdb/src/result_set_proxy.cpp
+++ b/relational_store/frameworks/native/rdb/src/result_set_proxy.cpp
@@ -37,7 +37,8 @@ ResultSetProxy::~ResultSetProxy()
 
 int ResultSetProxy::GetAllColumnNames(std::vector<std::string> &columnNames)
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", Code::CMD_GET_ALL_COLUMN_NAMES);
         return E_ERROR;
@@ -80,7 +81,8 @@ int ResultSetProxy::GetColumnType(int columnIndex, ColumnType &columnType)
 
 int ResultSetProxy::GetColumnIndex(const std::string &columnName, int &columnIndex)
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", Code::CMD_GET_COLUMN_INDEX);
         return E_ERROR;
@@ -256,7 +258,8 @@ int ResultSetProxy::GetRow(NativeRdb::RowEntity &rowEntity)
 
 bool ResultSetProxy::IsClosed() const
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", Code::CMD_IS_CLOSED);
         return false;
@@ -277,7 +280,8 @@ int ResultSetProxy::Close()
 
 int ResultSetProxy::SendRequest(uint32_t code)
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", code);
         return E_ERROR;
@@ -298,7 +302,8 @@ int ResultSetProxy::SendRequest(uint32_t code)
 
 int ResultSetProxy::SendIntRequest(uint32_t code, int value)
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", code);
         return E_ERROR;
@@ -323,7 +328,8 @@ int ResultSetProxy::SendIntRequest(uint32_t code, int value)
 
 int ResultSetProxy::SendRequestRetBool(uint32_t code, bool &result) const
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", code);
         return E_ERROR;
@@ -345,7 +351,8 @@ int ResultSetProxy::SendRequestRetBool(uint32_t code, bool &result) const
 
 int ResultSetProxy::SendRequestRetInt(uint32_t code, int &result) const
 {
-    MessageParcel data, reply;
+    MessageParcel data;
+    MessageParcel reply;
     if (!data.WriteInterfaceToken(ResultSetProxy::GetDescriptor())) {
         LOG_ERROR("Write descriptor failed, code is %{public}d.", code);
         return E_ERROR;
diff --git a/relational_store/frameworks/native/rdb/src/security_policy.cpp b/relational_store/frameworks/native/rdb/src/security_policy.cpp
index 75c46ec7c776ca811efdc217857a5f7e82dec3d1..390e84d2641641190fd99c9c2697ed9ba2deb992 100644
--- a/relational_store/frameworks/native/rdb/src/security_policy.cpp
+++ b/relational_store/frameworks/native/rdb/src/security_policy.cpp
@@ -55,8 +55,10 @@ int SecurityPolicy::SetSecurityLabel(const RdbStoreConfig &config)
         } else {
             errCode = currentLevel == toSetLevel ? E_OK : E_ERROR;
         }
-        LOG_INFO("Set security level from %{public}s to %{public}s, result:%{public}d.", currentLevel.c_str(),
-            toSetLevel.c_str(), errCode);
+        if (errCode != E_OK) {
+            LOG_ERROR("Set security level from %{public}s to %{public}s, result:%{public}d.", currentLevel.c_str(),
+                toSetLevel.c_str(), errCode);
+        }
         return errCode;
     }
     return E_OK;
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_connection.cpp b/relational_store/frameworks/native/rdb/src/sqlite_connection.cpp
index ac8ae4732a3066b3b997af9b14e2f76a71db5d8a..36e250403c1ca2bb9609e3e32b459c77323c2bce 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_connection.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_connection.cpp
@@ -144,10 +144,7 @@ int SqliteConnection::InnerOpen(const RdbStoreConfig &config, uint32_t retry)
     }
 
     if (isWriteConnection) {
-        errCode = sqlite3_wal_checkpoint_v2(dbHandle, nullptr, SQLITE_CHECKPOINT_TRUNCATE, nullptr, nullptr);
-        if (errCode != SQLITE_OK) {
-            LOG_WARN("sqlite checkpoint errCode is %{public}d", errCode);
-        }
+        TryCheckPoint();
     }
 
     filePath = dbPath;
@@ -781,7 +778,7 @@ void SqliteConnection::LimitPermission(const std::string &dbPath) const
         if ((st.st_mode & (S_IXUSR | S_IXGRP | S_IRWXO)) != 0) {
             int ret = chmod(dbPath.c_str(), st.st_mode & (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
             if (ret != 0) {
-                LOG_ERROR("SqliteConnection LimitPermission chmod fail, err = %{public}d", errno);
+                LOG_DEBUG("SqliteConnection LimitPermission chmod fail, err = %{public}d", errno);
             }
         }
     } else {
@@ -793,7 +790,8 @@ void SqliteConnection::LimitPermission(const std::string &dbPath) const
 int Collate8Compare(void *p, int n1, const void *v1, int n2, const void *v2)
 {
     UCollator *coll = reinterpret_cast<UCollator *>(p);
-    UCharIterator i1, i2;
+    UCharIterator i1;
+    UCharIterator i2;
     UErrorCode status = U_ZERO_ERROR;
 
     uiter_setUTF8(&i1, (const char *)v1, n1);
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_connection_pool.cpp b/relational_store/frameworks/native/rdb/src/sqlite_connection_pool.cpp
index 7d87a91158f5823dbd88795d8b2bfae2317fa99b..dfb5a068f68518f4cddabf145084c2739fead3d6 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_connection_pool.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_connection_pool.cpp
@@ -33,8 +33,7 @@ namespace OHOS {
 namespace NativeRdb {
 using namespace OHOS::Rdb;
 
-constexpr std::chrono::seconds WRITE_CONNECT_TIMEOUT(2);
-constexpr std::chrono::seconds READ_CONNECT_TIMEOUT(1);
+constexpr std::chrono::seconds TRANSACTION_TIMEOUT(2);
 
 SqliteConnectionPool *SqliteConnectionPool::Create(const RdbStoreConfig &storeConfig, int &errCode)
 {
@@ -82,6 +81,8 @@ int SqliteConnectionPool::Init()
 
     writeConnectionUsed_ = false;
     idleReadConnectionCount_ = readConnectionCount_;
+    writeTimeout_ = std::chrono::seconds(config_.GetWriteTime());
+    readTimeout_ = std::chrono::seconds(config_.GetReadTime());
     return E_OK;
 }
 
@@ -139,7 +140,9 @@ void SqliteConnectionPool::ReleaseConnection(std::shared_ptr<SqliteConnection> c
 std::shared_ptr<SqliteConnection> SqliteConnectionPool::AcquireWriteConnection()
 {
     std::unique_lock<std::mutex> lock(writeMutex_);
-    if (writeCondition_.wait_for(lock, WRITE_CONNECT_TIMEOUT, [this] { return !writeConnectionUsed_; })) {
+    if (writeCondition_.wait_for(lock, writeTimeout_, [this] {
+            return !writeConnectionUsed_;
+        })) {
         writeConnectionUsed_ = true;
         return writeConnection_;
     }
@@ -150,7 +153,9 @@ std::shared_ptr<SqliteConnection> SqliteConnectionPool::AcquireWriteConnection()
 int SqliteConnectionPool::AcquireTransaction()
 {
     std::unique_lock<std::mutex> lock(transMutex_);
-    if (transCondition_.wait_for(lock, WRITE_CONNECT_TIMEOUT, [this] { return !transactionUsed_; })) {
+    if (transCondition_.wait_for(lock, TRANSACTION_TIMEOUT, [this] {
+            return !transactionUsed_;
+        })) {
         transactionUsed_ = true;
         return E_OK;
     }
@@ -183,7 +188,9 @@ void SqliteConnectionPool::ReleaseWriteConnection()
 std::shared_ptr<SqliteConnection> SqliteConnectionPool::AcquireReadConnection()
 {
     std::unique_lock<std::mutex> lock(readMutex_);
-    if (readCondition_.wait_for(lock, READ_CONNECT_TIMEOUT, [this] { return idleReadConnectionCount_ > 0; })) {
+    if (readCondition_.wait_for(lock, readTimeout_, [this] {
+            return idleReadConnectionCount_ > 0;
+        })) {
         auto connection = readConnections_.back();
         readConnections_.pop_back();
         idleReadConnectionCount_--;
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_global_config.cpp b/relational_store/frameworks/native/rdb/src/sqlite_global_config.cpp
index 2cdc3ba03e202b7b9aaa53589e946db508e34e20..73fb57ef202a4b98ca461ec38cf763669ceb5812 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_global_config.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_global_config.cpp
@@ -17,7 +17,8 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
-
+#include <chrono>
+#include <cinttypes>
 #include "logger.h"
 #include "sqlite3sym.h"
 #include "sqlite_utils.h"
@@ -25,7 +26,7 @@
 namespace OHOS {
 namespace NativeRdb {
 using namespace OHOS::Rdb;
-
+using namespace std::chrono;
 void SqliteGlobalConfig::InitSqliteGlobalConfig()
 {
     static SqliteGlobalConfig globalConfig;
@@ -62,7 +63,8 @@ void SqliteGlobalConfig::SqliteLogCallback(const void *data, int err, const char
     } else if (errType == SQLITE_WARNING) {
         LOG_WARN("SQLite WARNING(%{public}d) %{public}s ", err, SqliteUtils::Anonymous(msg).c_str());
     } else {
-        LOG_ERROR("SQLite Error(%{public}d) %{public}s", err, msg);
+        auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+        LOG_ERROR("SQLite Error(%{public}d) %{public}s times %{public}" PRIu64 ".", err, msg, time);
     }
 }
 
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_sql_builder.cpp b/relational_store/frameworks/native/rdb/src/sqlite_sql_builder.cpp
index 03f03b54cd614b61495cdebec32397de50958d07..f7c594a0f5dc031ee9a66100bd2246c3ac9feac6 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_sql_builder.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_sql_builder.cpp
@@ -233,8 +233,8 @@ std::string SqliteSqlBuilder::BuildCountString(const AbsRdbPredicates &predicate
     return "SELECT COUNT(*) FROM " + tableName + BuildSqlStringFromPredicates(predicates);
 }
 
-std::string SqliteSqlBuilder::BuildCursorQueryString(
-    const AbsRdbPredicates &predicates, const std::vector<std::string> &columns, const std::string &logTable)
+std::string SqliteSqlBuilder::BuildCursorQueryString(const AbsRdbPredicates &predicates,
+    const std::vector<std::string> &columns, const std::string &logTable,  const std::pair<bool, bool> &queryStatus)
 {
     std::string sql;
     std::string table = predicates.GetTableName();
@@ -250,10 +250,18 @@ std::string SqliteSqlBuilder::BuildCursorQueryString(
     } else {
         sql.append(table + ".*");
     }
-    sql.append(", " + logTable + ".cursor");
-    sql.append(", CASE WHEN ").append(logTable).append(".")
-        .append("flag & 0x8 = 0x8 THEN true ELSE false END AS deleted_flag ");
-    sql.append("FROM ").append(table);
+    if (queryStatus.first) {
+        std::string field = DistributedRdb::Field::SHARING_RESOURCE_FIELD;
+        SqliteUtils::Replace(field, SqliteUtils::REP, "");
+        SqliteUtils::Replace(sql, table + "." + DistributedRdb::Field::SHARING_RESOURCE_FIELD,
+            logTable + "." + SHARING_RESOURCE + " AS " + field);
+    }
+    if (queryStatus.second) {
+        sql.append(", " + logTable + ".cursor");
+        sql.append(", CASE WHEN ").append(logTable).append(".")
+            .append("flag & 0x8 = 0x8 THEN true ELSE false END AS deleted_flag");
+    }
+    sql.append(" FROM ").append(table);
     AppendClause(sql, " INDEXED BY ", predicates.GetIndex());
     sql.append(" INNER JOIN ").append(logTable).append(" ON ").append(table)
         .append(".ROWID = ").append(logTable).append(".data_key");
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp b/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp
index 11881b600ede2d961bf4a0bfcce0a1f7567f880e..9446d2f707c44c4a4689452e6c85e014732c2919 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_statement.cpp
@@ -17,7 +17,8 @@
 
 #include <iomanip>
 #include <sstream>
-
+#include <chrono>
+#include <cinttypes>
 #include "logger.h"
 #include "raw_data_parser.h"
 #include "rdb_errno.h"
@@ -28,7 +29,7 @@
 namespace OHOS {
 namespace NativeRdb {
 using namespace OHOS::Rdb;
-
+using namespace std::chrono;
 // Setting Data Precision
 const int SET_DATA_PRECISION = 15;
 SqliteStatement::SqliteStatement() : sql(""), stmtHandle(nullptr), readOnly(false), columnCount(0), numParameters(0)
@@ -46,7 +47,8 @@ std::shared_ptr<SqliteStatement> SqliteStatement::CreateStatement(
     sqlite3_stmt *stmt = nullptr;
     int errCode = sqlite3_prepare_v2(connection->dbHandle, sql.c_str(), sql.length(), &stmt, nullptr);
     if (errCode != SQLITE_OK) {
-        LOG_ERROR("prepare_v2 ret is %{public}d", errCode);
+        auto time = static_cast<uint64_t>(duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count());
+        LOG_ERROR("prepare_v2 ret is %{public}d %{public}" PRIu64 ".", errCode, time);
         if (stmt != nullptr) {
             sqlite3_finalize(stmt);
         }
diff --git a/relational_store/frameworks/native/rdb/src/sqlite_utils.cpp b/relational_store/frameworks/native/rdb/src/sqlite_utils.cpp
index 2e634d852a86d95c9859367a27abd27293cabd40..135d6afa2847c339ab5c1ae2726aeb49274b74b7 100644
--- a/relational_store/frameworks/native/rdb/src/sqlite_utils.cpp
+++ b/relational_store/frameworks/native/rdb/src/sqlite_utils.cpp
@@ -44,6 +44,7 @@ const int SqliteUtils::STATEMENT_COMMIT = 6;
 const int SqliteUtils::STATEMENT_ROLLBACK = 7;
 const int SqliteUtils::STATEMENT_PRAGMA = 8;
 const int SqliteUtils::STATEMENT_DDL = 9;
+const int SqliteUtils::STATEMENT_INSERT = 10;
 const int SqliteUtils::STATEMENT_OTHER = 99;
 
 constexpr int32_t HEAD_SIZE = 3;
@@ -54,7 +55,7 @@ constexpr const char *DEFAULT_ANONYMOUS = "******";
 
 const std::map<std::string, int> SqliteUtils::SQL_TYPE_MAP = {
     { "SEL", SqliteUtils::STATEMENT_SELECT },
-    { "INS", SqliteUtils::STATEMENT_UPDATE },
+    { "INS", SqliteUtils::STATEMENT_INSERT },
     { "UPD", SqliteUtils::STATEMENT_UPDATE },
     { "REP", SqliteUtils::STATEMENT_UPDATE },
     { "DEL", SqliteUtils::STATEMENT_UPDATE },
diff --git a/relational_store/frameworks/native/rdb/src/step_result_set.cpp b/relational_store/frameworks/native/rdb/src/step_result_set.cpp
index bd22a11b9ea74cb7d899df7a4845810a09447d26..9b2e359d036777bcf3426b335f4a8fc1afd878c8 100644
--- a/relational_store/frameworks/native/rdb/src/step_result_set.cpp
+++ b/relational_store/frameworks/native/rdb/src/step_result_set.cpp
@@ -34,7 +34,10 @@ StepResultSet::StepResultSet(std::shared_ptr<RdbStoreImpl> rdb_, SqliteConnectio
     : rdb_(rdb_), sqliteStatement_(nullptr), args_(std::move(selectionArgs)), sql_(sql_),
       connectionPool_(connectionPool), rowCount_(INIT_POS), isAfterLast_(false)
 {
-    PrepareStep();
+    int errCode = PrepareStep();
+    if (errCode) {
+        LOG_ERROR("step resultset ret %{public}d", errCode);
+    }
 }
 
 StepResultSet::~StepResultSet()
@@ -57,7 +60,7 @@ int StepResultSet::GetAllColumnNames(std::vector<std::string> &columnNames)
 
     int errCode = PrepareStep();
     if (errCode) {
-        LOG_ERROR("PrepareStep ret %{public}d", errCode);
+        LOG_ERROR("get all column names Step ret %{public}d", errCode);
         return errCode;
     }
 
@@ -191,7 +194,7 @@ int StepResultSet::GoToNextRow()
 
     int errCode = PrepareStep();
     if (errCode) {
-        LOG_ERROR("PrepareStep ret %{public}d", errCode);
+        LOG_ERROR("go to nextrow step ret %{public}d", errCode);
         return errCode;
     }
 
@@ -263,7 +266,6 @@ int StepResultSet::PrepareStep()
     sqliteStatement_ = SqliteStatement::CreateStatement(connection, sql_);
     connectionPool_->ReleaseConnection(connection);
     if (sqliteStatement_ == nullptr) {
-        LOG_ERROR("Connection create statement failed!");
         return E_STATEMENT_NOT_PREPARED;
     }
 
diff --git a/relational_store/frameworks/native/rdb_data_share_adapter/src/rdb_utils.cpp b/relational_store/frameworks/native/rdb_data_share_adapter/src/rdb_utils.cpp
index 2645d7193e4cc62123505427a5f4a5313dab3f3f..4bcd9f996a600d40a4961bcc96dcd3a66a9a1319 100644
--- a/relational_store/frameworks/native/rdb_data_share_adapter/src/rdb_utils.cpp
+++ b/relational_store/frameworks/native/rdb_data_share_adapter/src/rdb_utils.cpp
@@ -54,27 +54,14 @@ RdbPredicates RdbUtils::ToPredicates(const DataShareAbsPredicates &predicates, c
     return rdbPredicates;
 }
 
-std::string RdbUtils::ToString(const DataSharePredicatesObject &predicatesObject)
+OHOS::NativeRdb::ValueObject RdbUtils::ToValueObject(const DataSharePredicatesObject &predicatesObject)
 {
     if (auto *val = std::get_if<int>(&predicatesObject.value)) {
-        return std::to_string(*val);
+        return ValueObject(*val);
     }
-    if (auto *val = std::get_if<double>(&predicatesObject.value)) {
-        return std::to_string(*val);
-    }
-    if (auto *val = std::get_if<std::string>(&predicatesObject.value)) {
-        return *val;
-    }
-    if (auto *val = std::get_if<bool>(&predicatesObject.value)) {
-        return std::to_string(*val);
-    }
-    if (auto *val = std::get_if<int64_t>(&predicatesObject.value)) {
-        return std::to_string(*val);
-    }
-    if (auto *val = std::get_if<std::monostate>(&predicatesObject.value)) {
-        LOG_INFO("RdbUtils::ToString No matching type");
-    }
-    return " ";
+    ValueObject::Type value;
+    RawDataParser::Convert(std::move(predicatesObject.value), value);
+    return value;
 }
 
 std::shared_ptr<ResultSetBridge> RdbUtils::ToResultSetBridge(std::shared_ptr<ResultSet> resultSet)
@@ -93,32 +80,32 @@ void RdbUtils::NoSupport(const OperationItem &item, RdbPredicates &query)
 
 void RdbUtils::EqualTo(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.EqualTo(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.EqualTo(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::NotEqualTo(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.NotEqualTo(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.NotEqualTo(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::GreaterThan(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.GreaterThan(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.GreaterThan(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::LessThan(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.LessThan(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.LessThan(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::GreaterThanOrEqualTo(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.GreaterThanOrEqualTo(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.GreaterThanOrEqualTo(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::LessThanOrEqualTo(const OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.LessThanOrEqualTo(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.LessThanOrEqualTo(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::And(const DataShare::OperationItem &item, RdbPredicates &predicates)
@@ -153,7 +140,7 @@ void RdbUtils::NotIn(const DataShare::OperationItem &item, RdbPredicates &predic
 
 void RdbUtils::Like(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.Like(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.Like(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::OrderByAsc(const DataShare::OperationItem &item, RdbPredicates &predicates)
@@ -189,12 +176,12 @@ void RdbUtils::EndWrap(const DataShare::OperationItem &item, RdbPredicates &pred
 
 void RdbUtils::BeginsWith(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.BeginsWith(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.BeginsWith(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::EndsWith(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.EndsWith(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.EndsWith(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::Distinct(const DataShare::OperationItem &item, RdbPredicates &predicates)
@@ -214,22 +201,24 @@ void RdbUtils::IndexedBy(const DataShare::OperationItem &item, RdbPredicates &pr
 
 void RdbUtils::Contains(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.Contains(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.Contains(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::Glob(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.Glob(item.GetSingle(0), ToString(item.singleParams[1]));
+    predicates.Glob(item.GetSingle(0), ToValueObject(item.singleParams[1]));
 }
 
 void RdbUtils::Between(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.Between(item.GetSingle(0), ToString(item.singleParams[1]), ToString(item.singleParams[2]));
+    // singleParams[2] is another param
+    predicates.Between(item.GetSingle(0), ToValueObject(item.singleParams[1]), ToValueObject(item.singleParams[2]));
 }
 
 void RdbUtils::NotBetween(const DataShare::OperationItem &item, RdbPredicates &predicates)
 {
-    predicates.NotBetween(item.GetSingle(0), ToString(item.singleParams[1]), ToString(item.singleParams[2]));
+    // singleParams[2] is another param
+    predicates.NotBetween(item.GetSingle(0), ToValueObject(item.singleParams[1]), ToValueObject(item.singleParams[2]));
 }
 
 void RdbUtils::CrossJoin(const DataShare::OperationItem &item, RdbPredicates &predicates)
diff --git a/relational_store/interfaces/inner_api/cloud_data/include/cloud_types.h b/relational_store/interfaces/inner_api/cloud_data/include/cloud_types.h
index 4897953a4a4bfb91a65a84faf85e0f07f1224244..0d70732101a192241a0dae29eb6d4b2067891823 100644
--- a/relational_store/interfaces/inner_api/cloud_data/include/cloud_types.h
+++ b/relational_store/interfaces/inner_api/cloud_data/include/cloud_types.h
@@ -17,7 +17,6 @@
 #define OHOS_DISTRIBUTED_DATA_CLOUD_CLOUD_TYPES_H
 
 #include <string>
-#include <vector>
 
 namespace OHOS::CloudData {
 enum Role : int32_t {
diff --git a/relational_store/interfaces/inner_api/common_type/include/common_types.h b/relational_store/interfaces/inner_api/common_type/include/common_types.h
index f7fbc7c98f91d63ee3e47088ba3af8041df47b0f..4895819bedaee1cb18b3bc8738d3ac9c4cb8eefc 100644
--- a/relational_store/interfaces/inner_api/common_type/include/common_types.h
+++ b/relational_store/interfaces/inner_api/common_type/include/common_types.h
@@ -18,7 +18,6 @@
 #include <map>
 #include <string>
 #include <variant>
-#include <vector>
 namespace OHOS::CommonType {
 struct AssetValue {
     enum Status : int32_t {
diff --git a/relational_store/interfaces/inner_api/rdb/BUILD.gn b/relational_store/interfaces/inner_api/rdb/BUILD.gn
index 6249e4858209478a1b7f3051a20564d4988f2593..4a9c785aa60384465dc3cf48d1b152c0f1172049 100644
--- a/relational_store/interfaces/inner_api/rdb/BUILD.gn
+++ b/relational_store/interfaces/inner_api/rdb/BUILD.gn
@@ -134,6 +134,7 @@ if (is_ohos && !build_ohos_sdk) {
       "hitrace:hitrace_meter",
       "huks:libhukssdk",
       "ipc:ipc_core",
+      "kv_store:database_utils",
       "kv_store:distributeddb",
       "samgr:samgr_proxy",
     ]
@@ -194,6 +195,7 @@ if (is_ohos && !build_ohos_sdk) {
       "hitrace:hitrace_meter",
       "huks:libhukssdk",
       "ipc:ipc_core",
+      "kv_store:database_utils",
       "kv_store:distributeddb",
       "samgr:samgr_proxy",
     ]
@@ -431,7 +433,7 @@ if (is_ohos && !build_ohos_sdk) {
     ]
   }
 
-  base_deps = [ "//third_party/icu/icu4c:shared_icuuc" ]
+  base_deps = [ "${plugins_path}/libs/icu:icu_android" ]
 
   ohos_source_set("native_rdb") {
     defines = [ "ANDROID_PLATFORM" ]
@@ -497,10 +499,7 @@ if (is_ohos && !build_ohos_sdk) {
     ]
   }
 
-  base_deps = [
-    "//third_party/icu/icu4c:static_icui18n",
-    "//third_party/icu/icu4c:static_icuuc",
-  ]
+  base_deps = [ "${plugins_path}/libs/icu:icu_ios" ]
 
   ohos_source_set("native_rdb") {
     defines = [ "IOS_PLATFORM" ]
diff --git a/relational_store/interfaces/inner_api/rdb/include/rdb_errno.h b/relational_store/interfaces/inner_api/rdb/include/rdb_errno.h
index c12f906cc755578b5bd5c13ec0a9f63c08ab89d9..3fad75768e3ea87d409457243ba1b23a47a90640 100644
--- a/relational_store/interfaces/inner_api/rdb/include/rdb_errno.h
+++ b/relational_store/interfaces/inner_api/rdb/include/rdb_errno.h
@@ -293,6 +293,16 @@ static constexpr int E_GET_DATAOBSMGRCLIENT_FAIL = (E_BASE + 50);
  * @brief The error when the type of the distributed table does not match.
  */
 static constexpr int E_TYPE_MISMATCH = (E_BASE + 51);
+
+/**
+ * @brief The error when database or disk is full.
+ */
+static constexpr int E_DATABASE_FULL = (E_BASE + 52);
+
+/**
+ * @brief The error when sql is not supported in execute
+ */
+static constexpr int E_NOT_SUPPORT_THE_SQL = (E_BASE + 53);
 } // namespace NativeRdb
 } // namespace OHOS
 
diff --git a/relational_store/interfaces/inner_api/rdb/include/rdb_store.h b/relational_store/interfaces/inner_api/rdb/include/rdb_store.h
index 34c0d973da1064383393649873b01e29b731157f..bc8c765eedb7cb10e0db988c15afd39ce8e34f6c 100644
--- a/relational_store/interfaces/inner_api/rdb/include/rdb_store.h
+++ b/relational_store/interfaces/inner_api/rdb/include/rdb_store.h
@@ -263,6 +263,19 @@ public:
      */
     virtual int ExecuteSql(const std::string &sql, const std::vector<ValueObject> &bindArgs = {}) = 0;
 
+    /**
+     * @brief Executes an SQL statement that contains specified parameters and
+     *        get two values of type int and ValueObject.
+     *
+     * @param sql Indicates the SQL statement to execute.
+     * @param bindArgs Indicates the {@link ValueObject} values of the parameters in the SQL statement.
+     */
+    virtual std::pair<int32_t, ValueObject> Execute(const std::string &sql,
+        const std::vector<ValueObject> &bindArgs = {})
+    {
+        return { E_NOT_SUPPORT, ValueObject() };
+    }
+
     /**
      * @brief Executes an SQL statement that contains specified parameters and get a long integer value.
      *
@@ -522,10 +535,13 @@ public:
         operator std::map<PRIKey, Date>();
         operator std::shared_ptr<ResultSet>();
         PRIKey GetOriginKey(const std::vector<uint8_t>& hash);
+        size_t GetMaxOriginKeySize();
+        bool NeedConvert() const;
 
     private:
         std::shared_ptr<ResultSet> result_;
         std::map<std::vector<uint8_t>, PRIKey> hash_;
+        size_t maxOriginKeySize_ = sizeof(int64_t);
         bool isFromRowId_{ false };
     };
     /**
diff --git a/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h b/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h
index fa6fb7ab6a6693d96837c17b36d948b46c4e2717..32d187884f50f3cacb56840da2d5f7174b560616 100644
--- a/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h
+++ b/relational_store/interfaces/inner_api/rdb/include/rdb_store_config.h
@@ -171,11 +171,10 @@ public:
      */
     API_EXPORT RdbStoreConfig(const std::string &path, StorageMode storageMode = StorageMode::MODE_DISK,
         bool readOnly = false, const std::vector<uint8_t> &encryptKey = std::vector<uint8_t>(),
-        const std::string &journalMode = DB_DEFAULT_JOURNAL_MODE,
-        const std::string &syncMode = "", const std::string &databaseFileType = "",
-        SecurityLevel securityLevel = SecurityLevel::LAST, bool isCreateNecessary = true,
-        bool autoCheck = false, int journalSize = DB_JOURNAL_SIZE, int pageSize = DB_PAGE_SIZE,
-        const std::string &encryptAlgo = DB_DEFAULT_ENCRYPT_ALGO);
+        const std::string &journalMode = DB_DEFAULT_JOURNAL_MODE, const std::string &syncMode = "",
+        const std::string &databaseFileType = "", SecurityLevel securityLevel = SecurityLevel::LAST,
+        bool isCreateNecessary = true, bool autoCheck = false, int journalSize = DB_JOURNAL_SIZE,
+        int pageSize = DB_PAGE_SIZE, const std::string &encryptAlgo = DB_DEFAULT_ENCRYPT_ALGO);
 
     /**
      * @brief Destructor.
@@ -516,6 +515,26 @@ public:
      */
     void SetSearchable(bool searchable);
 
+    /**
+     * @brief Sets the timeout to get write connection for the object.
+     */
+    int GetWriteTime() const;
+
+    /**
+     * @brief Gets the timeout to get write connection for the object.
+     */
+    void SetWriteTime(int timeout);
+
+    /**
+     * @brief Sets the timeout to get read connection for the object.
+     */
+    int GetReadTime() const;
+
+    /**
+     * @brief Gets the timeout to get read connection for the object.
+     */
+    void SetReadTime(int timeout);
+
 private:
     void ClearEncryptKey();
 
@@ -553,6 +572,8 @@ private:
 
     std::map<std::string, ScalarFunctionInfo> customScalarFunctions;
     bool isSearchable_ = false;
+    int writeTimeout_ = 2; // seconds
+    int readTimeout_ = 1; // seconds
 };
 } // namespace OHOS::NativeRdb
 
diff --git a/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store.h b/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store.h
index f13062a941dd47887eb98dc27307f0a8c8684746..a84ceb07453b0846530aaf3ff1277f1537e1f9a8 100644
--- a/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store.h
+++ b/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store.h
@@ -63,6 +63,8 @@ public:
         const std::vector<std::string> &sqlArgs) = 0;
     virtual std::shared_ptr<ResultSet> QueryByStep(const std::string &sql, const std::vector<ValueObject> &args) = 0;
     virtual int ExecuteSql(const std::string &sql, const std::vector<ValueObject> &bindArgs = {}) = 0;
+    virtual std::pair<int32_t, ValueObject> Execute(const std::string &sql,
+        const std::vector<ValueObject> &bindArgs = {}) = 0;
     virtual int ExecuteAndGetLong(int64_t &outValue, const std::string &sql,
         const std::vector<ValueObject> &bindArgs = {}) = 0;
     virtual int ExecuteAndGetString(std::string &outValue, const std::string &sql,
diff --git a/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store_config.h b/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store_config.h
index 2850c75aa47ae4a684013441fdb77b86012d64e0..e7599dd0ff25ea4f16a91829de86ebb6d5f2f83f 100644
--- a/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store_config.h
+++ b/relational_store/interfaces/inner_api/rdb/mock/include/rdb_store_config.h
@@ -145,6 +145,10 @@ public:
     std::map<std::string, ScalarFunctionInfo> GetScalarFunctions() const;
     bool IsSearchable() const;
     void SetSearchable(bool searchable);
+    int GetWriteTime() const;
+    void SetWriteTime(int timeout);
+    int GetReadTime() const;
+    void SetReadTime(int timeout);
 
     bool operator==(const RdbStoreConfig &config) const
     {
@@ -210,6 +214,8 @@ private:
 
     std::map<std::string, ScalarFunctionInfo> customScalarFunctions;
     bool isSearchable_ = false;
+    int writeTimeout_ = 2; // seconds
+    int readTimeout_ = 1; // seconds
 };
 } // namespace OHOS::NativeRdb
 
diff --git a/relational_store/interfaces/inner_api/rdb_data_share_adapter/include/rdb_utils.h b/relational_store/interfaces/inner_api/rdb_data_share_adapter/include/rdb_utils.h
index 3ec8c5de9c8048612484ad6cd883a3d913f90c05..873cc0d74d137e193a6b163c7c2b66a672813e3c 100644
--- a/relational_store/interfaces/inner_api/rdb_data_share_adapter/include/rdb_utils.h
+++ b/relational_store/interfaces/inner_api/rdb_data_share_adapter/include/rdb_utils.h
@@ -133,7 +133,7 @@ private:
     static void On(const OperationItem &item, RdbPredicates &predicates);
     RdbUtils();
     ~RdbUtils();
-    static std::string ToString(const DataSharePredicatesObject &predicatesObject);
+    static OHOS::NativeRdb::ValueObject ToValueObject(const DataSharePredicatesObject &predicatesObject);
     using OperateHandler = void (*)(const OperationItem &, RdbPredicates &);
     static constexpr OperateHandler HANDLERS[DataShare::LAST_TYPE] = {
         [DataShare::INVALID_OPERATION] = &RdbUtils::NoSupport,
diff --git a/relational_store/interfaces/ndk/include/data_asset.h b/relational_store/interfaces/ndk/include/data_asset.h
index 4b1fe937bb8804cce62b9f8757c00a2b259f2cae..a5312100473855353049066870de950e6211425e 100644
--- a/relational_store/interfaces/ndk/include/data_asset.h
+++ b/relational_store/interfaces/ndk/include/data_asset.h
@@ -31,6 +31,7 @@
  * @file data_asset.h
  *
  * @brief Provides the data type of asset.
+ * @library libnative_rdb_ndk.z.so
  * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core
  * @since 11
  */
@@ -313,4 +314,4 @@ int OH_Data_Asset_DestroyMultiple(Data_Asset **assets, uint32_t count);
 #ifdef __cplusplus
 };
 #endif
-#endif // DATA_ASSET_H
+#endif //DATA_ASSET_H
diff --git a/relational_store/interfaces/ndk/include/oh_cursor.h b/relational_store/interfaces/ndk/include/oh_cursor.h
index 02e9549b3cf685eabbfbc5efebed5694821f8afe..c52211f000311021906a210cb00ab045305114df 100644
--- a/relational_store/interfaces/ndk/include/oh_cursor.h
+++ b/relational_store/interfaces/ndk/include/oh_cursor.h
@@ -285,6 +285,18 @@ typedef struct OH_Cursor {
      * @since 11
      */
     int (*getAssets)(OH_Cursor *cursor, int32_t columnIndex, Data_Asset **value, uint32_t *length);
+
+    /**
+     * @brief Function pointer. Obtains the count of the {@Data_Asset} in the given column.
+     *
+     * @param cursor Represents a pointer to an {@link OH_Cursor} instance.
+     * @param columnIndex Indicates the zero-based column index.
+     * @param count Indicates the count of the assets int the column.
+     * @return Returns the status code of the execution.
+     * @see OH_Cursor.
+     * @since 11
+     */
+    int (*getAssetsCount)(OH_Cursor *cursor, int32_t columnIndex, uint32_t *count);
 } OH_Cursor;
 
 #ifdef __cplusplus
diff --git a/relational_store/interfaces/ndk/include/relational_store.h b/relational_store/interfaces/ndk/include/relational_store.h
index 6f77dcf83ce993a7e9caa0210367fa0c0286e072..bb103757a30854951ce10984fb4deeee8791a3aa 100644
--- a/relational_store/interfaces/ndk/include/relational_store.h
+++ b/relational_store/interfaces/ndk/include/relational_store.h
@@ -556,6 +556,90 @@ typedef enum Rdb_SubscribeType {
     RDB_SUBSCRIBE_TYPE_CLOUD_DETAILS,
 } Rdb_SubscribeType;
 
+/**
+ * @brief The callback function of cloud data change event.
+ *
+ * @param context Represents the context of data observer.
+ * @param values Indicates the cloud accounts that changed.
+ * @param count The count of changed cloud accounts.
+ * @see OH_VObject.
+ * @since 11
+ */
+typedef void (*Rdb_BriefObserver)(void *context, const char *values[], uint32_t count);
+
+/**
+ * @brief The callback function of cloud data change details event.
+ *
+ * @param context Represents the context of data observer.
+ * @param changeInfo Indicates the {@link Rdb_ChangeInfo} of changed tables.
+ * @param count The count of changed tables.
+ * @see Rdb_ChangeInfo.
+ * @since 11
+ */
+typedef void (*Rdb_DetailsObserver)(void *context, const Rdb_ChangeInfo **changeInfo, uint32_t count);
+
+/**
+ * @brief Indicates the callback functions.
+ *
+ * @since 11
+ */
+typedef union Rdb_SubscribeCallback {
+    /**
+     * The callback function of cloud data change details event.
+     */
+    Rdb_DetailsObserver detailsObserver;
+
+    /**
+     * The callback function of cloud data change event.
+     */
+    Rdb_BriefObserver briefObserver;
+} Rdb_SubscribeCallback;
+
+/**
+ * @brief Indicates the observer of data.
+ *
+ * @since 11
+ */
+typedef struct Rdb_DataObserver {
+    /**
+     * The context of data observer.
+     */
+    void *context;
+
+    /**
+     * The callback of data observer.
+     */
+    Rdb_SubscribeCallback callback;
+} Rdb_DataObserver;
+
+/**
+ * @brief Registers an observer for the database.
+ * When data in the distributed database changes, the callback will be invoked.
+ *
+ * @param store Represents a pointer to an {@link OH_Rdb_Store} instance.
+ * @param type Indicates the subscription type, which is defined in {@link Rdb_SubscribeType}.
+ * @param observer The {@link Rdb_DataObserver} of change events in the database.
+ * @return Returns the status code of the execution. See {@link OH_Rdb_ErrCode}.
+ * @see OH_Rdb_Store.
+ * @see Rdb_DataObserver.
+ * @since 11
+ */
+int OH_Rdb_Subscribe(OH_Rdb_Store *store, Rdb_SubscribeType type, const Rdb_DataObserver *observer);
+
+/**
+ * @brief Remove specified observer of specified type from the database.
+ *
+ * @param store Represents a pointer to an {@link OH_Rdb_Store} instance.
+ * @param type Indicates the subscription type, which is defined in {@link Rdb_SubscribeType}.
+ * @param observer The {@link Rdb_DataObserver} of change events in the database.
+ * If this is nullptr, remove all observers of the type.
+ * @return Returns the status code of the execution. See {@link OH_Rdb_ErrCode}.
+ * @see OH_Rdb_Store.
+ * @see Rdb_DataObserver.
+ * @since 11
+ */
+int OH_Rdb_Unsubscribe(OH_Rdb_Store *store, Rdb_SubscribeType type, const Rdb_DataObserver *observer);
+
 /**
  * @brief Indicates the database synchronization mode.
  *
@@ -729,14 +813,23 @@ typedef struct Rdb_ProgressDetails {
  *
  * @param progress Represents a pointer to an {@link Rdb_ProgressDetails} instance.
  * @param version Indicates the version of current {@link Rdb_ProgressDetails}.
- * @return If the operation is successful, a pointer to the instance of the @link Rdb_TableDetails} structure is
- * returned. Otherwise NULL is returned.
+ * @return If the operation is successful, a pointer to the instance of the {@link Rdb_TableDetails}
+ * structure is returned. Otherwise NULL is returned.
  * @see Rdb_ProgressDetails
  * @see Rdb_TableDetails
  * @since 11
  */
 Rdb_TableDetails *OH_Rdb_GetTableDetails(Rdb_ProgressDetails *progress, int32_t version);
 
+/**
+ * @brief The callback function of progress.
+ *
+ * @param progressDetails The details of the sync progress.
+ * @see Rdb_ProgressDetails.
+ * @since 11
+ */
+typedef void (*Rdb_ProgressCallback)(void *context, Rdb_ProgressDetails *progressDetails);
+
 /**
  * @brief The callback function of sync.
  *
@@ -746,6 +839,23 @@ Rdb_TableDetails *OH_Rdb_GetTableDetails(Rdb_ProgressDetails *progress, int32_t
  */
 typedef void (*Rdb_SyncCallback)(Rdb_ProgressDetails *progressDetails);
 
+/**
+ * @brief The observer of progress.
+ *
+ * @since 11
+ */
+typedef struct Rdb_ProgressObserver {
+    /**
+     * The context of progress observer.
+     */
+    void *context;
+
+    /**
+     * The callback function of progress observer.
+     */
+    Rdb_ProgressCallback callback;
+} Rdb_ProgressObserver;
+
 /**
  * @brief Sync data to cloud.
  *
@@ -753,14 +863,41 @@ typedef void (*Rdb_SyncCallback)(Rdb_ProgressDetails *progressDetails);
  * @param mode Represents the {@link Rdb_SyncMode} of sync progress.
  * @param tables Indicates the names of tables to sync.
  * @param count The count of tables to sync. If value equals 0, sync all tables of the store.
- * @param callback The {@link Rdb_SyncCallback} of cloud sync progress.
+ * @param observer The {@link Rdb_ProgressObserver} of cloud sync progress.
  * @return Returns the status code of the execution. See {@link OH_Rdb_ErrCode}.
  * @see OH_Rdb_Store.
- * @see Rdb_SyncCallback.
+ * @see Rdb_ProgressObserver.
  * @since 11
  */
 int OH_Rdb_CloudSync(OH_Rdb_Store *store, Rdb_SyncMode mode, const char *tables[], uint32_t count,
-    Rdb_SyncCallback *callback);
+    const Rdb_ProgressObserver *observer);
+
+/**
+* @brief Subscribes to the automatic synchronization progress of an RDB store.
+* A callback will be invoked when there is a notification of the automatic synchronization progress.
+*
+* @param store Indicates the pointer to the target {@Link OH_Rdb_Store} instance.
+* @param observer The {@link Rdb_SyncObserver} for the automatic synchornizaiton progress
+* Indicates the callback invoked to return the automatic synchronization progress.
+* @return Returns the status code of the execution. See {@link OH_Rdb_ErrCode}.
+* @see OH_Rdb_Store.
+* @see Rdb_ProgressObserver.
+* @since 11
+*/
+int OH_Rdb_SubscribeAutoSyncProgress(OH_Rdb_Store *store, const Rdb_ProgressObserver *observer);
+
+/**
+* @brief Unsubscribes from the automatic synchronization progress of an RDB store.
+*
+* @param store Indicates the pointer to the target {@Link OH_Rdb_Store} instance.
+* @param observer Indicates the {@link Rdb_SyncObserver} callback for the automatic synchronization progress.
+* If it is a null pointer, all callbacks for the automatic synchronization progress will be unregistered.
+* @return Returns the status code of the execution. See {@link OH_Rdb_ErrCode}.
+* @see OH_Rdb_Store.
+* @see Rdb_ProgressObserver.
+* @since 11
+*/
+int OH_Rdb_UnsubscribeAutoSyncProgress(OH_Rdb_Store *store, const Rdb_ProgressObserver *observer);
 #ifdef __cplusplus
 };
 #endif
diff --git a/relational_store/interfaces/ndk/include/relational_store_error_code.h b/relational_store/interfaces/ndk/include/relational_store_error_code.h
index 6efa0ee28ba89eb3ff30936133eecb2a91578f2e..37ef03f44872dbf138cabb32db05c0ac6f0e8b6d 100644
--- a/relational_store/interfaces/ndk/include/relational_store_error_code.h
+++ b/relational_store/interfaces/ndk/include/relational_store_error_code.h
@@ -313,4 +313,4 @@ typedef enum OH_Rdb_ErrCode {
 };
 #endif
 
-#endif // RELATIONAL_STORE_ERRNO_CODE_H
\ No newline at end of file
+#endif // RELATIONAL_STORE_ERRNO_CODE_H
diff --git a/relational_store/interfaces/ndk/src/BUILD.gn b/relational_store/interfaces/ndk/src/BUILD.gn
index 0d2fe838c7bd4c624f1e885503c5ab91fe06b3b7..332a7ae92ab62da6d3b26468f332af8df3a7a057 100644
--- a/relational_store/interfaces/ndk/src/BUILD.gn
+++ b/relational_store/interfaces/ndk/src/BUILD.gn
@@ -29,6 +29,7 @@ ohos_shared_library("native_rdb_ndk") {
     "${relational_store_native_path}/rdb/include",
   ]
   sources = [
+    "modify_time_cursor.cpp",
     "relational_asset.cpp",
     "relational_cursor.cpp",
     "relational_predicates.cpp",
diff --git a/relational_store/interfaces/ndk/src/modify_time_cursor.cpp b/relational_store/interfaces/ndk/src/modify_time_cursor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..34b73339a7729fddd183b1d0999023f8c2162ce9
--- /dev/null
+++ b/relational_store/interfaces/ndk/src/modify_time_cursor.cpp
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "modify_time_cursor.h"
+#include "logger.h"
+#include "relational_store_error_code.h"
+#include "securec.h"
+#include "traits.h"
+namespace OHOS::RdbNdk {
+ModifyTimeCursor::ModifyTimeCursor(ModifyTimeCursor::ModifyTime &&modifyTime)
+    : RelationalCursor(modifyTime), modifyTime_(std::move(modifyTime))
+{
+}
+
+int ModifyTimeCursor::GetSize(int32_t columnIndex, size_t *size)
+{
+    if (size == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    if (columnIndex == 0 && modifyTime_.NeedConvert()) {
+        *size = modifyTime_.GetMaxOriginKeySize();
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    return RelationalCursor::GetSize(columnIndex, size);
+}
+
+int ModifyTimeCursor::GetText(int32_t columnIndex, char *value, int length)
+{
+    if (value == nullptr || length <= 0) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    if (columnIndex == 0 && modifyTime_.NeedConvert()) {
+        auto priKey = ConvertPRIKey();
+        auto *val = Traits::get_if<std::string>(&priKey);
+        if (val == nullptr) {
+            return OH_Rdb_ErrCode::RDB_ERR;
+        }
+        errno_t result = strcpy_s(value, length, val->data());
+        if (result != EOK) {
+            LOG_ERROR("strcpy_s failed, result is %{public}d", result);
+            return OH_Rdb_ErrCode::RDB_ERR;
+        }
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    return RelationalCursor::GetText(columnIndex, value, length);
+}
+
+int ModifyTimeCursor::GetInt64(int32_t columnIndex, int64_t *value)
+{
+    if (value == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    if (columnIndex == 0 && modifyTime_.NeedConvert()) {
+        auto priKey = ConvertPRIKey();
+        auto *val = Traits::get_if<int64_t>(&priKey);
+        if (val == nullptr) {
+            return OH_Rdb_ErrCode::RDB_ERR;
+        }
+        *value = *val;
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    return RelationalCursor::GetInt64(columnIndex, value);
+}
+
+int ModifyTimeCursor::GetReal(int32_t columnIndex, double *value)
+{
+    if (columnIndex == 0 && modifyTime_.NeedConvert()) {
+        auto priKey = ConvertPRIKey();
+        auto *val = Traits::get_if<double>(&priKey);
+        if (val == nullptr) {
+            return OH_Rdb_ErrCode::RDB_ERR;
+        }
+        *value = *val;
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    return RelationalCursor::GetReal(columnIndex, value);
+}
+} // namespace OHOS::RdbNdk
diff --git a/relational_store/interfaces/ndk/src/modify_time_cursor.h b/relational_store/interfaces/ndk/src/modify_time_cursor.h
new file mode 100644
index 0000000000000000000000000000000000000000..1c52c7535ec6b2c9381d521327d09e328e993730
--- /dev/null
+++ b/relational_store/interfaces/ndk/src/modify_time_cursor.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef RELATIONAL_MODIFY_TIME_CURSOR_H
+#define RELATIONAL_MODIFY_TIME_CURSOR_H
+#include "relational_cursor.h"
+#include "rdb_store.h"
+#include "result_set.h"
+namespace OHOS::RdbNdk {
+class ModifyTimeCursor : public RelationalCursor {
+public:
+    using ResultSet = OHOS::NativeRdb::ResultSet;
+    using ModifyTime = OHOS::NativeRdb::RdbStore::ModifyTime;
+    using PRIKey = OHOS::NativeRdb::RdbStore::PRIKey;
+    explicit ModifyTimeCursor(ModifyTime &&modifyTime);
+    ~ModifyTimeCursor() override = default;
+
+protected:
+    int GetSize(int32_t columnIndex, size_t *size) override;
+    int GetText(int32_t columnIndex, char *value, int length) override;
+    int GetInt64(int32_t columnIndex, int64_t *value) override;
+    int GetReal(int32_t columnIndex, double *value) override;
+
+private:
+    inline PRIKey ConvertPRIKey()
+    {
+        std::vector<uint8_t> hash;
+        std::shared_ptr<ResultSet> result = modifyTime_;
+        if (result == nullptr) {
+            return PRIKey();
+        }
+        result->GetBlob(0, hash);
+        return modifyTime_.GetOriginKey(hash);
+    }
+
+    ModifyTime modifyTime_;
+};
+} // namespace OHOS::RdbNdk
+#endif // RELATIONAL_MODIFY_TIME_CURSOR_H
diff --git a/relational_store/interfaces/ndk/src/relational_asset.cpp b/relational_store/interfaces/ndk/src/relational_asset.cpp
index f7ed4557bf1753cd2e35867e995d8c7403258505..496fb5cf0e4c9d9d0bdfbcb56729cd5432c53665 100644
--- a/relational_store/interfaces/ndk/src/relational_asset.cpp
+++ b/relational_store/interfaces/ndk/src/relational_asset.cpp
@@ -1,17 +1,17 @@
 /*
-* Copyright (c) 2023 Huawei Device Co., Ltd.
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "relational_asset.h"
 
 #include "logger.h"
diff --git a/relational_store/interfaces/ndk/src/relational_asset.h b/relational_store/interfaces/ndk/src/relational_asset.h
index 5bf7ff2f522d94ebe83ef19c2ed91e3d6769ebd5..4554fe224acddf0405a714829ca3d506648ddad0 100644
--- a/relational_store/interfaces/ndk/src/relational_asset.h
+++ b/relational_store/interfaces/ndk/src/relational_asset.h
@@ -1,17 +1,17 @@
 /*
-* Copyright (c) 2023 Huawei Device Co., Ltd.
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #ifndef RELATIONAL_ASSET_IMPL_H
 #define RELATIONAL_ASSET_IMPL_H
 
diff --git a/relational_store/interfaces/ndk/src/relational_cursor.cpp b/relational_store/interfaces/ndk/src/relational_cursor.cpp
index 96b8973bbee454605e90e7591ff05c19c62adf9c..ec8fecb851948745fdabcc1aa1129540625c5df5 100644
--- a/relational_store/interfaces/ndk/src/relational_cursor.cpp
+++ b/relational_store/interfaces/ndk/src/relational_cursor.cpp
@@ -15,10 +15,7 @@
 
 #include "relational_cursor.h"
 
-#include <iostream>
-#include <sstream>
 #include <string>
-#include <utility>
 
 #include "logger.h"
 #include "oh_cursor.h"
@@ -32,205 +29,154 @@ namespace RdbNdk {
 int RelationalCursor::GetColumnCount(OH_Cursor *cursor, int *count)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || count == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetColumnCount(*count);
+    return self->GetColumnCount(count);
 }
 
 int RelationalCursor::GetColumnType(OH_Cursor *cursor, int32_t columnIndex, OH_ColumnType *columnType)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || columnType == nullptr || columnIndex < 0 || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    OHOS::NativeRdb::ColumnType type;
-    int result = self->resultSet_->GetColumnType(columnIndex, type);
-    *columnType = static_cast<OH_ColumnType>(static_cast<int>(type));
-    return result;
+    return self->GetColumnType(columnIndex, columnType);
 }
 
 int RelationalCursor::GetColumnIndex(OH_Cursor *cursor, const char *name, int *columnIndex)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || name == nullptr || columnIndex == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetColumnIndex(name, *columnIndex);
+    return self->GetColumnIndex(name, columnIndex);
 }
 
 int RelationalCursor::GetColumnName(OH_Cursor *cursor, int32_t columnIndex, char *name, int length)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || name == nullptr || length <= 0 || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    std::string str;
-    int errCode = self->resultSet_->GetColumnName(columnIndex, str);
-    if (errCode != OHOS::NativeRdb::E_OK) {
-        return errCode;
-    }
-    errno_t result = memcpy_s(name, length, str.c_str(), str.length());
-    if (result != EOK) {
-        LOG_ERROR("memcpy_s failed, result is %{public}d", result);
-        return OH_Rdb_ErrCode::RDB_ERR;
-    }
-    return OH_Rdb_ErrCode::RDB_OK;
+    return self->GetColumnName(columnIndex, name, length);
 }
 
 int RelationalCursor::GetRowCount(OH_Cursor *cursor, int *count)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || count == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetRowCount(*count);
+    return self->GetRowCount(count);
 }
 
 int RelationalCursor::GoToNextRow(OH_Cursor *cursor)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GoToNextRow();
+    return self->GoToNextRow();
 }
 
 int RelationalCursor::GetSize(OH_Cursor *cursor, int32_t columnIndex, size_t *size)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || size == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetSize(columnIndex, *size);
+    return self->GetSize(columnIndex, size);
 }
 
 int RelationalCursor::GetText(OH_Cursor *cursor, int32_t columnIndex, char *value, int length)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || value == nullptr || length <= 0 || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    std::string str;
-    int errCode = self->resultSet_->GetString(columnIndex, str);
-    if (errCode != OHOS::NativeRdb::E_OK) {
-        return errCode;
-    }
-    errno_t result = memcpy_s(value, length, str.c_str(), str.length());
-    if (result != EOK) {
-        LOG_ERROR("memcpy_s failed, result is %{public}d", result);
-        return OH_Rdb_ErrCode::RDB_ERR;
-    }
-    return OH_Rdb_ErrCode::RDB_OK;
+    return self->GetText(columnIndex, value, length);
 }
 
 int RelationalCursor::GetInt64(OH_Cursor *cursor, int32_t columnIndex, int64_t *value)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || value == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetLong(columnIndex, *value);
+    return self->GetInt64(columnIndex, value);
 }
 
 int RelationalCursor::GetReal(OH_Cursor *cursor, int32_t columnIndex, double *value)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || value == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->GetDouble(columnIndex, *value);
+    return self->GetReal(columnIndex, value);
 }
 
 int RelationalCursor::GetBlob(OH_Cursor *cursor, int32_t columnIndex, unsigned char *value, int length)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || value == nullptr || length <= 0 || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    std::vector<uint8_t> vec;
-    int errCode = self->resultSet_->GetBlob(columnIndex, vec);
-    if (errCode != OHOS::NativeRdb::E_OK) {
-        return errCode;
-    }
-    errno_t result = memcpy_s(value, length, vec.data(), vec.size());
-    if (result != EOK) {
-        LOG_ERROR("memcpy_s failed, result is %{public}d", result);
-        return OH_Rdb_ErrCode::RDB_ERR;
-    }
-    return OH_Rdb_ErrCode::RDB_OK;
+    return self->GetBlob(columnIndex, value, length);
 }
 
 int RelationalCursor::GetAsset(OH_Cursor *cursor, int32_t columnIndex, Data_Asset *value)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || self->resultSet_ == nullptr || value == nullptr || value->cid != DATA_ASSET_V0 ||
-        columnIndex < 0) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    NativeRdb::AssetValue asset;
-    auto errCode = self->resultSet_->GetAsset(columnIndex, asset);
-    if (errCode != OHOS::NativeRdb::E_OK) {
-        return errCode;
-    }
-    value->cid = DATA_ASSET_V0;
-    value->asset_ = asset;
-    return errCode;
+    return self->GetAsset(columnIndex, value);
 }
 
 int RelationalCursor::GetAssets(OH_Cursor *cursor, int32_t columnIndex, Data_Asset **value, uint32_t *length)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || self->resultSet_ == nullptr || length == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    std::vector<NativeRdb::AssetValue> assets;
-    auto errCode = self->resultSet_->GetAssets(columnIndex, assets);
-    if (errCode != OHOS::NativeRdb::E_OK) {
-        return errCode;
-    }
-    uint32_t inputLength = *length;
-    *length = assets.size();
-    if (value == nullptr) {
-        return OH_Rdb_ErrCode::RDB_OK;
-    }
-    if (*length != inputLength) {
+    return self->GetAssets(columnIndex, value, length);
+}
+
+int RelationalCursor::IsNull(OH_Cursor *cursor, int32_t columnIndex, bool *isNull)
+{
+    auto self = GetSelf(cursor);
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    for (uint32_t i = 0; i < *length; ++i) {
-        if (value[i] == nullptr) {
-            return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
-        }
-        value[i]->cid = DATA_ASSET_V0;
-        value[i]->asset_ = assets[i];
-    }
-    return errCode;
+    return self->IsNull(columnIndex, isNull);
 }
 
-int RelationalCursor::IsNull(OH_Cursor *cursor, int32_t columnIndex, bool *isNull)
+
+int RelationalCursor::GetAssetsCount(OH_Cursor *cursor, int32_t columnIndex, uint32_t *count)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || isNull == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    return self->resultSet_->IsColumnNull(columnIndex, *isNull);
+    return self->GetAssetsCount(columnIndex, count);
 }
 
 int RelationalCursor::Destroy(OH_Cursor *cursor)
 {
     auto self = GetSelf(cursor);
-    if (self == nullptr || self->resultSet_ == nullptr) {
+    if (self == nullptr) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    int errCode = self->resultSet_->Close();
-    if (errCode != OHOS::NativeRdb::E_OK) {
+    int errCode = self->Destroy();
+    if (errCode != NativeRdb::E_OK) {
         return errCode;
     }
     delete self;
     return errCode;
 }
 
-RelationalCursor::RelationalCursor(std::shared_ptr<OHOS::NativeRdb::ResultSet> resultSet)
+RelationalCursor::RelationalCursor(std::shared_ptr<NativeRdb::ResultSet> resultSet)
     : resultSet_(std::move(resultSet))
 {
     id = RDB_CURSOR_CID;
@@ -250,15 +196,212 @@ RelationalCursor::RelationalCursor(std::shared_ptr<OHOS::NativeRdb::ResultSet> r
     destroy = Destroy;
     getAsset = GetAsset;
     getAssets = GetAssets;
+    getAssetsCount = GetAssetsCount;
 }
 
 RelationalCursor *RelationalCursor::GetSelf(OH_Cursor *cursor)
 {
-    if (cursor == nullptr || cursor->id != OHOS::RdbNdk::RDB_CURSOR_CID) {
+    if (cursor == nullptr || cursor->id != RdbNdk::RDB_CURSOR_CID) {
         LOG_ERROR("cursor invalid. is null %{public}d", (cursor == nullptr));
         return nullptr;
     }
-    return static_cast<OHOS::RdbNdk::RelationalCursor *>(cursor);
+    return static_cast<RdbNdk::RelationalCursor *>(cursor);
+}
+
+int RelationalCursor::GetColumnCount(int *count)
+{
+    if (count == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetColumnCount(*count);
+}
+
+int RelationalCursor::GetColumnType(int32_t columnIndex, OH_ColumnType *columnType)
+{
+    if (columnType == nullptr || columnIndex < 0 || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    NativeRdb::ColumnType type;
+    int result = resultSet_->GetColumnType(columnIndex, type);
+    *columnType = static_cast<OH_ColumnType>(static_cast<int>(type));
+    return result;
+}
+
+int RelationalCursor::GetColumnIndex(const char *name, int *columnIndex)
+{
+    if (name == nullptr || columnIndex == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetColumnIndex(name, *columnIndex);
 }
+
+int RelationalCursor::GetColumnName(int32_t columnIndex, char *name, int length)
+{
+    if (name == nullptr || length <= 0 || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::string str;
+    int errCode = resultSet_->GetColumnName(columnIndex, str);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    errno_t result = strcpy_s(name, length, str.c_str());
+    if (result != EOK) {
+        LOG_ERROR("strcpy_s failed, result is %{public}d", result);
+        return OH_Rdb_ErrCode::RDB_ERR;
+    }
+    return OH_Rdb_ErrCode::RDB_OK;
+}
+
+int RelationalCursor::GetRowCount(int *count)
+{
+    if (count == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetRowCount(*count);
+}
+
+int RelationalCursor::GoToNextRow()
+{
+    if (resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GoToNextRow();
+}
+
+int RelationalCursor::GetSize(int32_t columnIndex, size_t *size)
+{
+    if (size == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetSize(columnIndex, *size);
+}
+
+int RelationalCursor::GetText(int32_t columnIndex, char *value, int length)
+{
+    if (value == nullptr || length <= 0 || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::string str;
+    int errCode = resultSet_->GetString(columnIndex, str);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    errno_t result = strcpy_s(value, length, str.c_str());
+    if (result != EOK) {
+        LOG_ERROR("strcpy_s failed, result is %{public}d", result);
+        return OH_Rdb_ErrCode::RDB_ERR;
+    }
+    return OH_Rdb_ErrCode::RDB_OK;
+}
+
+int RelationalCursor::GetInt64(int32_t columnIndex, int64_t *value)
+{
+    if (value == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetLong(columnIndex, *value);
+}
+
+int RelationalCursor::GetReal(int32_t columnIndex, double *value)
+{
+    if (value == nullptr || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->GetDouble(columnIndex, *value);
+}
+
+int RelationalCursor::GetBlob(int32_t columnIndex, unsigned char *value, int length)
+{
+    if (value == nullptr || length <= 0 || resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::vector<uint8_t> vec;
+    int errCode = resultSet_->GetBlob(columnIndex, vec);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    errno_t result = memcpy_s(value, length, vec.data(), vec.size());
+    if (result != EOK) {
+        LOG_ERROR("memcpy_s failed, result is %{public}d", result);
+        return OH_Rdb_ErrCode::RDB_ERR;
+    }
+    return OH_Rdb_ErrCode::RDB_OK;
+}
+
+int RelationalCursor::GetAsset(int32_t columnIndex, Data_Asset *value)
+{
+    if (resultSet_ == nullptr || value == nullptr || columnIndex < 0 || value->cid != DATA_ASSET_V0) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    NativeRdb::AssetValue asset;
+    auto errCode = resultSet_->GetAsset(columnIndex, asset);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    value->cid = DATA_ASSET_V0;
+    value->asset_ = asset;
+    return errCode;
+}
+
+int RelationalCursor::GetAssets(int32_t columnIndex, Data_Asset **value, uint32_t *length)
+{
+    if (resultSet_ == nullptr || length == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+
+    std::vector<NativeRdb::AssetValue> assets;
+    auto errCode = resultSet_->GetAssets(columnIndex, assets);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    uint32_t inputLength = *length;
+    *length = assets.size();
+    if (value == nullptr) {
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    if (*length != inputLength) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    for (int i = 0; i < *length; ++i) {
+        if (value[i] == nullptr || value[i]->cid != DATA_ASSET_V0) {
+            return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+        }
+        value[i]->cid = DATA_ASSET_V0;
+        value[i]->asset_ = assets[i];
+    }
+    return errCode;
+}
+
+int RelationalCursor::IsNull(int32_t columnIndex, bool *isNull)
+{
+    if (isNull == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->IsColumnNull(columnIndex, *isNull);
+}
+
+int RelationalCursor::Destroy()
+{
+    if (resultSet_ == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return resultSet_->Close();
+}
+
+int RelationalCursor::GetAssetsCount(int32_t columnIndex, uint32_t *count)
+{
+    if (count == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::vector<NativeRdb::AssetValue> assets;
+    auto errCode = resultSet_->GetAssets(columnIndex, assets);
+    if (errCode != NativeRdb::E_OK) {
+        return errCode;
+    }
+    *count = assets.size();
+    return OH_Rdb_ErrCode::RDB_OK;
+}
+
 } // namespace RdbNdk
 } // namespace OHOS
diff --git a/relational_store/interfaces/ndk/src/relational_cursor.h b/relational_store/interfaces/ndk/src/relational_cursor.h
index 1da5bd2c7644546dd4be979030064629fecf0b57..07a60f22c34f75bc99d6f81420397d8847732885 100644
--- a/relational_store/interfaces/ndk/src/relational_cursor.h
+++ b/relational_store/interfaces/ndk/src/relational_cursor.h
@@ -16,6 +16,8 @@
 #ifndef RELATIONAL_CURSOR_IMPL_H
 #define RELATIONAL_CURSOR_IMPL_H
 
+#include <memory>
+
 #include "oh_cursor.h"
 #include "result_set.h"
 #include <memory>
@@ -26,6 +28,26 @@ constexpr int RDB_CURSOR_CID = 1234563; // The class id used to uniquely identif
 class RelationalCursor : public OH_Cursor {
 public:
     explicit RelationalCursor(std::shared_ptr<OHOS::NativeRdb::ResultSet> resultSet);
+    virtual ~RelationalCursor() = default;
+
+protected:
+    virtual int GetColumnCount(int *count);
+    virtual int GetColumnType(int32_t columnIndex, OH_ColumnType *columnType);
+    virtual int GetColumnIndex(const char *name, int *columnIndex);
+    virtual int GetColumnName(int32_t columnIndex, char *name, int length);
+    virtual int GetRowCount(int *count);
+    virtual int GoToNextRow();
+    virtual int GetSize(int32_t columnIndex, size_t *size);
+    virtual int GetText(int32_t columnIndex, char *value, int length);
+    virtual int GetInt64(int32_t columnIndex, int64_t *value);
+    virtual int GetReal(int32_t columnIndex, double *value);
+    virtual int GetBlob(int32_t columnIndex, unsigned char *value, int length);
+    virtual int GetAsset(int32_t columnIndex, Data_Asset *value);
+    virtual int GetAssets(int32_t columnIndex, Data_Asset **value, uint32_t *length);
+    virtual int GetAssetsCount(int32_t columnIndex, uint32_t *count);
+    virtual int IsNull(int32_t columnIndex, bool *isNull);
+    virtual int Destroy();
+
 private:
     static int GetColumnCount(OH_Cursor *cursor, int *count);
     static int GetColumnType(OH_Cursor *cursor, int32_t columnIndex, OH_ColumnType *columnType);
@@ -41,6 +63,7 @@ private:
     static int GetAsset(OH_Cursor *cursor, int32_t columnIndex, Data_Asset *value);
     static int GetAssets(OH_Cursor *cursor, int32_t columnIndex, Data_Asset **value, uint32_t *length);
     static int IsNull(OH_Cursor *cursor, int32_t columnIndex, bool *isNull);
+    static int GetAssetsCount(OH_Cursor *cursor, int32_t columnIndex, uint32_t *count);
     static int Destroy(OH_Cursor *cursor);
     static RelationalCursor *GetSelf(OH_Cursor *cursor);
     std::shared_ptr<OHOS::NativeRdb::ResultSet> resultSet_;
diff --git a/relational_store/interfaces/ndk/src/relational_store.cpp b/relational_store/interfaces/ndk/src/relational_store.cpp
index 6176faa70f7ba1d20d0173ad402715d30b1f99b6..9d2f2c1bace6fa7b5ec8fa7a6eb74bf0c5e65eea 100644
--- a/relational_store/interfaces/ndk/src/relational_store.cpp
+++ b/relational_store/interfaces/ndk/src/relational_store.cpp
@@ -16,6 +16,7 @@
 #include "relational_store.h"
 
 #include "logger.h"
+#include "modify_time_cursor.h"
 #include "raw_data_parser.h"
 #include "rdb_errno.h"
 #include "rdb_helper.h"
@@ -26,17 +27,14 @@
 #include "relational_predicates_objects.h"
 #include "relational_store_error_code.h"
 #include "relational_store_impl.h"
+#include "relational_types_v0.h"
 #include "relational_values_bucket.h"
+#include "securec.h"
 #include "sqlite_global_config.h"
-#include "sys/stat.h"
-#include "unistd.h"
 
 using namespace OHOS::RdbNdk;
 using namespace OHOS::DistributedRdb;
 constexpr int RDB_STORE_CID = 1234560; // The class id used to uniquely identify the OH_Rdb_Store class.
-constexpr int RDB_DISTRIBUTED_CONFIG_V0 = 1;
-constexpr int RDB_PROGRESS_DETAILS_V0 = 1;
-constexpr int RDB_TABLE_DETAILS_V0 = 1;
 constexpr int RDB_CONFIG_SIZE_V0 = 41;
 constexpr int RDB_CONFIG_SIZE_V1 = 45;
 OH_VObject *OH_Rdb_CreateValueObject()
@@ -62,6 +60,55 @@ OHOS::RdbNdk::RelationalStore::RelationalStore(std::shared_ptr<OHOS::NativeRdb::
     id = RDB_STORE_CID;
 }
 
+int RelationalStore::SubscribeAutoSyncProgress(const Rdb_ProgressObserver *callback)
+{
+    std::lock_guard<decltype(mutex_)> lock(mutex_) ;
+    bool result = std::any_of(callbacks_.begin(), callbacks_.end(), [callback](const auto &observer) {
+        return *observer == callback;
+    });
+    if (result) {
+        LOG_INFO("duplicate subscribe");
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    auto obs = std::make_shared<NDKDetailProgressObserver>(callback);
+    int errCode = store_->RegisterAutoSyncCallback(obs);
+    if (errCode == NativeRdb::E_OK) {
+        LOG_ERROR("subscribe failed");
+        return errCode;
+    }
+    callbacks_.push_back(std::move(obs));
+    return NativeRdb::E_OK;
+}
+
+int RelationalStore::UnsubscribeAutoSyncProgress(const Rdb_ProgressObserver *callback)
+{
+    std::lock_guard<decltype(mutex_)> lock(mutex_) ;
+    for (auto it = callbacks_.begin(); it != callbacks_.end();) {
+        if (callback != nullptr && !(**it == callback)) {
+            ++it;
+            continue;
+        }
+
+        int errCode = store_->UnregisterAutoSyncCallback(*it);
+        if (errCode != NativeRdb::E_OK) {
+            LOG_ERROR("unsubscribe failed");
+            return errCode;
+        }
+        it = callbacks_.erase(it);
+        LOG_DEBUG("progress unsubscribe success");
+    }
+    return NativeRdb::E_OK;
+}
+
+RelationalStore::~RelationalStore()
+{
+    if (store_ == nullptr || callbacks_.empty()) {
+        return;
+    }
+    for (auto &callback : callbacks_) {
+        store_->UnregisterAutoSyncCallback(callback);
+    }
+}
 
 SyncMode NDKUtils::TransformMode(Rdb_SyncMode &mode)
 {
@@ -77,6 +124,18 @@ SyncMode NDKUtils::TransformMode(Rdb_SyncMode &mode)
     }
 }
 
+OHOS::DistributedRdb::SubscribeMode NDKUtils::GetSubscribeType(Rdb_SubscribeType &type)
+{
+    switch (type) {
+        case Rdb_SubscribeType::RDB_SUBSCRIBE_TYPE_CLOUD:
+            return SubscribeMode::CLOUD;
+        case Rdb_SubscribeType::RDB_SUBSCRIBE_TYPE_CLOUD_DETAILS:
+            return SubscribeMode::CLOUD_DETAIL;
+        default:
+            return SubscribeMode::SUBSCRIBE_MODE_MAX;
+    }
+}
+
 class MainOpenCallback : public OHOS::NativeRdb::RdbOpenCallback {
 public:
     int OnCreate(OHOS::NativeRdb::RdbStore &rdbStore) override;
@@ -107,7 +166,7 @@ OH_Rdb_Store *OH_Rdb_GetOrOpen(const OH_Rdb_Config *config, int *errCode)
     if (config == nullptr || config->selfSize > RDB_CONFIG_SIZE_V1 || errCode == nullptr) {
         LOG_ERROR("Parameters set error:config is NULL ? %{public}d and config size is %{public}zu or "
                   "errCode is NULL ? %{public}d ",
-            (config == nullptr), sizeof(OH_Rdb_Config), (errCode == nullptr));
+                  (config == nullptr), sizeof(OH_Rdb_Config), (errCode == nullptr));
         return nullptr;
     }
 
@@ -309,36 +368,46 @@ int OH_Rdb_SetVersion(OH_Rdb_Store *store, int version)
     return rdbStore->GetStore()->SetVersion(version);
 }
 
-std::pair<int32_t, DistributedConfig> Convert(const Rdb_DistributedConfig *config)
+static std::pair<int32_t, Rdb_DistributedConfig> Convert(const Rdb_DistributedConfig *config)
 {
-    if (config->version < RDB_DISTRIBUTED_CONFIG_V0) {
-        return { -1, {} };
-    }
+    std::pair<int32_t, Rdb_DistributedConfig> result = { OH_Rdb_ErrCode::RDB_E_INVALID_ARGS, {} };
+    auto &[errCode, cfg] = result;
     switch (config->version) {
-        case RDB_DISTRIBUTED_CONFIG_V0:
-            return { 0, DistributedConfig{ .autoSync = config->isAutoSync } };
+        case DISTRIBUTED_CONFIG_V0: {
+            const auto *realCfg = reinterpret_cast<const DistributedConfig_V0 *>(config);
+            cfg.version = realCfg->version;
+            cfg.isAutoSync = realCfg->isAutoSync;
+            errCode = OH_Rdb_ErrCode::RDB_OK;
+            break;
+        }
         default:
-            return { -1, {} };
+            break;
     }
+    return result;
 }
 
 int OH_Rdb_SetDistributedTables(OH_Rdb_Store *store, const char *tables[], uint32_t count, Rdb_DistributedType type,
-    const Rdb_DistributedConfig *config)
+                                const Rdb_DistributedConfig *config)
 {
     auto rdbStore = GetRelationalStore(store);
-    if (rdbStore == nullptr || type != Rdb_DistributedType::RDB_DISTRIBUTED_CLOUD) {
+    if (rdbStore == nullptr || type != Rdb_DistributedType::RDB_DISTRIBUTED_CLOUD || (count > 0 && tables == nullptr)) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
-    auto ret = Convert(config);
-    if (ret.first < 0) {
+
+    auto [errCode, cfg] = Convert(config);
+    if (errCode != OH_Rdb_ErrCode::RDB_OK) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
     std::vector<std::string> tableNames;
     tableNames.reserve(count);
     for (uint32_t i = 0; i < count; i++) {
+        if (tables[i] == nullptr) {
+            return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+        }
         tableNames.emplace_back(tables[i]);
     }
-    return rdbStore->GetStore()->SetDistributedTables(tableNames, DistributedTableType::DISTRIBUTED_CLOUD, ret.second);
+    return rdbStore->GetStore()->SetDistributedTables(tableNames, DistributedTableType::DISTRIBUTED_CLOUD,
+                                                      { cfg.isAutoSync });
 }
 
 OH_Cursor *OH_Rdb_FindModifyTime(OH_Rdb_Store *store, const char *tableName, const char *columnName, OH_VObject *values)
@@ -351,60 +420,139 @@ OH_Cursor *OH_Rdb_FindModifyTime(OH_Rdb_Store *store, const char *tableName, con
     std::vector<ValueObject> objects = selfObjects->Get();
     std::vector<OHOS::NativeRdb::RdbStore::PRIKey> keys;
     keys.reserve(objects.size());
-    for (const auto &object : objects) {
+    for (auto &object : objects) {
         OHOS::NativeRdb::RdbStore::PRIKey priKey;
-        OHOS::NativeRdb::RawDataParser::Convert(object.value, priKey);
-        keys.push_back(priKey);
+        OHOS::NativeRdb::RawDataParser::Convert(std::move(object.value), priKey);
+        keys.push_back(std::move(priKey));
     }
     auto results = rdbStore->GetStore()->GetModifyTime(tableName, columnName, keys);
-    return new (std::nothrow) RelationalCursor(std::move(results));
+    return new (std::nothrow) ModifyTimeCursor(std::move(results));
 }
 
-struct RelationalTableDetailsV0 : public Rdb_TableDetails {
-};
+int OH_Rdb_Subscribe(OH_Rdb_Store *store, Rdb_SubscribeType type, const Rdb_DataObserver *observer)
+{
+    auto rdbStore = GetRelationalStore(store);
+    if (rdbStore == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return (OH_Rdb_ErrCode)rdbStore->DoSubScribe(type, observer);
+}
 
+int OH_Rdb_Unsubscribe(OH_Rdb_Store *store, Rdb_SubscribeType type, const Rdb_DataObserver *observer)
+{
+    auto rdbStore = GetRelationalStore(store);
+    if (rdbStore == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return (OH_Rdb_ErrCode)rdbStore->DoUnsubScribe(type, observer);
+}
+
+int RelationalStore::DoSubScribe(Rdb_SubscribeType type, const Rdb_DataObserver *observer)
+{
+    if (store_ == nullptr || type < RDB_SUBSCRIBE_TYPE_CLOUD || type > RDB_SUBSCRIBE_TYPE_CLOUD_DETAILS ||
+        observer->callback.briefObserver == nullptr || observer->callback.detailsObserver == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::lock_guard<decltype(mutex_)> lock(mutex_);
+    auto result = std::any_of(dataObservers_[type].begin(), dataObservers_[type].end(),
+                              [observer](const std::shared_ptr<NDKStoreObserver> &item) {
+                                  return *item.get() == observer;
+                              });
+    if (result) {
+        LOG_INFO("duplicate subscribe");
+        return OH_Rdb_ErrCode::RDB_OK;
+    }
+    auto subscribeOption = SubscribeOption{ .mode = NDKUtils::GetSubscribeType(type), .event = "data_change" };
+    auto ndkObserver = std::make_shared<NDKStoreObserver>(observer, type);
+    auto subscribeResult = store_->Subscribe(subscribeOption, ndkObserver.get());
+    if (subscribeResult != OHOS::NativeRdb::E_OK) {
+        LOG_ERROR("subscribe failed");
+    } else {
+        dataObservers_[type].emplace_back(std::move(ndkObserver));
+    }
+    return (OH_Rdb_ErrCode)subscribeResult;
+}
+
+int RelationalStore::DoUnsubScribe(Rdb_SubscribeType type, const Rdb_DataObserver *observer)
+{
+    if (store_ == nullptr || type < RDB_SUBSCRIBE_TYPE_CLOUD || type > RDB_SUBSCRIBE_TYPE_CLOUD_DETAILS) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    std::lock_guard<decltype(mutex_)> lock(mutex_);
+    for (auto it = dataObservers_[type].begin(); it != dataObservers_[type].end();) {
+        if (observer != nullptr && !(**it == observer)) {
+            ++it;
+            continue;
+        }
+        auto subscribeOption = SubscribeOption{ .mode = NDKUtils::GetSubscribeType(type), .event = "data_change" };
+        int errCode = store_->UnSubscribe(subscribeOption, it->get());
+        if (errCode != NativeRdb::E_OK) {
+            LOG_ERROR("unsubscribe failed");
+            return errCode;
+        }
+        it = dataObservers_[type].erase(it);
+        LOG_DEBUG("data observer unsubscribe success");
+    }
+    return NativeRdb::E_OK;
+}
+
+namespace {
 struct RelationalProgressDetails : public Rdb_ProgressDetails {
-    TableDetails tableDetails_;
     Rdb_TableDetails *details_ = nullptr;
-    int curVersion_ = -1;
     explicit RelationalProgressDetails(const ProgressDetail &detail);
+    ~RelationalProgressDetails();
+
     Rdb_TableDetails *GetTableDetails(int paraVersion);
     void DestroyTableDetails();
+
+private:
+    uint8_t *ResizeBuff(size_t size);
+
+    TableDetails tableDetails_;
+    size_t size_ = 0;
+    uint8_t *buffer_ = nullptr;
 };
 
 void RelationalProgressDetails::DestroyTableDetails()
 {
     delete[] details_;
+    details_ = nullptr;
 }
 
-RelationalProgressDetails::RelationalProgressDetails(const ProgressDetail &detail) : Rdb_ProgressDetails()
+RelationalProgressDetails::RelationalProgressDetails(const ProgressDetail &detail)
 {
-    version = RDB_PROGRESS_DETAILS_V0;
+    version = DISTRIBUTED_PROGRESS_DETAIL_VERSION;
     schedule = detail.progress;
     code = detail.code;
     tableLength = (int32_t)detail.details.size();
     tableDetails_ = detail.details;
 }
 
-Rdb_TableDetails *RelationalProgressDetails::GetTableDetails(int paraVersion)
+RelationalProgressDetails::~RelationalProgressDetails()
 {
-    if (curVersion_ == paraVersion) {
-        return details_;
+    if (buffer_ != nullptr) {
+        free(buffer_);
     }
-    DestroyTableDetails();
+    buffer_ = nullptr;
+}
+
+Rdb_TableDetails *RelationalProgressDetails::GetTableDetails(int paraVersion)
+{
     switch (paraVersion) {
-        case RDB_TABLE_DETAILS_V0: {
-            details_ = new RelationalTableDetailsV0[tableLength + 1];
+        case TABLE_DETAIL_V0: {
+            auto length = sizeof(TableDetails_V0) * (tableLength + 1);
+            auto *detailsV0 = (TableDetails_V0 *)ResizeBuff(length);
+            (void)memset_s(detailsV0, length, 0, length);
             int index = 0;
             for (const auto &pair : tableDetails_) {
-                details_[index].table = pair.first.c_str();
-                details_[index].upload = Rdb_Statistic{
+                detailsV0[index].table = pair.first.c_str();
+                detailsV0[index].upload = Statistic_V0{
                     .total = (int)pair.second.upload.total,
                     .successful = (int)pair.second.upload.success,
                     .failed = (int)pair.second.upload.failed,
                     .remained = (int)pair.second.upload.untreated,
                 };
-                details_[index].download = Rdb_Statistic{
+                detailsV0[index].download = Statistic_V0{
                     .total = (int)pair.second.download.total,
                     .successful = (int)pair.second.download.success,
                     .failed = (int)pair.second.download.failed,
@@ -412,54 +560,147 @@ Rdb_TableDetails *RelationalProgressDetails::GetTableDetails(int paraVersion)
                 };
                 index++;
             }
-            curVersion_ = paraVersion;
-            return details_;
+            return reinterpret_cast<Rdb_TableDetails *>(reinterpret_cast<uint8_t *>(detailsV0));
         }
         default:
             return nullptr;
     }
 }
 
-std::pair<int, RelationalProgressDetails *> GetDetails(Rdb_ProgressDetails *progress, int32_t version)
+uint8_t *RelationalProgressDetails::ResizeBuff(size_t size)
 {
-    switch (version) {
-        case RDB_PROGRESS_DETAILS_V0:
-            return { 0, (RelationalProgressDetails *)progress };
-        default:
-            return { -1, {} };
+    if (size_ >= size) {
+        return buffer_;
+    }
+    if (buffer_ != nullptr) {
+        free(buffer_);
     }
+    buffer_ = (uint8_t *)malloc(size);
+    return buffer_;
+}
+} // namespace
+
+static std::pair<int, RelationalProgressDetails *> GetDetails(Rdb_ProgressDetails *progress)
+{
+    if (progress->version != DISTRIBUTED_PROGRESS_DETAIL_VERSION) {
+        return { -1, nullptr };
+    }
+    return { 0, (RelationalProgressDetails *)progress };
 }
 
 Rdb_TableDetails *OH_Rdb_GetTableDetails(Rdb_ProgressDetails *progress, int32_t version)
 {
-    auto pair = GetDetails(progress, version);
-    if (pair.first == -1) {
+    auto [errCode, details] = GetDetails(progress);
+    if (errCode == -1 || details == nullptr) {
         return nullptr;
     }
-    return pair.second->GetTableDetails(version);
+    return details->GetTableDetails(version);
 }
 
 int OH_Rdb_CloudSync(OH_Rdb_Store *store, Rdb_SyncMode mode, const char *tables[], uint32_t count,
-    Rdb_SyncCallback *callback)
+                     const Rdb_ProgressObserver *observer)
 {
     auto rdbStore = GetRelationalStore(store);
     if (rdbStore == nullptr || mode < RDB_SYNC_MODE_TIME_FIRST || mode > RDB_SYNC_MODE_CLOUD_FIRST ||
-        callback == nullptr) {
+        observer == nullptr || observer->callback == nullptr || (count > 0 && tables == nullptr)) {
         return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
     }
     SyncOption syncOption{ .mode = NDKUtils::TransformMode(mode), .isBlock = false };
     std::vector<std::string> tableNames;
     for (uint32_t i = 0; i < count; ++i) {
+        if (tables[i] == nullptr) {
+            return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+        }
         tableNames.emplace_back(tables[i]);
     }
-    auto progressCallback = [cb = *callback](Details &&details) {
+
+    auto progressCallback = [cxt = (*observer).context, cb = (*observer).callback](Details &&details) {
+        if (details.size() > 1) {
+            LOG_ERROR("Not support edge to edge detail notify");
+            return;
+        }
         if (details.empty()) {
-            LOG_ERROR("CloudSync has no details");
+            LOG_ERROR("No device or cloud synced");
             return;
         }
-        RelationalProgressDetails progressDetails = RelationalProgressDetails(details.begin()->second);
-        cb(&progressDetails);
-        progressDetails.DestroyTableDetails();
+        for (auto &[device, detail] : details) {
+            RelationalProgressDetails cloudDetail(detail);
+            cb(cxt, &cloudDetail);
+            break;
+        }
     };
     return rdbStore->GetStore()->Sync(syncOption, tableNames, progressCallback);
 }
+
+int OH_Rdb_SubscribeAutoSyncProgress(OH_Rdb_Store *store, const Rdb_ProgressObserver *callback)
+{
+    auto rdbStore = GetRelationalStore(store);
+    if (rdbStore == nullptr || callback == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return rdbStore->SubscribeAutoSyncProgress(callback);
+}
+
+int OH_Rdb_UnsubscribeAutoSyncProgress(OH_Rdb_Store *store, const Rdb_ProgressObserver *callback)
+{
+    auto rdbStore = GetRelationalStore(store);
+    if (rdbStore == nullptr) {
+        return OH_Rdb_ErrCode::RDB_E_INVALID_ARGS;
+    }
+    return rdbStore->UnsubscribeAutoSyncProgress(callback);
+}
+
+NDKDetailProgressObserver::NDKDetailProgressObserver(const Rdb_ProgressObserver *callback):callback_(callback)
+{
+}
+
+void NDKDetailProgressObserver::ProgressNotification(const Details &details)
+{
+    if (callback_ == nullptr || details.empty()) {
+        return;
+    }
+    RelationalProgressDetails progressDetails = RelationalProgressDetails(details.begin()->second);
+    (*(callback_->callback))(callback_->context, &progressDetails);
+    progressDetails.DestroyTableDetails();
+}
+
+bool NDKDetailProgressObserver::operator==(const Rdb_ProgressObserver *callback)
+{
+    return callback == callback_;
+}
+
+NDKStoreObserver::NDKStoreObserver(const Rdb_DataObserver *observer, int mode) : mode_(mode), observer_(observer) {}
+
+void NDKStoreObserver::OnChange(const std::vector<std::string> &devices)
+{
+    if (mode_ == Rdb_SubscribeType::RDB_SUBSCRIBE_TYPE_CLOUD) {
+        auto count = devices.size();
+        std::unique_ptr<const char *[]> deviceIds = std::make_unique<const char *[]>(count);
+        for (auto i = 0; i < count; ++i) {
+            deviceIds[i] = devices[i].c_str();
+        }
+        (*observer_->callback.briefObserver)(observer_->context, deviceIds.get(), count);
+    }
+}
+
+void NDKStoreObserver::OnChange(const Origin &origin, const RdbStoreObserver::PrimaryFields &fields,
+                                RdbStoreObserver::ChangeInfo &&changeInfo)
+{
+}
+
+void NDKStoreObserver::OnChange()
+{
+    RdbStoreObserver::OnChange();
+}
+
+void NDKStoreObserver::ConvertKeyInfo(Rdb_KeyInfo &keyInfo, std::vector<RdbStoreObserver::PrimaryKey> &primaryKey)
+{
+}
+
+bool NDKStoreObserver::operator==(const Rdb_DataObserver *other)
+{
+    if (other == nullptr) {
+        return false;
+    }
+    return other->context == observer_->context && &(other->callback) == &(observer_->callback);
+}
\ No newline at end of file
diff --git a/relational_store/interfaces/ndk/src/relational_store_impl.h b/relational_store/interfaces/ndk/src/relational_store_impl.h
index 34b3936953f1b4eafbb3d89803e13ab4cd7e41e4..efba65544b54089d5fe25f8517f4c25112cd9657 100644
--- a/relational_store/interfaces/ndk/src/relational_store_impl.h
+++ b/relational_store/interfaces/ndk/src/relational_store_impl.h
@@ -25,22 +25,62 @@
 
 namespace OHOS {
 namespace RdbNdk {
+class NDKDetailProgressObserver : public DistributedRdb::DetailProgressObserver {
+public:
+    explicit NDKDetailProgressObserver(const Rdb_ProgressObserver *callback);
+    void ProgressNotification(const DistributedRdb::Details &details);
+    bool operator==(const Rdb_ProgressObserver *callback);
+
+private:
+    const Rdb_ProgressObserver *callback_;
+};
+
+class NDKStoreObserver : public OHOS::DistributedRdb::RdbStoreObserver {
+public:
+    using Origin = DistributedRdb::Origin;
+    using RdbStoreObserver = OHOS::DistributedRdb::RdbStoreObserver;
+
+    NDKStoreObserver(const Rdb_DataObserver *observer, int mode);
+    ~NDKStoreObserver() noexcept override = default;
+
+    void OnChange(const std::vector<std::string> &devices) override;
+
+    void OnChange(const OHOS::DistributedRdb::Origin &origin, const PrimaryFields &fields,
+        ChangeInfo &&changeInfo) override;
+
+    void OnChange() override;
+    bool operator==(const Rdb_DataObserver *other);
+
+private:
+    void ConvertKeyInfo(Rdb_KeyInfo &keyInfo, std::vector<RdbStoreObserver::PrimaryKey> &primaryKey);
+    int mode_ = Rdb_SubscribeType::RDB_SUBSCRIBE_TYPE_CLOUD;
+    const Rdb_DataObserver *observer_;
+};
 
 class RelationalStore : public OH_Rdb_Store {
 public:
     explicit RelationalStore(std::shared_ptr<OHOS::NativeRdb::RdbStore> store);
+    ~RelationalStore();
     std::shared_ptr<OHOS::NativeRdb::RdbStore> GetStore()
     {
         return store_;
     }
+    int SubscribeAutoSyncProgress(const Rdb_ProgressObserver *callback);
+    int UnsubscribeAutoSyncProgress(const Rdb_ProgressObserver *callback);
+    int DoSubScribe(Rdb_SubscribeType type, const Rdb_DataObserver *observer);
+    int DoUnsubScribe(Rdb_SubscribeType type, const Rdb_DataObserver *observer);
 
 private:
     std::shared_ptr<OHOS::NativeRdb::RdbStore> store_;
+    std::mutex mutex_;
+    std::list<std::shared_ptr<NDKDetailProgressObserver>> callbacks_;
+    std::map<Rdb_SubscribeType, std::vector<std::shared_ptr<NDKStoreObserver>>> dataObservers_;
 };
 
 class NDKUtils {
 public:
     static OHOS::DistributedRdb::SyncMode TransformMode(Rdb_SyncMode &mode);
+    static OHOS::DistributedRdb::SubscribeMode GetSubscribeType(Rdb_SubscribeType &type);
 };
 } // namespace RdbNdk
 } // namespace OHOS
diff --git a/relational_store/interfaces/ndk/src/relational_types_v0.h b/relational_store/interfaces/ndk/src/relational_types_v0.h
new file mode 100644
index 0000000000000000000000000000000000000000..666aaebb1769a6c60360b18a89fc1279cf5e44d5
--- /dev/null
+++ b/relational_store/interfaces/ndk/src/relational_types_v0.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef RELATIONAL_TYPES_V0_H
+#define RELATIONAL_TYPES_V0_H
+#ifndef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif
+#define TABLE_DETAIL_V0 1
+typedef struct Statistic_V0 {
+    int total;
+    int successful;
+    int failed;
+    int remained;
+} Statistic_V0;
+
+typedef struct TableDetails_V0 {
+    const char *table;
+    Statistic_V0 upload;
+    Statistic_V0 download;
+} TableDetails_V0;
+
+#define DISTRIBUTED_CONFIG_V0 1
+typedef struct DistributedConfig_V0 {
+    int version;
+    bool isAutoSync;
+} DistributedConfig_V0;
+#ifndef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+#endif // RELATIONAL_TYPES_V0_H
diff --git a/relational_store/interfaces/ndk/src/relational_values_bucket.h b/relational_store/interfaces/ndk/src/relational_values_bucket.h
index 429773ccd86a4b0aefcced5d0d77372a9b536a2c..de349a041b5363c5907204ea489473da3a068b72 100644
--- a/relational_store/interfaces/ndk/src/relational_values_bucket.h
+++ b/relational_store/interfaces/ndk/src/relational_values_bucket.h
@@ -26,6 +26,7 @@ public:
     RelationalValuesBucket();
     static RelationalValuesBucket *GetSelf(OH_VBucket *bucket);
     OHOS::NativeRdb::ValuesBucket &Get();
+
 private:
     static int PutText(OH_VBucket *bucket, const char *field, const char *value);
     static int PutInt64(OH_VBucket *bucket, const char *field, int64_t value);
diff --git a/relational_store/relational_store.gni b/relational_store/relational_store.gni
index 57eb7a2835f48e4e18a338ec06bedee8e00fff48..e94b5ea858457096e13abac7ad0b5b8928a6b7d9 100644
--- a/relational_store/relational_store.gni
+++ b/relational_store/relational_store.gni
@@ -49,3 +49,5 @@ distributedfile_path =
     "//foundation/filemanagement/file_api/interfaces/kits/js/src"
 
 sdk_c_path = "//interface/sdk_c/distributeddatamgr"
+
+plugins_path = "//plugins"
diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbStoreAssetResultSetJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbStoreAssetResultSetJsunit.test.js
index cc664e93aa04cdb7286b827cb6ea34d8f738ffb9..2e5630e23bb4a279c3f87c0617303cda2fd26991 100644
--- a/relational_store/test/js/relationalstore/unittest/src/RdbStoreAssetResultSetJsunit.test.js
+++ b/relational_store/test/js/relationalstore/unittest/src/RdbStoreAssetResultSetJsunit.test.js
@@ -140,54 +140,54 @@ describe('rdbAssetResultSetTest', function () {
      * @tc.number SUB_DDM_AppDataFWK_JSRDB_ResultSet_0010
      * @tc.desc resultSet getAsset normal test
      */
-        it('testGetAssetBatchInsert0001', 0, async function (done) {
-            await batchInsertTable();
-            console.log(TAG + "************* testGetAssetBatchInsert0001 start *************");
-            let predicates = await new data_relationalStore.RdbPredicates("test")
-            let resultSet = await rdbStore.query(predicates)
-            try {
-                expect(true).assertEqual(resultSet.goToFirstRow())
-                const id = resultSet.getLong(resultSet.getColumnIndex("id"))
-                const data1 = resultSet.getAsset(resultSet.getColumnIndex("data1"))
-                console.log(TAG + "id=" + id + ", data1=" + data1);
-                expect("name1").assertEqual(data1.name);
-                expect("uri1").assertEqual(data1.uri);
-                expect("createTime1").assertEqual(data1.createTime);
-                expect("modifyTime1").assertEqual(data1.modifyTime);
-                expect("size1").assertEqual(data1.size);
-                expect("path1").assertEqual(data1.path);
-                expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(data1.status);
-
-                const data2 = resultSet.getAsset(resultSet.getColumnIndex("data2"))
-                console.log(TAG + "id=" + id + ", data2=" + data2);
-                expect("name2").assertEqual(data2.name);
-                expect("uri2").assertEqual(data2.uri);
-                expect("createTime2").assertEqual(data2.createTime);
-                expect("modifyTime2").assertEqual(data2.modifyTime);
-                expect("size2").assertEqual(data2.size);
-                expect("path2").assertEqual(data2.path);
-                expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(data2.status);
-
-                const data3 = resultSet.getAssets(resultSet.getColumnIndex("data3"))
-                console.log(TAG + "id=" + id + ", data3=" + data3);
-                const second = data3[1];
-                expect("name2").assertEqual(second.name);
-                expect("uri2").assertEqual(second.uri);
-                expect("createTime2").assertEqual(second.createTime);
-                expect("modifyTime2").assertEqual(second.modifyTime);
-                expect("size2").assertEqual(second.size);
-                expect("path2").assertEqual(second.path);
-                expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(second.status);
-
-                resultSet.close();
-                expect(true).assertEqual(resultSet.isClosed)
-            } catch (e) {
-                expect(null).assertFail();
-            }
-            resultSet = null
-            done();
-            console.log(TAG + "************* testGetAssetBatchInsert0001 end *************");
-        })
+    it('testGetAssetBatchInsert0001', 0, async function (done) {
+        await batchInsertTable();
+        console.log(TAG + "************* testGetAssetBatchInsert0001 start *************");
+        let predicates = await new data_relationalStore.RdbPredicates("test")
+        let resultSet = await rdbStore.query(predicates)
+        try {
+            expect(true).assertEqual(resultSet.goToFirstRow())
+            const id = resultSet.getLong(resultSet.getColumnIndex("id"))
+            const data1 = resultSet.getAsset(resultSet.getColumnIndex("data1"))
+            console.log(TAG + "id=" + id + ", data1=" + data1);
+            expect("name1").assertEqual(data1.name);
+            expect("uri1").assertEqual(data1.uri);
+            expect("createTime1").assertEqual(data1.createTime);
+            expect("modifyTime1").assertEqual(data1.modifyTime);
+            expect("size1").assertEqual(data1.size);
+            expect("path1").assertEqual(data1.path);
+            expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(data1.status);
+
+            const data2 = resultSet.getAsset(resultSet.getColumnIndex("data2"))
+            console.log(TAG + "id=" + id + ", data2=" + data2);
+            expect("name2").assertEqual(data2.name);
+            expect("uri2").assertEqual(data2.uri);
+            expect("createTime2").assertEqual(data2.createTime);
+            expect("modifyTime2").assertEqual(data2.modifyTime);
+            expect("size2").assertEqual(data2.size);
+            expect("path2").assertEqual(data2.path);
+            expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(data2.status);
+
+            const data3 = resultSet.getAssets(resultSet.getColumnIndex("data3"))
+            console.log(TAG + "id=" + id + ", data3=" + data3);
+            const second = data3[1];
+            expect("name2").assertEqual(second.name);
+            expect("uri2").assertEqual(second.uri);
+            expect("createTime2").assertEqual(second.createTime);
+            expect("modifyTime2").assertEqual(second.modifyTime);
+            expect("size2").assertEqual(second.size);
+            expect("path2").assertEqual(second.path);
+            expect(data_relationalStore.AssetStatus.ASSET_INSERT).assertEqual(second.status);
+
+            resultSet.close();
+            expect(true).assertEqual(resultSet.isClosed)
+        } catch (e) {
+            expect(null).assertFail();
+        }
+        resultSet = null
+        done();
+        console.log(TAG + "************* testGetAssetBatchInsert0001 end *************");
+    })
 
     /**
      * @tc.name resultSet getAsset normal test
diff --git a/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteJsunit.test.js b/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteJsunit.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..32f2aa31a7b963aab312a8edecf35278eb9b6ab3
--- /dev/null
+++ b/relational_store/test/js/relationalstore/unittest/src/RdbstoreStoreExcuteJsunit.test.js
@@ -0,0 +1,464 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import relationalStore from '@ohos.data.relationalStore'
+import ability_featureAbility from '@ohos.ability.featureAbility'
+
+const TAG = "[RELATIONAL_STORE_JSKITS_TEST]"
+
+let context = ability_featureAbility.getContext()
+const CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test (" +
+    "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+    "name TEXT NOT NULL, age INTEGER, salary REAL, blobType BLOB)";
+const CREATE_TABLE_TEST2 = "CREATE TABLE IF NOT EXISTS test2 (" +
+    "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+    "name TEXT NOT NULL, age INTEGER, salary REAL, blobType BLOB)";
+const TEST_TABLE_IS_EXIST = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='test2'";
+
+const STORE_CONFIG = {
+    name: "executeTest.db",
+    securityLevel: relationalStore.SecurityLevel.S1,
+}
+
+let rdbStore = undefined;
+
+describe('rdbStoreExcuteTest', function () {
+    beforeAll(async function () {
+        console.info(TAG + 'beforeAll')
+        rdbStore = await relationalStore.getRdbStore(context, STORE_CONFIG);
+    })
+
+    beforeEach(async function () {
+        await rdbStore.executeSql(CREATE_TABLE_TEST);
+        console.info(TAG + 'beforeEach')
+    })
+
+    afterEach(async function () {
+        console.info(TAG + 'afterEach')
+        await rdbStore.executeSql("DROP TABLE IF EXISTS test")
+    })
+
+    afterAll(async function () {
+        console.info(TAG + 'afterAll')
+        await relationalStore.deleteRdbStore(context, STORE_CONFIG);
+        rdbStore = null
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0001
+     * @tc.name Normal test case of Execute, check integrity for store
+     * @tc.desc 1. Execute sql: PRAGMA integrity_check
+     *          2. Check returned value
+     */
+    it('testExecute0001', 0, async function (done) {
+        console.info(TAG + "************* testExecute0001 start *************");
+        try {
+            let ret = await rdbStore.execute("PRAGMA integrity_check");
+            expect("ok").assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`integrity_check failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0001 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0002
+     * @tc.name Normal test case of Execute, check integrity for store
+     * @tc.desc 1. Execute sql: PRAGMA quick_check
+     *          2. Check returned value
+     */
+    it('testExecute0002', 0, async function (done) {
+        console.info(TAG + "************* testExecute0002 start *************");
+        try {
+            let ret = await rdbStore.execute("PRAGMA quick_check");
+            expect("ok").assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`integrity_check failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0002 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0003
+     * @tc.name Normal test case of Execute, get user_version of store
+     * @tc.desc 1. Execute sql: PRAGMA user_version
+     *          2. Check returned value
+     */
+    it('testExecute0003', 0, async function (done) {
+        console.info(TAG + "************* testExecute0003 start *************");
+        try {
+            // set user_version as 5
+            rdbStore.version = 5;
+            let ret = await rdbStore.execute("PRAGMA user_version");
+            // get user_version 5
+            expect("5").assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`get user_version failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0003 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0004
+     * @tc.name AbNormal test case of Execute, execute select sql
+     * @tc.desc 1. Execute select sql
+     *          2. Check returned value
+     */
+    it('testExecute0004', 0, async function (done) {
+        console.info(TAG + "************* testExecute0004 start *************");
+        try {
+            await rdbStore.execute("SELECT * FROM test");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute select sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0004 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0005
+     * @tc.name Normal test case of Execute, execute sql for inserting data
+     * @tc.desc 1. Execute insert sql
+     *          2. Check returned value
+     */
+    it('testExecute0005', 0, async function (done) {
+        console.info(TAG + "************* testExecute0005 start *************");
+        try {
+            let ret = await rdbStore.execute("INSERT INTO test(name, age, salary) VALUES ('tt', 28, 50000)");
+            // 1 represent that the last data is inserted in the first row
+            expect(1).assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute select sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0005 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0006
+     * @tc.name Normal test case of Execute, execute sql for inserting data
+     * @tc.desc 1. Execute insert sql
+     *          2. Check returned value
+     */
+    it('testExecute0006', 0, async function (done) {
+        console.info(TAG + "************* testExecute0006 start *************");
+        try {
+            let ret = await rdbStore.execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?)", ['tt', 28, 50000]);
+            // 1 represent that the last data is inserted in the first row
+            expect(1).assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute insert sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0006 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0007
+     * @tc.name Normal test case of Execute, execute sql for batch insert data
+     * @tc.desc 1. Execute batch insert sql
+     *          2. Check returned value
+     */
+    it('testExecute0007', 0, async function (done) {
+        console.info(TAG + "************* testExecute0007 start *************");
+        try {
+            let ret = await rdbStore.execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ? ,?)",
+                ['tt', 28, 50000, 'ttt', 278, 500800]);
+            // 2 represent that the last data is inserted in the second row
+            expect(2).assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute insert sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0007 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0008
+     * @tc.name Normal test case of Execute, execute sql for updating data
+     * @tc.desc 1. Execute update sql
+     *          2. Check returned value
+     */
+    it('testExecute0008', 0, async function (done) {
+        console.info(TAG + "************* testExecute0008 start *************");
+        try {
+            let ret = await rdbStore.execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ? ,?)",
+                ['tt', 28, 50000, 'ttt', 278, 500800]);
+            // 2 represent that the last data is inserted in the second row
+            expect(2).assertEqual(ret);
+
+            ret = await rdbStore.execute("UPDATE test SET name='dd' WHERE id = 1");
+            // 1 represent that effected row id
+            expect(1).assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute update sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0008 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0009
+     * @tc.name Normal test case of Execute, execute sql for deleting data
+     * @tc.desc 1. Execute delete sql
+     *          2. Check returned value
+     */
+    it('testExecute0009', 0, async function (done) {
+        console.info(TAG + "************* testExecute0009 start *************");
+        try {
+            let ret = await rdbStore.execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ? ,?)",
+                ['tt', 28, 50000, 'ttt', 278, 500800]);
+            // 2 represent that the last data is inserted in the second row
+            expect(2).assertEqual(ret);
+
+            ret = await rdbStore.execute("DELETE FROM test");
+            // 2 represent that effected row id
+            expect(2).assertEqual(ret);
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute delete sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0009 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0010
+     * @tc.name AbNormal test case of Execute, execute sql for attaching database and transaction
+     * @tc.desc 1. Execute attach sql
+     *          2. Execute detach sql
+     *          3. Execute transaction sql
+     *          4. Check returned value
+     */
+    it('testExecute0010', 0, async function (done) {
+        console.info(TAG + "************* testExecute0010 start *************");
+        try {
+            await rdbStore.execute("ATTACH DATABASE 'execute_attach_test.db' AS 'attach.db'");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute attach sql failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute("DETACH DATABASE 'attach.db'");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute detach sql failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute("BEGIN TRANSACTION");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute begin transaction sql failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute("COMMIT");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute commit sql failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute("ROLLBACK");
+            expect(null).assertFail();
+        } catch (err) {
+            // 14800000: inner error
+            expect(14800000).assertEqual(err.code);
+            console.error(`execute rollback sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0010 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0011
+     * @tc.name Normal test case of Execute, execute DDL sql for creating and dropping table
+     * @tc.desc 1. Create table
+     *          2. Drop table
+     */
+    it('testExecute0011', 0, async function (done) {
+        console.info(TAG + "************* testExecute0011 start *************");
+        try {
+            let ret = await rdbStore.execute(CREATE_TABLE_TEST2);
+            expect(null).assertEqual(ret);
+            let resultSet = await rdbStore.querySql(TEST_TABLE_IS_EXIST);
+            resultSet.goToFirstRow();
+            // 0 represent that get count of table test2 in the first row, 1 represent that the table exists
+            expect(1).assertEqual(resultSet.getLong(0))
+            resultSet.close();
+
+            await rdbStore.execute("DROP TABLE test2");
+            resultSet = await rdbStore.querySql(TEST_TABLE_IS_EXIST);
+            resultSet.goToFirstRow();
+            // 0 represent that get count of table test2 in the first row, and the table test2 does not exist
+            expect(0).assertEqual(resultSet.getLong(0))
+            resultSet.close();
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute ddl sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0011 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0012
+     * @tc.name Normal test case of Execute, execute sql for creating table and insert, query data
+     * @tc.desc 1. Create table
+     *          2. Insert data
+     *          3. Query data
+     *          4. Drop table
+     */
+    it('testExecute0012', 0, async function (done) {
+        console.info(TAG + "************* testExecute0012 start *************");
+        try {
+            await rdbStore.execute(CREATE_TABLE_TEST2);
+
+            let ret = await rdbStore.execute(
+                "INSERT INTO test2(name, age, salary) VALUES (?, ?, ?)", ['tt', 28, 50000]);
+            // 1 represent that the last data is inserted in the first row
+            expect(1).assertEqual(ret);
+
+            let resultSet = await rdbStore.querySql("SELECT * FROM test2");
+            // 1 represent that the row count of resultSet
+            expect(1).assertEqual(resultSet.rowCount)
+            resultSet.close();
+        } catch (err) {
+            expect(null).assertFail();
+            console.error(`execute sql failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0012 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0013
+     * @tc.name AbNormal test case of Execute, if sql is ""
+     * @tc.desc 1. Execute sql: ""
+     *          2. Check returned value
+     */
+    it('testExecute0013', 0, async function (done) {
+        console.info(TAG + "************* testExecute0013 start *************");
+        try {
+            await rdbStore.execute("");
+            expect(null).assertFail();
+        } catch (err) {
+            expect("401").assertEqual(err.code);
+            console.error(`execute attach sql failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        done();
+        console.info(TAG + "************* testExecute0013 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0014
+     * @tc.name AbNormal test case of Execute, execute sql insert data and if args is []
+     * @tc.desc 1. Insert data
+     *          2. Check returned value
+     */
+    it('testExecute0014', 0, async function (done) {
+        console.info(TAG + "************* testExecute0014 start *************");
+        try {
+            await rdbStore.execute("INSERT INTO test (name, age, salary) VALUES (?, ?, ?)");
+            expect(null).assertFail();
+        } catch (err) {
+            expect(14800000).assertEqual(err.code);
+            console.error(`insert data failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0014 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0015
+     * @tc.name AbNormal test case of Execute, if sql is null or undefined
+     * @tc.desc 1. Insert data and set sql as null or undefined
+     *          2. Check returned value
+     */
+    it('testExecute0015', 0, async function (done) {
+        console.info(TAG + "************* testExecute0015 start *************");
+        try {
+            await rdbStore.execute(null);
+            expect(null).assertFail();
+        } catch (err) {
+            expect('401').assertEqual(err.code);
+            console.error(`insert data failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute(undefined);
+            expect(null).assertFail();
+        } catch (err) {
+            expect('401').assertEqual(err.code);
+            console.error(`insert data failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0015 end   *************");
+    })
+
+    /**
+     * @tc.number SUB_DDM_AppDataFWK_JSRDB_Execute_0016
+     * @tc.name AbNormal test case of Execute, if args is null or undefined
+     * @tc.desc 1. Insert data and set args as null or undefined
+     *          2. Check returned value
+     */
+    it('testExecute0016', 0, async function (done) {
+        console.info(TAG + "************* testExecute0016 start *************");
+        try {
+            await rdbStore.execute("INSERT INTO test (name, age, salary) VALUES (?, ?, ?)", null);
+            expect(null).assertFail();
+        } catch (err) {
+            expect(14800000).assertEqual(err.code);
+            console.error(`insert data failed, code:${err.code}, message: ${err.message}`);
+        }
+
+        try {
+            await rdbStore.execute("INSERT INTO test (name, age, salary) VALUES (?, ?, ?)", undefined);
+            expect(null).assertFail();
+        } catch (err) {
+            expect(14800000).assertEqual(err.code);
+            console.error(`insert data failed, code:${err.code}, message: ${err.message}`);
+        }
+        done();
+        console.info(TAG + "************* testExecute0016 end   *************");
+    })
+
+    console.info(TAG + "*************Unit Test End*************");
+})
\ No newline at end of file
diff --git a/relational_store/test/native/rdb/unittest/cache_result_set_test.cpp b/relational_store/test/native/rdb/unittest/cache_result_set_test.cpp
index c644caf1db5594598d0bee97910502e5cca5d900..fc29be8f71ad295192c5009263ebf57627161056 100644
--- a/relational_store/test/native/rdb/unittest/cache_result_set_test.cpp
+++ b/relational_store/test/native/rdb/unittest/cache_result_set_test.cpp
@@ -95,7 +95,6 @@ HWTEST_F(CacheResultSetTest, GetBlobTest_001, TestSize.Level2)
 {
     std::vector<ValuesBucket> valuesBuckets;
     ValuesBucket valuesBucket;
-    std::set<std::string> columnNames = { "id", "data", "field" };
     valuesBucket.Put("id", 1);
     std::vector<uint8_t> blob = { 't', 'e', 's', 't' };
     valuesBucket.Put("data", blob);
@@ -214,7 +213,6 @@ HWTEST_F(CacheResultSetTest, GetAssetTest_001, TestSize.Level2)
 {
     std::vector<ValuesBucket> valuesBuckets;
     ValuesBucket valuesBucket;
-    std::set<std::string> columnNames = { "id", "data", "field" };
     valuesBucket.Put("id", 1);
     ValueObject::Asset value = {};
     valuesBucket.Put("data", value);
@@ -240,7 +238,6 @@ HWTEST_F(CacheResultSetTest, GetAssetsTest_001, TestSize.Level2)
 {
     std::vector<ValuesBucket> valuesBuckets;
     ValuesBucket valuesBucket;
-    std::set<std::string> columnNames = { "id", "data", "field" };
     valuesBucket.Put("id", 1);
     ValueObject::Assets value = {};
     valuesBucket.Put("data", value);
diff --git a/relational_store/test/native/rdb/unittest/common.cpp b/relational_store/test/native/rdb/unittest/common.cpp
index f98207135dff0ad3d56fd39bfadb17ee9af94460..45f961f5c1b011984d175e6ac56cc57d129d36f9 100644
--- a/relational_store/test/native/rdb/unittest/common.cpp
+++ b/relational_store/test/native/rdb/unittest/common.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-
 #include "common.h"
 #include <string>
+#include "rdb_errno.h"
 
 namespace OHOS {
 namespace NativeRdb {
@@ -36,5 +36,59 @@ const RowData UTUtils::g_rowData[3] = {
     {2, "lisi", 19, 200.5, std::vector<uint8_t>{ 4, 5, 6 }},
     {3, "wangyjing", 20, 300.5, std::vector<uint8_t>{ 7, 8, 9 }}
 };
+
+ValuesBucket UTUtils::SetRowDatas(const RowDatas &rowDatas)
+{
+    ValuesBucket value;
+    ValueObjectType typeMgr = rowDatas.mgr.GetType();
+    ValueObjectType typeBonus = rowDatas.bonus.GetType();
+
+    int outputMgr = 0;
+    double outputBonus = 0.0;
+
+    value.PutInt("id", rowDatas.id);
+    value.PutString("eName", rowDatas.eName);
+    value.PutInt("jobId", rowDatas.jobId);
+
+    if (typeMgr == ValueObjectType::TYPE_NULL) {
+        value.PutNull("mgr");
+    } else {
+        int ret = rowDatas.mgr.GetInt(outputMgr);
+        if (ret == E_OK) {
+            value.PutInt("mgr", outputMgr);
+        }
+    }
+
+    value.PutString("joinDate", rowDatas.joinDate);
+    value.PutDouble("salary", rowDatas.salary);
+
+    if (typeBonus == ValueObjectType::TYPE_NULL) {
+        value.PutNull("bonus");
+    } else {
+        int ret = rowDatas.bonus.GetDouble(outputBonus);
+        if (ret == E_OK) {
+            value.PutDouble("bonus", outputBonus);
+        }
+    }
+
+    value.PutInt("deptId", rowDatas.deptId);
+    return value;
+}
+
+const RowDatas UTUtils::gRowDatas[14] = {
+    { 1001, "SunWuKong", 4, ValueObject(1004), "2000-12-17", 8000.00, ValueObject(), 20 },
+    { 1002, "LuJunYi", 3, ValueObject(1006), "2001-02-20", 16000.00, ValueObject(3000.00), 30 },
+    { 1003, "LinChong", 3, ValueObject(1006), "2001-02-22", 12500.00, ValueObject(5000.00), 30 },
+    { 1004, "TangCeng", 2, ValueObject(1009), "2001-04-02", 29750.00, ValueObject(), 20 },
+    { 1005, "LiKui", 4, ValueObject(1006), "2001-09-28", 12500.00, ValueObject(14000.00), 30 },
+    { 1006, "SongJiang", 2, ValueObject(1009), "2001-05-01", 28500.00, ValueObject(), 30 },
+    { 1007, "LiuBei", 2, ValueObject(1009), "2001-09-01", 24500.00, ValueObject(), 10 },
+    { 1008, "ZhuBaJie", 4, ValueObject(1004), "2007-04-19", 30000.00, ValueObject(), 20 },
+    { 1009, "LuoGuanZhong", 1, ValueObject(), "2001-11-17", 50000.00, ValueObject(), 10 },
+    { 1010, "WuYong", 3, ValueObject(1006), "2001-09-08", 15000.00, ValueObject(), 30 },
+    { 1011, "ShaCeng", 4, ValueObject(1004), "2007-05-23", 11000.00, ValueObject(), 20 },
+    { 1012, "LiKui", 4, ValueObject(1006), "2001-12-03", 9500.00, ValueObject(), 30 },
+    { 1013, "XiaoBaiLong", 4, ValueObject(1004), "2001-12-03", 30000.00, ValueObject(), 20 },
+    { 1014, "GuanYu", 4, ValueObject(1007), "2002-01-23", 13000.00, ValueObject(), 10 } };
 }
 }
diff --git a/relational_store/test/native/rdb/unittest/common.h b/relational_store/test/native/rdb/unittest/common.h
index 97c9ab50c49bdf12139d42852265a6363f6557d6..c6b11f1536ec3efcd9fa1bbc4252753eb06f83d7 100644
--- a/relational_store/test/native/rdb/unittest/common.h
+++ b/relational_store/test/native/rdb/unittest/common.h
@@ -31,11 +31,26 @@ struct RowData {
     std::vector<uint8_t> blobType;
 };
 
+struct RowDatas {
+    int id;
+    std::string eName;
+    int jobId;
+    ValueObject mgr;
+    std::string joinDate;
+    double salary;
+    ValueObject bonus;
+    int deptId;
+};
+
 class UTUtils {
 public:
     static ValuesBucket SetRowData(const RowData &rowData);
 
+    static ValuesBucket SetRowDatas(const RowDatas &rowDatas);
+
     static const RowData g_rowData[3];
+
+    static const RowDatas gRowDatas[14];
 };
 
 } // namespace NativeRdb
diff --git a/relational_store/test/native/rdb/unittest/rdb_delete_test.cpp b/relational_store/test/native/rdb/unittest/rdb_delete_test.cpp
index b39d4078568600a45c2e4df10dd40ca662b93c88..794f5f568832ec8ebb21fa9c9782a21b0580f168 100644
--- a/relational_store/test/native/rdb/unittest/rdb_delete_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_delete_test.cpp
@@ -96,35 +96,17 @@ HWTEST_F(RdbDeleteTest, RdbStore_Delete_001, TestSize.Level1)
     std::shared_ptr<RdbStore> &store = RdbDeleteTest::store;
 
     int64_t id;
-    ValuesBucket values;
     int deletedRows;
 
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->Insert(id, "test", values);
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
-    values.Clear();
-    values.PutInt("id", 2);
-    values.PutString("name", std::string("lisi"));
-    values.PutInt("age", 19);
-    values.PutDouble("salary", 200.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 4, 5, 6 });
-    ret = store->Insert(id, "test", values);
+    ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[1]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(2, id);
 
-    values.Clear();
-    values.PutInt("id", 3);
-    values.PutString("name", std::string("wangyjing"));
-    values.PutInt("age", 20);
-    values.PutDouble("salary", 300.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 7, 8, 9 });
-    ret = store->Insert(id, "test", values);
+    ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[2]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(3, id);
 
diff --git a/relational_store/test/native/rdb/unittest/rdb_encrypt_decrypt_test.cpp b/relational_store/test/native/rdb/unittest/rdb_encrypt_decrypt_test.cpp
index 0d6df7ea048e1a47508e4ef0e3ff557a8774c1f1..0bc9101c5d9fbd7ec20ca494cd64753180f9f216 100644
--- a/relational_store/test/native/rdb/unittest/rdb_encrypt_decrypt_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_encrypt_decrypt_test.cpp
@@ -83,7 +83,6 @@ void RdbEncryptTest::SetUpTestCase(void)
 
 void RdbEncryptTest::TearDownTestCase(void)
 {
-
 }
 
 void RdbEncryptTest::SetUp(void)
@@ -148,14 +147,8 @@ HWTEST_F(RdbEncryptTest, RdbStore_Encrypt_03, TestSize.Level1)
     EXPECT_NE(store, nullptr);
 
     int64_t id;
-    ValuesBucket values;
-
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->Insert(id, "test", values);
+
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
@@ -168,8 +161,6 @@ HWTEST_F(RdbEncryptTest, RdbStore_Encrypt_03, TestSize.Level1)
     int columnIndex;
     int intVal;
     std::string strVal;
-    double dVal;
-    std::vector<uint8_t> blob;
 
     ret = resultSet->GetColumnIndex("id", columnIndex);
     EXPECT_EQ(ret, E_OK);
@@ -183,25 +174,6 @@ HWTEST_F(RdbEncryptTest, RdbStore_Encrypt_03, TestSize.Level1)
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ("zhangsan", strVal);
 
-    ret = resultSet->GetColumnIndex("age", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetInt(columnIndex, intVal);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(18, intVal);
-
-    ret = resultSet->GetColumnIndex("salary", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetDouble(columnIndex, dVal);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(100.5, dVal);
-
-    ret = resultSet->GetColumnIndex("blobType", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetBlob(columnIndex, blob);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(3, static_cast<int>(blob.size()));
-    EXPECT_EQ(1, blob[0]);
-
     ret = resultSet->GoToNextRow();
     EXPECT_EQ(ret, E_ERROR);
 
@@ -316,6 +288,57 @@ HWTEST_F(RdbEncryptTest, RdbStore_Encrypt_008, TestSize.Level1)
     EXPECT_NE(store, nullptr);
 }
 
+/**
+ * @tc.name: RdbStore_Encrypt_Decrypt_Test_009
+ * @tc.desc: test create encrypted Rdb and insert data ,then query
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbEncryptTest, RdbStore_Encrypt_009, TestSize.Level1)
+{
+    RdbStoreConfig config(RdbEncryptTest::ENCRYPTED_DATABASE_NAME);
+    config.SetEncryptStatus(true);
+    config.SetBundleName("com.example.TestEncrypt9");
+    EncryptTestOpenCallback helper;
+    int errCode;
+    std::shared_ptr<RdbStore> store = RdbHelper::GetRdbStore(config, 1, helper, errCode);
+    EXPECT_NE(store, nullptr);
+
+    int64_t id;
+
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql("SELECT * FROM test");
+    EXPECT_NE(resultSet, nullptr);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_OK);
+
+    int columnIndex;
+    double dVal;
+    std::vector<uint8_t> blob;
+
+    ret = resultSet->GetColumnIndex("salary", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetDouble(columnIndex, dVal);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(100.5, dVal);
+
+    ret = resultSet->GetColumnIndex("blobType", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetBlob(columnIndex, blob);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(3, static_cast<int>(blob.size()));
+    EXPECT_EQ(1, blob[0]);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_ERROR);
+
+    ret = resultSet->Close();
+    EXPECT_EQ(ret, E_OK);
+}
+
 /**
  * @tc.name: RdbStore_RdbPassword_001
  * @tc.desc: Abnomal test RdbStore RdbPassword class
diff --git a/relational_store/test/native/rdb/unittest/rdb_execute_test.cpp b/relational_store/test/native/rdb/unittest/rdb_execute_test.cpp
index c56bbf578bda63d2880f464b2526f697389f1fd5..3f543ab2af759fab72145c456d6a1871477fd17e 100644
--- a/relational_store/test/native/rdb/unittest/rdb_execute_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_execute_test.cpp
@@ -34,6 +34,7 @@ public:
 
     static const std::string DATABASE_NAME;
     static std::shared_ptr<RdbStore> store;
+    static const std::string CREATE_TABLE_TEST;
 };
 
 const std::string RdbExecuteTest::DATABASE_NAME = RDB_TEST_PATH + "execute_test.db";
@@ -43,17 +44,16 @@ class ExecuteTestOpenCallback : public RdbOpenCallback {
 public:
     int OnCreate(RdbStore &store) override;
     int OnUpgrade(RdbStore &store, int oldVersion, int newVersion) override;
-    static const std::string CREATE_TABLE_TEST;
 };
 
-const std::string ExecuteTestOpenCallback::CREATE_TABLE_TEST = std::string("CREATE TABLE IF NOT EXISTS test ")
-                                                               + std::string("(id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                                                                             "name TEXT NOT NULL, age INTEGER, salary "
-                                                                             "REAL, blobType BLOB)");
+const std::string RdbExecuteTest::CREATE_TABLE_TEST = "CREATE TABLE IF NOT EXISTS test "
+                                                      "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
+                                                      "name TEXT NOT NULL, age INTEGER, salary REAL, "
+                                                      "blobType BLOB)";
 
 int ExecuteTestOpenCallback::OnCreate(RdbStore &store)
 {
-    return store.ExecuteSql(CREATE_TABLE_TEST);
+    return E_OK;
 }
 
 int ExecuteTestOpenCallback::OnUpgrade(RdbStore &store, int oldVersion, int newVersion)
@@ -74,17 +74,18 @@ void RdbExecuteTest::SetUpTestCase(void)
 
 void RdbExecuteTest::TearDownTestCase(void)
 {
-    store = nullptr;
     RdbHelper::DeleteRdbStore(RdbExecuteTest::DATABASE_NAME);
+    store = nullptr;
 }
 
 void RdbExecuteTest::SetUp(void)
 {
-    store->ExecuteSql("DELETE FROM test");
+    store->ExecuteSql(CREATE_TABLE_TEST);
 }
 
 void RdbExecuteTest::TearDown(void)
 {
+    store->ExecuteSql("DROP TABLE test");
 }
 
 /**
@@ -161,32 +162,15 @@ HWTEST_F(RdbExecuteTest, RdbStore_Execute_002, TestSize.Level1)
     int64_t id;
     ValuesBucket values;
 
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->Insert(id, "test", values);
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
-    values.Clear();
-    values.PutInt("id", 2);
-    values.PutString("name", std::string("lisi"));
-    values.PutInt("age", 19);
-    values.PutDouble("salary", 200.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 4, 5, 6 });
-    ret = store->Insert(id, "test", values);
+    ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[1]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(2, id);
 
-    values.Clear();
-    values.PutInt("id", 3);
-    values.PutString("name", std::string("wangyjing"));
-    values.PutInt("age", 20);
-    values.PutDouble("salary", 300.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 7, 8, 9 });
-    ret = store->Insert(id, "test", values);
+    ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[2]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(3, id);
 
@@ -282,4 +266,304 @@ HWTEST_F(RdbExecuteTest, RdbStore_Execute_006, TestSize.Level4)
     int64_t outValue;
     int ret = store->ExecuteForChangedRowCount(outValue, "", {});
     EXPECT_NE(E_OK, ret);
-}
\ No newline at end of file
+}
+
+/**
+ * @tc.name: RdbStore_Execute_007
+ * @tc.desc: Normal testCase for ExecuteAndGetString, check integrity for store
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_007, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    auto [ret, outValue] = store->Execute("PRAGMA integrity_check");
+    EXPECT_EQ(E_OK, ret);
+    EXPECT_EQ(ValueObjectType::TYPE_STRING, outValue.GetType());
+
+    std::string outputResult;
+    outValue.GetString(outputResult);
+    EXPECT_EQ("ok", outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_008
+ * @tc.desc: Normal testCase for Execute, check integrity for store
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_008, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    auto [ret, outValue] = store->Execute("PRAGMA quick_check");
+    EXPECT_EQ(E_OK, ret);
+    EXPECT_EQ(ValueObjectType::TYPE_STRING, outValue.GetType());
+
+    std::string outputResult;
+    outValue.GetString(outputResult);
+    EXPECT_EQ("ok", outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_009
+ * @tc.desc: Normal testCase for Execute, get user_version of store
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_009, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    // set user_version as 5
+    store->SetVersion(5);
+    auto [ret, outValue] = store->Execute("PRAGMA user_version");
+    EXPECT_EQ(E_OK, ret);
+    EXPECT_EQ(ValueObjectType::TYPE_STRING, outValue.GetType());
+
+    std::string outputResult;
+    outValue.GetString(outputResult);
+    EXPECT_EQ("5", outputResult);
+
+    // set user_version as 0
+    store->SetVersion(0);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0010
+ * @tc.desc: AbNormal testCase for Execute, execute select sql
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0010, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    auto [ret, outValue] = store->Execute("SELECT * FROM test");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0011
+ * @tc.desc: Normal testCase for Execute, execute sql for inserting data
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0011, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    std::vector<ValueObject> args = {
+        ValueObject(std::string("tt")), ValueObject(int(28)), ValueObject(double(50000.0)) };
+    auto [ret, outValue] = store->Execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?);", args);
+    EXPECT_EQ(E_OK, ret);
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue.GetType());
+
+    int64_t outputResult;
+    outValue.GetLong(outputResult);
+    // 1 represent that the last data is inserted in the first row
+    EXPECT_EQ(1, outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0012
+ * @tc.desc: Normal testCase for Execute, execute sql for batch insert data
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0012, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    std::vector<ValueObject> args = { ValueObject(std::string("tt")), ValueObject(int(28)),
+        ValueObject(double(50000.0)), ValueObject(std::string("ttt")), ValueObject(int(58)),
+        ValueObject(double(500080.0)) };
+    auto [ret, outValue] = store->Execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ?, ?)", args);
+    EXPECT_EQ(E_OK, ret);
+
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue.GetType());
+
+    int64_t outputResult;
+    outValue.GetLong(outputResult);
+    // 2 represent that the last data is inserted in the second row
+    EXPECT_EQ(2, outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0013
+ * @tc.desc: Normal testCase for Execute, execute sql for updating data
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0013, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    std::vector<ValueObject> args = { ValueObject(std::string("tt")), ValueObject(int(28)),
+        ValueObject(double(50000.0)), ValueObject(std::string("ttt")), ValueObject(int(58)),
+        ValueObject(double(500080.0)) };
+    auto [ret1, outValue1] = store->Execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ?, ?)", args);
+    EXPECT_EQ(E_OK, ret1);
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue1.GetType());
+
+    int64_t outputResult;
+    outValue1.GetLong(outputResult);
+    // 2 represent that the last data is inserted in the second row
+    EXPECT_EQ(2, outputResult);
+
+    auto [ret2, outValue2] = store->Execute("UPDATE test SET name='dd' WHERE id = 2");
+    EXPECT_EQ(E_OK, ret2);
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue2.GetType());
+
+    outValue2.GetLong(outputResult);
+    // 1 represent that effected row id
+    EXPECT_EQ(1, outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0014
+ * @tc.desc: Normal testCase for Execute, execute sql for deleting data
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0014, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    std::vector<ValueObject> args = { ValueObject(std::string("tt")), ValueObject(int(28)),
+        ValueObject(double(50000.0)), ValueObject(std::string("ttt")), ValueObject(int(82)),
+        ValueObject(double(500080.0)) };
+    auto [ret1, outValue1] = store->Execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ?, ?)", args);
+    EXPECT_EQ(E_OK, ret1);
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue1.GetType());
+
+    int64_t outputResult;
+    outValue1.GetLong(outputResult);
+    // 2 represent that the last data is inserted in the second row
+    EXPECT_EQ(2, outputResult);
+
+    auto [ret2, outValue2] = store->Execute("DELETE FROM test");
+    EXPECT_EQ(E_OK, ret2);
+    EXPECT_EQ(ValueObjectType::TYPE_INT, outValue2.GetType());
+
+    outValue2.GetLong(outputResult);
+    // 2 represent that effected row id
+    EXPECT_EQ(2, outputResult);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0015
+ * @tc.desc: AbNormal testCase for Execute, execute sql for attaching database and transaction
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0015, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+
+    auto [ret1, outValue1] = store->Execute("ATTACH DATABASE 'execute_attach_test.db' AS 'attach.db'");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret1);
+
+    auto [ret2, outValue2] = store->Execute("DETACH DATABASE 'attach.db'");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret2);
+
+    auto [ret3, outValue3] = store->Execute("BEGIN TRANSACTION");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret3);
+
+    auto [ret4, outValue4] = store->Execute("COMMIT");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret4);
+
+    auto [ret5, outValue5] = store->Execute("ROLLBACK");
+    EXPECT_EQ(E_NOT_SUPPORT_THE_SQL, ret5);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0016
+ * @tc.desc: Normal testCase for Execute, execute DDL sql for creating and dropping table
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0016, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+    int64_t intOutValue;
+    std::string strOutValue;
+
+    const std::string CREATE_TABLE_TEST2 = "CREATE TABLE IF NOT EXISTS test2 "
+                                           "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
+                                           "name TEXT NOT NULL, age INTEGER, salary REAL, "
+                                           "blobType BLOB)";
+    const std::string DROP_TABLE_TEST2 = "DROP TABLE test2";
+    const std::string TEST_TABLE_IS_EXIST = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='test2'";
+
+    auto [ret1, outValue1] = store->Execute(CREATE_TABLE_TEST2);
+    EXPECT_EQ(E_OK, ret1);
+    outValue1.GetString(strOutValue);
+    EXPECT_EQ("", strOutValue);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql(TEST_TABLE_IS_EXIST);
+    EXPECT_NE(nullptr, resultSet);
+    resultSet->GoToFirstRow();
+    // 0 represent that get count of table test in the first row
+    resultSet->GetLong(0, intOutValue);
+    // 1 represent that the table exists
+    EXPECT_EQ(1, intOutValue);
+    resultSet->Close();
+
+    auto [ret2, outValue2] = store->Execute(DROP_TABLE_TEST2);
+    EXPECT_EQ(E_OK, ret2);
+    outValue2.GetString(strOutValue);
+    EXPECT_EQ("", strOutValue);
+
+    resultSet = store->QuerySql(TEST_TABLE_IS_EXIST);
+    EXPECT_NE(nullptr, resultSet);
+    resultSet->GoToFirstRow();
+    // 0 represent that get count of table test in the first column
+    resultSet->GetLong(0, intOutValue);
+    // 0 represent the table does not exist
+    EXPECT_EQ(0, intOutValue);
+    resultSet->Close();
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0017
+ * @tc.desc: Normal testCase for Execute, execute sql for creating table and insert, query data
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0017, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+    int64_t intOutValue;
+    int intOutResultSet;
+
+    const std::string CREATE_TABLE_TEST2 = "CREATE TABLE IF NOT EXISTS test2 "
+                                           "(id INTEGER PRIMARY KEY AUTOINCREMENT, "
+                                           "name TEXT NOT NULL, age INTEGER, salary REAL, "
+                                           "blobType BLOB)";
+    const std::string DROP_TABLE_TEST2 = "DROP TABLE test2";
+
+    auto [ret1, outValue1] = store->Execute(CREATE_TABLE_TEST2);
+    EXPECT_EQ(E_OK, ret1);
+
+    std::vector<ValueObject> args = { ValueObject("tt"), ValueObject(28), ValueObject(50000) };
+    auto [ret2, outValue2] = store->Execute("INSERT INTO test2(name, age, salary) VALUES (?, ?, ?)", args);
+    EXPECT_EQ(E_OK, ret2);
+    outValue2.GetLong(intOutValue);
+    // 1 represent that the last data is inserted in the first row
+    EXPECT_EQ(1, intOutValue);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql("SELECT * FROM test2");
+    EXPECT_NE(nullptr, resultSet);
+    EXPECT_EQ(E_OK, resultSet->GetRowCount(intOutResultSet));
+    // 1 represent that the row number of resultSet
+    EXPECT_EQ(1, intOutResultSet);
+    resultSet->Close();
+
+    auto [ret3, outValue3] = store->Execute(DROP_TABLE_TEST2);
+    EXPECT_EQ(E_OK, ret3);
+}
+
+/**
+ * @tc.name: RdbStore_Execute_0018
+ * @tc.desc: AbNormal testCase for Execute, execute sql for inserting data but args is []
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbExecuteTest, RdbStore_Execute_0018, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbExecuteTest::store;
+    ValueObject outValue;
+
+    auto [ret1, outValue1] = store->Execute("INSERT INTO test(name, age, salary) VALUES (?, ?, ?), (?, ?, ?)");
+    EXPECT_NE(E_OK, ret1);
+}
diff --git a/relational_store/test/native/rdb/unittest/rdb_get_store_test.cpp b/relational_store/test/native/rdb/unittest/rdb_get_store_test.cpp
index aa405ba6a54d477ebdb5b489bfe20680d40c6ecf..13d47d63f46648b265eef20bbed879266faf0c15 100644
--- a/relational_store/test/native/rdb/unittest/rdb_get_store_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_get_store_test.cpp
@@ -260,13 +260,12 @@ HWTEST_F(RdbGetStoreTest, RdbStore_GetStore_002, TestSize.Level1)
     std::shared_ptr<RdbStore> store = CreateGetRDB(2);
 
     int currentVersion;
-    int ret;
     int64_t id;
     int changedRows;
     ValuesBucket values;
     int rowCount;
 
-    ret = store->GetVersion(currentVersion);
+    int ret = store->GetVersion(currentVersion);
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(currentVersion, 1);
 
diff --git a/relational_store/test/native/rdb/unittest/rdb_insert_test.cpp b/relational_store/test/native/rdb/unittest/rdb_insert_test.cpp
index 355772c96450b1fff0873d3e3ed6c29ba88a4d9f..5b54a293ecac99aa9f5131805e52894196cd07cd 100644
--- a/relational_store/test/native/rdb/unittest/rdb_insert_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_insert_test.cpp
@@ -298,12 +298,7 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_001, TestSize.Level1)
     int64_t id;
     ValuesBucket values;
 
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->Replace(id, "test", values);
+    int ret = store->Replace(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
@@ -316,8 +311,6 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_001, TestSize.Level1)
     int columnIndex;
     int intVal;
     std::string strVal;
-    double dVal;
-    std::vector<uint8_t> blob;
 
     ret = resultSet->GetColumnIndex("id", columnIndex);
     EXPECT_EQ(ret, E_OK);
@@ -337,21 +330,6 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_001, TestSize.Level1)
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(18, intVal);
 
-    ret = resultSet->GetColumnIndex("salary", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetDouble(columnIndex, dVal);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(100.5, dVal);
-
-    ret = resultSet->GetColumnIndex("blobType", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetBlob(columnIndex, blob);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(3, static_cast<int>(blob.size()));
-    EXPECT_EQ(1, blob[0]);
-    EXPECT_EQ(2, blob[1]);
-    EXPECT_EQ(3, blob[2]);
-
     ret = resultSet->GoToNextRow();
     EXPECT_EQ(ret, E_ERROR);
 
@@ -371,12 +349,7 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_002, TestSize.Level1)
     int64_t id;
     ValuesBucket values;
 
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->Insert(id, "test", values);
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
@@ -399,8 +372,6 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_002, TestSize.Level1)
     int columnIndex;
     int intVal;
     std::string strVal;
-    double dVal;
-    std::vector<uint8_t> blob;
 
     ret = resultSet->GetColumnIndex("id", columnIndex);
     EXPECT_EQ(ret, E_OK);
@@ -420,21 +391,6 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_002, TestSize.Level1)
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(18, intVal);
 
-    ret = resultSet->GetColumnIndex("salary", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetDouble(columnIndex, dVal);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(200.5, dVal);
-
-    ret = resultSet->GetColumnIndex("blobType", columnIndex);
-    EXPECT_EQ(ret, E_OK);
-    ret = resultSet->GetBlob(columnIndex, blob);
-    EXPECT_EQ(ret, E_OK);
-    EXPECT_EQ(3, static_cast<int>(blob.size()));
-    EXPECT_EQ(1, blob[0]);
-    EXPECT_EQ(2, blob[1]);
-    EXPECT_EQ(3, blob[2]);
-
     ret = resultSet->GoToNextRow();
     EXPECT_EQ(ret, E_ERROR);
 
@@ -489,6 +445,111 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_004, TestSize.Level1)
     EXPECT_EQ(ret, RdbStoreInsertTest::E_SQLITE_ERROR);
 }
 
+/**
+ * @tc.name: RdbStore_Replace_005
+ * @tc.desc: test RdbStore replace
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_005, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbStoreInsertTest::store;
+
+    int64_t id;
+
+    int ret = store->Replace(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql("SELECT * FROM test");
+    EXPECT_NE(resultSet, nullptr);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_OK);
+
+    int columnIndex;
+    double dVal;
+    std::vector<uint8_t> blob;
+
+    ret = resultSet->GetColumnIndex("salary", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetDouble(columnIndex, dVal);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(100.5, dVal);
+
+    ret = resultSet->GetColumnIndex("blobType", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetBlob(columnIndex, blob);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(3, static_cast<int>(blob.size()));
+    EXPECT_EQ(1, blob[0]);
+    EXPECT_EQ(2, blob[1]);
+    EXPECT_EQ(3, blob[2]);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_ERROR);
+
+    ret = resultSet->Close();
+    EXPECT_EQ(ret, E_OK);
+}
+
+/**
+ * @tc.name: RdbStore_Replace_006
+ * @tc.desc: test RdbStore replace
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbStoreInsertTest, RdbStore_Replace_006, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbStoreInsertTest::store;
+
+    int64_t id;
+    ValuesBucket values;
+
+    int ret = store->Insert(id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]));
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    values.Clear();
+    values.PutInt("id", 1);
+    values.PutString("name", std::string("zhangsan"));
+    values.PutInt("age", 18);
+    values.PutDouble("salary", 200.5);
+    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
+    ret = store->Replace(id, "test", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql("SELECT * FROM test");
+    EXPECT_NE(resultSet, nullptr);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_OK);
+
+    int columnIndex;
+    double dVal;
+    std::vector<uint8_t> blob;
+
+    ret = resultSet->GetColumnIndex("salary", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetDouble(columnIndex, dVal);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(200.5, dVal);
+
+    ret = resultSet->GetColumnIndex("blobType", columnIndex);
+    EXPECT_EQ(ret, E_OK);
+    ret = resultSet->GetBlob(columnIndex, blob);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(3, static_cast<int>(blob.size()));
+    EXPECT_EQ(1, blob[0]);
+    EXPECT_EQ(2, blob[1]);
+    EXPECT_EQ(3, blob[2]);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_ERROR);
+
+    ret = resultSet->Close();
+    EXPECT_EQ(ret, E_OK);
+}
+
 /**
  * @tc.name: RdbStore_InsertWithConflictResolution_001_002
  * @tc.desc: test RdbStore InsertWithConflictResolution
@@ -586,23 +647,19 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_005, TestSize
 }
 
 /**
- * @tc.name: RdbStore_InsertWithConflictResolution_006_007
+ * @tc.name: RdbStore_InsertWithConflictResolution_006
  * @tc.desc: test RdbStore InsertWithConflictResolution
  * @tc.type: FUNC
  */
-HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_006_007, TestSize.Level1)
+HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_006, TestSize.Level1)
 {
     std::shared_ptr<RdbStore> &store = RdbStoreInsertTest::store;
 
     int64_t id;
     ValuesBucket values;
 
-    values.PutInt("id", 1);
-    values.PutString("name", std::string("zhangsan"));
-    values.PutInt("age", 18);
-    values.PutDouble("salary", 100.5);
-    values.PutBlob("blobType", std::vector<uint8_t>{ 1, 2, 3 });
-    int ret = store->InsertWithConflictResolution(id, "test", values, ConflictResolution::ON_CONFLICT_REPLACE);
+    int ret = store->InsertWithConflictResolution(
+        id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]), ConflictResolution::ON_CONFLICT_REPLACE);
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(1, id);
 
@@ -625,8 +682,6 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_006_007, Test
     int columnIndex;
     int intVal;
     std::string strVal;
-    double dVal;
-    std::vector<uint8_t> blob;
 
     ret = resultSet->GetColumnIndex("id", columnIndex);
     EXPECT_EQ(ret, E_OK);
@@ -646,6 +701,50 @@ HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_006_007, Test
     EXPECT_EQ(ret, E_OK);
     EXPECT_EQ(18, intVal);
 
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_ERROR);
+
+    ret = resultSet->Close();
+    EXPECT_EQ(ret, E_OK);
+}
+
+/**
+ * @tc.name: RdbStore_InsertWithConflictResolution_007
+ * @tc.desc: test RdbStore InsertWithConflictResolution
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbStoreInsertTest, RdbStore_InsertWithConflictResolution_007, TestSize.Level1)
+{
+    std::shared_ptr<RdbStore> &store = RdbStoreInsertTest::store;
+
+    int64_t id;
+    ValuesBucket values;
+
+    int ret = store->InsertWithConflictResolution(
+        id, "test", UTUtils::SetRowData(UTUtils::g_rowData[0]), ConflictResolution::ON_CONFLICT_REPLACE);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    values.Clear();
+    values.PutInt("id", 1);
+    values.PutString("name", std::string("zhangsan"));
+    values.PutInt("age", 18);
+    values.PutDouble("salary", 200.5);
+    values.PutBlob("blobType", std::vector<uint8_t>{ 4, 5, 6 });
+    ret = store->InsertWithConflictResolution(id, "test", values, ConflictResolution::ON_CONFLICT_REPLACE);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(id, 1);
+
+    std::shared_ptr<ResultSet> resultSet = store->QuerySql("SELECT * FROM test");
+    EXPECT_NE(resultSet, nullptr);
+
+    ret = resultSet->GoToNextRow();
+    EXPECT_EQ(ret, E_OK);
+
+    int columnIndex;
+    double dVal;
+    std::vector<uint8_t> blob;
+
     ret = resultSet->GetColumnIndex("salary", columnIndex);
     EXPECT_EQ(ret, E_OK);
     ret = resultSet->GetDouble(columnIndex, dVal);
diff --git a/relational_store/test/native/rdb/unittest/rdb_predicates_join_b_test.cpp b/relational_store/test/native/rdb/unittest/rdb_predicates_join_b_test.cpp
index 2368cb46af56385407b0bcadab1fac2a86416e03..ab37d1b4a82b31c3ddb65d0ba3265cc2556d1171 100644
--- a/relational_store/test/native/rdb/unittest/rdb_predicates_join_b_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_predicates_join_b_test.cpp
@@ -33,6 +33,8 @@
 using namespace testing::ext;
 using namespace OHOS::NativeRdb;
 
+constexpr int CYCLENUM = 13;
+
 class RdbStorePredicateJoinBTest : public testing::Test {
 public:
     static void SetUpTestCase(void);
@@ -176,161 +178,13 @@ void RdbStorePredicateJoinBTest::InsertJobDates()
 
 void RdbStorePredicateJoinBTest::InsertEmpDates()
 {
-    int64_t  id;
-    ValuesBucket values;
-
-    values.PutInt("id", 1001);
-    values.PutString("eName", std::string("SunWuKong"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1004);
-    values.PutString("joinDate", std::string("2000-12-17"));
-    values.PutDouble("salary", 8000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 20);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1002);
-    values.PutString("eName", std::string("LuJunYi"));
-    values.PutInt("jobId", 3);
-    values.PutInt("mgr", 1006);
-    values.PutString("joinDate", std::string("2001-02-20"));
-    values.PutDouble("salary", 16000.00);
-    values.PutDouble("bonus", 3000.00);
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1003);
-    values.PutString("eName", std::string("LinChong"));
-    values.PutInt("jobId", 3);
-    values.PutInt("mgr", 1006);
-    values.PutString("joinDate", std::string("2001-02-22"));
-    values.PutDouble("salary", 12500.00);
-    values.PutDouble("bonus", 5000.00);
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1004);
-    values.PutString("eName", std::string("TangCeng"));
-    values.PutInt("jobId", 2);
-    values.PutInt("mgr", 1009);
-    values.PutString("joinDate", std::string("2001-04-02"));
-    values.PutDouble("salary", 29750.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 20);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1005);
-    values.PutString("eName", std::string("LiKui"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1006);
-    values.PutString("joinDate", std::string("2001-09-28"));
-    values.PutDouble("salary", 12500.00);
-    values.PutDouble("bonus", 14000.00);
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1006);
-    values.PutString("eName", std::string("SongJiang"));
-    values.PutInt("jobId", 2);
-    values.PutInt("mgr", 1009);
-    values.PutString("joinDate", std::string("2001-05-01"));
-    values.PutDouble("salary", 28500.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1007);
-    values.PutString("eName", std::string("LiuBei"));
-    values.PutInt("jobId", 2);
-    values.PutInt("mgr", 1009);
-    values.PutString("joinDate", std::string("2001-09-01"));
-    values.PutDouble("salary", 24500.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 10);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1008);
-    values.PutString("eName", std::string("ZhuBaJie"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1004);
-    values.PutString("joinDate", std::string("2007-04-19"));
-    values.PutDouble("salary", 30000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 20);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1009);
-    values.PutString("eName", std::string("LuoGuanZhong"));
-    values.PutInt("jobId", 1);
-    values.PutNull("mgr");
-    values.PutString("joinDate", std::string("2001-11-17"));
-    values.PutDouble("salary", 50000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 10);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1010);
-    values.PutString("eName", std::string("WuYong"));
-    values.PutInt("jobId", 3);
-    values.PutInt("mgr", 1006);
-    values.PutString("joinDate", std::string("2001-09-08"));
-    values.PutDouble("salary", 15000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
+    int64_t id;
 
-    values.Clear();
-    values.PutInt("id", 1011);
-    values.PutString("eName", std::string("ShaCeng"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1004);
-    values.PutString("joinDate", std::string("2007-05-23"));
-    values.PutDouble("salary", 11000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 20);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1012);
-    values.PutString("eName", std::string("LiKui"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1006);
-    values.PutString("joinDate", std::string("2001-12-03"));
-    values.PutDouble("salary", 9500.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 30);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1013);
-    values.PutString("eName", std::string("XiaoBaiLong"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1004);
-    values.PutString("joinDate", std::string("2001-12-03"));
-    values.PutDouble("salary", 30000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 20);
-    store->Insert(id, "emp", values);
-
-    values.Clear();
-    values.PutInt("id", 1014);
-    values.PutString("eName", std::string("GuanYu"));
-    values.PutInt("jobId", 4);
-    values.PutInt("mgr", 1007);
-    values.PutString("joinDate", std::string("2002-01-23"));
-    values.PutDouble("salary", 13000.00);
-    values.PutNull("bonus");
-    values.PutInt("deptId", 10);
-    store->Insert(id, "emp", values);
+    int ret = 0;
+    for (int i = 0; i <= CYCLENUM; i++) {
+        ret = store->Insert(id, "emp", UTUtils::SetRowDatas(UTUtils::gRowDatas[i]));
+    }
+    EXPECT_EQ(ret, E_OK);
 }
 
 void RdbStorePredicateJoinBTest::InsertSalarygradeDates()
diff --git a/relational_store/test/native/rdb/unittest/rdb_predicates_test.cpp b/relational_store/test/native/rdb/unittest/rdb_predicates_test.cpp
index 968c0001f0bbc24d08ebdbb02b21fc8315b3877a..e7b75179f12ee989e948e7a9f345a5796b47bee4 100644
--- a/relational_store/test/native/rdb/unittest/rdb_predicates_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_predicates_test.cpp
@@ -323,6 +323,7 @@ public:
     int ResultSize(std::shared_ptr<ResultSet> &resultSet);
     void BasicDataTypeTest002(RdbPredicates predicates1);
     void CalendarTest002(RdbPredicates predicates1);
+    void SetJionList(RdbPredicates &predicates1);
 };
 
 std::shared_ptr<RdbStore> RdbStorePredicateTest::store = nullptr;
@@ -630,6 +631,46 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_EqualTo_001, TestSize.Level1)
     CalendarTest(predicates1);
 }
 
+/* *
+ * @tc.name: RdbStore_EqualTo_002
+ * @tc.desc: Normal testCase of RdbPredicates for EqualTo
+ * @tc.type: FUNC
+ * @tc.require: AR000FKD4F
+ */
+HWTEST_F(RdbStorePredicateTest, RdbStore_EqualTo_002, TestSize.Level1)
+{
+    ValuesBucket values;
+    int64_t id;
+    values.PutInt("id", 1);
+    values.PutString("name", std::string("zhangsi"));
+    values.PutInt("age", 18);
+    values.PutInt("REAL", 100);
+    int ret = store->Insert(id, "person", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    values.Clear();
+    values.PutInt("id", 2);
+    values.PutString("name", std::string("zhangsi"));
+    values.PutInt("age", 18);
+    values.PutInt("REAL", 100);
+    ret = store->Insert(id, "person", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(2, id);
+
+    RdbPredicates predicates("person");
+    predicates.EqualTo("name", "");
+    std::vector<std::string> columns;
+    std::shared_ptr<ResultSet> allPerson = RdbStorePredicateTest::store->Query(predicates, columns);
+    EXPECT_EQ(0, ResultSize(allPerson));
+
+    RdbPredicates predicates1("person");
+    predicates1.EqualTo("name", "zhangsi");
+    allPerson = RdbStorePredicateTest::store->Query(predicates1, columns);
+    EXPECT_EQ(2, ResultSize(allPerson));
+    RdbStorePredicateTest::store->ExecuteSql("delete from person where id < 3;");
+}
+
 void RdbStorePredicateTest::CalendarTest(RdbPredicates predicates1)
 {
     std::vector<std::string> columns;
@@ -702,9 +743,8 @@ void RdbStorePredicateTest::BasicDataTypeTest(RdbPredicates predicates1)
     predicates1.Clear();
     predicates1.EqualTo("blobValue", std::vector<uint8_t>{1, 2, 3});
     std::shared_ptr<ResultSet> allDataTypes9 = RdbStorePredicateTest::store->Query(predicates1, columns);
-    int count = 0;
-    allDataTypes9->GetRowCount(count);
-    EXPECT_EQ(3, count);
+    // 3 rows in the resultSet when blobValue={1, 2, 3}
+    EXPECT_EQ(3, ResultSize(allDataTypes9));
 }
 
 int RdbStorePredicateTest::ResultSize(std::shared_ptr<ResultSet> &resultSet)
@@ -750,6 +790,57 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_NotEqualTo_002, TestSize.Level1)
     CalendarTest002(predicates1);
 }
 
+/* *
+ * @tc.name: RdbStore_NotEqualTo_003
+ * @tc.desc: Normal testCase of RdbPredicates for EqualTo
+ * @tc.type: FUNC
+ * @tc.require: AR000FKD4F
+ */
+HWTEST_F(RdbStorePredicateTest, RdbStore_NotEqualTo_003, TestSize.Level1)
+{
+    ValuesBucket values;
+    int64_t id;
+    values.PutInt("id", 1);
+    values.PutString("name", std::string("zhangsi"));
+    values.PutInt("age", 18);
+    values.PutInt("REAL", 100);
+    int ret = store->Insert(id, "person", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(1, id);
+
+    values.Clear();
+    values.PutInt("id", 2);
+    values.PutString("name", std::string("zhangsi"));
+    values.PutInt("age", 18);
+    values.PutInt("REAL", 100);
+    ret = store->Insert(id, "person", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(2, id);
+
+    values.Clear();
+    values.PutInt("id", 3);
+    values.PutString("name", std::string(""));
+    values.PutInt("age", 18);
+    values.PutInt("REAL", 100);
+    ret = store->Insert(id, "person", values);
+    EXPECT_EQ(ret, E_OK);
+    EXPECT_EQ(3, id);
+
+    RdbPredicates predicates("person");
+    predicates.NotEqualTo("name", "");
+    std::vector<std::string> columns;
+    std::shared_ptr<ResultSet> allPerson = RdbStorePredicateTest::store->Query(predicates, columns);
+    EXPECT_EQ(2, ResultSize(allPerson));
+
+    RdbPredicates predicates1("person");
+    predicates1.NotEqualTo("name", "zhangsi");
+
+    allPerson = RdbStorePredicateTest::store->Query(predicates1, columns);
+    EXPECT_EQ(1, ResultSize(allPerson));
+
+    RdbStorePredicateTest::store->ExecuteSql("delete from person where id < 4;");
+}
+
 void RdbStorePredicateTest::CalendarTest002(RdbPredicates predicates1)
 {
     std::vector<std::string> columns;
@@ -1404,6 +1495,17 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_ComplexPredicate_021, TestSize.Level1)
     EXPECT_EQ(1, ResultSize(allDataTypes1));
 }
 
+void RdbStorePredicateTest::SetJionList(RdbPredicates &predicates1)
+{
+    std::vector<std::string> lists = { "ohos", "bazhahei", "zhaxidelie" };
+    predicates1.SetJoinTableNames(lists);
+    predicates1.SetJoinCount(1);
+    predicates1.SetJoinConditions(lists);
+    predicates1.SetJoinTypes(lists);
+    predicates1.SetOrder("ohos");
+    predicates1.Distinct();
+}
+
 /* *
  * @tc.name: RdbStore_ClearMethod_022
  * @tc.desc: Normal testCase of RdbPredicates for Clear Method
@@ -1435,13 +1537,7 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_ClearMethod_022, TestSize.Level1)
     auto ret = find(agrs.begin(), agrs.end(), "ABCDEFGHIJKLMN");
     EXPECT_EQ(true, ret != agrs.end());
 
-    std::vector<std::string> lists = {"ohos", "bazhahei", "zhaxidelie"};
-    predicates1.SetJoinTableNames(lists);
-    predicates1.SetJoinCount(1);
-    predicates1.SetJoinConditions(lists);
-    predicates1.SetJoinTypes(lists);
-    predicates1.SetOrder("ohos");
-    predicates1.Distinct();
+    SetJionList(predicates1);
 
     agrs = predicates1.GetJoinTableNames();
     ret = find(agrs.begin(), agrs.end(), "zhaxidelie");
@@ -1584,6 +1680,7 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_KeywordMethod_024, TestSize.Level1)
     ->Or()
     ->EqualTo("integerValue", std::to_string(INT_MAX))
     ->EndWrap()->OrderByDesc("integerValue")->Limit(2);
+
     std::vector<std::string> columns = {"booleanValue", "doubleValue", "orderr"};
     std::shared_ptr<ResultSet> allDataTypes1 = RdbStorePredicateTest::store->Query(predicates1, columns);
     allDataTypes1->GoToFirstRow();
@@ -1598,13 +1695,7 @@ HWTEST_F(RdbStorePredicateTest, RdbStore_KeywordMethod_024, TestSize.Level1)
     auto ret = find(args.begin(), args.end(), "ABCDEFGHIJKLMN");
     EXPECT_EQ(true, ret != args.end());
 
-    std::vector<std::string> lists = {"ohos", "bazhahei", "zhaxidelie"};
-    predicates1.SetJoinTableNames(lists);
-    predicates1.SetJoinCount(1);
-    predicates1.SetJoinConditions(lists);
-    predicates1.SetJoinTypes(lists);
-    predicates1.SetOrder("ohos");
-    predicates1.Distinct();
+    SetJionList(predicates1);
 
     args = predicates1.GetJoinTableNames();
     ret = find(args.begin(), args.end(), "zhaxidelie");
diff --git a/relational_store/test/native/rdb/unittest/rdb_step_result_get_row_test.cpp b/relational_store/test/native/rdb/unittest/rdb_step_result_get_row_test.cpp
index 7ceb159e9d3fb2551cd74aea2b6b1d4e18498d51..bf85e760f8c5043473adec8045f50918f1bc0dc6 100644
--- a/relational_store/test/native/rdb/unittest/rdb_step_result_get_row_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_step_result_get_row_test.cpp
@@ -114,6 +114,20 @@ HWTEST_F(RdbStepResultSetGetRowTest, RdbStore_StepResultSet_GetRow_001, TestSize
     int idValueByIndex = rowEntity.Get(0);
     EXPECT_EQ(1, idValueByIndex);
 
+    std::map<std::string, ValueObject> rowEntityTmp = rowEntity.Get();
+    ValueObject valueObjectTmp = rowEntityTmp["id"];
+    int id;
+    valueObjectTmp.GetInt(id);
+    EXPECT_EQ(1, id);
+
+    std::map<std::string, ValueObject> rowEntityTmp2 = rowEntity.Steal();
+    ValueObject valueObjectTmp2 = rowEntityTmp2["id"];
+    id = 0;
+    valueObjectTmp2.GetInt(id);
+    EXPECT_EQ(1, id);
+    rowEntityTmp = rowEntity.Get();
+    EXPECT_EQ(0, rowEntityTmp.size());
+
     resultSet->Close();
 }
 
diff --git a/relational_store/test/native/rdb/unittest/rdb_step_result_set_test.cpp b/relational_store/test/native/rdb/unittest/rdb_step_result_set_test.cpp
index faa8c6f6e5469600356c47274b4c6e0c813df042..9e40b13bffd0d825fc3b8b25eba112dbfc9b3499 100644
--- a/relational_store/test/native/rdb/unittest/rdb_step_result_set_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_step_result_set_test.cpp
@@ -1443,24 +1443,26 @@ HWTEST_F(RdbStepResultSetTest, testSqlStep018, TestSize.Level1)
     std::vector<std::string> columns;
     std::string logTable = "naturalbase_rdb_aux_test_log";
     std::string sqlstr;
+    std::pair<bool, bool> queryStatus = {false, false};
 
     // logtable is empty && tableName is not empty
-    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, "");
+    queryStatus = {false, true};
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, "", queryStatus);
     EXPECT_EQ("", sqlstr);
 
     // logtable is empty && tableName is empty
     AbsRdbPredicates emptyPredicates("");
     std::string tableName = emptyPredicates.GetTableName();
     EXPECT_EQ("", tableName);
-    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(emptyPredicates, columns, "");
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(emptyPredicates, columns, "", queryStatus);
     EXPECT_EQ("", sqlstr);
 
     // logtable is not empty && tableName is empty
-    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(emptyPredicates, columns, logTable);
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(emptyPredicates, columns, logTable, queryStatus);
     EXPECT_EQ("", sqlstr);
 
     // Distinct is false, clumns is empty
-    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable);
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
     std::string value = "SELECT test.*, naturalbase_rdb_aux_test_log.cursor, CASE "
                         "WHEN naturalbase_rdb_aux_test_log.flag & 0x8 = 0x8 "
                         "THEN true ELSE false END AS deleted_flag "
@@ -1471,7 +1473,7 @@ HWTEST_F(RdbStepResultSetTest, testSqlStep018, TestSize.Level1)
     // Distinct is true, clumns is not empty
     predicates.Distinct();
     columns.push_back("name");
-    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable);
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
     value = "SELECT DISTINCT test.name, naturalbase_rdb_aux_test_log.cursor, CASE "
             "WHEN naturalbase_rdb_aux_test_log.flag & 0x8 = 0x8 "
             "THEN true ELSE false END AS deleted_flag "
@@ -1480,6 +1482,49 @@ HWTEST_F(RdbStepResultSetTest, testSqlStep018, TestSize.Level1)
     EXPECT_EQ(value, sqlstr);
 }
 
+/* *
+ * @tc.name: testSqlStep019
+ * @tc.desc: Abnormal testcase for build query string
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbStepResultSetTest, testSqlStep019, TestSize.Level1)
+{
+    AbsRdbPredicates predicates("test");
+    std::vector<std::string> columns;
+    std::string logTable = "naturalbase_rdb_aux_test_log";
+    std::string sqlstr;
+    std::pair<bool, bool> queryStatus = {true, false};
+
+    //Distinct is false, columns has spacial field
+    queryStatus = {true, false};
+    columns.push_back("name");
+    columns.push_back("#_sharing_resource_field");
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
+    std::string value = "SELECT test.name, naturalbase_rdb_aux_test_log.sharing_resource AS sharing_resource_field"
+                        " FROM test INNER JOIN naturalbase_rdb_aux_test_log "
+                        "ON test.ROWID = naturalbase_rdb_aux_test_log.data_key";
+    EXPECT_EQ(value, sqlstr);
+
+    //Distinct is true, columns has spacial field
+    predicates.Distinct();
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
+    value = "SELECT DISTINCT test.name, naturalbase_rdb_aux_test_log.sharing_resource AS sharing_resource_field"
+            " FROM test INNER JOIN naturalbase_rdb_aux_test_log "
+            "ON test.ROWID = naturalbase_rdb_aux_test_log.data_key";
+    EXPECT_EQ(value, sqlstr);
+
+    //Distinct is true, columns and predicates have spacial fields
+    queryStatus = {true, true};
+    sqlstr = SqliteSqlBuilder::BuildCursorQueryString(predicates, columns, logTable, queryStatus);
+    value = "SELECT DISTINCT test.name, naturalbase_rdb_aux_test_log.sharing_resource AS sharing_resource_field, "
+            "naturalbase_rdb_aux_test_log.cursor, CASE "
+            "WHEN naturalbase_rdb_aux_test_log.flag & 0x8 = 0x8 "
+            "THEN true ELSE false END AS deleted_flag "
+            "FROM test INNER JOIN naturalbase_rdb_aux_test_log "
+            "ON test.ROWID = naturalbase_rdb_aux_test_log.data_key";
+    EXPECT_EQ(value, sqlstr);
+}
+
 /**
  * @tc.name: ResultSetProxy001
  * @tc.desc: Abnormal testcase of distributed ResultSetProxy, if resultSet is Empty
diff --git a/relational_store/test/native/rdb/unittest/rdb_store_impl_test.cpp b/relational_store/test/native/rdb/unittest/rdb_store_impl_test.cpp
index 22dbfeda57c2d20296cbba9bdf9f1319ae76e72e..87397a450f0bf03a464790d7b7c8d9659d485ffb 100644
--- a/relational_store/test/native/rdb/unittest/rdb_store_impl_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_store_impl_test.cpp
@@ -164,12 +164,14 @@ HWTEST_F(RdbStoreImplTest, GetModifyTimeByRowIdTest_003, TestSize.Level2)
     EXPECT_EQ(1, rowId);
 
     std::vector<RdbStore::PRIKey> PKey = { 1 };
-    std::map<RdbStore::PRIKey, RdbStore::Date> resultMap =
+    RdbStore::ModifyTime resultMapTmp =
         RdbStoreImplTest::store->GetModifyTime("rdbstoreimpltest_integer", "ROWID", PKey);
+    std::map<RdbStore::PRIKey, RdbStore::Date> resultMap = std::map<RdbStore::PRIKey, RdbStore::Date>(resultMapTmp);
     EXPECT_EQ(1, resultMap.size());
 
-    std::shared_ptr<ResultSet> resultPtr =
+    RdbStore::ModifyTime resultPtrTmp =
         RdbStoreImplTest::store->GetModifyTime("rdbstoreimpltest_integer", "ROWID", PKey);
+    std::shared_ptr<ResultSet> resultPtr = std::shared_ptr<ResultSet>(resultPtrTmp);
     int count = 0;
     resultPtr->GetRowCount(count);
     EXPECT_EQ(1, count);
diff --git a/relational_store/test/native/rdb/unittest/rdb_update_test.cpp b/relational_store/test/native/rdb/unittest/rdb_update_test.cpp
index 04d8b46a756b9c0881ad749698d11d570d248439..82b87ae77e8a51bbbcf9e7339f4ed664bcfd91d3 100644
--- a/relational_store/test/native/rdb/unittest/rdb_update_test.cpp
+++ b/relational_store/test/native/rdb/unittest/rdb_update_test.cpp
@@ -550,9 +550,6 @@ void RdbStoreUpdateTest::ExpectValue(const std::shared_ptr<OHOS::NativeRdb::Resu
     EXPECT_NE(nullptr, resultSet);
     int columnIndex;
     int intVal;
-    std::string strVal;
-    double dVal;
-    std::vector<uint8_t> blob;
     int ret;
 
     if (expect.id != -1) {
@@ -563,6 +560,7 @@ void RdbStoreUpdateTest::ExpectValue(const std::shared_ptr<OHOS::NativeRdb::Resu
         EXPECT_EQ(expect.id, intVal);
     }
     if (expect.name != "") {
+        std::string strVal;
         ret = resultSet->GetColumnIndex("name", columnIndex);
         EXPECT_EQ(ret, E_OK);
         ret = resultSet->GetString(columnIndex, strVal);
@@ -577,6 +575,7 @@ void RdbStoreUpdateTest::ExpectValue(const std::shared_ptr<OHOS::NativeRdb::Resu
         EXPECT_EQ(expect.age, intVal);
     }
     if (expect.salary != -1) {
+        double dVal;
         ret = resultSet->GetColumnIndex("salary", columnIndex);
         EXPECT_EQ(ret, E_OK);
         ret = resultSet->GetDouble(columnIndex, dVal);
@@ -584,6 +583,7 @@ void RdbStoreUpdateTest::ExpectValue(const std::shared_ptr<OHOS::NativeRdb::Resu
         EXPECT_EQ(expect.salary, dVal);
     }
     if (expect.blobType.size() != 0) {
+        std::vector<uint8_t> blob;
         ret = resultSet->GetColumnIndex("blobType", columnIndex);
         EXPECT_EQ(ret, E_OK);
         ret = resultSet->GetBlob(columnIndex, blob);
diff --git a/relational_store/test/native/rdb_data_share_adapter/unittest/rdb_data_share_adapter_test.cpp b/relational_store/test/native/rdb_data_share_adapter/unittest/rdb_data_share_adapter_test.cpp
index b901648444a0533170588ce02b84755b565223c5..e0043f94c34026fa192c0756d7fb23e00c0ad49c 100644
--- a/relational_store/test/native/rdb_data_share_adapter/unittest/rdb_data_share_adapter_test.cpp
+++ b/relational_store/test/native/rdb_data_share_adapter/unittest/rdb_data_share_adapter_test.cpp
@@ -414,4 +414,40 @@ HWTEST_F(RdbDataShareAdapterTest, Rdb_DataShare_Adapter_007, TestSize.Level1)
 
     allDataTypes->GetDouble(3, doubleVal);
     EXPECT_EQ(doubleVal, DBL_MAX);
+}
+
+/* *
+ * @tc.name: Rdb_DataShare_Adapter_008
+ * @tc.desc: normal testcase of query double
+ * @tc.type: test double for high accuracy
+ */
+HWTEST_F(RdbDataShareAdapterTest, Rdb_DataShare_Adapter_008, TestSize.Level1)
+{
+    std::string createTableSql = std::string("CREATE TABLE test (id INTEGER PRIMARY KEY AUTOINCREMENT, data1 double,") +
+                                 std::string("data2 double, data3 TEXT);");
+    store->ExecuteSql(createTableSql);
+
+    ValuesBucket values;
+    int64_t id;
+    double data1 = 1.777777777777;
+    double data2 = 1.888888888888;
+    std::string data3 = "zh-has";
+    std::string tableName = "test";
+
+    values.PutDouble("data1", data1);
+    values.PutDouble("data2", data2);
+    values.PutString("data3", data3);
+    int ret = store->Insert(id, tableName, values);
+    EXPECT_EQ(ret, OHOS::NativeRdb::E_OK);
+    EXPECT_EQ(1, id);
+
+    OHOS::DataShare::DataSharePredicates predicates;
+    predicates.BeginWrap()->EqualTo("data1", data1)->And()
+        ->EqualTo("data2", data2)->And()->EqualTo("data3", data3)->EndWrap();
+    std::vector<std::string> columns;
+    auto allDataTypes = store->Query(RdbUtils::ToPredicates(predicates, tableName), columns);
+    int rowCount;
+    int ok = allDataTypes->GetRowCount(rowCount);
+    EXPECT_EQ(ok, OHOS::NativeRdb::E_OK);
+    EXPECT_EQ(1, rowCount);
 }
\ No newline at end of file
diff --git a/relational_store/test/ndk/BUILD.gn b/relational_store/test/ndk/BUILD.gn
index 5a527ea342fa8a592de3a26c92d6c33aa973fd91..70cf9826471f83a0f40f318e0ed242cf4811960c 100644
--- a/relational_store/test/ndk/BUILD.gn
+++ b/relational_store/test/ndk/BUILD.gn
@@ -34,6 +34,7 @@ ohos_unittest("NativeRdbNdkTest") {
   module_out_path = module_output_path
 
   sources = [
+    "${relational_store_base_path}/interfaces/ndk/src/modify_time_cursor.cpp",
     "${relational_store_base_path}/interfaces/ndk/src/relational_asset.cpp",
     "${relational_store_base_path}/interfaces/ndk/src/relational_cursor.cpp",
     "${relational_store_base_path}/interfaces/ndk/src/relational_predicates.cpp",
diff --git a/relational_store/test/ndk/unittest/rdb_cursor_test.cpp b/relational_store/test/ndk/unittest/rdb_cursor_test.cpp
index 41abc86b97d251baeebc2e1d9e592b87e3ac2432..2d8ba889a8c7a8fb7cdc70cb05801d7463ea708b 100644
--- a/relational_store/test/ndk/unittest/rdb_cursor_test.cpp
+++ b/relational_store/test/ndk/unittest/rdb_cursor_test.cpp
@@ -633,8 +633,7 @@ HWTEST_F(RdbNativeCursorTest, Abnormal_cursor_PutAssets_test_010, TestSize.Level
 
     valueBucket->putInt64(valueBucket, "id", curRow);
 
-    int errCode = OH_Rdb_ErrCode::RDB_OK;
-    errCode = OH_VBucket_PutAsset(nullptr, "data1", asset);
+    int errCode = OH_VBucket_PutAsset(nullptr, "data1", asset);
     EXPECT_EQ(errCode, OH_Rdb_ErrCode::RDB_E_INVALID_ARGS);
     errCode = OH_Rdb_ErrCode::RDB_OK;
     errCode = OH_VBucket_PutAsset(valueBucket, nullptr, asset);
diff --git a/relational_store/test/ndk/unittest/rdb_store_test.cpp b/relational_store/test/ndk/unittest/rdb_store_test.cpp
index 7835e4023ec8d467668e74de252e84adb4f269dd..a40388f72100f35a8f942af16b8c405c77c7f59a 100644
--- a/relational_store/test/ndk/unittest/rdb_store_test.cpp
+++ b/relational_store/test/ndk/unittest/rdb_store_test.cpp
@@ -21,14 +21,14 @@
 #include "common.h"
 #include "rdb_errno.h"
 #include "relational_store.h"
-//#include "relational_store_impl.h"
+#include "relational_store_impl.h"
 #include "relational_store_error_code.h"
 #include "token_setproc.h"
 
 using namespace testing::ext;
 using namespace OHOS::NativeRdb;
 using namespace OHOS::Security::AccessToken;
-//using namespace OHOS::RdbNdk;
+using namespace OHOS::RdbNdk;
 
 class RdbNativeStoreTest : public testing::Test {
 public:
@@ -104,7 +104,7 @@ void RdbNativeStoreTest::SetUp(void)
                             "data3 FLOAT, data4 BLOB, data5 TEXT);";
     int errCode = OH_Rdb_Execute(storeTestRdbStore_, createTableSql);
     EXPECT_EQ(errCode, 0);
-    
+
     OH_VBucket* valueBucket = OH_Rdb_CreateValuesBucket();
     valueBucket->putInt64(valueBucket, "id", 1);
     valueBucket->putText(valueBucket, "data1", "zhangSan");
@@ -134,7 +134,7 @@ void RdbNativeStoreTest::TearDown(void)
     EXPECT_EQ(errCode, 0);
 }
 
-void CloudSyncCallback(Rdb_ProgressDetails *progressDetails)
+void CloudSyncObserverCallback(void *context, Rdb_ProgressDetails *progressDetails)
 {
     EXPECT_NE(progressDetails, nullptr);
     EXPECT_EQ(progressDetails->version, DISTRIBUTED_PROGRESS_DETAIL_VERSION);
@@ -145,6 +145,14 @@ void CloudSyncCallback(Rdb_ProgressDetails *progressDetails)
     EXPECT_NE(tableDetails, nullptr);
 }
 
+void CloudSyncCallback(Rdb_ProgressDetails *progressDetails)
+{
+    CloudSyncObserverCallback(nullptr, progressDetails);
+}
+
+Rdb_ProgressCallback callback = CloudSyncObserverCallback;
+Rdb_ProgressObserver observer = { nullptr, callback };
+
 /**
  * @tc.name: RDB_Native_store_test_001
  * @tc.desc: Normal testCase of store for Update、Query.
@@ -630,7 +638,7 @@ HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_011, TestSize.Level1)
     // store is nullptr
     cursor = OH_Rdb_ExecuteQuery(nullptr, querySql);
     EXPECT_EQ(cursor, NULL);
-    
+
     // store is nullptr
     OH_Predicates *predicates = OH_Rdb_CreatePredicates("store_test");
     cursor = OH_Rdb_Query(nullptr, predicates, NULL, 0);
@@ -673,17 +681,20 @@ HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_013, TestSize.Level1)
     const char *table[TABLE_COUNT];
     table[0] = "store_test";
     EXPECT_EQ(table[0], "store_test");
-    Rdb_SyncCallback callback = CloudSyncCallback;
+    Rdb_ProgressObserver observer;
+    void *context = nullptr;
+    observer.context = &context;
+    observer.callback = CloudSyncObserverCallback;
     auto errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_TIME_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_TIME_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 
     errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 
     errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_NATIVE_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_NATIVE_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 
     errorCode =
@@ -723,17 +734,20 @@ HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_015, TestSize.Level1)
     constexpr int TABLE_COUNT = 1;
     const char *table[TABLE_COUNT];
     table[0] = "store_test";
-    Rdb_SyncCallback callback = CloudSyncCallback;
+    Rdb_ProgressObserver observer;
+    void *context = nullptr;
+    observer.context = context;
+    observer.callback = CloudSyncObserverCallback;
     auto errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_TIME_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_TIME_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 
     errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 
     errorCode =
-        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_NATIVE_FIRST, table, TABLE_COUNT, &callback);
+        OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_NATIVE_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_OK);
 }
 
@@ -748,11 +762,14 @@ HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_016, TestSize.Level1)
     constexpr int TABLE_COUNT = 1;
     const char *table[TABLE_COUNT];
     table[0] = "store_test";
-    Rdb_SyncCallback callback = CloudSyncCallback;
+    Rdb_ProgressObserver observer;
+    void *context = nullptr;
+    observer.context = context;
+    observer.callback = CloudSyncObserverCallback;
     auto errorCode =
         OH_Rdb_CloudSync(storeTestRdbStore_, Rdb_SyncMode::RDB_SYNC_MODE_TIME_FIRST, table, TABLE_COUNT, nullptr);
     EXPECT_EQ(errorCode, RDB_E_INVALID_ARGS);
-    errorCode = OH_Rdb_CloudSync(nullptr, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &callback);
+    errorCode = OH_Rdb_CloudSync(nullptr, Rdb_SyncMode::RDB_SYNC_MODE_CLOUD_FIRST, table, TABLE_COUNT, &observer);
     EXPECT_EQ(errorCode, RDB_E_INVALID_ARGS);
 }
 
@@ -868,11 +885,39 @@ HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_018, TestSize.Level1)
 }
 
 /**
- * @tc.name: Abnormal_RDB_OH_interface_test_019
+ * @tc.name: RDB_Native_store_test_019
+ * @tc.desc: testCase for OH_Rdb_SubscribeAutoSyncProgress test.
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_019, TestSize.Level1)
+{
+    EXPECT_NE(storeTestRdbStore_, nullptr);
+    EXPECT_EQ(OH_Rdb_SubscribeAutoSyncProgress(storeTestRdbStore_, &observer), RDB_OK);
+    EXPECT_EQ(OH_Rdb_SubscribeAutoSyncProgress(storeTestRdbStore_, &observer), RDB_OK);
+    EXPECT_EQ(OH_Rdb_SubscribeAutoSyncProgress(storeTestRdbStore_, nullptr), RDB_E_INVALID_ARGS);
+    EXPECT_EQ(OH_Rdb_SubscribeAutoSyncProgress(nullptr, &observer), RDB_E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: RDB_Native_store_test_020
+ * @tc.desc: testCase for OH_Rdb_UnsubscribeAutoSyncProgress test.
+ * @tc.type: FUNC
+ */
+HWTEST_F(RdbNativeStoreTest, RDB_Native_store_test_020, TestSize.Level1)
+{
+    EXPECT_NE(storeTestRdbStore_, nullptr);
+    EXPECT_EQ(OH_Rdb_UnsubscribeAutoSyncProgress(storeTestRdbStore_, &observer), RDB_OK);
+    EXPECT_EQ(OH_Rdb_UnsubscribeAutoSyncProgress(storeTestRdbStore_, &observer), RDB_OK);
+    EXPECT_EQ(OH_Rdb_UnsubscribeAutoSyncProgress(storeTestRdbStore_, nullptr), RDB_OK);
+    EXPECT_EQ(OH_Rdb_UnsubscribeAutoSyncProgress(nullptr, &observer), RDB_E_INVALID_ARGS);
+}
+
+/**
+ * @tc.name: Abnormal_RDB_OH_interface_test_021
  * @tc.desc: Abnormal testCase of store for OH interface.
  * @tc.type: FUNC
  */
-HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_019, TestSize.Level1)
+HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_021, TestSize.Level1)
 {
     OH_Rdb_Config config;
     int errCode = E_OK;
@@ -884,7 +929,7 @@ HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_019, TestSize.Level1
     rdbStore = OH_Rdb_GetOrOpen(&config, nullptr);
     EXPECT_EQ(rdbStore, nullptr);
 
-    config.selfSize = INT32_MAX;
+    config.selfSize = INT_MAX;
     rdbStore = OH_Rdb_GetOrOpen(&config, nullptr);
     EXPECT_EQ(rdbStore, nullptr);
 
@@ -913,18 +958,18 @@ HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_019, TestSize.Level1
 
 
 /**
- * @tc.name: Abnormal_RDB_OH_interface_test_020
+ * @tc.name: Abnormal_RDB_OH_interface_test_022
  * @tc.desc: Abnormal testCase of store for OH interface.
  * @tc.type: FUNC
  */
-HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_020, TestSize.Level1)
+HWTEST_F(RdbNativeStoreTest, Abnormal_RDB_OH_interface_test_022, TestSize.Level1)
 {
     char createTableSql[] = "CREATE TABLE test (id INTEGER PRIMARY KEY AUTOINCREMENT, data1 TEXT, data2 INTEGER);";
     int errCode = OH_Rdb_Execute(nullptr, createTableSql);
     EXPECT_EQ(errCode, RDB_E_INVALID_ARGS);
     errCode = OH_Rdb_Execute(storeTestRdbStore_, nullptr);
     EXPECT_EQ(errCode, RDB_E_INVALID_ARGS);
-    
+
     errCode = OH_Rdb_Backup(nullptr, RDB_TEST_PATH);
     EXPECT_EQ(errCode, RDB_E_INVALID_ARGS);
     errCode = OH_Rdb_Backup(storeTestRdbStore_, nullptr);
diff --git a/udmf/bundle.json b/udmf/bundle.json
index 7a1336fb6f4774fa63aced234504422be48897d7..b2e83dab7f13945f453f7aaa61fa445b3ffd7cce 100644
--- a/udmf/bundle.json
+++ b/udmf/bundle.json
@@ -35,12 +35,12 @@
         "kv_store",
         "napi",
         "samgr",
-        "app_file_service"
+        "app_file_service",
+        "selinux_adapter"
       ],
       "third_party": [
         "bounds_checking_function",
-        "cJSON",
-        "googletest"
+        "cJSON"
       ]
     },
     "build": {
diff --git a/udmf/framework/common/custom_utd_store.cpp b/udmf/framework/common/custom_utd_store.cpp
index ed497351966cb72490f5130ef72035d26cc8c84e..83a5c74fa08fbcb45fd79d3cd3abfddcac6ab5b4 100644
--- a/udmf/framework/common/custom_utd_store.cpp
+++ b/udmf/framework/common/custom_utd_store.cpp
@@ -18,6 +18,9 @@
 #include "unistd.h"
 #include "error_code.h"
 #include "logger.h"
+#ifdef WITH_SELINUX
+#include <policycoreutils.h>
+#endif
 namespace OHOS {
 namespace UDMF {
 constexpr const char* UTD_CFG_FILE = "utd-adt.json";
@@ -102,7 +105,14 @@ bool CustomUtdStore::CreateDirectory(const std::string &path) const
         }
     } while (index != std::string::npos);
 
-    return access(path.c_str(), F_OK) == 0;
+    if (access(path.c_str(), F_OK) == 0) {
+#ifdef WITH_SELINUX
+        Restorecon(path.c_str());
+#endif
+        return true;
+    }
+
+    return false;
 }
 } // namespace UDMF
 } // namespace OHOS
\ No newline at end of file
diff --git a/udmf/framework/innerkitsimpl/client/udmf_client.cpp b/udmf/framework/innerkitsimpl/client/udmf_client.cpp
index 91dab5cfed6443003ee6794576f5586eb670bb36..8d3b1ce1597e5e0167db13b97e7cad6a5266030e 100644
--- a/udmf/framework/innerkitsimpl/client/udmf_client.cpp
+++ b/udmf/framework/innerkitsimpl/client/udmf_client.cpp
@@ -158,5 +158,21 @@ Status UdmfClient::Sync(const QueryOption &query, const std::vector<std::string>
     }
     return static_cast<Status>(ret);
 }
+
+Status UdmfClient::IsRemoteData(const QueryOption &query, bool &result)
+{
+    DdsTrace trace(
+        std::string(TAG) + std::string(__FUNCTION__), TraceSwitch::BYTRACE_ON | TraceSwitch::TRACE_CHAIN_ON);
+    auto service = UdmfServiceClient::GetInstance();
+    if (service == nullptr) {
+        LOG_ERROR(UDMF_CLIENT, "Service unavailable");
+        return E_IPC;
+    }
+    int32_t ret = service->IsRemoteData(query, result);
+    if (ret != E_OK) {
+        LOG_ERROR(UDMF_CLIENT, "failed! ret = %{public}d", ret);
+    }
+    return static_cast<Status>(ret);
+}
 } // namespace UDMF
 } // namespace OHOS
\ No newline at end of file
diff --git a/udmf/framework/innerkitsimpl/data/preset_type_descriptors.cpp b/udmf/framework/innerkitsimpl/data/preset_type_descriptors.cpp
index 6b78eaea89efa794aa4b94678d6d3d2177e3eba3..0db77e9f08671ea50c371d03dfcbd42c71a2ad9d 100644
--- a/udmf/framework/innerkitsimpl/data/preset_type_descriptors.cpp
+++ b/udmf/framework/innerkitsimpl/data/preset_type_descriptors.cpp
@@ -68,14 +68,14 @@ void PresetTypeDescriptors::InitDescriptors()
          {},
          "Base type for directory.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_folder"},
         {"general.folder",
          {"general.directory"},
          {},
          {},
          "Base type for folder.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_folder"},
         {"general.symlink",
          {"general.entity"},
          {},
@@ -103,168 +103,168 @@ void PresetTypeDescriptors::InitDescriptors()
          {},
          "Base type for images.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"general.png",
          {"general.image"},
          {".png"},
          {"image/png"},
          "PNG image.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"general.jpeg",
          {"general.image"},
          {".jpg", ".jpeg"},
          {"image/jpeg"},
          "JPEG image.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"general.tiff",
          {"general.image"},
          {".tif", ".tiff"},
          {"image/tiff"},
          "TIFF image.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"general.raw-image",
          {"general.image"},
          {},
          {},
          "Base type for digital camera raw image formats.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"general.video",
          {"general.media"},
          {},
          {},
          "Base type for video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.avi",
          {"general.video"},
          {".avi", ".vfw"},
          {"video/avi", "video/msvideo", "video/x-msvideo"},
          "AVI video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.mpeg",
          {"general.video"},
          {".mpg", ".mpeg", ".m75", ".m15"},
          {"video/mpg", "video/mpeg", "video/x-mpg", "video/x-mpeg"},
          "MPEG-1 or MPEG-2 video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.mpeg-4",
          {"general.video"},
          {".mp4"},
          {"video/mp4", "video/mp4v"},
          "MPEG-4 video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.3gpp",
          {"general.video"},
          {".3gp", ".3gpp"},
          {"video/3gpp"},
          "3GPP video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.3gpp2",
          {"general.video"},
          {".3g2", ".3gp2"},
          {"video/3gpp2"},
          "3GPP2 video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"general.audio",
          {"general.media"},
          {},
          {},
          "Base type for audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.ogg",
          {"general.audio"},
          {".ogg"},
          {"audio/ogg"},
          "OGG audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.aiff",
          {"general.audio"},
          {".aiff"},
          {"audio/aiff"},
          "AIFF audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.pcm",
          {"general.audio"},
          {".pcm"},
          {"audio/pcm"},
          "PCM audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.flac",
          {"general.audio"},
          {".flac"},
          {"audio/flac"},
          "FLAC audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_flac"},
         {"general.alac",
          {"general.audio"},
          {".alac"},
          {"audio/alac"},
          "ALAC audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.mp3",
          {"general.audio"},
          {".mp3"},
          {"audio/mp3"},
          "MPEG-3 audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_mp3"},
         {"general.aac",
          {"general.audio"},
          {".aac"},
          {"audio/aac"},
          "AAC audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"general.archive",
          {"general.object"},
          {},
          {},
          "Base type for an archive of files and directories.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"general.tar-archive",
          {"general.archive"},
          {".tar"},
          {"application/x-tar, application/tar"},
          "Tar archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"general.zip-archive",
          {"general.archive"},
          {".zip"},
          {"application/zip"},
          "Zip archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_zip"},
         {"general.disk-image",
          {"general.archive"},
          {},
          {},
          "Base type for items mountable as a volume.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"general.bz2-archive",
          {"general.archive"},
          {".bz2"},
          {"application/x-bzip2"},
          "BZip2 archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"general.text",
          {"general.object"},
          {},
@@ -278,14 +278,14 @@ void PresetTypeDescriptors::InitDescriptors()
          {"text/plain"},
          "Text of unspecified encoding, with no markup.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_txt"},
         {"general.html",
          {"general.text"},
          {".html", ".htm"},
          {"text/html"},
          "HTML text.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_html"},
         {"general.hyperlink",
          {"general.text"},
          {},
@@ -299,7 +299,7 @@ void PresetTypeDescriptors::InitDescriptors()
          {"text/xml"},
          "XML text.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_xml"},
         {"general.source-code",
          {"general.plain-text"},
          {},
@@ -453,7 +453,7 @@ void PresetTypeDescriptors::InitDescriptors()
          {},
          "Base type for scheduled events.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_calendar"},
         {"general.message",
          {"general.object"},
          {},
@@ -474,28 +474,28 @@ void PresetTypeDescriptors::InitDescriptors()
          {},
          "Windows bitmap image.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"com.microsoft.ico",
          {"general.image"},
          {".ico"},
          {},
          "Windows icon image.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"com.microsoft.word.doc",
          {"general.composite-object"},
          {".doc"},
          {"application/msword"},
          "Microsoft Word data.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_doc"},
         {"com.microsoft.excel.xls",
          {"general.composite-object"},
          {".xls"},
          {"application/vnd.ms-excel"},
          "Microsoft Excel data.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_xls"},
         {"com.microsoft.powerpoint.ppt",
          {"general.composite-object"},
          {".ppt"},
@@ -509,63 +509,63 @@ void PresetTypeDescriptors::InitDescriptors()
          {"audio/wav", "audio/wave"},
          "Waveform audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_wav"},
         {"com.microsoft.windows-media-wm",
          {"general.video"},
          {".wm"},
          {"video/x-ms-wm"},
          "Windows WM video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"com.microsoft.windows-media-wmv",
          {"general.video"},
          {".wmv"},
          {"video/x-ms-wmv"},
          "Windows WMV video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"com.microsoft.windows-media-wmp",
          {"general.video"},
          {".wmp"},
          {"video/x-ms-wmp"},
          "Windows WMP video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"com.microsoft.windows-media-wma",
          {"general.audio"},
          {".wma"},
-         {"video/x-ms-wma"},
+         {"audio/x-ms-wma"},
          "Windows WMA audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_wma"},
         {"com.microsoft.windows-media-wmx",
-         {"general.audio"},
+         {"general.video"},
          {".wmx"},
          {"video/x-ms-wmx"},
-         "Windows WMX audio.",
+         "Windows WMX video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"com.microsoft.windows-media-wvx",
-         {"general.audio"},
+         {"general.video"},
          {".wvx"},
          {"video/x-ms-wvx"},
-         "Windows WVX audio.",
+         "Windows WVX video.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_video"},
         {"com.microsoft.windows-media-wax",
          {"general.audio"},
          {".wax"},
-         {"video/x-ms-wax"},
+         {"audio/x-ms-wax"},
          "Windows WAX audio.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_audio"},
         {"com.adobe.pdf",
          {"general.composite-object"},
          {".pdf"},
          {"application/pdf"},
          "PDF data.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_pdf"},
         {"com.adobe.postscript",
          {"general.composite-object"},
          {".ps"},
@@ -586,42 +586,42 @@ void PresetTypeDescriptors::InitDescriptors()
          {"image/x-photoshop", "image/photoshop", "image/psd", "application/photoshop"},
          "Adobe Photoshop document.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"com.adobe.illustrator.ai-image",
          {"general.image"},
          {".ai"},
          {},
          "Adobe Illustrator document.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"com.sun.java-archive",
          {"general.archive"},
          {".jar"},
          {"application/java-archive"},
          "Java archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"org.gnu.gnu-tar-archive",
          {"general.archive"},
          {".gtar"},
          {"application/x-gtar"},
          "GNU archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"org.gnu.gnu-zip-archive",
          {"general.archive"},
          {".gz", ".gzip"},
          {"application/x-gzip", "application/gzip"},
          "Gzip archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"org.gnu.gnu-zip-tar-archive",
          {"general.archive"},
          {".tgz"},
          {},
          "Gzip tar archive.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_compress"},
         {"com.amazon.azw",
          {"general.ebook"},
          {".azw"},
@@ -670,7 +670,7 @@ void PresetTypeDescriptors::InitDescriptors()
          {},
          "OpenHarmony system defined pixel map.",
          REFERENCE_URL,
-         ""},
+         "sys.media.ohos_ic_normal_white_grid_image"},
         {"openharmony.atomic-service",
          {"general.object"},
          {},
diff --git a/udmf/framework/innerkitsimpl/service/distributeddata_udmf_ipc_interface_code.h b/udmf/framework/innerkitsimpl/service/distributeddata_udmf_ipc_interface_code.h
index ed14f6dbeb3b6fa7dca7fbc112f469aa5933a5db..3d7aa34284a14f0c1d4acde94c1af3083474722f 100644
--- a/udmf/framework/innerkitsimpl/service/distributeddata_udmf_ipc_interface_code.h
+++ b/udmf/framework/innerkitsimpl/service/distributeddata_udmf_ipc_interface_code.h
@@ -28,6 +28,7 @@ enum class UdmfServiceInterfaceCode : uint32_t {
     GET_SUMMARY,
     ADD_PRIVILEGE,
     SYNC,
+    IS_REMOTE_DATA,
     CODE_BUTT
 };
 } // namespace OHOS::UDMF
diff --git a/udmf/framework/innerkitsimpl/service/udmf_service.h b/udmf/framework/innerkitsimpl/service/udmf_service.h
index ac7b977054c53a6a0f1ea26281ee579f4abe5032..1f8f2478a3b702d6bcafa609f6df3bae3288785f 100644
--- a/udmf/framework/innerkitsimpl/service/udmf_service.h
+++ b/udmf/framework/innerkitsimpl/service/udmf_service.h
@@ -45,6 +45,7 @@ public:
     virtual int32_t GetSummary(const QueryOption &query, Summary &summary) = 0;
     virtual int32_t AddPrivilege(const QueryOption &query, Privilege &privilege) = 0;
     virtual int32_t Sync(const QueryOption &query, const std::vector<std::string> &devices) = 0;
+    virtual int32_t IsRemoteData(const QueryOption &query, bool &result) = 0;
 };
 } // namespace UDMF
 } // namespace OHOS
diff --git a/udmf/framework/innerkitsimpl/service/udmf_service_client.cpp b/udmf/framework/innerkitsimpl/service/udmf_service_client.cpp
index 5def8e6bace3ba29b754fed1ce06a28db2fbd146..5f855b2157a8e6d54708a6971d37ee53aa75e6e0 100644
--- a/udmf/framework/innerkitsimpl/service/udmf_service_client.cpp
+++ b/udmf/framework/innerkitsimpl/service/udmf_service_client.cpp
@@ -73,7 +73,7 @@ sptr<DistributedKv::IKvStoreDataService> UdmfServiceClient::GetDistributedKvData
         LOG_ERROR(UDMF_SERVICE, "initialize proxy failed.");
         return nullptr;
     }
-    auto deathRecipientPtr = new (std::nothrow)ServiceDeathRecipient();
+    sptr<UdmfServiceClient::ServiceDeathRecipient> deathRecipientPtr = new (std::nothrow)ServiceDeathRecipient();
     if (deathRecipientPtr == nullptr) {
         return nullptr;
     }
@@ -237,5 +237,16 @@ int32_t UdmfServiceClient::Sync(const QueryOption &query, const std::vector<std:
     }
     return udmfProxy_->Sync(query, devices);
 }
+
+int32_t UdmfServiceClient::IsRemoteData(const QueryOption &query, bool &result)
+{
+    LOG_DEBUG(UDMF_SERVICE, "start, key: %{public}s", query.key.c_str());
+    UnifiedKey key(query.key);
+    if (!key.IsValid()) {
+        LOG_ERROR(UDMF_SERVICE, "invalid key");
+        return E_INVALID_PARAMETERS;
+    }
+    return udmfProxy_->IsRemoteData(query, result);
+}
 } // namespace UDMF
 } // namespace OHOS
\ No newline at end of file
diff --git a/udmf/framework/innerkitsimpl/service/udmf_service_client.h b/udmf/framework/innerkitsimpl/service/udmf_service_client.h
index 1877196ec359800551cf022c60ee0982ac8f0b1e..d2c12151ff6dc93c30c34c4b2e26ca24e776469d 100644
--- a/udmf/framework/innerkitsimpl/service/udmf_service_client.h
+++ b/udmf/framework/innerkitsimpl/service/udmf_service_client.h
@@ -40,6 +40,7 @@ public:
     int32_t GetSummary(const QueryOption &query, Summary &summary) override;
     int32_t AddPrivilege(const QueryOption &query, Privilege &privilege) override;
     int32_t Sync(const QueryOption &query, const std::vector<std::string> &devices) override;
+    int32_t IsRemoteData(const QueryOption &query, bool &result) override;
 
 private:
     class ServiceDeathRecipient : public IRemoteObject::DeathRecipient {
diff --git a/udmf/framework/innerkitsimpl/service/udmf_service_proxy.cpp b/udmf/framework/innerkitsimpl/service/udmf_service_proxy.cpp
index e050c6599c257f629b418eb01408743000ee3d97..7d70e7a1ef89175a7eb60f94205caf6bd5ae4935 100644
--- a/udmf/framework/innerkitsimpl/service/udmf_service_proxy.cpp
+++ b/udmf/framework/innerkitsimpl/service/udmf_service_proxy.cpp
@@ -165,6 +165,21 @@ int32_t UdmfServiceProxy::Sync(const QueryOption &query, const std::vector<std::
     return status;
 }
 
+int32_t UdmfServiceProxy::IsRemoteData(const QueryOption &query, bool &result)
+{
+    MessageParcel reply;
+    int32_t status = IPC_SEND(UdmfServiceInterfaceCode::IS_REMOTE_DATA, reply, query);
+    if (status != E_OK) {
+        LOG_ERROR(UDMF_SERVICE, "status:0x%{public}x, key:%{public}s!", status, query.key.c_str());
+        return status;
+    }
+    if (!ITypesUtil::Unmarshal(reply, result)) {
+        LOG_ERROR(UDMF_SERVICE, "Unmarshal result failed!");
+        return E_READ_PARCEL_ERROR;
+    }
+    return status;
+}
+
 int32_t UdmfServiceProxy::SendRequest(UdmfServiceInterfaceCode code, MessageParcel &data,
                                       MessageParcel &reply, MessageOption &option)
 {
diff --git a/udmf/framework/innerkitsimpl/service/udmf_service_proxy.h b/udmf/framework/innerkitsimpl/service/udmf_service_proxy.h
index b1baf72136cd62a2e57bcb46bffb4a0c0d66f1ea..64d38bac857fc6e702f78673d3629019ee21e68e 100644
--- a/udmf/framework/innerkitsimpl/service/udmf_service_proxy.h
+++ b/udmf/framework/innerkitsimpl/service/udmf_service_proxy.h
@@ -43,6 +43,7 @@ public:
     int32_t GetSummary(const QueryOption &query, Summary &summary) override;
     int32_t AddPrivilege(const QueryOption &query, Privilege &privilege) override;
     int32_t Sync(const QueryOption &query, const std::vector<std::string> &devices) override;
+    int32_t IsRemoteData(const QueryOption &query, bool &result) override;
 
 private:
     static inline BrokerDelegator<UdmfServiceProxy> delegator_;
diff --git a/udmf/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp b/udmf/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
index 4c436bc31b4a14f4fbdd3b59e9bfc1bad41e1cb3..9a90d44035ec440334cc6cc4aa631e1d30f4acc8 100644
--- a/udmf/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
+++ b/udmf/framework/innerkitsimpl/test/unittest/udmf_client_test.cpp
@@ -1995,4 +1995,45 @@ HWTEST_F(UdmfClientTest, GetSummary003, TestSize.Level1)
 
     LOG_INFO(UDMF_TEST, "GetSummary003 end.");
 }
+
+/**
+* @tc.name: IsRemoteData
+* @tc.desc: is remote data, result false: not remote data, true: remote data.
+* @tc.type: FUNC
+*/
+HWTEST_F(UdmfClientTest, IsRemoteData001, TestSize.Level1)
+{
+    LOG_INFO(UDMF_TEST, "IsRemoteData001 begin.");
+
+    CustomOption option1 = { .intention = Intention::UD_INTENTION_DRAG };
+    UnifiedData data;
+    std::string key;
+
+    UDDetails details;
+    details.insert({ "udmf_key", "udmf_value" });
+
+    Text text;
+    text.SetDetails(details);
+    std::shared_ptr<UnifiedRecord> record1 = std::make_shared<Text>(text);
+    data.AddRecord(record1);
+
+    PlainText plainText;
+    plainText.SetDetails(details);
+    plainText.SetContent("content");
+    plainText.SetAbstract("abstract");
+    std::shared_ptr<UnifiedRecord> record2 = std::make_shared<PlainText>(plainText);
+    data.AddRecord(record2);
+
+    auto status = UdmfClient::GetInstance().SetData(option1, data, key);
+    ASSERT_EQ(status, E_OK);
+
+    QueryOption option2 = { .key = key };
+    bool result = true;
+    status = UdmfClient::GetInstance().IsRemoteData(option2, result);
+
+    ASSERT_EQ(status, E_OK);
+    ASSERT_EQ(result, false);
+
+    LOG_INFO(UDMF_TEST, "IsRemoteData001 end.");
+}
 } // OHOS::Test
\ No newline at end of file
diff --git a/udmf/framework/innerkitsimpl/test/unittest/utd_client_test.cpp b/udmf/framework/innerkitsimpl/test/unittest/utd_client_test.cpp
index 49ff7acb90b7d47af2e1308c287c2619aabb36e9..5f6dbba70cf98f189684e85b354eefefc2037519 100644
--- a/udmf/framework/innerkitsimpl/test/unittest/utd_client_test.cpp
+++ b/udmf/framework/innerkitsimpl/test/unittest/utd_client_test.cpp
@@ -125,7 +125,7 @@ HWTEST_F(UtdClientTest, GetTypeDescriptor004, TestSize.Level1)
     EXPECT_EQ(descriptor->GetTypeId(), typeId);
     EXPECT_EQ(*(descriptor->GetBelongingToTypes().begin()), "general.archive");
     EXPECT_EQ(descriptor->GetDescription(), "Gzip archive.");
-    EXPECT_EQ(descriptor->GetIconFile(), "");
+    EXPECT_EQ(descriptor->GetIconFile(), "sys.media.ohos_ic_normal_white_grid_compress");
     LOG_INFO(UDMF_TEST, "GetTypeDescriptor004 end.");
 }
 
diff --git a/udmf/framework/jskitsimpl/unittest/UdmfJsTest.js b/udmf/framework/jskitsimpl/unittest/UdmfJsTest.js
index b9f5e38fd428f6ce69e5b4674ddda27bf3709375..c1bee5a078417485ef8185e8935e63d85d97db13 100644
--- a/udmf/framework/jskitsimpl/unittest/UdmfJsTest.js
+++ b/udmf/framework/jskitsimpl/unittest/UdmfJsTest.js
@@ -838,7 +838,7 @@ describe('UdmfJSTest', function () {
     console.info(TAG, 'start');
     try {
       let text = new UDC.SystemDefinedPixelMap();
-      let longU8ArrayData = new Uint8Array(NUM_4M);     // 4*1024*1024
+      let longU8ArrayData = new Uint8Array(NUM_4M);
       longU8ArrayData.fill(0);
       text.rawData = longU8ArrayData;
       text.details = {
@@ -899,7 +899,7 @@ describe('UdmfJSTest', function () {
     try {
       let text = new UDC.ApplicationDefinedRecord();
       text.applicationDefinedType = '1';
-      text.rawData = new Uint8Array(NUM_4M);  //  4*1024*1024
+      text.rawData = new Uint8Array(NUM_4M);
       let unifiedData = new UDC.UnifiedData(text);
       UDC.insertData(optionsValid, unifiedData).then((data) => {
         console.info(TAG, `insert success. The key: ${data}`);
diff --git a/udmf/framework/jskitsimpl/unittest/UdmfUtdJsTest.js b/udmf/framework/jskitsimpl/unittest/UdmfUtdJsTest.js
index f418102f2079f547c48756d653673ed047b0ddab..c8ec8e61372df0f92bda49ab143a6098baf97c39 100644
--- a/udmf/framework/jskitsimpl/unittest/UdmfUtdJsTest.js
+++ b/udmf/framework/jskitsimpl/unittest/UdmfUtdJsTest.js
@@ -67,7 +67,7 @@ describe('UdmfUtdJSTest', function () {
     let equalStr = 'https://gitee.com/openharmony/docs/blob/master/en/application-dev/reference/' +
       'apis/js-apis-data-uniformTypeDescriptor.md#uniformdatatype';
     expect(typeObj.referenceURL).assertEqual(equalStr);
-    expect(typeObj.iconFile).assertEqual('');
+    expect(typeObj.iconFile).assertEqual('sys.media.ohos_ic_normal_white_grid_image');
     console.info(TAG, 'end');
   });
 
@@ -139,7 +139,7 @@ describe('UdmfUtdJSTest', function () {
     let equalStr = 'https://gitee.com/openharmony/docs/blob/master/en/application-dev/reference/' +
       'apis/js-apis-data-uniformTypeDescriptor.md#uniformdatatype';
     expect(typeObj.referenceURL).assertEqual(equalStr);
-    expect(typeObj.iconFile).assertEqual('');
+    expect(typeObj.iconFile).assertEqual('sys.media.ohos_ic_normal_white_grid_image');
     console.info(TAG, 'end');
   });
 
diff --git a/udmf/interfaces/innerkits/BUILD.gn b/udmf/interfaces/innerkits/BUILD.gn
index 9cb73d8adc92cecaca290287614024d680fb9a24..a70631a21666468269ae9f1597a52cadae6dfeeb 100644
--- a/udmf/interfaces/innerkits/BUILD.gn
+++ b/udmf/interfaces/innerkits/BUILD.gn
@@ -34,6 +34,12 @@ config("udmf_client_config") {
 }
 
 ohos_shared_library("udmf_client") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   sources = [
     "${udmf_framework_path}/common/custom_utd_json_parser.cpp",
     "${udmf_framework_path}/common/custom_utd_store.cpp",
@@ -94,4 +100,9 @@ ohos_shared_library("udmf_client") {
   subsystem_name = "distributeddatamgr"
 
   part_name = "udmf"
+
+  if (build_selinux) {
+    cflags = [ "-DWITH_SELINUX" ]
+    external_deps += [ "selinux_adapter:librestorecon" ]
+  }
 }
diff --git a/udmf/interfaces/innerkits/client/udmf_client.h b/udmf/interfaces/innerkits/client/udmf_client.h
index a6eb010ecc72a6425d22e9ffa64eca54c8da9f54..3919112078372a7a77ad0b904dd5ad9df3651436 100644
--- a/udmf/interfaces/innerkits/client/udmf_client.h
+++ b/udmf/interfaces/innerkits/client/udmf_client.h
@@ -38,6 +38,7 @@ public:
     Status GetSummary(const QueryOption &query, Summary& summary);
     Status AddPrivilege(const QueryOption &query, Privilege &privilege);
     Status Sync(const QueryOption &query, const std::vector<std::string> &devices);
+    Status IsRemoteData(const QueryOption &query, bool &result);
 };
 } // namespace UDMF
 } // namespace OHOS
diff --git a/udmf/interfaces/jskits/BUILD.gn b/udmf/interfaces/jskits/BUILD.gn
index 252d229e6e38ffda40fdc82a72c3dd8ea13e23c7..807bb51c564b5c9658c77d6d984afbe329b832b7 100644
--- a/udmf/interfaces/jskits/BUILD.gn
+++ b/udmf/interfaces/jskits/BUILD.gn
@@ -37,6 +37,12 @@ config("udmf_napi_config") {
 }
 
 ohos_shared_library("unifieddatachannel_napi") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   sources = [
     "${udmf_framework_path}/jskitsimpl/data/application_defined_record_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/audio_napi.cpp",
@@ -84,6 +90,12 @@ ohos_shared_library("unifieddatachannel_napi") {
 }
 
 ohos_shared_library("uniformtypedescriptor_napi") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   sources = [
     "${udmf_framework_path}/jskitsimpl/data/type_descriptor_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/uniform_type_descriptor_napi.cpp",
@@ -113,6 +125,12 @@ ohos_shared_library("uniformtypedescriptor_napi") {
 }
 
 ohos_shared_library("udmf_data_napi") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   sources = [
     "${udmf_framework_path}/jskitsimpl/data/application_defined_record_napi.cpp",
     "${udmf_framework_path}/jskitsimpl/data/audio_napi.cpp",
@@ -159,6 +177,12 @@ ohos_shared_library("udmf_data_napi") {
 }
 
 ohos_static_library("udmf_js_common") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
   sources = [
     "${udmf_framework_path}/jskitsimpl/common/napi_data_utils.cpp",
     "${udmf_framework_path}/jskitsimpl/common/napi_error_utils.cpp",