diff --git a/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h b/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h
index 71232db2d19b1013ff6d9d2122590b5477347944..87507f4f5d59f3837877a24f2fa78813c485563e 100644
--- a/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h
+++ b/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h
@@ -558,37 +558,6 @@ enum {
     ERR_APPEXECFWK_DB_INSERT_ERROR = 8522304,
     ERR_APPEXECFWK_DB_UPDATE_ERROR = 8522305,
     ERR_APPEXECFWK_DB_GET_DATA_ERROR = 8522306,
-    ERR_APPEXECFWK_DB_QUERY_DATA_TABLE_NAME_NOT_SAME = 8522307,
-    ERR_APPEXECFWK_DB_SQL_MUST_BE_QUERY_STATEMENT = 8522308,
-    ERR_APPEXECFWK_DB_COLUMN_OUT_OF_BOUNDS = 8522309,
-    ERR_APPEXECFWK_DB_INVALID_DATABASE_PATH = 8522310,
-    ERR_APPEXECFWK_DB_ROW_OUT_OF_BOUNDS = 8522311,
-    ERR_APPEXECFWK_DB_NO_DATA_MEETS_CONDITION = 8522312,
-    ERR_APPEXECFWK_DB_ALREADY_CLOSED = 8522313,
-    ERR_APPEXECFWK_DB_DO_NOT_RESPOND = 8522314,
-    ERR_APPEXECFWK_DB_THE_WAL_FILE_SIZE_OVER_DEFAULT_LIMIT = 8522315,
-    ERR_APPEXECFWK_DB_FAILED_TO_GET_DATA_OBS_MGR_CLIENT = 8522316,
-    ERR_APPEXECFWK_DB_THE_TYPE_OF_DISTRIBUTED_TABLE_NOT_MATCH = 8522317,
-    ERR_APPEXECFWK_DB_IS_FULL = 8522318,
-    ERR_APPEXECFWK_DB_NOT_SUPPORT_THS_SQL = 8522319,
-    ERR_APPEXECFWK_DB_IS_ALREADY_ATTACHED = 8522320,
-    ERR_APPEXECFWK_DB_SQL_GENERIC_ERROR = 8522321,
-    ERR_APPEXECFWK_DB_SQL_CORRUPTED = 8522322,
-    ERR_APPEXECFWK_DB_SQL_CALLBACK_ROUTINE_REQUESTED_AN_ABORT = 8522323,
-    ERR_APPEXECFWK_DB_SQL_ACCESS_PERMISSION_DENIED = 8522324,
-    ERR_APPEXECFWK_DB_SQL_FILE_IS_LOCKED = 8522325,
-    ERR_APPEXECFWK_DB_SQL_TABLE_IS_LOCKED = 8522326,
-    ERR_APPEXECFWK_DB_SQL_DB_IS_OUT_OF_MEMORY = 8522327,
-    ERR_APPEXECFWK_DB_SQL_ATTEMPT_WRITE_READONLY_DB = 8522328,
-    ERR_APPEXECFWK_DB_SQL_SOME_KIND_OF_DISK_IO_ERROR = 8522329,
-    ERR_APPEXECFWK_DB_SQL_UNABLE_OPEN_DB_FILE = 8522330,
-    ERR_APPEXECFWK_DB_SQL_TEXT_OR_BLOB_EXCEED_SIZE_LIMIT = 8522331,
-    ERR_APPEXECFWK_DB_SQL_ABORT_DUE_TO_CONSTRAINT_VIOLATION = 8522332,
-    ERR_APPEXECFWK_DB_SQL_DATA_TYPE_MISMATCH = 8522333,
-    ERR_APPEXECFWK_DB_SQL_LIBRARY_USED_INCORRECTLY = 8522334,
-    ERR_APPEXECFWK_DB_CONFIG_CHANGED = 8522335,
-    ERR_APPEXECFWK_DB_CAPABILITY_NOT_SUPPORT = 8522336,
-
 
     // CODE SIGNATURE ERR
     ERR_BUNDLEMANAGER_INSTALL_CODE_SIGNATURE_PARAM_INVALID = 8522350,
diff --git a/services/bundlemgr/include/bundle_data_mgr.h b/services/bundlemgr/include/bundle_data_mgr.h
index 6a43f361b799c843fe60dd78393c55e5d74383d0..610c06d20078a713141ab2c227facefe9587f808 100644
--- a/services/bundlemgr/include/bundle_data_mgr.h
+++ b/services/bundlemgr/include/bundle_data_mgr.h
@@ -778,7 +778,7 @@ public:
     bool QueryExtensionAbilityInfoByUri(const std::string &uri, int32_t userId,
         ExtensionAbilityInfo &extensionAbilityInfo) const;
 
-    ErrCode AddInnerBundleUserInfo(const std::string &bundleName, const InnerBundleUserInfo& newUserInfo);
+    bool AddInnerBundleUserInfo(const std::string &bundleName, const InnerBundleUserInfo& newUserInfo);
 
     bool RemoveInnerBundleUserInfo(const std::string &bundleName, int32_t userId);
 
diff --git a/services/bundlemgr/include/bundle_data_storage_interface.h b/services/bundlemgr/include/bundle_data_storage_interface.h
index 43713b9aaea3e4775255cada598ded7ffc20aefc..7c6b243b0ad5283fc111f4b2ee3be0cd8ae59761 100644
--- a/services/bundlemgr/include/bundle_data_storage_interface.h
+++ b/services/bundlemgr/include/bundle_data_storage_interface.h
@@ -38,13 +38,6 @@ public:
      * @return Returns true if this function is successfully called; returns false otherwise.
      */
     virtual bool SaveStorageBundleInfo(const InnerBundleInfo &innerBundleInfo) = 0;
-
-    /**
-     * @brief Save the bundle data corresponding to the device Id of the bundle name to KvStore.
-     * @param innerBundleInfo Indicates the InnerBundleInfo object to be save.
-     * @return Returns true if this function is successfully called; returns false otherwise.
-     */
-    virtual ErrCode SaveStorageBundleInfoWithCode(const InnerBundleInfo &innerBundleInfo) = 0;
     /**
      * @brief Delete the bundle data corresponding to the device Id of the bundle name to KvStore.
      * @param innerBundleInfo Indicates the InnerBundleInfo object to be Delete.
diff --git a/services/bundlemgr/include/bundle_data_storage_rdb.h b/services/bundlemgr/include/bundle_data_storage_rdb.h
index c9c6820944a63f546a5f62d6bb3744b88c7b7380..3e70e2fd9b6211089ad8456bf23093a06b54c66f 100644
--- a/services/bundlemgr/include/bundle_data_storage_rdb.h
+++ b/services/bundlemgr/include/bundle_data_storage_rdb.h
@@ -33,7 +33,6 @@ public:
     bool SaveStorageBundleInfo(const InnerBundleInfo &innerBundleInfo) override;
     bool DeleteStorageBundleInfo(const InnerBundleInfo &innerBundleInfo) override;
     virtual bool ResetKvStore() override;
-    ErrCode SaveStorageBundleInfoWithCode(const InnerBundleInfo &innerBundleInfo) override;
 
 private:
     void TransformStrToInfo(
diff --git a/services/bundlemgr/include/rdb/rdb_data_manager.h b/services/bundlemgr/include/rdb/rdb_data_manager.h
index e17408530cb7e39a2c60f002d9327e07135716c1..c14b748ae87c85451178de58f9a4df6970b3f50b 100644
--- a/services/bundlemgr/include/rdb/rdb_data_manager.h
+++ b/services/bundlemgr/include/rdb/rdb_data_manager.h
@@ -34,7 +34,6 @@ public:
 
     static void ClearCache();
     bool InsertData(const std::string &key, const std::string &value);
-    ErrCode InsertDataWithCode(const std::string &key, const std::string &value);
     bool InsertData(const NativeRdb::ValuesBucket &valuesBucket);
     bool UpdateData(const std::string &key, const std::string &value);
     bool DeleteData(const std::string &key);
@@ -63,8 +62,8 @@ public:
 
     void SendDbErrorEvent(const std::string &dbName, int32_t operationType, int32_t errorCode);
 private:
-    std::shared_ptr<NativeRdb::RdbStore> GetRdbStore(ErrCode &result);
-    ErrCode GetRdbStoreFromNative();
+    std::shared_ptr<NativeRdb::RdbStore> GetRdbStore();
+    void GetRdbStoreFromNative();
     int32_t InsertWithRetry(std::shared_ptr<NativeRdb::RdbStore> rdbStore, int64_t &rowId,
         const NativeRdb::ValuesBucket &valuesBucket);
     bool IsRetryErrCode(int32_t errCode);
diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp
index b43b5c7cb2e6428c45630726e29cfe80e69e0bc4..aa670a3b633ee7d36f004257ceefc58d409134ce 100644
--- a/services/bundlemgr/src/bundle_data_mgr.cpp
+++ b/services/bundlemgr/src/bundle_data_mgr.cpp
@@ -633,7 +633,7 @@ bool BundleDataMgr::RemoveHspModuleByVersionCode(int32_t versionCode, InnerBundl
     return true;
 }
 
-ErrCode BundleDataMgr::AddInnerBundleUserInfo(
+bool BundleDataMgr::AddInnerBundleUserInfo(
     const std::string &bundleName, const InnerBundleUserInfo& newUserInfo)
 {
     APP_LOGD("AddInnerBundleUserInfo:%{public}s", bundleName.c_str());
@@ -641,19 +641,18 @@ ErrCode BundleDataMgr::AddInnerBundleUserInfo(
     auto infoItem = bundleInfos_.find(bundleName);
     if (infoItem == bundleInfos_.end()) {
         APP_LOGW("bundleName: %{public}s bundle info not exist", bundleName.c_str());
-        return ERR_BUNDLE_MANAGER_BUNDLE_NOT_EXIST;
+        return false;
     }
 
     std::lock_guard<ffrt::mutex> stateLock(stateMutex_);
     auto& info = bundleInfos_.at(bundleName);
     info.AddInnerBundleUserInfo(newUserInfo);
     info.SetBundleStatus(InnerBundleInfo::BundleStatus::ENABLED);
-    ErrCode ret = dataStorage_->SaveStorageBundleInfoWithCode(info);
-    if (ret != ERR_OK) {
-        APP_LOGW("update storage failed bundle:%{public}s, errcode:%{public}d", bundleName.c_str(), ret);
-        return ret;
+    if (!dataStorage_->SaveStorageBundleInfo(info)) {
+        APP_LOGW("update storage failed bundle:%{public}s", bundleName.c_str());
+        return false;
     }
-    return ERR_OK;
+    return true;
 }
 
 bool BundleDataMgr::RemoveInnerBundleUserInfo(
diff --git a/services/bundlemgr/src/bundle_data_storage_rdb.cpp b/services/bundlemgr/src/bundle_data_storage_rdb.cpp
index ada0fe64e433c18658a993eac99a4e83bede8b9e..d8d9c70d06bca183764ad7b98958e37af9675371 100644
--- a/services/bundlemgr/src/bundle_data_storage_rdb.cpp
+++ b/services/bundlemgr/src/bundle_data_storage_rdb.cpp
@@ -137,20 +137,6 @@ bool BundleDataStorageRdb::SaveStorageBundleInfo(const InnerBundleInfo &innerBun
     return ret;
 }
 
-ErrCode BundleDataStorageRdb::SaveStorageBundleInfoWithCode(const InnerBundleInfo &innerBundleInfo)
-{
-    EventReport::ReportDataPartitionUsageEvent();
-    if (rdbDataManager_ == nullptr) {
-        APP_LOGE("rdbDataManager is null");
-        return ERR_APPEXECFWK_NULL_PTR;
-    }
-
-    LOG_NOFUNC_I(BMS_TAG_COMMON, "rdb SaveStorageBundleInfo -n %{public}s", innerBundleInfo.GetBundleName().c_str());
-    return rdbDataManager_->InsertDataWithCode(
-        innerBundleInfo.GetBundleName(), innerBundleInfo.ToString());
-}
-
-
 bool BundleDataStorageRdb::DeleteStorageBundleInfo(const InnerBundleInfo &innerBundleInfo)
 {
     if (rdbDataManager_ == nullptr) {
diff --git a/services/bundlemgr/src/bundle_multiuser_installer.cpp b/services/bundlemgr/src/bundle_multiuser_installer.cpp
index 005678ed6a4c863bdcc4a5c49052e0f74b2f94c4..e70af3e6a3155fcff3ff18688331a58d8e284f48 100644
--- a/services/bundlemgr/src/bundle_multiuser_installer.cpp
+++ b/services/bundlemgr/src/bundle_multiuser_installer.cpp
@@ -192,9 +192,8 @@ ErrCode BundleMultiUserInstaller::ProcessBundleInstall(const std::string &bundle
     }
 
     ScopeGuard addBundleUserGuard([&] { dataMgr_->RemoveInnerBundleUserInfo(bundleName, userId); });
-    result = dataMgr_->AddInnerBundleUserInfo(bundleName, newUserInfo);
-    if (result != ERR_OK) {
-        return result;
+    if (!dataMgr_->AddInnerBundleUserInfo(bundleName, newUserInfo)) {
+        return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
     }
     // add new user bundle info
     BundleResourceHelper::AddResourceInfoByBundleName(bundleName, userId, ADD_RESOURCE_TYPE::CREATE_USER);
diff --git a/services/bundlemgr/src/rdb/rdb_data_manager.cpp b/services/bundlemgr/src/rdb/rdb_data_manager.cpp
index adab06040d7b3094ab497eebe58eac0c60ca56ac..6309463ecd39fbc8232a5c54630d3e0d8ea0b1f0 100644
--- a/services/bundlemgr/src/rdb/rdb_data_manager.cpp
+++ b/services/bundlemgr/src/rdb/rdb_data_manager.cpp
@@ -38,38 +38,6 @@ constexpr int32_t RETRY_TIMES = 3;
 constexpr int32_t RETRY_INTERVAL = 500; // 500ms
 constexpr const char* INTEGRITY_CHECK = "PRAGMA integrity_check";
 constexpr const char* CHECK_OK = "ok";
-const std::unordered_map<int32_t, int32_t> RDB_ERR_MAP = {
-    {NativeRdb::E_OK, ERR_OK},
-    {NativeRdb::E_NOT_SELECT, ERR_APPEXECFWK_DB_SQL_MUST_BE_QUERY_STATEMENT},
-    {NativeRdb::E_COLUMN_OUT_RANGE, ERR_APPEXECFWK_DB_COLUMN_OUT_OF_BOUNDS},
-    {NativeRdb::E_INVALID_FILE_PATH, ERR_APPEXECFWK_DB_INVALID_DATABASE_PATH},
-    {NativeRdb::E_ROW_OUT_RANGE, ERR_APPEXECFWK_DB_ROW_OUT_OF_BOUNDS},
-    {NativeRdb::E_NO_ROW_IN_QUERY, ERR_APPEXECFWK_DB_NO_DATA_MEETS_CONDITION},
-    {NativeRdb::E_ALREADY_CLOSED, ERR_APPEXECFWK_DB_ALREADY_CLOSED},
-    {NativeRdb::E_DATABASE_BUSY, ERR_APPEXECFWK_DB_DO_NOT_RESPOND},
-    {NativeRdb::E_WAL_SIZE_OVER_LIMIT, ERR_APPEXECFWK_DB_THE_WAL_FILE_SIZE_OVER_DEFAULT_LIMIT},
-    {NativeRdb::E_GET_DATAOBSMGRCLIENT_FAIL, ERR_APPEXECFWK_DB_FAILED_TO_GET_DATA_OBS_MGR_CLIENT},
-    {NativeRdb::E_TYPE_MISMATCH, ERR_APPEXECFWK_DB_THE_TYPE_OF_DISTRIBUTED_TABLE_NOT_MATCH},
-    {NativeRdb::E_SQLITE_FULL, ERR_APPEXECFWK_DB_IS_FULL},
-    {NativeRdb::E_NOT_SUPPORT_THE_SQL, ERR_APPEXECFWK_DB_NOT_SUPPORT_THS_SQL},
-    {NativeRdb::E_ATTACHED_DATABASE_EXIST, ERR_APPEXECFWK_DB_IS_ALREADY_ATTACHED},
-    {NativeRdb::E_SQLITE_ERROR, ERR_APPEXECFWK_DB_SQL_GENERIC_ERROR},
-    {NativeRdb::E_SQLITE_CORRUPT, ERR_APPEXECFWK_DB_SQL_CORRUPTED},
-    {NativeRdb::E_SQLITE_ABORT, ERR_APPEXECFWK_DB_SQL_CALLBACK_ROUTINE_REQUESTED_AN_ABORT},
-    {NativeRdb::E_SQLITE_PERM, ERR_APPEXECFWK_DB_SQL_ACCESS_PERMISSION_DENIED},
-    {NativeRdb::E_SQLITE_BUSY, ERR_APPEXECFWK_DB_SQL_FILE_IS_LOCKED},
-    {NativeRdb::E_SQLITE_LOCKED, ERR_APPEXECFWK_DB_SQL_TABLE_IS_LOCKED},
-    {NativeRdb::E_SQLITE_NOMEM, ERR_APPEXECFWK_DB_SQL_DB_IS_OUT_OF_MEMORY},
-    {NativeRdb::E_SQLITE_READONLY, ERR_APPEXECFWK_DB_SQL_ATTEMPT_WRITE_READONLY_DB},
-    {NativeRdb::E_SQLITE_IOERR, ERR_APPEXECFWK_DB_SQL_SOME_KIND_OF_DISK_IO_ERROR},
-    {NativeRdb::E_SQLITE_CANTOPEN, ERR_APPEXECFWK_DB_SQL_UNABLE_OPEN_DB_FILE},
-    {NativeRdb::E_SQLITE_TOOBIG, ERR_APPEXECFWK_DB_SQL_TEXT_OR_BLOB_EXCEED_SIZE_LIMIT},
-    {NativeRdb::E_SQLITE_CONSTRAINT, ERR_APPEXECFWK_DB_SQL_ABORT_DUE_TO_CONSTRAINT_VIOLATION},
-    {NativeRdb::E_SQLITE_MISMATCH, ERR_APPEXECFWK_DB_SQL_DATA_TYPE_MISMATCH},
-    {NativeRdb::E_SQLITE_MISUSE, ERR_APPEXECFWK_DB_SQL_LIBRARY_USED_INCORRECTLY},
-    {NativeRdb::E_CONFIG_INVALID_CHANGE, ERR_APPEXECFWK_DB_CONFIG_CHANGED},
-    {NativeRdb::E_NOT_SUPPORT, ERR_APPEXECFWK_DB_CAPABILITY_NOT_SUPPORT},
-};
 }
 
 ffrt::mutex RdbDataManager::restoreRdbMapMutex_;
@@ -100,7 +68,7 @@ ffrt::mutex &RdbDataManager::GetRdbRestoreMutex(const std::string &dbName)
     return restoreRdbMap_[dbName];
 }
 
-ErrCode RdbDataManager::GetRdbStoreFromNative()
+void RdbDataManager::GetRdbStoreFromNative()
 {
     auto &mutex = GetRdbRestoreMutex(bmsRdbConfig_.dbName);
     std::lock_guard<ffrt::mutex> restoreLock(mutex);
@@ -123,7 +91,7 @@ ErrCode RdbDataManager::GetRdbStoreFromNative()
     if (rdbStore_ == nullptr) {
         APP_LOGE("GetRdbStore failed, errCode:%{public}d", errCode);
         SendDbErrorEvent(bmsRdbConfig_.dbName, static_cast<int32_t>(DB_OPERATION_TYPE::OPEN), errCode);
-        return errCode;
+        return;
     }
     CheckSystemSizeAndHisysEvent(bmsRdbConfig_.dbPath, bmsRdbConfig_.dbName);
     bool isNeedRebuildDb = false;
@@ -141,22 +109,14 @@ ErrCode RdbDataManager::GetRdbStoreFromNative()
             APP_LOGE("rdb restore failed ret:%{public}d", restoreRet);
         }
         SendDbErrorEvent(bmsRdbConfig_.dbName, static_cast<int32_t>(DB_OPERATION_TYPE::REBUILD), rebuildCode);
-        return restoreRet;
     }
-    return ERR_OK;
 }
 
-std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore(ErrCode &result)
+std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore()
 {
     std::lock_guard<ffrt::mutex> lock(rdbMutex_);
     if (rdbStore_ == nullptr) {
-        result = GetRdbStoreFromNative();
-    }
-    auto it = RDB_ERR_MAP.find(result);
-    if (it != RDB_ERR_MAP.end()) {
-        result = it->second;
-    } else {
-        result = ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
+        GetRdbStoreFromNative();
     }
 
     if (rdbStore_ != nullptr) {
@@ -197,8 +157,7 @@ void RdbDataManager::SendDbErrorEvent(const std::string &dbName, int32_t operati
 bool RdbDataManager::InsertData(const std::string &key, const std::string &value)
 {
     APP_LOGD("InsertData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -208,60 +167,40 @@ bool RdbDataManager::InsertData(const std::string &key, const std::string &value
     NativeRdb::ValuesBucket valuesBucket;
     valuesBucket.PutString(BMS_KEY, key);
     valuesBucket.PutString(BMS_VALUE, value);
-    ret = InsertWithRetry(rdbStore, rowId, valuesBucket);
+    auto ret = InsertWithRetry(rdbStore, rowId, valuesBucket);
     return ret == NativeRdb::E_OK;
 }
 
-ErrCode RdbDataManager::InsertDataWithCode(const std::string &key, const std::string &value)
-{
-    APP_LOGD("InsertData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
-    if (rdbStore == nullptr) {
-        APP_LOGE("RdbStore is null");
-        return ret;
-    }
-
-    int64_t rowId = -1;
-    NativeRdb::ValuesBucket valuesBucket;
-    valuesBucket.PutString(BMS_KEY, key);
-    valuesBucket.PutString(BMS_VALUE, value);
-    return InsertWithRetry(rdbStore, rowId, valuesBucket);
-}
-
 bool RdbDataManager::InsertData(const NativeRdb::ValuesBucket &valuesBucket)
 {
     APP_LOGD("InsertData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
     }
 
     int64_t rowId = -1;
-    ret = InsertWithRetry(rdbStore, rowId, valuesBucket);
+    auto ret = InsertWithRetry(rdbStore, rowId, valuesBucket);
     return ret == NativeRdb::E_OK;
 }
 
 bool RdbDataManager::BatchInsert(int64_t &outInsertNum, const std::vector<NativeRdb::ValuesBucket> &valuesBuckets)
 {
     APP_LOGD("BatchInsert start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
     }
-    ret = rdbStore->BatchInsert(outInsertNum, bmsRdbConfig_.tableName, valuesBuckets);
+    auto ret = rdbStore->BatchInsert(outInsertNum, bmsRdbConfig_.tableName, valuesBuckets);
     return ret == NativeRdb::E_OK;
 }
 
 bool RdbDataManager::UpdateData(const std::string &key, const std::string &value)
 {
     APP_LOGD("UpdateData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -273,7 +212,7 @@ bool RdbDataManager::UpdateData(const std::string &key, const std::string &value
     NativeRdb::ValuesBucket valuesBucket;
     valuesBucket.PutString(BMS_KEY, key);
     valuesBucket.PutString(BMS_VALUE, value);
-    ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
+    auto ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
     return ret == NativeRdb::E_OK;
 }
 
@@ -281,8 +220,7 @@ bool RdbDataManager::UpdateData(
     const NativeRdb::ValuesBucket &valuesBucket, const NativeRdb::AbsRdbPredicates &absRdbPredicates)
 {
     APP_LOGD("UpdateData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -292,7 +230,7 @@ bool RdbDataManager::UpdateData(
         return false;
     }
     int32_t rowId = -1;
-    ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
+    auto ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
     return ret == NativeRdb::E_OK;
 }
 
@@ -300,8 +238,7 @@ bool RdbDataManager::UpdateOrInsertData(
     const NativeRdb::ValuesBucket &valuesBucket, const NativeRdb::AbsRdbPredicates &absRdbPredicates)
 {
     APP_LOGD("UpdateOrInsertData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -311,7 +248,7 @@ bool RdbDataManager::UpdateOrInsertData(
         return false;
     }
     int32_t rowId = -1;
-    ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
+    auto ret = rdbStore->Update(rowId, valuesBucket, absRdbPredicates);
     if ((ret == NativeRdb::E_OK) && (rowId == 0)) {
         APP_LOGI_NOFUNC("data not exist, need insert data");
         int64_t rowIdInsert = -1;
@@ -324,8 +261,7 @@ bool RdbDataManager::UpdateOrInsertData(
 bool RdbDataManager::DeleteData(const std::string &key)
 {
     APP_LOGD("DeleteData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -334,14 +270,13 @@ bool RdbDataManager::DeleteData(const std::string &key)
     int32_t rowId = -1;
     NativeRdb::AbsRdbPredicates absRdbPredicates(bmsRdbConfig_.tableName);
     absRdbPredicates.EqualTo(BMS_KEY, key);
-    ret = rdbStore->Delete(rowId, absRdbPredicates);
+    auto ret = rdbStore->Delete(rowId, absRdbPredicates);
     return ret == NativeRdb::E_OK;
 }
 
 bool RdbDataManager::DeleteData(const NativeRdb::AbsRdbPredicates &absRdbPredicates)
 {
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -351,15 +286,14 @@ bool RdbDataManager::DeleteData(const NativeRdb::AbsRdbPredicates &absRdbPredica
         return false;
     }
     int32_t rowId = -1;
-    ret = rdbStore->Delete(rowId, absRdbPredicates);
+    auto ret = rdbStore->Delete(rowId, absRdbPredicates);
     return ret == NativeRdb::E_OK;
 }
 
 bool RdbDataManager::QueryData(const std::string &key, std::string &value)
 {
     APP_LOGD("QueryData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -373,7 +307,7 @@ bool RdbDataManager::QueryData(const std::string &key, std::string &value)
         return false;
     }
     ScopeGuard stateGuard([&] { absSharedResultSet->Close(); });
-    ret = absSharedResultSet->GoToFirstRow();
+    auto ret = absSharedResultSet->GoToFirstRow();
     if (ret != NativeRdb::E_OK) {
         APP_LOGE_NOFUNC("GoToFirstRow failed, ret: %{public}d", ret);
         return false;
@@ -392,8 +326,7 @@ std::shared_ptr<NativeRdb::ResultSet> RdbDataManager::QueryData(
     const NativeRdb::AbsRdbPredicates &absRdbPredicates)
 {
     APP_LOGD("QueryData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return nullptr;
@@ -413,8 +346,7 @@ std::shared_ptr<NativeRdb::ResultSet> RdbDataManager::QueryData(
 bool RdbDataManager::QueryAllData(std::map<std::string, std::string> &datas)
 {
     APP_LOGD("QueryAllData start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
@@ -462,13 +394,12 @@ bool RdbDataManager::CreateTable()
     } else {
         createTableSql = bmsRdbConfig_.createTableSql;
     }
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return false;
     }
-    ret = rdbStore->ExecuteSql(createTableSql);
+    int ret = rdbStore->ExecuteSql(createTableSql);
     if (ret != NativeRdb::E_OK) {
         APP_LOGE("CreateTable %{public}s failed, ret: %{public}d", bmsRdbConfig_.tableName.c_str(), ret);
         return false;
@@ -523,8 +454,7 @@ std::shared_ptr<NativeRdb::ResultSet> RdbDataManager::QueryByStep(
     const NativeRdb::AbsRdbPredicates &absRdbPredicates)
 {
     APP_LOGD("QueryByStep start");
-    ErrCode ret = ERR_OK;
-    auto rdbStore = GetRdbStore(ret);
+    auto rdbStore = GetRdbStore();
     if (rdbStore == nullptr) {
         APP_LOGE("RdbStore is null");
         return nullptr;
@@ -557,12 +487,7 @@ int32_t RdbDataManager::InsertWithRetry(std::shared_ptr<NativeRdb::RdbStore> rdb
         }
         APP_LOGW("rdb insert failed, retry count: %{public}d, ret: %{public}d", retryCnt, ret);
     } while (retryCnt < RETRY_TIMES);
-    auto it = RDB_ERR_MAP.find(ret);
-    if (it != RDB_ERR_MAP.end()) {
-        ret = it->second;
-        return ret;
-    }
-    return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
+    return ret;
 }
 
 bool RdbDataManager::IsRetryErrCode(int32_t errCode)
diff --git a/services/bundlemgr/src/status_receiver_proxy.cpp b/services/bundlemgr/src/status_receiver_proxy.cpp
index 7a21d2d56a268cbab316e7d4f339a343e1f20d9f..6da781dcfe26fef31ac9bd47e3ee43288fd8013b 100644
--- a/services/bundlemgr/src/status_receiver_proxy.cpp
+++ b/services/bundlemgr/src/status_receiver_proxy.cpp
@@ -752,65 +752,6 @@ const std::unordered_map<int32_t, struct ReceivedResult> MAP_RECEIVED_RESULTS {
     {ERR_APPEXECFWK_INSTALL_NOT_SUPPORT_STATIC_ATOMIC_SERVICE,
         {IStatusReceiver::ERR_INSTALL_NOT_SUPPORT_STATIC_ATOMIC_SERVICE,
             MSG_ERR_INSTALL_NOT_SUPPORT_STATIC_ATOMIC_SERVICE}},
-    {ERR_APPEXECFWK_DB_SQL_MUST_BE_QUERY_STATEMENT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_COLUMN_OUT_OF_BOUNDS,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_INVALID_DATABASE_PATH,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_ROW_OUT_OF_BOUNDS,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_NO_DATA_MEETS_CONDITION,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_ALREADY_CLOSED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_DO_NOT_RESPOND,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_THE_WAL_FILE_SIZE_OVER_DEFAULT_LIMIT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_FAILED_TO_GET_DATA_OBS_MGR_CLIENT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_THE_TYPE_OF_DISTRIBUTED_TABLE_NOT_MATCH,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_IS_FULL,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_NOT_SUPPORT_THS_SQL,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_IS_ALREADY_ATTACHED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_GENERIC_ERROR,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_CORRUPTED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_CALLBACK_ROUTINE_REQUESTED_AN_ABORT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_ACCESS_PERMISSION_DENIED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_FILE_IS_LOCKED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_TABLE_IS_LOCKED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_DB_IS_OUT_OF_MEMORY,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_ATTEMPT_WRITE_READONLY_DB,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_SOME_KIND_OF_DISK_IO_ERROR,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_UNABLE_OPEN_DB_FILE,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_TEXT_OR_BLOB_EXCEED_SIZE_LIMIT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_ABORT_DUE_TO_CONSTRAINT_VIOLATION,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_DATA_TYPE_MISMATCH,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_SQL_LIBRARY_USED_INCORRECTLY,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_CONFIG_CHANGED,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    {ERR_APPEXECFWK_DB_CAPABILITY_NOT_SUPPORT,
-        {IStatusReceiver::ERR_INSTALL_INTERNAL_ERROR, MSG_ERR_INSTALL_INTERNAL_ERROR}},
-    
 };
 }  // namespace
 
diff --git a/services/bundlemgr/test/mock/src/bundle_data_storage_rdb.cpp b/services/bundlemgr/test/mock/src/bundle_data_storage_rdb.cpp
index 1b040ab1d7a8ee8ed5e610b95ef809b2317508dd..efc0a0ffb97b9b486f5ce06e638ea8ec9621aa0b 100644
--- a/services/bundlemgr/test/mock/src/bundle_data_storage_rdb.cpp
+++ b/services/bundlemgr/test/mock/src/bundle_data_storage_rdb.cpp
@@ -43,12 +43,6 @@ bool BundleDataStorageRdb::SaveStorageBundleInfo(const InnerBundleInfo &innerBun
     return true;
 }
 
-ErrCode BundleDataStorageRdb::SaveStorageBundleInfoWithCode(const InnerBundleInfo &innerBundleInfo)
-{
-    INNER_BUNDLE_INFOS[innerBundleInfo.GetBundleName()] = innerBundleInfo;
-    return ERR_OK;
-}
-
 bool BundleDataStorageRdb::DeleteStorageBundleInfo(const InnerBundleInfo &innerBundleInfo)
 {
     auto ret = INNER_BUNDLE_INFOS.erase(innerBundleInfo.GetBundleName());
diff --git a/services/bundlemgr/test/mock/src/mock_rdb_data_manager.cpp b/services/bundlemgr/test/mock/src/mock_rdb_data_manager.cpp
index f9e8d403aa5a262b1d5a39698da393ac62667094..29c9e42999756c812e54a6cf3ebd8fb8fff152b5 100644
--- a/services/bundlemgr/test/mock/src/mock_rdb_data_manager.cpp
+++ b/services/bundlemgr/test/mock/src/mock_rdb_data_manager.cpp
@@ -34,7 +34,7 @@ void RdbDataManager::ClearCache()
     NativeRdb::RdbHelper::ClearCache();
 }
 
-std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore(ErrCode &ret)
+std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore()
 {
     return nullptr;
 }
@@ -44,11 +44,6 @@ bool RdbDataManager::InsertData(const std::string &key, const std::string &value
     return false;
 }
 
-ErrCode RdbDataManager::InsertDataWithCode(const std::string &key, const std::string &value)
-{
-    return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
-}
-
 bool RdbDataManager::InsertData(const NativeRdb::ValuesBucket &valuesBucket)
 {
     return false;
diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp
index ea8e42eac238e328b0627141c3c8485ae95b0ea7..212c0bca97a4b683f663fe9fe36c4d0b9a7e8bbb 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp
@@ -1330,8 +1330,7 @@ HWTEST_F(BmsBundleDataMgrNullptrTest, RdbDataManager_0001, Function | MediumTest
     bmsRdbConfig.tableName = TABLE_NAME;
     auto rdbDataManager = std::make_shared<RdbDataManager>(bmsRdbConfig);
     ASSERT_NE(rdbDataManager, nullptr);
-    ErrCode ret = ERR_OK;
-    auto ptr = rdbDataManager->GetRdbStore(ret);
+    auto ptr = rdbDataManager->GetRdbStore();
     EXPECT_EQ(ptr, nullptr);
 }
 
diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/mock_rdb_data_manager.h b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/mock_rdb_data_manager.h
index ff1e80f00cc04a49ef872629ca6b5b09ed0d6634..fc197f0c284d34130077eab39305721ebfd921f0 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/mock_rdb_data_manager.h
+++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/mock/mock_rdb_data_manager.h
@@ -38,7 +38,7 @@ void RdbDataManager::ClearCache()
     NativeRdb::RdbHelper::ClearCache();
 }
 
-std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore(ErrCode &ret)
+std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore()
 {
     return nullptr;
 }
@@ -48,11 +48,6 @@ bool RdbDataManager::InsertData(const std::string &key, const std::string &value
     return true;
 }
 
-ErrCode RdbDataManager::InsertDataWithCode(const std::string &key, const std::string &value)
-{
-    return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
-}
-
 bool RdbDataManager::InsertData(const NativeRdb::ValuesBucket &valuesBucket)
 {
     return true;
diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp
index 853df9294e163bbdae75c5e1ffdc472eba35eb2b..a4c3cdfcb6d19b1ff86f180654181656efe95cd7 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp
@@ -12458,39 +12458,4 @@ HWTEST_F(BmsBundleInstallerTest, CheckArkTSMode_0800, Function | MediumTest | Le
     auto result = installer.CheckArkTSMode(infos);
     EXPECT_EQ(result, ERR_OK);
 }
-
-/**
- * @tc.number: AddInnerBundleUserInfo_0100
- * @tc.name: test AddInnerBundleUserInfo
- * @tc.desc: 1.AddInnerBundleUserInfo failed
- *           2.AddInnerBundleUserInfo succeed
- */
-HWTEST_F(BmsBundleInstallerTest, AddInnerBundleUserInfo_0100, Function | SmallTest | Level0)
-{
-    OHOS::system::SetParameter(ServiceConstants::IS_ENTERPRISE_DEVICE, "true");
-    auto dataMgr = GetBundleDataMgr();
-    EXPECT_NE(dataMgr, nullptr);
-    std::string bundleFile = RESOURCE_ROOT_PATH + RIGHT_BUNDLE;
-    bool result = InstallSystemBundle(bundleFile);
-    EXPECT_TRUE(result) << "the bundle file install failed: " << bundleFile;
-
-    InnerBundleUserInfo innerBundleUserInfo;
-    innerBundleUserInfo.bundleUserInfo.userId = ADD_NEW_USERID;
-    innerBundleUserInfo.bundleName = BUNDLE_NAME;
-    auto ret = dataMgr->AddInnerBundleUserInfo(BUNDLE_NAME, innerBundleUserInfo);
-    EXPECT_EQ(ret, ERR_OK);
-
-    // test multiuser force uninstall
-    InstallParam installParam;
-    installParam.userId = USERID;
-    setuid(Constants::EDC_UID);
-    installParam.parameters.emplace(Constants::VERIFY_UNINSTALL_FORCED_KEY,
-        Constants::VERIFY_UNINSTALL_FORCED_VALUE);
-    ErrCode res = MockForceUnInstallBundle(BUNDLE_NAME, installParam);
-    EXPECT_EQ(res, ERR_OK);
-
-    dataMgr->RemoveInnerBundleUserInfo(BUNDLE_NAME, ADD_NEW_USERID);
-    OHOS::system::SetParameter(ServiceConstants::IS_ENTERPRISE_DEVICE, "false");
-    ClearBundleInfo();
-}
 } // OHOS
diff --git a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_two.cpp b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_two.cpp
index 99f4456e878a438ecfb5563b2547aaab00538298..2607087b9626971d27b45d4fa17732ea93991e9a 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_two.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_two.cpp
@@ -2221,9 +2221,9 @@ HWTEST_F(BmsBundleManagerTest2, GetBundleDataMgr_0021, Function | SmallTest | Le
     innerBundleUserInfo.bundleUserInfo.enabled = true;
     innerBundleUserInfo.bundleUserInfo.userId = Constants::INVALID_USERID;
     innerBundleUserInfo.uid = 65535;
-    ErrCode res = GetBundleDataMgr()->AddInnerBundleUserInfo(
+    bool res = GetBundleDataMgr()->AddInnerBundleUserInfo(
         TEST_BUNDLE_NAME, innerBundleUserInfo);
-    EXPECT_NE(res, ERR_OK);
+    EXPECT_EQ(res, false);
 }
 
 /**
diff --git a/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/bms_bundle_rdb_data_manager_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/bms_bundle_rdb_data_manager_test.cpp
index 51c6fb4205bd2a7049c1053445662def80d76e38..643b00dece3b8c54e395c511b5dee6ec80dcd5a5 100644
--- a/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/bms_bundle_rdb_data_manager_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_rdb_data_manager_test/bms_bundle_rdb_data_manager_test.cpp
@@ -264,8 +264,7 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1200, Function | SmallTest
     ASSERT_NE(rdbDataManager, nullptr);
     auto store = std::make_shared<MockAppProvisionInfo>();
     rdbDataManager->rdbStore_ = store;
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+    auto ret = rdbDataManager->GetRdbStore();
     ASSERT_EQ(ret, store);
 }
 
@@ -280,8 +279,7 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1300, Function | SmallTest
     ASSERT_NE(rdbDataManager, nullptr);
     rdbDataManager->rdbStore_ = nullptr;
     rdbDataManager->bmsRdbConfig_.dbName = "";
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+    auto ret = rdbDataManager->GetRdbStore();
     ASSERT_EQ(ret, nullptr);
 }
 
@@ -296,8 +294,7 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1400, Function | SmallTest
     ASSERT_NE(rdbDataManager, nullptr);
     rdbDataManager->rdbStore_ = nullptr;
     rdbDataManager->bmsRdbConfig_.dbName = BMS_BACK_UP_RDB_NAME;
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+    auto ret = rdbDataManager->GetRdbStore();
     ASSERT_EQ(ret, nullptr);
 }
 
@@ -314,8 +311,7 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1500, Function | SmallTest
     auto store = std::make_shared<MockAppProvisionInfo>();
     MockGetRdbStore(store);
     rdbDataManager->bmsRdbConfig_.dbName = BMS_BACK_UP_RDB_NAME;
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+    auto ret = rdbDataManager->GetRdbStore();
     ASSERT_NE(ret, nullptr);
 }
 
@@ -333,8 +329,7 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1600, Function | SmallTest
     MockGetRdbStore(store);
     rdbDataManager->bmsRdbConfig_.dbName = BMS_BACK_UP_RDB_NAME;
     rdbDataManager->isInitial_ = false;
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+    auto ret = rdbDataManager->GetRdbStore();
     ASSERT_NE(ret, nullptr);
 }
 
@@ -352,8 +347,6 @@ HWTEST_F(BmsBundleRdbDataManagerTest, RdbDataManager_1700, Function | SmallTest
     MockGetRdbStore(store);
     auto ret = rdbDataManager->InsertData(KEY_ONE, VALUE_ONE);
     EXPECT_FALSE(ret);
-    auto ret2 = rdbDataManager->InsertDataWithCode(KEY_ONE, VALUE_ONE);
-    EXPECT_NE(ret2, ERR_OK);
 }
 
 /**
diff --git a/services/bundlemgr/test/unittest/bms_on_demand_install_test/mock_rdb_data_manager_true.cpp b/services/bundlemgr/test/unittest/bms_on_demand_install_test/mock_rdb_data_manager_true.cpp
index 7916af5a2454b4cd3e082eecd93ac1683d8fdc52..f170d536c36292cc2af0b95215ba792b12a77e9b 100644
--- a/services/bundlemgr/test/unittest/bms_on_demand_install_test/mock_rdb_data_manager_true.cpp
+++ b/services/bundlemgr/test/unittest/bms_on_demand_install_test/mock_rdb_data_manager_true.cpp
@@ -34,7 +34,7 @@ void RdbDataManager::ClearCache()
     NativeRdb::RdbHelper::ClearCache();
 }
 
-std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore(ErrCode &result)
+std::shared_ptr<NativeRdb::RdbStore> RdbDataManager::GetRdbStore()
 {
     return nullptr;
 }
@@ -44,11 +44,6 @@ bool RdbDataManager::InsertData(const std::string &key, const std::string &value
     return true;
 }
 
-ErrCode RdbDataManager::InsertDataWithCode(const std::string &key, const std::string &value)
-{
-    return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR;
-}
-
 bool RdbDataManager::InsertData(const NativeRdb::ValuesBucket &valuesBucket)
 {
     return true;
diff --git a/services/bundlemgr/test/unittest/bms_rdb_data_manager_test/bms_rdb_data_manager_test.cpp b/services/bundlemgr/test/unittest/bms_rdb_data_manager_test/bms_rdb_data_manager_test.cpp
index 08354d2d5fd335ab0542081e02a0f82a70481562..694d47aa282cbfe834919be4226f91968dfc36e5 100755
--- a/services/bundlemgr/test/unittest/bms_rdb_data_manager_test/bms_rdb_data_manager_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_rdb_data_manager_test/bms_rdb_data_manager_test.cpp
@@ -629,8 +629,8 @@ HWTEST_F(BmsRdbDataManagerTest, RdbDataManager_0900, Function | SmallTest | Leve
 {
     auto rdbDataManager = OpenDbAndTable();
     ASSERT_NE(rdbDataManager, nullptr);
-    ErrCode result = ERR_OK;
-    auto ret = rdbDataManager->GetRdbStore(result);
+
+    auto ret = rdbDataManager->GetRdbStore();
     EXPECT_NE(ret, nullptr);
 }
 
@@ -658,8 +658,8 @@ HWTEST_F(BmsRdbDataManagerTest, RdbDataManager_1100, Function | SmallTest | Leve
 {
     auto rdbDataManager = OpenDbAndTable();
     ASSERT_NE(rdbDataManager, nullptr);
-    ErrCode result = ERR_OK;
-    auto rdbStore = rdbDataManager->GetRdbStore(result);
+
+    auto rdbStore = rdbDataManager->GetRdbStore();
     ASSERT_NE(rdbStore, nullptr);
 
     NativeRdb::ValuesBucket valuesBucket;
@@ -680,46 +680,16 @@ HWTEST_F(BmsRdbDataManagerTest, RdbDataManager_1200, Function | SmallTest | Leve
 {
     auto rdbDataManager = OpenDbAndTable();
     ASSERT_NE(rdbDataManager, nullptr);
-    ErrCode result = ERR_OK;
-    auto rdbStore = rdbDataManager->GetRdbStore(result);
+
+    auto rdbStore = rdbDataManager->GetRdbStore();
     ASSERT_NE(rdbStore, nullptr);
 
     std::string path = DB_PATH + DB_NAME;
     auto res = BundleUtil::DeleteDir(path);
     EXPECT_TRUE(res);
-    result = ERR_OK;
-    rdbStore = rdbDataManager->GetRdbStore(result);
-    ASSERT_NE(rdbStore, nullptr);
-}
-
-/**
- * @tc.number: RdbDataManager_1300
- * @tc.name: insert queryAll
- * @tc.desc: 1.insert data
- *           2.queryAll data
- * @tc.require: issueI56W8B
- */
-HWTEST_F(BmsRdbDataManagerTest, RdbDataManager_1300, Function | SmallTest | Level1)
-{
-    auto rdbDataManager = OpenDbAndTable();
-    EXPECT_TRUE(rdbDataManager != nullptr);
-
-    ErrCode ret = rdbDataManager->InsertDataWithCode(KEY_ONE, VALUE_ONE);
-    EXPECT_EQ(ret, ERR_OK);
-
-    ret = rdbDataManager->InsertDataWithCode(KEY_TWO, VALUE_TWO);
-    EXPECT_EQ(ret, ERR_OK);
-
-    ret = rdbDataManager->InsertDataWithCode(KEY_THREE, VALUE_THREE);
-    EXPECT_EQ(ret, ERR_OK);
 
-    std::map<std::string, std::string> datas;
-    bool ret2 = rdbDataManager->QueryAllData(datas);
-    EXPECT_TRUE(ret2);
-    EXPECT_TRUE(datas[KEY_ONE] == VALUE_ONE);
-    EXPECT_TRUE(datas[KEY_TWO] == VALUE_TWO);
-    EXPECT_TRUE(datas[KEY_THREE] == VALUE_THREE);
-    CloseDb();
+    rdbStore = rdbDataManager->GetRdbStore();
+    ASSERT_NE(rdbStore, nullptr);
 }
 
 #ifdef BUNDLE_FRAMEWORK_DEFAULT_APP