From 4d662155ec3d1bf0a67cc1106cef351c34eb08bb Mon Sep 17 00:00:00 2001 From: zqq Date: Tue, 17 May 2022 18:56:35 +0800 Subject: [PATCH 1/3] fix code check Signed-off-by: zqq --- .../distributeddataservice/libs/distributeddb/include/query.h | 4 ++-- .../src/multiver/multi_ver_natural_store_connection.cpp | 4 +--- .../storage/src/operation/multi_ver_database_oper.cpp | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/services/distributeddataservice/libs/distributeddb/include/query.h b/services/distributeddataservice/libs/distributeddb/include/query.h index 2f01c676c..8a340f14b 100644 --- a/services/distributeddataservice/libs/distributeddb/include/query.h +++ b/services/distributeddataservice/libs/distributeddb/include/query.h @@ -99,7 +99,7 @@ public: DB_API Query &In(const std::string &field, const std::vector &values) { std::vector fieldValues; - QueryValueType type; + QueryValueType type = QueryValueType::VALUE_TYPE_INVALID; for (const auto &value : values) { FieldValue fieldValue; type = GetFieldTypeAndValue(value, fieldValue); @@ -114,7 +114,7 @@ public: DB_API Query &NotIn(const std::string &field, const std::vector &values) { std::vector fieldValues; - QueryValueType type; + QueryValueType type = QueryValueType::VALUE_TYPE_INVALID; for (const auto &value : values) { FieldValue fieldValue; type = GetFieldTypeAndValue(value, fieldValue); diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp index 0820c9adc..6ba32ddb8 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/multiver/multi_ver_natural_store_connection.cpp @@ -238,9 +238,7 @@ int MultiVerNaturalStoreConnection::DeleteBatch(const IOption &option, const std errCode = writeHandle_->Delete(item); if (errCode == E_OK) { needCommit = true; - } else if (errCode == -E_NOT_FOUND) { - errCode = E_OK; - } else { + } else if (errCode != -E_NOT_FOUND) { if (isAuto) { (void)(RollBackTransactionInner()); } diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp index a7aeccc49..76a33727a 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/operation/multi_ver_database_oper.cpp @@ -123,8 +123,7 @@ int MultiVerDatabaseOper::RekeyPostHandle(const CipherPassword &passwd) if (errCode != E_OK) { return errCode; } - errCode = RekeyRecover(multiVerNaturalStore_->GetDbProperties()); - return E_OK; + return RekeyRecover(multiVerNaturalStore_->GetDbProperties()); } int MultiVerDatabaseOper::ExportAllDatabases(const std::string ¤tDir, const CipherPassword &passwd, -- Gitee From 7bcb6ca7a8d98e095db02b92cbae5a60ded0f394 Mon Sep 17 00:00:00 2001 From: lidwchn Date: Wed, 18 May 2022 11:34:17 +0800 Subject: [PATCH 2/3] Fix unused variable. Signed-off-by: lidwchn --- .../storage/src/sqlite/sqlite_single_ver_storage_executor.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp index 52e65653b..63d102620 100644 --- a/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp +++ b/services/distributeddataservice/libs/distributeddb/storage/src/sqlite/sqlite_single_ver_storage_executor.cpp @@ -498,6 +498,10 @@ int SQLiteSingleVerStorageExecutor::GetSyncDataItems(std::vector &data errCode = SQLiteUtils::StepWithRetry(statement, isMemDb_); if (errCode == SQLiteUtils::MapSQLiteErrno(SQLITE_ROW)) { errCode = GetDataItemForSync(statement, dataItem); + if (errCode != E_OK) { + LOGE("GetDataItemForSync failed:%d", errCode); + return errCode; + } } else { if (errCode == SQLiteUtils::MapSQLiteErrno(SQLITE_DONE)) { LOGD("Get sync data finished, size of packet:%zu, number of item:%zu", dataTotalSize, dataItems.size()); -- Gitee From 2d19822473eed8f93d563299528de095678e8928 Mon Sep 17 00:00:00 2001 From: lianhuix Date: Thu, 26 May 2022 16:06:44 +0800 Subject: [PATCH 3/3] Fix query failed with In & NotIn Signed-off-by: lianhuix --- .../distributeddataservice/libs/distributeddb/include/query.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/libs/distributeddb/include/query.h b/services/distributeddataservice/libs/distributeddb/include/query.h index 8a340f14b..1f4f03900 100644 --- a/services/distributeddataservice/libs/distributeddb/include/query.h +++ b/services/distributeddataservice/libs/distributeddb/include/query.h @@ -99,7 +99,7 @@ public: DB_API Query &In(const std::string &field, const std::vector &values) { std::vector fieldValues; - QueryValueType type = QueryValueType::VALUE_TYPE_INVALID; + QueryValueType type = QueryValueType::VALUE_TYPE_NULL; for (const auto &value : values) { FieldValue fieldValue; type = GetFieldTypeAndValue(value, fieldValue); @@ -114,7 +114,7 @@ public: DB_API Query &NotIn(const std::string &field, const std::vector &values) { std::vector fieldValues; - QueryValueType type = QueryValueType::VALUE_TYPE_INVALID; + QueryValueType type = QueryValueType::VALUE_TYPE_NULL; for (const auto &value : values) { FieldValue fieldValue; type = GetFieldTypeAndValue(value, fieldValue); -- Gitee