From 829c04ae6c7c465419747f620800d735d55ab306 Mon Sep 17 00:00:00 2001 From: zwx1271681 Date: Mon, 8 Jul 2024 09:13:25 +0800 Subject: [PATCH] feat: Modify the datashare module, add, delete, and modify the return value of the interface to pair Signed-off-by: zwx1271681 --- common/native/src/edm_data_ability_utils.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/common/native/src/edm_data_ability_utils.cpp b/common/native/src/edm_data_ability_utils.cpp index 57e59c448..2c693bf21 100644 --- a/common/native/src/edm_data_ability_utils.cpp +++ b/common/native/src/edm_data_ability_utils.cpp @@ -54,12 +54,14 @@ ErrCode EdmDataAbilityUtils::GetStringFromSettingsDataShare(const std::string &k resultset->GetRowCount(numRows); if (numRows <= 0) { EDMLOGD("EdmDataAbilityUtils::GetStringFromDataAbility row zero."); + resultset->Close(); return ERR_OK; } int columnIndex = 0; resultset->GoToFirstRow(); resultset->GetColumnIndex(SETTINGS_DATA_FIELD_VALUE, columnIndex); resultset->GetString(columnIndex, value); + resultset->Close(); return ERR_OK; } @@ -106,10 +108,19 @@ ErrCode EdmDataAbilityUtils::UpdateSettingsData(const std::string &key, const st } if (resultset == nullptr || numRows <= 0) { EDMLOGD("UpdateSettingsData Insert branch"); - dataShareHelper->Insert(uri, bucket); + auto [errCode, status] = dataShareHelper->Insert(uri, bucket); + if (errCode != 0) { + EDMLOGE("UpdateSettingsData Insert failed, errcode = %{public}d", errCode); + } } else { EDMLOGD("UpdateSettingsData update branch"); - dataShareHelper->Update(uri, predicates, bucket); + auto [errNum, retVal] = dataShareHelper->Update(uri, predicates, bucket); + if (errNum != 0) { + EDMLOGE("UpdateSettingsData update failed, status = %{public}d", errNum); + } + } + if (resultset != nullptr) { + resultset->Close(); } return ERR_OK; } -- Gitee