fix(json_family): Fix error in JsonFamilyTest.MGet (#3285)

* fix(json_family): Fix error in JsonFamilyTest.MGet Signed-off-by: Stepan Bagritsevich <[email protected]> * refactor(json_family): address comments Signed-off-by: Stepan Bagritsevich <[email protected]> * refactor(json_family): Change LOG(WARNING) to VLOG(2) Signed-off-by: Stepan Bagritsevich <[email protected]> * fix(json_family): Test case when jsonpathv2 is false Signed-off-by: Stepan Bagritsevich <[email protected]> * refactor(json_family): Update VLOGs level from 2 to 1 Signed-off-by: Stepan Bagritsevich <[email protected]> --------- Signed-off-by: Stepan Bagritsevich <[email protected]>
dragonflydb · Jul 9, 2024 · e914a5f · e914a5f
1 parent 628985b
commit e914a5f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,6 +156,7 @@ jobs:
           ./dragonfly_test
           ./multi_test --multi_exec_mode=1
           ./multi_test --multi_exec_mode=3
+          ./json_family_test --jsonpathv2=false
 
       - name: Upload unit logs on failure
         if: failure()

diff --git a/src/server/json_family.cc b/src/server/json_family.cc
@@ -1447,10 +1447,16 @@ io::Result<JsonPathV2, string> ParsePathV2(string_view path) {
   }
 
   if (absl::GetFlag(FLAGS_jsonpathv2)) {
-    return json::ParsePath(path);
+    auto path_result = json::ParsePath(path);
+    if (!path_result) {
+      VLOG(1) << "Invalid Json path: " << path << ' ' << path_result.error() << std::endl;
+      return nonstd::make_unexpected(kSyntaxErr);
+    }
+    return path_result;
   }
   io::Result<JsonExpression> expr_result = ParseJsonPath(path);
   if (!expr_result) {
+    VLOG(1) << "Invalid Json path: " << path << ' ' << expr_result.error() << std::endl;
     return nonstd::make_unexpected(kSyntaxErr);
   }
   return JsonPathV2(std::move(expr_result.value()));

diff --git a/src/server/json_family_test.cc b/src/server/json_family_test.cc
@@ -982,7 +982,7 @@ TEST_F(JsonFamilyTest, MGet) {
 
 #ifndef SANITIZERS
   resp = Run({"JSON.MGET", "json1", "??INNNNVALID??"});
-  EXPECT_THAT(resp, ErrArg("Unknown token"));
+  EXPECT_THAT(resp, ErrArg("ERR syntax error"));
 #endif
 
   resp = Run({"JSON.MGET", "json1", "json2", "json3", "$.address.country"});