optimize append str && some logic err

apache · Nov 22, 2023 · 8eb50c0 · 8eb50c0
1 parent 6eca3af
commit 8eb50c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/types/json.h b/src/types/json.h
@@ -155,21 +155,20 @@ struct JsonValue {
 
   Status StrAppend(std::string_view path, const std::string &append_value, std::vector<uint64_t> &append_cnt) {
     try {
-      std::string append_trimmed;
+      std::string append_str;
       jsoncons::json append_json = jsoncons::json::parse(append_value);
       if (append_json.is_string()) {
-        append_trimmed = append_json.as_string();
+        append_str = append_json.as_string();
       } else {
         return {Status::NotOK, "STRAPPEND need input a string to append"};
       }
 
       jsoncons::jsonpath::json_replace(
-          value, path, [&append_trimmed, &append_cnt](const std::string & /*path*/, jsoncons::json &origin) {
+          value, path, [&append_str, &append_cnt](const std::string & /*path*/, jsoncons::json &origin) {
             if (origin.is_string()) {
-              auto origin_trimmed = origin.as<std::string>();
-              append_cnt.push_back(origin_trimmed.length() + append_trimmed.length());
-              jsoncons::json new_value(origin_trimmed + append_trimmed);
-              origin = new_value;
+              auto origin_trimmed = origin.as_string();
+              append_cnt.push_back(origin_trimmed.length() + append_str.length());
+              origin = origin_trimmed + append_str;
             } else {
               append_cnt.push_back(std::numeric_limits<uint64_t>::max());
             }
@@ -186,7 +185,7 @@ struct JsonValue {
       jsoncons::jsonpath::json_query(value, path,
                                      [&str_lens](const std::string & /*path*/, const jsoncons::json &origin) {
                                        if (origin.is_string()) {
-                                         str_lens.push_back((int64_t)origin.as<std::string>().length());
+                                         str_lens.push_back(origin.as_string().length());
                                        } else {
                                          str_lens.push_back(std::numeric_limits<uint64_t>::max());
                                        }

diff --git a/src/types/redis_json.cc b/src/types/redis_json.cc
@@ -400,12 +400,12 @@ rocksdb::Status Json::StrAppend(const std::string &user_key, const std::string &
 
   auto append_res = json_val.StrAppend(path, value, append_cnt);
   if (!append_res) return rocksdb::Status::InvalidArgument(append_res.Msg());
-  // need Reverse order
+  // need reverse order
   std::reverse(append_cnt.begin(), append_cnt.end());
 
   bool need_overwrite = false;
   for (auto append : append_cnt) {
-    if (append > 0) {
+    if (append != std::numeric_limits<uint64_t>::max()) {
       need_overwrite = true;
     }
   }

diff --git a/tests/cppunit/types/json_test.cc b/tests/cppunit/types/json_test.cc
@@ -518,4 +518,4 @@ TEST_F(RedisJsonTest, StrLen) {
   for (int i = 0; i < 3; ++i) {
     ASSERT_EQ(append_cnt_[i], result1[i]);
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -518,4 +518,4 @@ TEST_F(RedisJsonTest, StrLen) { @@
       for (int i = 0; i < 3; ++i) {
         ASSERT_EQ(append_cnt_[i], result1[i]);
       }
-    }
+    }