From e2b71f6e6db7d9e9392632ce6bdb705cfa5783a9 Mon Sep 17 00:00:00 2001 From: wuyongning Date: Mon, 7 Mar 2022 10:36:24 +0800 Subject: [PATCH] update files Signed-off-by: wuyongning Changes to be committed: modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h modified: frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h modified: frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp modified: frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h modified: frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h modified: frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h modified: frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h modified: frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp modified: frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp modified: interfaces/innerkits/distributeddata/include/blob.h modified: interfaces/innerkits/distributeddata/include/types.h modified: services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp modified: services/distributeddataservice/app/src/kvstore_observer_impl.h modified: services/distributeddataservice/app/src/kvstore_snapshot_impl.h --- .../innerkitsimpl/distributeddatafwk/include/ikvstore.h | 1 - .../include/ikvstore_client_death_observer.h | 3 --- .../distributeddatafwk/include/ikvstore_observer.h | 2 -- .../distributeddatafwk/include/ikvstore_single.h | 1 - .../distributeddatafwk/include/ikvstore_snapshot.h | 1 - .../distributeddatafwk/include/ikvstore_sync_callback.h | 2 -- .../innerkitsimpl/distributeddatafwk/include/inner_types.h | 2 -- .../distributeddatafwk/src/ikvstore_snapshot.cpp | 2 -- .../innerkitsimpl/distributeddatafwk/src/kvstore_client.h | 2 -- .../distributeddatafwk/src/kvstore_death_recipient_impl.h | 2 -- .../distributeddatafwk/src/kvstore_observer_client.h | 1 - .../distributeddatafwk/src/kvstore_sync_callback_client.h | 1 - .../test/unittest/app_distributed_kv_store_test.cpp | 7 ++++--- .../test/unittest/distributed_kv_data_manager_test.cpp | 3 --- interfaces/innerkits/distributeddata/include/blob.h | 1 - interfaces/innerkits/distributeddata/include/types.h | 1 - .../adapter/permission/src/client_permission_validator.cpp | 1 - .../distributeddataservice/app/src/kvstore_observer_impl.h | 2 -- .../distributeddataservice/app/src/kvstore_snapshot_impl.h | 2 -- 19 files changed, 4 insertions(+), 33 deletions(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h index 5b79c239d..ffd926a6d 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h @@ -26,7 +26,6 @@ namespace OHOS { namespace DistributedKv { - class IKvStoreImpl : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreImpl") diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h index ee6d91a4a..2d391111b 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h @@ -22,7 +22,6 @@ namespace OHOS { namespace DistributedKv { - class IKvStoreClientDeathObserver : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreClientDeathObserver"); @@ -30,7 +29,6 @@ public: class KvStoreClientDeathObserverStub : public IRemoteStub { public: - }; class KvStoreClientDeathObserverProxy : public IRemoteProxy { @@ -40,7 +38,6 @@ public: private: static inline BrokerDelegator delegator_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h index b04d53ced..14b195f78 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h @@ -25,7 +25,6 @@ namespace OHOS { namespace DistributedKv { - class IKvStoreObserver : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreObserver"); @@ -46,7 +45,6 @@ public: private: static inline BrokerDelegator delegator_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h index 2d333cb63..67e710e88 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h @@ -206,7 +206,6 @@ public: private: static inline BrokerDelegator delegator_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h index 843d16358..31268126d 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h @@ -24,7 +24,6 @@ namespace OHOS { namespace DistributedKv { - class IKvStoreSnapshotImpl : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreSnapshotImpl") diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h index 343760a8c..7761fdfc7 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h @@ -24,7 +24,6 @@ namespace OHOS { namespace DistributedKv { - class IKvStoreSyncCallback : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreSyncCallback"); @@ -45,7 +44,6 @@ public: private: static inline BrokerDelegator delegator_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h b/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h index add36329c..192338f77 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h @@ -18,13 +18,11 @@ namespace OHOS { namespace DistributedKv { - enum class InnerStatus { SUCCESS = 0, DECREASE_REFCOUNT, ERROR, }; - } } #endif diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp index 8b8c4aaa4..9b812440b 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp @@ -64,7 +64,6 @@ void KvStoreSnapshotImplProxy::GetEntries(const Key &prefixKey, const Key &nextK // buffer: | status | entryLength | rawdatasize | (sptr)nextkey | // rawData: ( | keyLen | key | valueLen | value | ){entryLength} int32_t error = Remote()->SendRequest(GETENTRIES, data, reply, mo); - if (error != 0) { ZLOGW("Transact failed"); callback(Status::IPC_ERROR, entries, Key()); @@ -409,7 +408,6 @@ int32_t KvStoreSnapshotImplStub::GetKeysRemote(MessageParcel &data, MessageParce nxtKey = key; }); int bufferSize = GetTotalkeysSize(keyList); - if (bufferSize < Constant::SWITCH_RAW_DATA_SIZE) { return WritekeysParcelable(reply, statusTmp, keyList, bufferSize, nxtKey); } diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h index bc964eb24..2c8a0abc1 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h @@ -25,7 +25,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreClient final : public KvStore { public: explicit KvStoreClient(sptr kvStoreProxy, const std::string &storeId); @@ -65,7 +64,6 @@ private: std::mutex observerMapMutex_; std::string storeId_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h index 5e334cde6..a8deafec2 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h @@ -21,7 +21,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreDeathRecipientImpl { public: explicit KvStoreDeathRecipientImpl(std::shared_ptr kvStoreDeathRecipient); @@ -31,7 +30,6 @@ private: std::shared_ptr kvStoreDeathRecipient_; friend struct KvStoreDeathRecipientImplCompare; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h index 6e242912a..d7a3340b6 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h @@ -25,7 +25,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreObserverClient : public KvStoreObserverStub { public: KvStoreObserverClient(const StoreId &storeId, SubscribeType subscribeType, diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h index 52ac38e68..c738b58bb 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h @@ -23,7 +23,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreSyncCallbackClient : public KvStoreSyncCallbackStub { public: KvStoreSyncCallbackClient() = default; diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp index 5cb1421db..338b5ae79 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp @@ -419,13 +419,13 @@ HWTEST_F(AppDistributedKvStoreTest, AppKvstorePut007, TestSize.Level1) status = appKvStorePtr->Get(localRead, Key("teacher_name_wanger"), ret); EXPECT_EQ(status, Status::SUCCESS); ASSERT_EQ(ret.Size(), val.size()); - for(unsigned long i = 0; i < ret.Size(); i++) { + for (unsigned long i = 0; i < ret.Size(); i++) { EXPECT_EQ(ret.Data()[i], val[i]); } status = appKvStorePtr->Get(syncRead, Key("teacher_name_wanger"), ret); EXPECT_EQ(status, Status::SUCCESS); ASSERT_EQ(ret.Size(), val.size()); - for(unsigned long i = 0; i < ret.Size(); i++) { + for (unsigned long i = 0; i < ret.Size(); i++) { EXPECT_EQ(ret.Data()[i], val[i]); } @@ -582,8 +582,9 @@ HWTEST_F(AppDistributedKvStoreTest, AppKvstorePut011, TestSize.Level1) std::string Generate1025KeyLen() { // Generate key and the length is more than 1024; + constexpr int KEY_MAX_LENGTH = 1024; std::string str("prefix"); - for (int i = 0; i < 1024; i++) { + for (int i = 0; i < KEY_MAX_LENGTH; i++) { str += "a"; } return str; diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp index a7937ddf2..bd6aa922c 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp @@ -799,9 +799,6 @@ HWTEST_F(DistributedKvDataManagerTest, GetDevice001, TestSize.Level1) std::vector infos; status = manager.GetDeviceList(infos, DeviceFilterStrategy::FILTER); - // EXPECT_EQ(Status::SUCCESS, status) << "expected GetDeviceList true"; - // EXPECT_TRUE(infos.size() == 0) << "expected GetDeviceList exist"; - auto listener = std::make_shared(); status = manager.StartWatchDeviceChange(listener); EXPECT_EQ(Status::SUCCESS, status) << "expected StartWatchDeviceChange true"; diff --git a/interfaces/innerkits/distributeddata/include/blob.h b/interfaces/innerkits/distributeddata/include/blob.h index da9b9c2bf..d89c29d8c 100644 --- a/interfaces/innerkits/distributeddata/include/blob.h +++ b/interfaces/innerkits/distributeddata/include/blob.h @@ -104,7 +104,6 @@ public: private: std::vector blob_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/interfaces/innerkits/distributeddata/include/types.h b/interfaces/innerkits/distributeddata/include/types.h index 4e2b0fe1f..66a70b9fc 100755 --- a/interfaces/innerkits/distributeddata/include/types.h +++ b/interfaces/innerkits/distributeddata/include/types.h @@ -25,7 +25,6 @@ namespace OHOS { namespace DistributedKv { - // key set by client, can be any non-empty bytes array, and less than 1024 size. using Key = OHOS::DistributedKv::Blob; diff --git a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp index b004c9376..6781b1b16 100755 --- a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp +++ b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace DistributedKv { - ClientPermissionChangedCallback::ClientPermissionChangedCallback(std::int32_t pid, std::int32_t uid) { this->pid_ = pid; diff --git a/services/distributeddataservice/app/src/kvstore_observer_impl.h b/services/distributeddataservice/app/src/kvstore_observer_impl.h index 7887c2c42..55c9d792a 100644 --- a/services/distributeddataservice/app/src/kvstore_observer_impl.h +++ b/services/distributeddataservice/app/src/kvstore_observer_impl.h @@ -23,7 +23,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreObserverImpl : public DistributedDB::KvStoreObserver { public: KvStoreObserverImpl(SubscribeType subscribeType, sptr observerProxy); @@ -40,7 +39,6 @@ private: SubscribeType subscribeType_; sptr observerProxy_; }; - } // namespace DistributedKv } // namespace OHOS diff --git a/services/distributeddataservice/app/src/kvstore_snapshot_impl.h b/services/distributeddataservice/app/src/kvstore_snapshot_impl.h index d806f1a44..74f385f57 100644 --- a/services/distributeddataservice/app/src/kvstore_snapshot_impl.h +++ b/services/distributeddataservice/app/src/kvstore_snapshot_impl.h @@ -30,7 +30,6 @@ namespace OHOS { namespace DistributedKv { - class KvStoreSnapshotImpl : public KvStoreSnapshotImplStub { public: explicit KvStoreSnapshotImpl(DistributedDB::KvStoreSnapshotDelegate *kvStoreSnapshotDelegate, @@ -79,7 +78,6 @@ private: void GetKeysFromDelegateLocked(const Key &prefixKey, const Key &nextKey, std::function &, const Key &)> callback); }; - } // namespace DistributedKv } // namespace OHOS -- Gitee