From f3e3ba6cd29f30953604e9f3a378626c48dc8cf6 Mon Sep 17 00:00:00 2001 From: Sven Wang Date: Wed, 25 May 2022 20:55:20 +0800 Subject: [PATCH] correct the interfaces Signed-off-by: Sven Wang --- .../mock/include/mock_single_kv_store.h | 9 ++-- .../moduletest/mock/mock_single_kv_store.cpp | 9 ++-- .../mock/include/mock_single_kv_store.h | 42 +++++++++---------- .../unittest/mock/mock_single_kv_store.cpp | 15 ++++--- .../mock/ans_test_single_kv_store.cpp | 8 ++-- .../unittest/mock/ans_test_single_kv_store.h | 12 +++--- .../mock/include/mock_single_kv_store.h | 11 +++-- .../moduletest/mock/mock_single_kv_store.cpp | 11 +++-- 8 files changed, 55 insertions(+), 62 deletions(-) diff --git a/frameworks/ans/test/moduletest/mock/include/mock_single_kv_store.h b/frameworks/ans/test/moduletest/mock/include/mock_single_kv_store.h index 64a6a1cd1..4b6b6cea4 100644 --- a/frameworks/ans/test/moduletest/mock/include/mock_single_kv_store.h +++ b/frameworks/ans/test/moduletest/mock/include/mock_single_kv_store.h @@ -48,7 +48,7 @@ public: * @param entries Indicates the entries. * @return Indicates the status of this GetEntries operation. */ - virtual Status GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const override; + virtual Status GetEntries(const DataQuery &query, std::vector &entries) const override; /** * @brief Get ResultSet in this store which key start with prefixKey. @@ -66,8 +66,7 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this GetResultSet operation. */ - virtual Status GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const override; + Status GetResultSet(const DataQuery &query, std::shared_ptr &resultSet) const override; /** * @brief Close the ResultSet returned by GetResultSet. @@ -84,7 +83,7 @@ public: * @param result Indicates the result will be returned in this parameter. * @return Indicates the status of this CloseResultSet operation. */ - virtual Status GetCountWithQuery(const DataQuery &query, int &result) const override; + virtual Status GetCount(const DataQuery &query, int &result) const override; /** * @brief Sync store with other devices. This is an asynchronous method, @@ -282,7 +281,7 @@ public: * PUSH_PULL will firstly push all not-local store to listed devices, then pull these stores back. * @return Indicates the status of this operation. */ - virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, + virtual Status Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, std::shared_ptr syncCallback) override; /** diff --git a/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp b/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp index 0bd07aff0..899a0ed52 100644 --- a/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp +++ b/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp @@ -114,7 +114,7 @@ Status AnsTestSingleKvStore::GetEntries(const Key &prefixKey, std::vector return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const +Status AnsTestSingleKvStore::GetEntries(const DataQuery &query, std::vector &entries) const { return Status::SUCCESS; } @@ -124,8 +124,7 @@ Status AnsTestSingleKvStore::GetResultSet(const Key &prefixKey, std::shared_ptr< return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetResultSetWithQuery( - const DataQuery &query, std::shared_ptr &resultSet) const +Status AnsTestSingleKvStore::GetResultSet(const DataQuery &query, std::shared_ptr &resultSet) const { return Status::SUCCESS; } @@ -135,7 +134,7 @@ Status AnsTestSingleKvStore::CloseResultSet(std::shared_ptr &r return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetCountWithQuery(const DataQuery &query, int &result) const +Status AnsTestSingleKvStore::GetCount(const DataQuery &query, int &result) const { return Status::SUCCESS; } @@ -261,7 +260,7 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons return Status::SUCCESS; } -Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, +Status AnsTestSingleKvStore::Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, std::shared_ptr syncCallback) { return Status::SUCCESS; diff --git a/services/ans/test/unittest/mock/include/mock_single_kv_store.h b/services/ans/test/unittest/mock/include/mock_single_kv_store.h index 80de9d23d..1b0de70a3 100644 --- a/services/ans/test/unittest/mock/include/mock_single_kv_store.h +++ b/services/ans/test/unittest/mock/include/mock_single_kv_store.h @@ -40,7 +40,7 @@ public: * @param entries Indicates the entries. * @return Indicates the status of this GetEntries operation. */ - virtual Status GetEntries(const Key &prefixKey, std::vector &entries) const override; + Status GetEntries(const Key &prefixKey, std::vector &entries) const override; /** * @brief Get all entries in this store by query. @@ -49,7 +49,7 @@ public: * @param entries Indicates the entries. * @return Indicates the status of this GetEntries operation. */ - virtual Status GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const override; + Status GetEntries(const DataQuery &query, std::vector &entries) const override; /** * @brief Get ResultSet in this store which key start with prefixKey. @@ -58,7 +58,7 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this GetResultSet operation. */ - virtual Status GetResultSet(const Key &prefixKey, std::shared_ptr &resultSet) const override; + Status GetResultSet(const Key &prefixKey, std::shared_ptr &resultSet) const override; /** * @brief Get ResultSet in this store by Query. @@ -67,8 +67,7 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this GetResultSet operation. */ - virtual Status GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const override; + Status GetResultSet(const DataQuery &query, std::shared_ptr &resultSet) const override; /** * @brief Close the ResultSet returned by GetResultSet. @@ -76,7 +75,7 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this CloseResultSet operation. */ - virtual Status CloseResultSet(std::shared_ptr &resultSet) override; + Status CloseResultSet(std::shared_ptr &resultSet) override; /** * @brief Get the number of result by query. @@ -85,7 +84,7 @@ public: * @param result Indicates the result will be returned in this parameter. * @return Indicates the status of this CloseResultSet operation. */ - virtual Status GetCountWithQuery(const DataQuery &query, int &result) const override; + Status GetCount(const DataQuery &query, int &result) const override; /** * @brief Sync store with other devices. This is an asynchronous method, @@ -97,8 +96,7 @@ public: * @param allowedDelayMs Indicates the allowed delay milli-second to sync. default value is 0 for compatibility. * @return Indicates the status of this Sync operation. */ - virtual Status Sync( - const std::vector &deviceIds, SyncMode mode, uint32_t allowedDelayMs = 0) override; + Status Sync(const std::vector &deviceIds, SyncMode mode, uint32_t delayMs) override; /** * @brief Remove the device data synced from remote. @@ -106,14 +104,14 @@ public: * @param device Indicates the device id. * @return Indicates the status of this remove operation. */ - virtual Status RemoveDeviceData(const std::string &device) override; + Status RemoveDeviceData(const std::string &device) override; /** * @brief Get id of this AppKvStore. * * @return Indicates the id of store. */ - virtual StoreId GetStoreId() const override; + StoreId GetStoreId() const override; /** * @brief Delete an entry by its key. @@ -121,7 +119,7 @@ public: * @param key Indicates the key of the entry to be deleted. * @return Indicates the status of this delete operation. */ - virtual Status Delete(const Key &key) override; + Status Delete(const Key &key) override; /** * @brief Write a pair of key and value to this store. @@ -130,7 +128,7 @@ public: * @param value Indicates the value of this entry. Should be less than (1024 * 1024) bytes. * @return Indicates the status of this put operation. */ - virtual Status Put(const Key &key, const Value &value) override; + Status Put(const Key &key, const Value &value) override; /** * @brief Get value from AppKvStore by its key. @@ -139,7 +137,7 @@ public: * @param value Indicates the value will be returned in this parameter. * @return Indicates the status of this get operation. */ - virtual Status Get(const Key &key, Value &value) override; + Status Get(const Key &key, Value &value) override; /** * @brief Register change of this kvstore to a client-defined observer. @@ -153,7 +151,7 @@ public: * @param observer Indicates the observer to subscribe changes. * @return Indicates the status of this subscribe operation. */ - virtual Status SubscribeKvStore(SubscribeType subscribeType, std::shared_ptr observer) override; + Status SubscribeKvStore(SubscribeType subscribeType, std::shared_ptr observer) override; /** * @brief Unregister a kvstore to an observer. @@ -163,7 +161,7 @@ public: * @param observer Indicates the observer to unsubscribe this store. * @return Indicates the status of this unsubscribe operation. */ - virtual Status UnSubscribeKvStore(SubscribeType subscribeType, std::shared_ptr observer) override; + Status UnSubscribeKvStore(SubscribeType subscribeType, std::shared_ptr observer) override; /** * @brief Register message for sync operation. @@ -171,7 +169,7 @@ public: * @param callback Indicates the callback to register. * @return Indicates the status of this register operation. */ - virtual Status RegisterSyncCallback(std::shared_ptr callback) override; + Status RegisterSyncCallback(std::shared_ptr callback) override; /** * @brief Unregister message for sync operation. @@ -179,7 +177,7 @@ public: * @param callback Indicates the callback to register. * @return Indicates the status of this register operation. */ - virtual Status UnRegisterSyncCallback() override; + Status UnRegisterSyncCallback() override; /** * @brief See Put, PutBatch put a list of entries to kvstore, @@ -190,7 +188,7 @@ public: * The entries's size should be less than 128 and memory size must be less than IPC transport limit. * @return Indicates the status of this register operation. */ - virtual Status PutBatch(const std::vector &entries) override; + Status PutBatch(const std::vector &entries) override; /** * @brief Delete a list of entries in the kvstore, @@ -202,7 +200,7 @@ public: * The keys memory size should not be greater than IPC transport limit, and can not be empty. * @return Indicates the status of this register operation. */ - virtual Status DeleteBatch(const std::vector &keys) override; + Status DeleteBatch(const std::vector &keys) override; /** * @brief Start transaction. @@ -283,8 +281,8 @@ public: * PUSH_PULL will firstly push all not-local store to listed devices, then pull these stores back. * @return Indicates the status of this operation. */ - virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback) override; + virtual Status Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, + std::shared_ptr syncCallback) override; /** * @brief Subscribe store with other devices consistently Synchronize the data which is satisfied diff --git a/services/ans/test/unittest/mock/mock_single_kv_store.cpp b/services/ans/test/unittest/mock/mock_single_kv_store.cpp index d773ab25f..33ddc0240 100644 --- a/services/ans/test/unittest/mock/mock_single_kv_store.cpp +++ b/services/ans/test/unittest/mock/mock_single_kv_store.cpp @@ -23,7 +23,7 @@ Status AnsTestSingleKvStore::GetEntries(const Key &prefixKey, std::vector return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const +Status AnsTestSingleKvStore::GetEntries(const DataQuery &query, std::vector &entries) const { return Status::SUCCESS; } @@ -33,8 +33,8 @@ Status AnsTestSingleKvStore::GetResultSet(const Key &prefixKey, std::shared_ptr< return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const +Status AnsTestSingleKvStore::GetResultSet(const DataQuery &query, + std::shared_ptr &resultSet) const { return Status::SUCCESS; } @@ -44,13 +44,12 @@ Status AnsTestSingleKvStore::CloseResultSet(std::shared_ptr &r return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetCountWithQuery(const DataQuery &query, int &result) const +Status AnsTestSingleKvStore::GetCount(const DataQuery &query, int &result) const { return Status::SUCCESS; } -Status AnsTestSingleKvStore::Sync( - const std::vector &deviceIds, SyncMode mode, uint32_t allowedDelayMs) +Status AnsTestSingleKvStore::Sync(const std::vector &deviceIds, SyncMode mode, uint32_t delayMs) { return Status::SUCCESS; } @@ -153,8 +152,8 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons return Status::SUCCESS; } -Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback) +Status AnsTestSingleKvStore::Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, + std::shared_ptr syncCallback) { return Status::SUCCESS; } diff --git a/services/distributed/test/unittest/mock/ans_test_single_kv_store.cpp b/services/distributed/test/unittest/mock/ans_test_single_kv_store.cpp index 77c3e84b4..db41e31be 100644 --- a/services/distributed/test/unittest/mock/ans_test_single_kv_store.cpp +++ b/services/distributed/test/unittest/mock/ans_test_single_kv_store.cpp @@ -23,7 +23,7 @@ Status AnsTestSingleKvStore::GetEntries(const Key &prefixKey, std::vector return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const +Status AnsTestSingleKvStore::GetEntries(const DataQuery &query, std::vector &entries) const { return Status::SUCCESS; } @@ -33,7 +33,7 @@ Status AnsTestSingleKvStore::GetResultSet(const Key &prefixKey, std::shared_ptr< return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetResultSetWithQuery( +Status AnsTestSingleKvStore::GetResultSet( const DataQuery &query, std::shared_ptr &resultSet) const { return Status::SUCCESS; @@ -44,7 +44,7 @@ Status AnsTestSingleKvStore::CloseResultSet(std::shared_ptr &r return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetCountWithQuery(const DataQuery &query, int &result) const +Status AnsTestSingleKvStore::GetCount(const DataQuery &query, int &result) const { return Status::SUCCESS; } @@ -152,7 +152,7 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons return Status::SUCCESS; } -Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, +Status AnsTestSingleKvStore::Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, std::shared_ptr syncCallback) { return Status::SUCCESS; diff --git a/services/distributed/test/unittest/mock/ans_test_single_kv_store.h b/services/distributed/test/unittest/mock/ans_test_single_kv_store.h index fbf984172..ae800cfdd 100644 --- a/services/distributed/test/unittest/mock/ans_test_single_kv_store.h +++ b/services/distributed/test/unittest/mock/ans_test_single_kv_store.h @@ -49,7 +49,7 @@ public: * @param entries Indicates the entries. * @return Indicates the status of this GetEntries operation. */ - virtual Status GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const override; + virtual Status GetEntries(const DataQuery &query, std::vector &entries) const override; /** * @brief Get ResultSet in this store which key start with prefixKey. @@ -67,8 +67,8 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this GetResultSet operation. */ - virtual Status GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const override; + virtual Status GetResultSet(const DataQuery &query, + std::shared_ptr &resultSet) const override; /** * @brief Close the ResultSet returned by GetResultSet. @@ -85,7 +85,7 @@ public: * @param result Indicates the result will be returned in this parameter. * @return Indicates the status of this CloseResultSet operation. */ - virtual Status GetCountWithQuery(const DataQuery &query, int &result) const override; + virtual Status GetCount(const DataQuery &query, int &result) const override; /** * @brief Sync store with other devices. This is an asynchronous method, @@ -283,8 +283,8 @@ public: * PUSH_PULL will firstly push all not-local store to listed devices, then pull these stores back. * @return Indicates the status of this operation. */ - virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback) override; + virtual Status Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, + std::shared_ptr syncCallback) override; /** * @brief Subscribe store with other devices consistently Synchronize the data which is satisfied diff --git a/services/test/moduletest/mock/include/mock_single_kv_store.h b/services/test/moduletest/mock/include/mock_single_kv_store.h index 2cd867588..2b2d3fdfa 100644 --- a/services/test/moduletest/mock/include/mock_single_kv_store.h +++ b/services/test/moduletest/mock/include/mock_single_kv_store.h @@ -49,7 +49,7 @@ public: * @param entries Indicates the entries. * @return Indicates the status of this GetEntries operation. */ - virtual Status GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const override; + virtual Status GetEntries(const DataQuery &query, std::vector &entries) const override; /** * @brief Get ResultSet in this store which key start with prefixKey. @@ -67,8 +67,7 @@ public: * @param resultSet Indicates the resultSet. * @return Indicates the status of this GetResultSet operation. */ - virtual Status GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const override; + Status GetResultSet(const DataQuery &query, std::shared_ptr &resultSet) const override; /** * @brief Close the ResultSet returned by GetResultSet. @@ -85,7 +84,7 @@ public: * @param result Indicates the result will be returned in this parameter. * @return Indicates the status of this CloseResultSet operation. */ - virtual Status GetCountWithQuery(const DataQuery &query, int &result) const override; + virtual Status GetCount(const DataQuery &query, int &result) const override; /** * @brief Sync store with other devices. This is an asynchronous method, @@ -283,8 +282,8 @@ public: * PUSH_PULL will firstly push all not-local store to listed devices, then pull these stores back. * @return Indicates the status of this operation. */ - virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback) override; + virtual Status Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, + std::shared_ptr syncCallback) override; /** * @brief Subscribe store with other devices consistently Synchronize the data which is satisfied diff --git a/services/test/moduletest/mock/mock_single_kv_store.cpp b/services/test/moduletest/mock/mock_single_kv_store.cpp index d773ab25f..9313653e2 100644 --- a/services/test/moduletest/mock/mock_single_kv_store.cpp +++ b/services/test/moduletest/mock/mock_single_kv_store.cpp @@ -23,7 +23,7 @@ Status AnsTestSingleKvStore::GetEntries(const Key &prefixKey, std::vector return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetEntriesWithQuery(const DataQuery &query, std::vector &entries) const +Status AnsTestSingleKvStore::GetEntries(const DataQuery &query, std::vector &entries) const { return Status::SUCCESS; } @@ -33,8 +33,7 @@ Status AnsTestSingleKvStore::GetResultSet(const Key &prefixKey, std::shared_ptr< return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetResultSetWithQuery(const DataQuery &query, - std::shared_ptr &resultSet) const +Status AnsTestSingleKvStore::GetResultSet(const DataQuery &query, std::shared_ptr &resultSet) const { return Status::SUCCESS; } @@ -44,7 +43,7 @@ Status AnsTestSingleKvStore::CloseResultSet(std::shared_ptr &r return Status::SUCCESS; } -Status AnsTestSingleKvStore::GetCountWithQuery(const DataQuery &query, int &result) const +Status AnsTestSingleKvStore::GetCount(const DataQuery &query, int &result) const { return Status::SUCCESS; } @@ -153,8 +152,8 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons return Status::SUCCESS; } -Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback) +Status AnsTestSingleKvStore::Sync(const std::vector &deviceIds, SyncMode mode, const DataQuery &query, + std::shared_ptr syncCallback) { return Status::SUCCESS; } -- Gitee