From 5d58d8afe5ca8b039b4e2f9e980e9e1f116d91ea Mon Sep 17 00:00:00 2001 From: lobty Date: Sat, 14 Jun 2025 10:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=AB=98=E9=A2=91=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lobty --- .../src/relational/relational_store_delegate_impl.cpp | 2 +- .../storage/src/sqlite/sqlite_single_ver_storage_executor.cpp | 2 +- .../src/sqlite/sqlite_single_ver_storage_executor_cache.cpp | 4 ++-- .../libs/distributeddb/syncer/src/cloud/cloud_db_proxy.cpp | 1 - .../distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frameworks/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp b/frameworks/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp index 5cf4ebdb941..d9676ede465 100644 --- a/frameworks/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp +++ b/frameworks/libs/distributeddb/interfaces/src/relational/relational_store_delegate_impl.cpp @@ -371,7 +371,7 @@ DBStatus RelationalStoreDelegateImpl::Pragma(PragmaCmd cmd, PragmaData &pragmaDa LOGE("[RelationalStore Delegate] Pragma failed:%d", errCode); return TransferDBErrno(errCode); } - LOGI("[RelationalStore Delegate] Pragma success"); + LOGI("[Rstore Delegate] Pragma success %d", cmd); return OK; } diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp index 3cc5c82bd91..7f89f70c8b6 100644 --- a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp +++ b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp @@ -1383,7 +1383,7 @@ int SQLiteSingleVerStorageExecutor::SaveSyncDataItem(DataItem &dataItem, const D PutConflictData(dataItem, notify.getData, deviceInfo, notify.dataStatus, committedData); if (notify.dataStatus.isDefeated) { - LOGE("Data status is defeated:%d", errCode); + LOGE("Save defeated"); return ResetSaveSyncStatements(errCode); } diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp index bd2c272f657..5180d5ef87b 100644 --- a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp +++ b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor_cache.cpp @@ -272,7 +272,7 @@ int SQLiteSingleVerStorageExecutor::MigrateDataItem(DataItem &dataItem, const No } // after solving conflict, the item should not be saved into mainDB if (notify.dataStatus.isDefeated) { - LOGE("Data status is defeated:%d", errCode); + LOGE("Migrate defeated"); return errCode; } bool isUpdate = notify.dataStatus.preStatus != DataStatus::NOEXISTED; @@ -777,7 +777,7 @@ int SQLiteSingleVerStorageExecutor::PutIntoConflictAndCommitForMigrateCache(Data PutConflictData(dataItem, notify.getData, deviceInfo, notify.dataStatus, notify.committedData); if (notify.dataStatus.isDefeated) { - LOGE("Data status is defeated:%d", errCode); + LOGE("Put defeated"); return ResetForMigrateCacheData(); } diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_db_proxy.cpp b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_db_proxy.cpp index 6e549656191..4fa670ab13d 100644 --- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_db_proxy.cpp +++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_db_proxy.cpp @@ -70,7 +70,6 @@ void CloudDBProxy::SetIAssetLoader(const std::shared_ptr &loader) void CloudDBProxy::RecordSyncDataTimeStampLog(std::vector &data, InnerActionCode action) { if (data.empty()) { - LOGI("[CloudDBProxy] sync data is empty"); return; } diff --git a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp index 78033f70c5e..6f353f29199 100644 --- a/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp +++ b/frameworks/libs/distributeddb/syncer/src/cloud/cloud_syncer_extend.cpp @@ -814,7 +814,7 @@ int CloudSyncer::GetUploadCountByTable(const CloudSyncer::TaskId &taskId, int64_ void CloudSyncer::UpdateProcessInfoWithoutUpload(CloudSyncer::TaskId taskId, const std::string &tableName, bool needNotify) { - LOGI("[CloudSyncer] There is no need to doing upload, as the upload data count is zero."); + LOGI("[CloudSyncer] Not need to upload %s.", DBCommon::StringMiddleMasking(tableName)); InnerProcessInfo innerProcessInfo; innerProcessInfo.tableName = tableName; innerProcessInfo.upLoadInfo.total = 0; // count is zero @@ -1637,7 +1637,7 @@ void CloudSyncer::CheckDataAfterDownload(const std::string &tableName) int logicDeleteDataCount = 0; int errCode = storageProxy_->GetLocalDataCount(tableName, dataCount, logicDeleteDataCount); if (errCode == E_OK) { - LOGI("[CloudSyncer] Check local data after download[%s[%zu]], data count: %d, logic delete data count: %d", + LOGI("[CloudSyncer] after download[%s[%zu]], data: %d, logic delete: %d", DBCommon::StringMiddleMasking(tableName).c_str(), tableName.length(), dataCount, logicDeleteDataCount); } else { LOGW("[CloudSyncer] Get local data after download fail: %d", errCode); -- Gitee