From d2f9401bd3ab1f9519dd0ac5e604a5148a0dbb86 Mon Sep 17 00:00:00 2001
From: Jeremyzz <mazhao12@huawei.com>
Date: Thu, 18 May 2023 17:13:27 +0800
Subject: [PATCH] fix code alarm

Signed-off-by: Jeremyzz <mazhao12@huawei.com>
---
 .../gaussdb_rd/src/common/src/json_common.cpp      | 14 +++++---------
 .../gaussdb_rd/src/interface/src/result_set.cpp    |  2 +-
 .../gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp |  1 -
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp
index 7380fa09..cf906cff 100644
--- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp
+++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp
@@ -82,12 +82,11 @@ std::vector<ValueObject> JsonCommon::GetLeafValue(const JsonObject &node)
 
 bool JsonCommon::CheckNode(JsonObject &node)
 {
-    std::string fieldName;
     while (!node.IsNull()) {
         int ret = 0;
         std::set<std::string> fieldSet;
         bool isFieldNameExist = true;
-        fieldName = node.GetItemField(ret);
+        std::string fieldName = node.GetItemField(ret);
         if (ret != E_OK) {
             isFieldNameExist = false;
         }
@@ -130,11 +129,10 @@ bool JsonCommon::CheckJsonField(JsonObject &jsonObj)
 
 bool JsonCommon::CheckProjectionNode(JsonObject &node, bool isFirstLevel, int &errCode)
 {
-    std::string fieldName;
     while (!node.IsNull()) {
         int ret = 0;
         std::set<std::string> fieldSet;
-        fieldName = node.GetItemField(ret);
+        std::string fieldName = node.GetItemField(ret);
         if (fieldName.empty()) {
             errCode = -E_INVALID_ARGS;
             return false;
@@ -678,7 +676,7 @@ bool JsonCommon::IsJsonNodeMatch(const JsonObject &src, const JsonObject &target
 {
     errCode = E_OK;
     int isMatchFlag = true;
-    JsonObjectIterator(target, {}, [&src, &isMatchFlag, &errCode](JsonFieldPath &path, const JsonObject &item) {
+    JsonObjectIterator(target, {}, [&src, &isMatchFlag, &errCode](const JsonFieldPath &path, const JsonObject &item) {
         int isAlreadyMatched = 0;
         bool isCollapse = false;
         if (isMatchFlag == false) {
@@ -706,11 +704,9 @@ bool JsonCommon::IsJsonNodeMatch(const JsonObject &src, const JsonObject &target
             }
         } else {
             std::vector<ValueObject> ItemLeafValue = GetLeafValue(item);
-            int isNULLFlag = true;
             for (auto ValueItem : ItemLeafValue) {
-                if (ValueItem.GetValueType() != ValueObject::ValueType::VALUE_NULL) { // leaf value is not null
-                    isNULLFlag = false;
-                } else { // filter leaf is null, Src leaf is dont exist
+                // filter leaf is null, Src leaf is dont exist.
+                if (ValueItem.GetValueType() == ValueObject::ValueType::VALUE_NULL) {
                     isMatchFlag = true;
                     return false;
                 }
diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp
index 5dc1741a..cadbf670 100644
--- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp
+++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp
@@ -214,10 +214,10 @@ int ResultSet::CutJsonBranch(std::string &jsonData)
         GLOGE("jsonData Parsed failed");
         return errCode;
     }
-    std::vector<std::vector<std::string>> allCutPath;
     if (context_->viewType) {
         std::vector<std::string> singlePath;
         JsonObject cjsonObjChild = cjsonObj.GetChild();
+        std::vector<std::vector<std::string>> allCutPath;
         errCode = CheckCutNode(&cjsonObjChild, singlePath, allCutPath);
         if (errCode != E_OK) {
             GLOGE("The node in CheckCutNode is nullptr");
diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp
index 4daae0f1..0b40db95 100644
--- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp
+++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp
@@ -291,7 +291,6 @@ int SQLiteUtils::ExecSql(sqlite3 *db, const std::string &sql, const std::functio
         while (true) {
             errCode = SQLiteUtils::StepWithRetry(stmt);
             if (errCode == SQLITE_DONE) {
-                errCode = E_OK; // Step finished
                 break;
             } else if (errCode != SQLITE_ROW) {
                 goto END; // Step return error
-- 
Gitee