From 488c197c2a4fe018860545604783921e37d07a33 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Sat, 12 Feb 2022 13:18:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9syncwithcondition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- .../ans/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- .../distributed/test/unittest/mock/ans_test_single_kv_store.h | 2 +- 2 files changed, 2 insertions(+), 2 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 e71772fb8..16526c70e 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 @@ -95,7 +95,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) override; + const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; 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 dd099a7a7..1adf17831 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 @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) override; + const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; -- Gitee From 6a413cff5df3bc0e5d6fb0e68c0192ac71be0541 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Sat, 12 Feb 2022 14:18:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9syncwithcondition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- .../ans/test/unittest/mock/include/mock_single_kv_store.h | 2 +- services/ans/test/unittest/mock/mock_single_kv_store.cpp | 2 +- .../test/unittest/mock/ans_test_single_kv_store.cpp | 4 ++-- services/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- services/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 d09801b06..30850ffd9 100644 --- a/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp +++ b/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp @@ -283,7 +283,7 @@ Status AnsTestSingleKvStore::Control(KvControlCmd cmd, const KvParam &inputParam } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) + const DataQuery &query, std::shared_ptr syncCallback = nullptr) { 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 18a139986..1389d2b86 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 @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) override; + const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; 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 3f6d34b42..421b70cc8 100644 --- a/services/ans/test/unittest/mock/mock_single_kv_store.cpp +++ b/services/ans/test/unittest/mock/mock_single_kv_store.cpp @@ -175,7 +175,7 @@ Status AnsTestSingleKvStore::Control(KvControlCmd cmd, const KvParam &inputParam } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) + const DataQuery &query, std::shared_ptr syncCallback = nullptr) { 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 dd8c5c5cb..e2e4f811e 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 @@ -169,7 +169,7 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) + const DataQuery &query, std::shared_ptr syncCallback = nullptr) { return Status::SUCCESS; } @@ -205,4 +205,4 @@ Status AnsTestSingleKvStore::Control(KvControlCmd cmd, const KvParam &inputParam return Status::SUCCESS; } } // namespace DistributedKv -} // namespace OHOS \ No newline at end of file +} // namespace OHOS 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 18a139986..1389d2b86 100644 --- a/services/test/moduletest/mock/include/mock_single_kv_store.h +++ b/services/test/moduletest/mock/include/mock_single_kv_store.h @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query) override; + const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; diff --git a/services/test/moduletest/mock/mock_single_kv_store.cpp b/services/test/moduletest/mock/mock_single_kv_store.cpp index b5eab9ea4..428f8e653 100644 --- a/services/test/moduletest/mock/mock_single_kv_store.cpp +++ b/services/test/moduletest/mock/mock_single_kv_store.cpp @@ -186,7 +186,7 @@ Status AnsTestSingleKvStore::ReleaseKvStoreSnapshot(std::shared_ptr &deviceIds, SyncMode mode, - const DataQuery &query) + const DataQuery &query, std::shared_ptr syncCallback = nullptr) { return Status::SUCCESS; } -- Gitee From 48298b7dc02a03feebff6c8da39d2f5847fd5aa9 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Sat, 12 Feb 2022 16:31:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9syncwithcondition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- services/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- services/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 1389d2b86..9bc5ec543 100644 --- a/services/test/moduletest/mock/include/mock_single_kv_store.h +++ b/services/test/moduletest/mock/include/mock_single_kv_store.h @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; + const DataQuery &query, std::shared_ptr syncCallback) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; diff --git a/services/test/moduletest/mock/mock_single_kv_store.cpp b/services/test/moduletest/mock/mock_single_kv_store.cpp index 428f8e653..99cd14379 100644 --- a/services/test/moduletest/mock/mock_single_kv_store.cpp +++ b/services/test/moduletest/mock/mock_single_kv_store.cpp @@ -186,7 +186,7 @@ Status AnsTestSingleKvStore::ReleaseKvStoreSnapshot(std::shared_ptr &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) + const DataQuery &query, std::shared_ptr syncCallback) { return Status::SUCCESS; } -- Gitee From 8b5c0a38b31c05e89fa7c746f060e8b5103bef6c Mon Sep 17 00:00:00 2001 From: Hollokin Date: Sat, 12 Feb 2022 17:09:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9syncwithcondition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- .../ans/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- 2 files changed, 2 insertions(+), 2 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 16526c70e..f3f0ef0a9 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 @@ -95,7 +95,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; + const DataQuery &query, std::shared_ptr syncCallback) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) 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 30850ffd9..c84b5bec5 100644 --- a/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp +++ b/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp @@ -283,7 +283,7 @@ Status AnsTestSingleKvStore::Control(KvControlCmd cmd, const KvParam &inputParam } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) + const DataQuery &query, std::shared_ptr syncCallback) { return Status::SUCCESS; } -- Gitee From 01718f3f92bdd378612957035669df071fca14a3 Mon Sep 17 00:00:00 2001 From: Hollokin Date: Sat, 12 Feb 2022 18:06:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hollokin --- services/ans/test/unittest/mock/include/mock_single_kv_store.h | 2 +- services/ans/test/unittest/mock/mock_single_kv_store.cpp | 2 +- .../distributed/test/unittest/mock/ans_test_single_kv_store.cpp | 2 +- .../distributed/test/unittest/mock/ans_test_single_kv_store.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 1389d2b86..9bc5ec543 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 @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; + const DataQuery &query, std::shared_ptr syncCallback) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; 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 421b70cc8..25bb2b9a2 100644 --- a/services/ans/test/unittest/mock/mock_single_kv_store.cpp +++ b/services/ans/test/unittest/mock/mock_single_kv_store.cpp @@ -175,7 +175,7 @@ Status AnsTestSingleKvStore::Control(KvControlCmd cmd, const KvParam &inputParam } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) + 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 e2e4f811e..6680e7167 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 @@ -169,7 +169,7 @@ Status AnsTestSingleKvStore::GetSecurityLevel(SecurityLevel &securityLevel) cons } Status AnsTestSingleKvStore::SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) + 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 1adf17831..8d9216af0 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 @@ -96,7 +96,7 @@ public: virtual Status GetSecurityLevel(SecurityLevel &securityLevel) const override; virtual Status SyncWithCondition(const std::vector &deviceIds, SyncMode mode, - const DataQuery &query, std::shared_ptr syncCallback = nullptr) override; + const DataQuery &query, std::shared_ptr syncCallback) override; virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; -- Gitee From fcba58041e8025b02ee178b4b74995ad5037bedd Mon Sep 17 00:00:00 2001 From: Hollokin Date: Mon, 14 Feb 2022 17:27:27 +0800 Subject: [PATCH 6/6] UnsubscribeWithQuery Signed-off-by: Hollokin --- .../ans/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- services/ans/test/unittest/mock/include/mock_single_kv_store.h | 2 +- services/ans/test/unittest/mock/mock_single_kv_store.cpp | 2 +- .../distributed/test/unittest/mock/ans_test_single_kv_store.cpp | 2 +- .../distributed/test/unittest/mock/ans_test_single_kv_store.h | 2 +- services/test/moduletest/mock/include/mock_single_kv_store.h | 2 +- services/test/moduletest/mock/mock_single_kv_store.cpp | 2 +- 8 files changed, 8 insertions(+), 8 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 f3f0ef0a9..771745702 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 @@ -99,7 +99,7 @@ public: virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; - virtual Status UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; + virtual Status UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; Status GetKvStoreSnapshot(std::shared_ptr observer, std::shared_ptr &snapshot) const 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 c84b5bec5..36738847d 100644 --- a/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp +++ b/frameworks/ans/test/moduletest/mock/mock_single_kv_store.cpp @@ -293,7 +293,7 @@ Status AnsTestSingleKvStore::SubscribeWithQuery(const std::vector & return Status::SUCCESS; } -Status AnsTestSingleKvStore::UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) +Status AnsTestSingleKvStore::UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) { 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 9bc5ec543..b682e4315 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 @@ -100,7 +100,7 @@ public: virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; - virtual Status UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; + virtual Status UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; Status GetKvStoreSnapshot(std::shared_ptr observer, std::shared_ptr &snapshot) const override; 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 25bb2b9a2..d58c045a4 100644 --- a/services/ans/test/unittest/mock/mock_single_kv_store.cpp +++ b/services/ans/test/unittest/mock/mock_single_kv_store.cpp @@ -185,7 +185,7 @@ Status AnsTestSingleKvStore::SubscribeWithQuery(const std::vector & return Status::SUCCESS; } -Status AnsTestSingleKvStore::UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) +Status AnsTestSingleKvStore::UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) { 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 6680e7167..6ae2fbf1e 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 @@ -179,7 +179,7 @@ Status AnsTestSingleKvStore::SubscribeWithQuery(const std::vector & return Status::SUCCESS; } -Status AnsTestSingleKvStore::UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) +Status AnsTestSingleKvStore::UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) { 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 8d9216af0..e930fde5d 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 @@ -100,7 +100,7 @@ public: virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; - virtual Status UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; + virtual Status UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; Status GetKvStoreSnapshot(std::shared_ptr observer, std::shared_ptr &snapshot) const override; 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 9bc5ec543..b682e4315 100644 --- a/services/test/moduletest/mock/include/mock_single_kv_store.h +++ b/services/test/moduletest/mock/include/mock_single_kv_store.h @@ -100,7 +100,7 @@ public: virtual Status SubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; - virtual Status UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; + virtual Status UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) override; Status GetKvStoreSnapshot(std::shared_ptr observer, std::shared_ptr &snapshot) const override; diff --git a/services/test/moduletest/mock/mock_single_kv_store.cpp b/services/test/moduletest/mock/mock_single_kv_store.cpp index 99cd14379..83e719b81 100644 --- a/services/test/moduletest/mock/mock_single_kv_store.cpp +++ b/services/test/moduletest/mock/mock_single_kv_store.cpp @@ -196,7 +196,7 @@ Status AnsTestSingleKvStore::SubscribeWithQuery(const std::vector & return Status::SUCCESS; } -Status AnsTestSingleKvStore::UnSubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) +Status AnsTestSingleKvStore::UnsubscribeWithQuery(const std::vector &deviceIds, const DataQuery &query) { return Status::SUCCESS; } -- Gitee