From 6c1b080255257d6f1f7fb58dc655276be32190cf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Nov 2023 17:20:57 +0800 Subject: [PATCH] fix alarm Signed-off-by: root --- .../gaussdb_rd/src/common/src/os_api.cpp | 4 +- .../src/interface/src/document_key.cpp | 4 +- ...rd_single_ver_natural_store_connection.cpp | 4 +- .../rd_single_ver_natural_store_connection.h | 2 +- .../rd_single_ver_storage_executor.cpp | 7 +- ...te_single_ver_natural_store_connection.cpp | 4 +- ...lite_single_ver_natural_store_connection.h | 2 +- ..._interfaces_nb_delegate_test_rd_kernal.cpp | 235 ++++++------------ 8 files changed, 91 insertions(+), 171 deletions(-) mode change 100644 => 100755 frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp mode change 100644 => 100755 frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.h diff --git a/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/os_api.cpp b/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/os_api.cpp index 246494c44d0..9cbda690cdd 100644 --- a/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/os_api.cpp +++ b/frameworks/libs/distributeddb/gaussdb_rd/src/common/src/os_api.cpp @@ -15,7 +15,7 @@ #include "os_api.h" #include -#include +#include #include #include @@ -65,7 +65,7 @@ int GetRealPath(const std::string &inOriPath, std::string &outRealPath) GLOGE("[OS] Realpath error:%d.", errno); delete [] realPath; return -E_SYSTEM_API_FAIL; - } + } #endif outRealPath = std::string(realPath); delete[] realPath; diff --git a/frameworks/libs/distributeddb/gaussdb_rd/src/interface/src/document_key.cpp b/frameworks/libs/distributeddb/gaussdb_rd/src/interface/src/document_key.cpp index 7d7ddf009f2..258e074fabb 100644 --- a/frameworks/libs/distributeddb/gaussdb_rd/src/interface/src/document_key.cpp +++ b/frameworks/libs/distributeddb/gaussdb_rd/src/interface/src/document_key.cpp @@ -14,8 +14,8 @@ */ #include "document_key.h" -#include -#include +#include +#include #include "doc_errno.h" #include "rd_log_print.h" diff --git a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp old mode 100644 new mode 100755 index 1e27b1f3473..f6e9f7d3d97 --- a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp +++ b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.cpp @@ -97,7 +97,7 @@ int RdSingleVerNaturalStoreConnection::GetResultSet(const IOption &option, const { // maximum of result set size is 4 std::lock_guard lock(kvDbResultSetsMutex_); - if (kvDbResultSets_.size() >= maxResultSetSize) { + if (kvDbResultSets_.size() >= MAX_RESULTSET_SIZE) { LOGE("Over max result set size"); return -E_MAX_LIMITS; } @@ -130,7 +130,7 @@ int RdSingleVerNaturalStoreConnection::GetResultSet(const IOption &option, { // maximum of result set size is 4 std::lock_guard lock(kvDbResultSetsMutex_); - if (kvDbResultSets_.size() >= maxResultSetSize) { + if (kvDbResultSets_.size() >= MAX_RESULTSET_SIZE) { LOGE("Over max result set size"); return -E_MAX_LIMITS; } diff --git a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.h b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.h old mode 100644 new mode 100755 index 39680da2f03..18245b0c0e7 --- a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.h +++ b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_natural_store_connection.h @@ -113,7 +113,7 @@ private: mutable std::set kvDbResultSets_; // ResultSet Related Info - static constexpr std::size_t maxResultSetSize = 8; // Max 8 ResultSet At The Same Time + static constexpr std::size_t MAX_RESULTSET_SIZE = 8; // Max 8 ResultSet At The Same Time int CheckSyncEntriesValid(const std::vector &entries) const override; diff --git a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_storage_executor.cpp b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_storage_executor.cpp index 3632cd34e02..c636bcc0ce1 100644 --- a/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_storage_executor.cpp +++ b/frameworks/libs/distributeddb/storage/src/gaussdb_rd/rd_single_ver_storage_executor.cpp @@ -375,10 +375,9 @@ int RdSingleVerStorageExecutor::GetEntries(bool isGetValue, SingleVerDataType ty if (ret != E_OK) { return ret; } - int innerCode = E_OK; ret = TransferGrdErrno(GRD_Next(resultSet)); if (ret == -E_NOT_FOUND) { - innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); + int innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); if (innerCode != E_OK) { return innerCode; } @@ -389,7 +388,7 @@ int RdSingleVerStorageExecutor::GetEntries(bool isGetValue, SingleVerDataType ty ret = RdKvFetch(resultSet, tmpEntry.key, tmpEntry.value); if (ret != E_OK && ret != -E_NOT_FOUND) { LOGE("RdSingleVerStorageExecutor][GetEntries]fail to fetch, %d", ret); - innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); + int innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); if (innerCode != E_OK) { return innerCode; } @@ -400,7 +399,7 @@ int RdSingleVerStorageExecutor::GetEntries(bool isGetValue, SingleVerDataType ty } if (ret != -E_NOT_FOUND) { LOGE("[RdSingleVerStorageExecutor][GetEntries]fail to move, %d", ret); - innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); + int innerCode = ClearEntriesAndFreeResultSet(entries, resultSet); if (innerCode != E_OK) { return innerCode; } diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp index a96fef7f097..a616cf0d51c 100644 --- a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp +++ b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.cpp @@ -536,7 +536,7 @@ int SQLiteSingleVerNaturalStoreConnection::GetResultSet(const IOption &option, c // maximum of result set size is 4 std::lock_guard lock(kvDbResultSetsMutex_); - if (kvDbResultSets_.size() >= MAX_RESULT_SET_SIZE) { + if (kvDbResultSets_.size() >= maxResultsetSize) { LOGE("Over max result set size"); return -E_MAX_LIMITS; } @@ -580,7 +580,7 @@ int SQLiteSingleVerNaturalStoreConnection::GetResultSet(const IOption &option, c // maximum of result set size is 4 std::lock_guard lock(kvDbResultSetsMutex_); - if (kvDbResultSets_.size() >= MAX_RESULT_SET_SIZE) { + if (kvDbResultSets_.size() >= maxResultsetSize) { LOGE("Over max result set size"); return -E_MAX_LIMITS; } diff --git a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h index da101f89684..29ed3c848b2 100644 --- a/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h +++ b/frameworks/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_natural_store_connection.h @@ -206,7 +206,7 @@ private: DECLARE_OBJECT_TAG(SQLiteSingleVerNaturalStoreConnection); // ResultSet Related Info - static constexpr std::size_t MAX_RESULT_SET_SIZE = 8; // Max 8 ResultSet At The Same Time + static constexpr std::size_t maxResultsetSize = 8; // Max 8 ResultSet At The Same Time std::atomic cacheModeForNewResultSet_{ResultSetCacheMode::CACHE_FULL_ENTRY}; std::atomic cacheMaxSizeForNewResultSet_{0}; // Will be init to default value in constructor diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test_rd_kernal.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test_rd_kernal.cpp index 17c6eb28573..31e28447e14 100644 --- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test_rd_kernal.cpp +++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test_rd_kernal.cpp @@ -1849,23 +1849,8 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, FreqGet001, TestSize.Level2) ASSERT_NO_FATAL_FAILURE(FreqGet001()); } -/** - * @tc.name: RdRangeQuery001 - * @tc.desc: Test GetEntries and the out of the parameter is entries. - * @tc.type: FUNC - * @tc.require: AR000DPTTA - * @tc.author: mazhao - */ -HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery001, TestSize.Level1) +void PutRangeDataIntoDB() { - /** - * @tc.steps:step1. Get the nb delegate. - * @tc.expected: step1. Get results OK and non-null delegate. - */ - g_mgr.GetKvStore("RdRangeQuery001", g_option, g_kvNbDelegateCallback); - ASSERT_TRUE(g_kvNbDelegatePtr != nullptr); - EXPECT_TRUE(g_kvDelegateStatus == OK); - /** * @tc.steps: step1. * @tc.expected: step1. @@ -1882,7 +1867,26 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery001, TestSize.Leve EXPECT_EQ(g_kvNbDelegatePtr->Put(entry3.key, entry3.value), OK); EXPECT_EQ(g_kvNbDelegatePtr->Put(entry4.key, entry4.value), OK); EXPECT_EQ(g_kvNbDelegatePtr->Put(entry5.key, entry5.value), OK); +} +/** + * @tc.name: RdRangeQuery001 + * @tc.desc: Test GetEntries and the out of the parameter is entries. + * @tc.type: FUNC + * @tc.require: AR000DPTTA + * @tc.author: mazhao + */ +HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery001, TestSize.Level1) +{ + /** + * @tc.steps:step1. Get the nb delegate. + * @tc.expected: step1. Get results OK and non-null delegate. + */ + g_mgr.GetKvStore("RdRangeQuery001", g_option, g_kvNbDelegateCallback); + ASSERT_TRUE(g_kvNbDelegatePtr != nullptr); + EXPECT_TRUE(g_kvDelegateStatus == OK); + + PutRangeDataIntoDB(); /** * @tc.steps: step2. @@ -1928,6 +1932,19 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery001, TestSize.Leve } } +void ChkRangeResultSet(KvStoreResultSet *resultSet, int beginNum, int EndNum) +{ + while (resultSet->MoveToNext()) { + Entry entryValue; + EXPECT_EQ(resultSet->GetEntry(entryValue), OK); + std::string keyStr(entryValue.value.begin(), entryValue.value.end()); + EXPECT_EQ(to_string(beginNum), keyStr); + beginNum++; + } + EXPECT_EQ(beginNum, EndNum + 1); + EXPECT_EQ(resultSet->MoveToNext(), false); +} + /** * @tc.name: RdRangeQuery002 * @tc.desc:Test GetEntries and the out of the parameter is resultSet. @@ -1944,24 +1961,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Leve g_mgr.GetKvStore("RdRangeQuery002", g_option, g_kvNbDelegateCallback); ASSERT_TRUE(g_kvNbDelegatePtr != nullptr); EXPECT_TRUE(g_kvDelegateStatus == OK); - - /** - * @tc.steps: step1. - * @tc.expected: step1. - */ - Entry entry0 = {{'0'}, {'0'}}; - Entry entry1 = {{'1'}, {'1'}}; - Entry entry2 = {{'2'}, {'2'}}; - Entry entry3 = {{'3'}, {'3'}}; - Entry entry4 = {{'4'}, {'4'}}; - Entry entry5 = {{'5'}, {'5'}}; - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry0.key, entry0.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry1.key, entry1.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry2.key, entry2.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry3.key, entry3.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry4.key, entry4.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry5.key, entry5.value), OK); - + PutRangeDataIntoDB(); /** * @tc.steps: step2. @@ -1971,19 +1971,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Leve KvStoreResultSet *resultSet = nullptr; EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery, resultSet), OK); EXPECT_NE(resultSet, nullptr); - int count1 = 1; - while (resultSet->MoveToNext()) { - count1++; - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); - EXPECT_EQ(to_string(count1), keyStr); - } - EXPECT_EQ(count1, 4); - EXPECT_EQ(resultSet->MoveToNext(), false); - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); + int beginCount = 2; + int endCount = 4; + ChkRangeResultSet(resultSet, beginCount, endCount); /** * @tc.steps: step3. @@ -1992,16 +1982,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Leve Query fullQuery2 = Query::Select().Range({}, {'4'}); EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery2, resultSet), OK); EXPECT_NE(resultSet, nullptr); - int count2 = 0; - while (resultSet->MoveToNext()) { - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); - EXPECT_EQ(to_string(count2), keyStr); - count2++; - } - EXPECT_EQ(count2, 5); - EXPECT_EQ(resultSet->MoveToNext(), false); + int beginCount2 = 0; + int endCount2 = 4; + ChkRangeResultSet(resultSet, beginCount2, endCount2); /** * @tc.steps: step4. @@ -2010,19 +1993,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Leve Query fullQuery3 = Query::Select().Range({'2'}, {}); EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery3, resultSet), OK); EXPECT_NE(resultSet, nullptr); - int count3 = 2; - while (resultSet->MoveToNext()) { - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); - EXPECT_EQ(to_string(count3), keyStr); - count3++; - } - EXPECT_EQ(count3, 6); - EXPECT_EQ(resultSet->MoveToNext(), false); - if (resultSet != nullptr) { - EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK); - } + int beginCount3 = 2; + int endCount3 = 5; + ChkRangeResultSet(resultSet, beginCount3, endCount3); /** * @tc.steps: step4. @@ -2031,16 +2004,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery002, TestSize.Leve Query fullQuery4 = Query::Select().Range({}, {}); EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery4, resultSet), OK); EXPECT_NE(resultSet, nullptr); - int count4 = 0; - while (resultSet->MoveToNext()) { - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); - EXPECT_EQ(to_string(count4), keyStr); - count4++; - } - EXPECT_EQ(count4, 6); - EXPECT_EQ(resultSet->MoveToNext(), false); + int beginCount4 = 0; + int endCount4 = 5; + ChkRangeResultSet(resultSet, beginCount4, endCount4); if (resultSet != nullptr) { EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK); } @@ -2096,6 +2062,25 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery003, TestSize.Leve EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(inValidQuery4, entries), INVALID_ARGS); } +void ChkRangeResultSetMoveFuc(KvStoreResultSet *resultSet, int beginNum, int endNum) +{ + resultSet->MoveToLast(); + Entry entryValue; + EXPECT_EQ(resultSet->GetEntry(entryValue), OK); + std::string keyStr(entryValue.value.begin(), entryValue.value.end());; + EXPECT_EQ(to_string(endNum), keyStr); + + while (resultSet->MoveToPrevious()) { + endNum--; + Entry entryValue2; + EXPECT_EQ(resultSet->GetEntry(entryValue2), OK); + std::string keyStr2(entryValue2.value.begin(), entryValue2.value.end()); + EXPECT_EQ(to_string(endNum), keyStr2); + } + EXPECT_EQ(endNum, beginNum); + EXPECT_EQ(resultSet->MoveToPrevious(), false); +} + /** * @tc.name: RdRangeQuery004 * @tc.desc: Test resultSet fuction. @@ -2113,24 +2098,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery004, TestSize.Leve ASSERT_TRUE(g_kvNbDelegatePtr != nullptr); EXPECT_TRUE(g_kvDelegateStatus == OK); - /** - * @tc.steps: step1. - * @tc.expected: step1. - */ - Entry entry0 = {{'0'}, {'0'}}; - Entry entry1 = {{'1'}, {'1'}}; - Entry entry2 = {{'2'}, {'2'}}; - Entry entry3 = {{'3'}, {'3'}}; - Entry entry4 = {{'4'}, {'4'}}; - Entry entry5 = {{'5'}, {'5'}}; - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry0.key, entry0.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry1.key, entry1.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry2.key, entry2.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry3.key, entry3.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry4.key, entry4.value), OK); - EXPECT_EQ(g_kvNbDelegatePtr->Put(entry5.key, entry5.value), OK); - - + PutRangeDataIntoDB(); /** * @tc.steps: step2. * @tc.expected: step2. @@ -2139,26 +2107,9 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery004, TestSize.Leve KvStoreResultSet *resultSet = nullptr; EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery, resultSet), OK); EXPECT_NE(resultSet, nullptr); - - resultSet->MoveToLast(); - Entry entryValue; - EXPECT_EQ(resultSet->GetEntry(entryValue), OK); - std::string keyStr(entryValue.value.begin(), entryValue.value.end()); - int count1 = 4; - EXPECT_EQ(to_string(count1), keyStr); - EXPECT_EQ(count1, 4); - - int count2 = 3; - while (resultSet->MoveToPrevious()) { - Entry entryValue2; - EXPECT_EQ(resultSet->GetEntry(entryValue2), OK); - std::string keyStr2(entryValue2.value.begin(), entryValue2.value.end()); - EXPECT_EQ(to_string(count2), keyStr2); - count2--; - } - EXPECT_EQ(count2, 1); - EXPECT_EQ(resultSet->MoveToPrevious(), false); - + int beginNum1 = 2; + int endNum1 = 4; + ChkRangeResultSetMoveFuc(resultSet, beginNum1, endNum1); /** * @tc.steps: step2. Getentries by query, query is full-set; @@ -2168,54 +2119,24 @@ HWTEST_F(DistributedDBInterfacesNBDelegateRdTest, RdRangeQuery004, TestSize.Leve EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery2, resultSet), OK); EXPECT_NE(resultSet, nullptr); - resultSet->MoveToLast(); - Entry entryValue3; - EXPECT_EQ(resultSet->GetEntry(entryValue3), OK); - std::string keyStr3(entryValue3.value.begin(), entryValue3.value.end()); - int count3 = 4; - EXPECT_EQ(to_string(count3), keyStr3); - - int count4 = 3; - while (resultSet->MoveToPrevious()) { - Entry entryValue4; - EXPECT_EQ(resultSet->GetEntry(entryValue4), OK); - std::string keyStr4(entryValue4.value.begin(), entryValue4.value.end()); - EXPECT_EQ(to_string(count4), keyStr4); - count4--; - } - EXPECT_EQ(count4, -1); - EXPECT_EQ(resultSet->MoveToPrevious(), false); + int beginNum2 = 0; + int endNum2 = 4; + ChkRangeResultSetMoveFuc(resultSet, beginNum2, endNum2); /** * @tc.steps: step2. Getentries by query, query is full-set; - * @tc.expected: step2. Getentries return OK; - */ + * @tc.expected: step2. Getentries return OK; */ Query fullQuery3 = Query::Select().Range({'2'}, {}); EXPECT_EQ(g_kvNbDelegatePtr->GetEntries(fullQuery3, resultSet), OK); EXPECT_NE(resultSet, nullptr); - resultSet->MoveToLast(); - Entry entryValue5; - EXPECT_EQ(resultSet->GetEntry(entryValue5), OK); - std::string keyStr5(entryValue5.value.begin(), entryValue5.value.end()); - int count5 = 5; - EXPECT_EQ(to_string(count5), keyStr5); - EXPECT_EQ(count5, 5); - - int count6 = 4; - while (resultSet->MoveToPrevious()) { - Entry entryValue6; - EXPECT_EQ(resultSet->GetEntry(entryValue6), OK); - std::string keyStr6(entryValue6.value.begin(), entryValue6.value.end()); - EXPECT_EQ(to_string(count6), keyStr6); - count6--; - } - EXPECT_EQ(count2, 1); - EXPECT_EQ(resultSet->MoveToPrevious(), false); + int beginNum3 = 2; + int endNum3 = 5; + ChkRangeResultSetMoveFuc(resultSet, beginNum3, endNum3); if (resultSet != nullptr) { EXPECT_EQ(g_kvNbDelegatePtr->CloseResultSet(resultSet), OK); } } -#endif // DB_DEBUG_ENV +#endif // RUNNING_ON_SIMULATED_ENV } -#endif // USE_RD_KERNEL +#endif // USE_RD_KERNEL \ No newline at end of file -- Gitee