diff --git a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp
index 9fd1fe9d0f0d4785b940859fa673f5ed6341fd50..9cc30a2de1f3ef5882b5d3278f013ea9396a0686 100644
--- a/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp
+++ b/services/distributeddataservice/service/kvdb/kvdb_general_store.cpp
@@ -521,6 +521,7 @@ int32_t KVDBGeneralStore::Clean(const std::vector<std::string> &devices, int32_t
         return GeneralError::E_ALREADY_CLOSED;
     }
     DBStatus status = OK;
+    DBStatus currentStatus = OK;
     switch (mode) {
         case CLOUD_INFO:
             status = delegate_->RemoveDeviceData(
@@ -540,7 +541,10 @@ int32_t KVDBGeneralStore::Clean(const std::vector<std::string> &devices, int32_t
                 break;
             }
             for (auto device : devices) {
-                status = delegate_->RemoveDeviceData(device);
+                currentStatus = delegate_->RemoveDeviceData(device);
+                if (currentStatus != status) {
+                    status = currentStatus;
+                }
             }
             break;
         default:
diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
index 06373b517c50497e72112c3f063d012b41ee9b7c..23fda331f14dce8960df68831602ecb9bfe43f32 100644
--- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
+++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp
@@ -106,7 +106,7 @@ void KVDBServiceImpl::Init()
         if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta, true)) {
             if (meta.user == "0") {
                 ZLOGE("meta empty, bundleName:%{public}s, storeId:%{public}s, user = %{public}s",
-                    meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), meta.user.c_str());
+                    meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), Anonymous::Change(meta.user).c_str());
                 return;
             }
             meta.user = "0";
@@ -114,7 +114,7 @@ void KVDBServiceImpl::Init()
             if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKeyLocal(), localMeta, true) || !localMeta.isPublic ||
                 !MetaDataManager::GetInstance().LoadMeta(meta.GetKey(), meta, true)) {
                 ZLOGE("meta empty, not public store. bundleName:%{public}s, storeId:%{public}s, user = %{public}s",
-                    meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), meta.user.c_str());
+                    meta.bundleName.c_str(), meta.GetStoreAlias().c_str(), Anonymous::Change(meta.user).c_str());
                 return;
             }
         }
@@ -174,7 +174,7 @@ Status KVDBServiceImpl::GetStoreIds(const AppId &appId, int32_t subUser, std::ve
         }
         storeIds.push_back({ item.storeId });
     }
-    ZLOGD("appId:%{public}s store size:%{public}zu", appId.appId.c_str(), storeIds.size());
+    ZLOGD("appId:%{public}s store size:%{public}zu", Anonymous::Change(appId.appId).c_str(), storeIds.size());
     return SUCCESS;
 }
 
@@ -187,7 +187,7 @@ Status KVDBServiceImpl::Delete(const AppId &appId, const StoreId &storeId, int32
     syncAgents_.ComputeIfPresent(metaData.tokenId, [&appId, &storeId](auto &key, SyncAgent &syncAgent) {
         if (syncAgent.pid_ != IPCSkeleton::GetCallingPid()) {
             ZLOGW("agent already changed! old pid:%{public}d new pid:%{public}d appId:%{public}s",
-                IPCSkeleton::GetCallingPid(), syncAgent.pid_, appId.appId.c_str());
+                IPCSkeleton::GetCallingPid(), syncAgent.pid_, Anonymous::Change(appId.appId).c_str());
             return true;
         }
         syncAgent.delayTimes_.erase(storeId);
@@ -206,7 +206,7 @@ Status KVDBServiceImpl::Delete(const AppId &appId, const StoreId &storeId, int32
     MetaDataManager::GetInstance().DelMeta(metaData.GetCloneSecretKey(), true);
     PermitDelegate::GetInstance().DelCache(metaData.GetKeyWithoutPath());
     AutoCache::GetInstance().CloseStore(metaData.tokenId, metaData.dataDir);
-    ZLOGD("appId:%{public}s storeId:%{public}s instanceId:%{public}d", appId.appId.c_str(),
+    ZLOGD("appId:%{public}s storeId:%{public}s instanceId:%{public}d", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str(), metaData.instanceId);
     return SUCCESS;
 }
@@ -218,7 +218,7 @@ Status KVDBServiceImpl::Close(const AppId &appId, const StoreId &storeId, int32_
         return ILLEGAL_STATE;
     }
     AutoCache::GetInstance().CloseStore(metaData.tokenId, metaData.dataDir);
-    ZLOGD("appId:%{public}s storeId:%{public}s instanceId:%{public}d", appId.appId.c_str(),
+    ZLOGD("appId:%{public}s storeId:%{public}s instanceId:%{public}d", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str(), metaData.instanceId);
     return SUCCESS;
 }
@@ -227,7 +227,7 @@ Status KVDBServiceImpl::CloudSync(const AppId &appId, const StoreId &storeId, co
 {
     StoreMetaMapping metaData = GetStoreMetaData(appId, storeId);
     if (!MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData, true)) {
-        ZLOGE("invalid, appId:%{public}s storeId:%{public}s", appId.appId.c_str(),
+        ZLOGE("invalid, appId:%{public}s storeId:%{public}s", Anonymous::Change(appId.appId).c_str(),
             Anonymous::Change(storeId.storeId).c_str());
         return Status::INVALID_ARGUMENT;
     }
@@ -253,8 +253,8 @@ Status KVDBServiceImpl::Sync(const AppId &appId, const StoreId &storeId, int32_t
         StoreMetaDataLocal localMeta;
         MetaDataManager::GetInstance().LoadMeta(metaData.GetKeyLocal(), localMeta, true);
         if (!localMeta.HasPolicy(IMMEDIATE_SYNC_ON_CHANGE)) {
-            ZLOGW("appId:%{public}s storeId:%{public}s no IMMEDIATE_SYNC_ON_CHANGE ", appId.appId.c_str(),
-                Anonymous::Change(storeId.storeId).c_str());
+            ZLOGW("appId:%{public}s storeId:%{public}s no IMMEDIATE_SYNC_ON_CHANGE ",
+                Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str());
             return Status::SUCCESS;
         }
     }
@@ -272,7 +272,7 @@ Status KVDBServiceImpl::NotifyDataChange(const AppId &appId, const StoreId &stor
 {
     StoreMetaData meta = GetStoreMetaData(appId, storeId);
     if (!MetaDataManager::GetInstance().LoadMeta(meta.GetKeyWithoutPath(), meta)) {
-        ZLOGE("invalid, appId:%{public}s storeId:%{public}s", appId.appId.c_str(),
+        ZLOGE("invalid, appId:%{public}s storeId:%{public}s", Anonymous::Change(appId.appId).c_str(),
             Anonymous::Change(storeId.storeId).c_str());
         return Status::INVALID_ARGUMENT;
     }
@@ -319,7 +319,8 @@ Status KVDBServiceImpl::PutSwitch(const AppId &appId, const SwitchData &data)
                 SYNC_APP_ID, appId.appId);
         }
     }
-    ZLOGI("appId:%{public}s, exist:%{public}d, saved:%{public}d", appId.appId.c_str(), exist, newMeta != oldMeta);
+    ZLOGI("appId:%{public}s, exist:%{public}d, saved:%{public}d", Anonymous::Change(appId.appId).c_str(), exist,
+        newMeta != oldMeta);
     return Status::SUCCESS;
 }
 
@@ -357,7 +358,7 @@ Status KVDBServiceImpl::UnregServiceNotifier(const AppId &appId)
     syncAgents_.ComputeIfPresent(IPCSkeleton::GetCallingTokenID(), [&appId](const auto &key, SyncAgent &value) {
         if (value.pid_ != IPCSkeleton::GetCallingPid()) {
             ZLOGW("agent already changed! old pid:%{public}d, new pid:%{public}d, appId:%{public}s",
-                IPCSkeleton::GetCallingPid(), value.pid_, appId.appId.c_str());
+                IPCSkeleton::GetCallingPid(), value.pid_, Anonymous::Change(appId.appId).c_str());
             return true;
         }
         value.notifier_ = nullptr;
@@ -474,7 +475,7 @@ Status KVDBServiceImpl::GetSyncParam(const AppId &appId, const StoreId &storeId,
     syncAgents_.ComputeIfPresent(meta.tokenId, [&appId, &key, &syncParam](auto &, SyncAgent &value) {
         if (value.pid_ != IPCSkeleton::GetCallingPid()) {
             ZLOGW("agent already changed! old pid:%{public}d, new pid:%{public}d, appId:%{public}s",
-                IPCSkeleton::GetCallingPid(), value.pid_, appId.appId.c_str());
+                IPCSkeleton::GetCallingPid(), value.pid_, Anonymous::Change(appId.appId).c_str());
             return true;
         }
 
@@ -555,7 +556,7 @@ Status KVDBServiceImpl::Subscribe(const AppId &appId, const StoreId &storeId, in
         return INVALID_ARGUMENT;
     }
     StoreMetaData metaData = LoadStoreMetaData(appId, storeId, subUser);
-    ZLOGI("appId:%{public}s storeId:%{public}s tokenId:0x%{public}x", appId.appId.c_str(),
+    ZLOGI("appId:%{public}s storeId:%{public}s tokenId:0x%{public}x", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str(), metaData.tokenId);
     bool isCreate = false;
     auto key = GenerateKey(metaData.user, storeId.storeId);
@@ -580,7 +581,7 @@ Status KVDBServiceImpl::Unsubscribe(const AppId &appId, const StoreId &storeId,
     sptr<IKvStoreObserver> observer)
 {
     StoreMetaData metaData = LoadStoreMetaData(appId, storeId, subUser);
-    ZLOGI("appId:%{public}s storeId:%{public}s tokenId:0x%{public}x", appId.appId.c_str(),
+    ZLOGI("appId:%{public}s storeId:%{public}s tokenId:0x%{public}x", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str(), metaData.tokenId);
     bool destroyed = false;
     auto key = GenerateKey(metaData.user, storeId.storeId);
@@ -658,7 +659,7 @@ Status KVDBServiceImpl::GetBackupPassword(const AppId &appId, const StoreId &sto
         return passwords.size() > 0 ? SUCCESS : ERROR;
     }
     ZLOGE("passwordType is invalid, appId:%{public}s, storeId:%{public}s, passwordType:%{public}d",
-        appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(), passwordType);
+          Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str(), passwordType);
     return ERROR;
 }
 
@@ -693,14 +694,14 @@ Status KVDBServiceImpl::SetConfig(const AppId &appId, const StoreId &storeId, co
     for (auto store : stores) {
         store->SetConfig({ storeConfig.cloudConfig.enableCloud });
     }
-    ZLOGI("appId:%{public}s storeId:%{public}s enable:%{public}d", appId.appId.c_str(),
+    ZLOGI("appId:%{public}s storeId:%{public}s enable:%{public}d", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str(), storeConfig.cloudConfig.enableCloud);
     return Status::SUCCESS;
 }
 
 Status KVDBServiceImpl::BeforeCreate(const AppId &appId, const StoreId &storeId, const Options &options)
 {
-    ZLOGD("appId:%{public}s storeId:%{public}s to export data", appId.appId.c_str(),
+    ZLOGD("appId:%{public}s storeId:%{public}s to export data", Anonymous::Change(appId.appId).c_str(),
         Anonymous::Change(storeId.storeId).c_str());
     StoreMetaData meta = GetStoreMetaData(appId, storeId, options.subUser);
     AddOptions(options, meta);
@@ -720,8 +721,8 @@ Status KVDBServiceImpl::BeforeCreate(const AppId &appId, const StoreId &storeId,
         ZLOGE("meta appId:%{public}s storeId:%{public}s user:%{public}s type:%{public}d->%{public}d "
               "encrypt:%{public}d->%{public}d area:%{public}d->%{public}d persistent:%{public}d "
               "securityLevel:%{public}d->%{public}d isPublic:%{public}d->%{public}d",
-              appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(), old.user.c_str(), old.storeType,
-              meta.storeType, old.isEncrypt, meta.isEncrypt, old.area, meta.area, options.persistent,
+              Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str(), old.user.c_str(),
+              old.storeType, meta.storeType, old.isEncrypt, meta.isEncrypt, old.area, meta.area, options.persistent,
               old.securityLevel, meta.securityLevel, oldLocal.isPublic, options.isPublic);
         return Status::STORE_META_CHANGED;
     }
@@ -778,7 +779,8 @@ Status KVDBServiceImpl::AfterCreate(
 {
     if (!appId.IsValid() || !storeId.IsValid() || !options.IsValidType()) {
         ZLOGE("failed please check type:%{public}d appId:%{public}s storeId:%{public}s dataType:%{public}d",
-            options.kvStoreType, appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(), options.dataType);
+            options.kvStoreType, Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str(),
+            options.dataType);
         return INVALID_ARGUMENT;
     }
 
@@ -792,8 +794,8 @@ Status KVDBServiceImpl::AfterCreate(
         auto dbStatus = Upgrade::GetInstance().UpdateStore(oldMeta, metaData, password);
         ZLOGI("update status:%{public}d appId:%{public}s storeId:%{public}s inst:%{public}d "
               "type:%{public}d->%{public}d dir:%{public}s dataType:%{public}d->%{public}d",
-            dbStatus, appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(), metaData.instanceId,
-            oldMeta.storeType, metaData.storeType, Anonymous::Change(metaData.dataDir).c_str(),
+            dbStatus, Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str(),
+            metaData.instanceId, oldMeta.storeType, metaData.storeType, Anonymous::Change(metaData.dataDir).c_str(),
             oldMeta.dataType, metaData.dataType);
         if (dbStatus != DBStatus::OK) {
             status = STORE_UPGRADE_FAILED;
@@ -818,7 +820,8 @@ Status KVDBServiceImpl::AfterCreate(
         SaveSecretKeyMeta(metaData, password);
     }
     ZLOGI("appId:%{public}s storeId:%{public}s instanceId:%{public}d type:%{public}d dir:%{public}s "
-        "isCreated:%{public}d dataType:%{public}d", appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str(),
+        "isCreated:%{public}d dataType:%{public}d", Anonymous::Change(appId.appId).c_str(),
+        Anonymous::Change(storeId.storeId).c_str(),
         metaData.instanceId, metaData.storeType, Anonymous::Change(metaData.dataDir).c_str(), isCreated,
         metaData.dataType);
     return status;
@@ -826,7 +829,7 @@ Status KVDBServiceImpl::AfterCreate(
 
 int32_t KVDBServiceImpl::OnAppExit(pid_t uid, pid_t pid, uint32_t tokenId, const std::string &appId)
 {
-    ZLOGI("pid:%{public}d uid:%{public}d appId:%{public}s", pid, uid, appId.c_str());
+    ZLOGI("pid:%{public}d uid:%{public}d appId:%{public}s", pid, uid, Anonymous::Change(appId).c_str());
     CheckerManager::StoreInfo info;
     info.uid = uid;
     info.tokenId = tokenId;
@@ -871,12 +874,13 @@ bool KVDBServiceImpl::CompareTripleIdentifier(const std::string &accountId, cons
 int32_t KVDBServiceImpl::ResolveAutoLaunch(const std::string &identifier, DBLaunchParam &param)
 {
     ZLOGI("user:%{public}s appId:%{public}s storeId:%{public}s identifier:%{public}s", param.userId.c_str(),
-        param.appId.c_str(), Anonymous::Change(param.storeId).c_str(), Anonymous::Change(identifier).c_str());
+        Anonymous::Change(param.appId).c_str(), Anonymous::Change(param.storeId).c_str(),
+        Anonymous::Change(identifier).c_str());
 
     std::vector<StoreMetaData> metaData;
     auto prefix = StoreMetaData::GetPrefix({ DMAdapter::GetInstance().GetLocalDevice().uuid });
     if (!MetaDataManager::GetInstance().LoadMeta(prefix, metaData)) {
-        ZLOGE("no meta data appId:%{public}s", param.appId.c_str());
+        ZLOGE("no meta data appId:%{public}s", Anonymous::Change(param.appId).c_str());
         return STORE_NOT_FOUND;
     }
 
@@ -899,8 +903,8 @@ int32_t KVDBServiceImpl::ResolveAutoLaunch(const std::string &identifier, DBLaun
             store->SetEqualIdentifier(storeMeta.appId, storeMeta.storeId, accountId);
         }
         ZLOGI("isTriple:%{public}d,storeId:%{public}s,appId:%{public}s,size:%{public}zu,user:%{public}s",
-            isTripleIdentifierEqual, Anonymous::Change(storeMeta.storeId).c_str(), storeMeta.appId.c_str(),
-            watchers.size(), storeMeta.user.c_str());
+            isTripleIdentifierEqual, Anonymous::Change(storeMeta.storeId).c_str(),
+            Anonymous::Change(storeMeta.appId).c_str(), watchers.size(), Anonymous::Change(storeMeta.user).c_str());
     }
     return SUCCESS;
 }
@@ -1014,7 +1018,7 @@ int32_t KVDBServiceImpl::GetInstIndex(uint32_t tokenId, const AppId &appId)
     int errCode = AccessTokenKit::GetHapTokenInfo(tokenId, tokenInfo);
     if (errCode != RET_SUCCESS) {
         ZLOGE("GetHapTokenInfo error:%{public}d, tokenId:0x%{public}x appId:%{public}s", errCode, tokenId,
-            appId.appId.c_str());
+            Anonymous::Change(appId.appId).c_str());
         return -1;
     }
     return tokenInfo.instIndex;
@@ -1032,8 +1036,8 @@ KVDBServiceImpl::DBResult KVDBServiceImpl::HandleGenBriefDetails(const GenDetail
 Status KVDBServiceImpl::DoCloudSync(const StoreMetaData &meta, const SyncInfo &syncInfo)
 {
     if (!meta.enableCloud) {
-        ZLOGE("appId:%{public}s storeId:%{public}s instanceId:%{public}d not supports cloud sync", meta.appId.c_str(),
-            Anonymous::Change(meta.storeId).c_str(), meta.instanceId);
+        ZLOGE("appId:%{public}s storeId:%{public}s instanceId:%{public}d not supports cloud sync",
+            Anonymous::Change(meta.appId).c_str(), Anonymous::Change(meta.storeId).c_str(), meta.instanceId);
         return Status::NOT_SUPPORT;
     }
     auto instance = CloudServer::GetInstance();
@@ -1047,8 +1051,8 @@ Status KVDBServiceImpl::DoCloudSync(const StoreMetaData &meta, const SyncInfo &s
     if (meta.user != StoreMetaData::ROOT_USER) {
         users.push_back(std::atoi(meta.user.c_str()));
     } else if (!AccountDelegate::GetInstance()->QueryForegroundUsers(users)) {
-        ZLOGE("appId:%{public}s storeId:%{public}s instanceId:%{public}d. no foreground user!", meta.appId.c_str(),
-            Anonymous::Change(meta.storeId).c_str(), meta.instanceId);
+        ZLOGE("appId:%{public}s storeId:%{public}s instanceId:%{public}d. no foreground user!",
+            Anonymous::Change(meta.appId).c_str(), Anonymous::Change(meta.storeId).c_str(), meta.instanceId);
         return Status::CLOUD_DISABLED;
     }
     bool res = false;
@@ -1505,8 +1509,8 @@ AutoCache::Watchers KVDBServiceImpl::GetWatchers(uint32_t tokenId, const std::st
 
 void KVDBServiceImpl::SyncAgent::ReInit(pid_t pid, const AppId &appId)
 {
-    ZLOGW("pid:%{public}d->%{public}d appId:%{public}s notifier:%{public}d", pid, pid_, appId_.appId.c_str(),
-        notifier_ == nullptr);
+    ZLOGW("pid:%{public}d->%{public}d appId:%{public}s notifier:%{public}d", pid, pid_,
+        Anonymous::Change(appId_.appId).c_str(), notifier_ == nullptr);
     pid_ = pid;
     appId_ = appId;
     notifier_ = nullptr;
diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
index 37de89063cb67c628b7921dd146a531a5b2df219..1eeeeb4e03b5939294f544fea45c7b1b05fd3fcc 100644
--- a/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
+++ b/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp
@@ -92,7 +92,7 @@ std::pair<int32_t, KVDBServiceStub::StoreInfo> KVDBServiceStub::GetStoreInfo(uin
     StoreId storeId;
     if (!ITypesUtil::Unmarshal(data, appId, storeId)) {
         ZLOGE("Unmarshal appId:%{public}s storeId:%{public}s",
-            appId.appId.c_str(), Anonymous::Change(storeId.storeId).c_str());
+            Anonymous::Change(appId.appId).c_str(), Anonymous::Change(storeId.storeId).c_str());
         return { IPC_STUB_INVALID_DATA_ERR, StoreInfo() };
     }
     appId.appId = Constant::TrimCopy(appId.appId);