From c8cdeefa3803ea0643bc549ee718a337c6e676d6 Mon Sep 17 00:00:00 2001 From: Sven Wang Date: Thu, 7 Jul 2022 10:40:28 +0800 Subject: [PATCH 1/2] Get Entries to NOT_FOUND change to SUCCESS Signed-off-by: Sven Wang --- .../test/unittest/single_kvstore_client_test.cpp | 16 ++++++++++++++++ .../innerkitsimpl/kvdb/src/single_store_impl.cpp | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp index 49ddafd07..2dd1cdf33 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp @@ -255,6 +255,22 @@ HWTEST_F(SingleKvStoreClientTest, GetEntriesAndResultSet001, TestSize.Level1) EXPECT_EQ(closeResultSetStatus, Status::SUCCESS) << "close resultSet failed."; } +/** +* @tc.name: GetEmptyEntries +* @tc.desc: Batch get empty values. +* @tc.type: FUNC +* @tc.require: +* @tc.author: Sven Wang +*/ +HWTEST_F(SingleKvStoreClientTest, GetEmptyEntries, TestSize.Level1) +{ + EXPECT_NE(singleKvStorePtr, nullptr) << "kvStorePtr is null."; + std::vector results; + auto status = singleKvStorePtr->GetEntries({"SUCCESS_TEST"}, results); + EXPECT_EQ(status, Status::SUCCESS) << "status is not SUCCESS."; + EXPECT_EQ(results.size(), 0) << "entries size is not empty."; +} + /** * @tc.name: Subscribe001 * @tc.desc: Put data and get callback. diff --git a/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp b/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp index 367c3f33b..8dc509ed0 100644 --- a/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp +++ b/frameworks/innerkitsimpl/kvdb/src/single_store_impl.cpp @@ -702,7 +702,12 @@ Status SingleStoreImpl::GetEntries(const DistributedDB::Query &query, std::vecto entry.value = std::move(dbEntry.value); ++it; } - return StoreUtil::ConvertStatus(dbStatus); + + auto status = StoreUtil::ConvertStatus(dbStatus); + if (status == NOT_FOUND) { + status = SUCCESS; + } + return status; } std::vector SingleStoreImpl::GetPrefix(const Key &prefix) const @@ -734,6 +739,7 @@ std::vector SingleStoreImpl::TrimKey(const Key &prefix) const } return {begin, end}; } + Status SingleStoreImpl::DoSync(const SyncInfo &syncInfo, std::shared_ptr observer) { auto service = KVDBServiceClient::GetInstance(); -- Gitee From a4878e43183bd2543bff292597c79969733f1539 Mon Sep 17 00:00:00 2001 From: Sven Wang Date: Thu, 7 Jul 2022 11:36:00 +0800 Subject: [PATCH 2/2] fixed code style Signed-off-by: Sven Wang --- .../test/unittest/single_kvstore_client_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp index 2dd1cdf33..1d21b432b 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp @@ -266,7 +266,7 @@ HWTEST_F(SingleKvStoreClientTest, GetEmptyEntries, TestSize.Level1) { EXPECT_NE(singleKvStorePtr, nullptr) << "kvStorePtr is null."; std::vector results; - auto status = singleKvStorePtr->GetEntries({"SUCCESS_TEST"}, results); + auto status = singleKvStorePtr->GetEntries({ "SUCCESS_TEST" }, results); EXPECT_EQ(status, Status::SUCCESS) << "status is not SUCCESS."; EXPECT_EQ(results.size(), 0) << "entries size is not empty."; } -- Gitee