diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp index f04980ccc167301f48916a6a907e72f745330e5e..7e80ab286c962bcb8d8ea2b8433632aacd256f92 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.cpp @@ -1305,43 +1305,6 @@ Status KVDBServiceImpl::ConvertDbStatus(DBStatus status) const return Status::ERROR; } -Status KVDBServiceImpl::ConvertGeneralErr(GeneralError error) const -{ - switch (error) { - case GeneralError::E_DB_ERROR: - return Status::DB_ERROR; - case GeneralError::E_OK: - return Status::SUCCESS; - case GeneralError::E_INVALID_ARGS: - return Status::INVALID_ARGUMENT; - case GeneralError::E_RECORD_NOT_FOUND: - return Status::KEY_NOT_FOUND; - case GeneralError::E_INVALID_VALUE_FIELDS: - return Status::INVALID_VALUE_FIELDS; - case GeneralError::E_INVALID_FIELD_TYPE: - return Status::INVALID_FIELD_TYPE; - case GeneralError::E_CONSTRAIN_VIOLATION: - return Status::CONSTRAIN_VIOLATION; - case GeneralError::E_INVALID_FORMAT: - return Status::INVALID_FORMAT; - case GeneralError::E_INVALID_QUERY_FORMAT: - return Status::INVALID_QUERY_FORMAT; - case GeneralError::E_INVALID_QUERY_FIELD: - return Status::INVALID_QUERY_FIELD; - case GeneralError::E_NOT_SUPPORT: - return Status::NOT_SUPPORT; - case GeneralError::E_TIME_OUT: - return Status::TIME_OUT; - case GeneralError::E_OVER_MAX_LIMITS: - return Status::OVER_MAX_LIMITS; - case GeneralError::E_SECURITY_LEVEL_ERROR: - return Status::SECURITY_LEVEL_ERROR; - default: - break; - } - return Status::ERROR; -} - KVDBServiceImpl::DBMode KVDBServiceImpl::ConvertDBMode(SyncMode syncMode) const { DBMode dbMode; @@ -1484,36 +1447,6 @@ bool KVDBServiceImpl::IsOHOSType(const std::vector &ids) return isOHOSType; } -Status KVDBServiceImpl::RemoveDeviceData(const AppId &appId, const StoreId &storeId, int32_t subUser, - const std::string &device) -{ - StoreMetaData metaData = GetStoreMetaData(appId, storeId, subUser); - MetaDataManager::GetInstance().LoadMeta(metaData.GetKey(), metaData); - auto watcher = GetWatchers(metaData.tokenId, metaData.storeId, metaData.user); - auto store = AutoCache::GetInstance().GetStore(metaData, watcher); - if (store == nullptr) { - ZLOGE("GetStore failed! appId:%{public}s storeId:%{public}s dir:%{public}s", metaData.bundleName.c_str(), - Anonymous::Change(metaData.storeId).c_str(), metaData.dataDir.c_str()); - return Status::ERROR; - } - - int32_t ret; - if (device.empty()) { - ret = store->Clean({}, KVDBGeneralStore::NEARBY_DATA, ""); - } else { - auto uuid = DMAdapter::GetInstance().ToUUID(device); - if (uuid.empty()) { - auto tokenId = IPCSkeleton::GetCallingTokenID(); - if (AccessTokenKit::GetTokenTypeFlag(tokenId) != TOKEN_HAP) { - ZLOGW("uuid convert empty! device:%{public}s", Anonymous::Change(device).c_str()); - uuid = device; - } - } - ret = store->Clean({ uuid }, KVDBGeneralStore::NEARBY_DATA, ""); - } - return ConvertGeneralErr(GeneralError(ret)); -} - std::string KVDBServiceImpl::GenerateKey(const std::string &userId, const std::string &storeId) const { std::string key = ""; diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h index 4604f8b56eac50623014bd56fe84f06167797057..ee7aa2812ccf8c74a24832b8f43c986c21909566 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_impl.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_impl.h @@ -80,8 +80,6 @@ public: int32_t OnAppExit(pid_t uid, pid_t pid, uint32_t tokenId, const std::string &appId) override; int32_t ResolveAutoLaunch(const std::string &identifier, DBLaunchParam ¶m) override; int32_t OnUserChange(uint32_t code, const std::string &user, const std::string &account) override; - Status RemoveDeviceData(const AppId &appId, const StoreId &storeId, int32_t subUser, - const std::string &device) override; private: using StrategyMeta = OHOS::DistributedData::StrategyMeta; @@ -94,7 +92,6 @@ private: using DBStatus = DistributedDB::DBStatus; using DBMode = DistributedDB::SyncMode; using Action = OHOS::DistributedData::MetaDataManager::Action; - using GeneralError = DistributedData::GeneralError; enum SyncAction { ACTION_SYNC, ACTION_SUBSCRIBE, @@ -136,7 +133,6 @@ private: Status DoComplete(const StoreMetaData &meta, const SyncInfo &info, RefCount refCount, const DBResult &dbResult); uint32_t GetSyncDelayTime(uint32_t delay, const StoreId &storeId, const std::string &subUser = ""); Status ConvertDbStatus(DBStatus status) const; - Status ConvertGeneralErr(GeneralError error) const; DBMode ConvertDBMode(SyncMode syncMode) const; ChangeType ConvertType(SyncMode syncMode) const; SwitchState ConvertAction(Action action) const; diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp b/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp index 37de89063cb67c628b7921dd146a531a5b2df219..91e2662d3bc7347771f2670925f99834746f8e9a 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp +++ b/services/distributeddataservice/service/kvdb/kvdb_service_stub.cpp @@ -49,7 +49,6 @@ const KVDBServiceStub::Handler &KVDBServiceStub::OnSubscribeSwitchData, &KVDBServiceStub::OnUnsubscribeSwitchData, &KVDBServiceStub::OnClose, - &KVDBServiceStub::OnRemoveDeviceData, }; int KVDBServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply) @@ -561,22 +560,4 @@ int32_t KVDBServiceStub::OnSetConfig(const AppId &appId, const StoreId &storeId, } return ERR_NONE; } - -int32_t KVDBServiceStub::OnRemoveDeviceData(const AppId &appId, const StoreId &storeId, MessageParcel &data, - MessageParcel &reply) -{ - std::string device; - int32_t subUser; - if (!ITypesUtil::Unmarshal(data, device, subUser)) { - 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 = RemoveDeviceData(appId, storeId, subUser, device); - if (!ITypesUtil::Marshal(reply, status)) { - ZLOGE("Marshal status:0x%{public}x appId:%{public}s", status, appId.appId.c_str()); - return IPC_STUB_WRITE_PARCEL_ERR; - } - return ERR_NONE; -} } // namespace OHOS::DistributedKv diff --git a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h index f26cb7c8325dfb1d5348c1f426379d8c340e7708..2322886970e22886d05b6ac834b730419fe75131 100644 --- a/services/distributeddataservice/service/kvdb/kvdb_service_stub.h +++ b/services/distributeddataservice/service/kvdb/kvdb_service_stub.h @@ -57,7 +57,6 @@ private: int32_t OnUnsubscribeSwitchData( const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply); int32_t OnSetConfig(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply); - int32_t OnRemoveDeviceData(const AppId &appId, const StoreId &storeId, MessageParcel &data, MessageParcel &reply); static const Handler HANDLERS[static_cast(KVDBServiceInterfaceCode::TRANS_BUTT)]; bool CheckPermission(uint32_t code, const StoreInfo &storeInfo); diff --git a/services/distributeddataservice/service/test/kvdb_service_impl_test.cpp b/services/distributeddataservice/service/test/kvdb_service_impl_test.cpp index 41d80ae99c20f19ab7a882e12d8fe0ed6882bc43..d7081753fbef0582b0ea76381f89c647303c669e 100644 --- a/services/distributeddataservice/service/test/kvdb_service_impl_test.cpp +++ b/services/distributeddataservice/service/test/kvdb_service_impl_test.cpp @@ -715,30 +715,6 @@ HWTEST_F(KvdbServiceImplTest, GetSyncDelayTimeTest001, TestSize.Level0) ASSERT_EQ(status, 0); } -/** -* @tc.name: ConvertGeneralErrTest -* @tc.desc: ConvertGeneralErr test the return result of input with different values. -* @tc.type: FUNC -* @tc.author: wangbin -*/ -HWTEST_F(KvdbServiceImplTest, ConvertGeneralErrTest, TestSize.Level0) -{ - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_DB_ERROR), Status::DB_ERROR); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_OK), Status::SUCCESS); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_ARGS), Status::INVALID_ARGUMENT); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_RECORD_NOT_FOUND), Status::KEY_NOT_FOUND); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_VALUE_FIELDS), Status::INVALID_VALUE_FIELDS); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_FIELD_TYPE), Status::INVALID_FIELD_TYPE); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_CONSTRAIN_VIOLATION), Status::CONSTRAIN_VIOLATION); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_FORMAT), Status::INVALID_FORMAT); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_QUERY_FORMAT), Status::INVALID_QUERY_FORMAT); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_INVALID_QUERY_FIELD), Status::INVALID_QUERY_FIELD); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_NOT_SUPPORT), Status::NOT_SUPPORT); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_TIME_OUT), Status::TIME_OUT); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_OVER_MAX_LIMITS), Status::OVER_MAX_LIMITS); - EXPECT_EQ(kvdbServiceImpl_->ConvertGeneralErr(GeneralError::E_SECURITY_LEVEL_ERROR), Status::SECURITY_LEVEL_ERROR); -} - /** * @tc.name: DisableCapabilityTest001 * @tc.desc: DisableCapability test diff --git a/services/distributeddataservice/service/test/kvdb_service_stub_unittest.cpp b/services/distributeddataservice/service/test/kvdb_service_stub_unittest.cpp index c9bf0cef913f7108fa949eb0c15459fb500cdacc..78f0132d7e7da4afcc94c3a779399ae50fda6194 100644 --- a/services/distributeddataservice/service/test/kvdb_service_stub_unittest.cpp +++ b/services/distributeddataservice/service/test/kvdb_service_stub_unittest.cpp @@ -334,21 +334,5 @@ HWTEST_F(KVDBServiceStubTest, OnSetConfig, TestSize.Level1) auto status = kvdbServiceStub->OnSetConfig(appId, storeId, data, reply); EXPECT_EQ(status, IPC_STUB_INVALID_DATA_ERR); } - -/** - * @tc.name: OnRemoveDeviceData - * @tc.desc: Test OnRemoveDeviceData - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(KVDBServiceStubTest, OnRemoveDeviceData, TestSize.Level1) -{ - MessageParcel data; - MessageParcel reply; - AppId appId = {"appId"}; - StoreId storeId = {"storeId"}; - auto status = kvdbServiceStub->OnRemoveDeviceData(appId, storeId, data, reply); - EXPECT_EQ(status, IPC_STUB_INVALID_DATA_ERR); -} } // namespace DistributedDataTest } // namespace OHOS::Test \ No newline at end of file