Merge pull request #9147 from hantmac/fix/parse-json-path

fix: support SQL-style double-quoted identifier in get_path()

Author: BohuTANG

src/common/jsonb/src/functions.rs

@@ -816,6 +816,7 @@ pub fn parse_json_path(path: &[u8]) -> Result<Vec<JsonPath>, Error> {
                 }
                 let s = std::str::from_utf8(&path[prev_idx..idx - 2])?;
                 let json_path = JsonPath::String(Cow::Borrowed(s));
+
                 json_paths.push(json_path);
             } else {
                 prev_idx = idx - 1;
@@ -836,6 +837,34 @@ pub fn parse_json_path(path: &[u8]) -> Result<Vec<JsonPath>, Error> {
                     return Err(Error::InvalidToken);
                 }
             }
+        } else if c == b'"' {
+            prev_idx = idx;
+            loop {
+                let c = read_char(path, &mut idx)?;
+                if c == b'\\' {
+                    idx += 1;
+                    let c = read_char(path, &mut idx)?;
+                    if c == b'"' {
+                        idx += 1;
+                    }
+                } else if c != b'"' {
+                    idx += 1;
+                } else {
+                    // Try to read to check if has extra strings, string value can only have one.
+                    let c = read_char(path, &mut idx);
+                    match c {
+                        Ok(_) => return Err(Error::InvalidToken),
+                        Err(_) => break,
+                    }
+                }
+            }
+            let s = std::str::from_utf8(&path[prev_idx..idx - 1])?;
+            let json_path = JsonPath::String(Cow::Borrowed(s));
+            if json_paths.is_empty() {
+                json_paths.push(json_path);
+            } else {
+                return Err(Error::InvalidToken);
+            }
         } else {
             if c == b':' || c == b'.' {
                 if idx == 1 {

src/common/jsonb/tests/it/functions.rs

@@ -32,6 +32,7 @@ use common_jsonb::object_keys;
 use common_jsonb::parse_json_path;
 use common_jsonb::parse_value;
 use common_jsonb::to_string;
+use common_jsonb::Error;
 use common_jsonb::JsonPath;
 use common_jsonb::Number;
 use common_jsonb::Object;
@@ -361,6 +362,8 @@ fn test_parse_json_path() {
             JsonPath::String(Cow::from("k2")),
             JsonPath::String(Cow::from("k3")),
         ]),
+        ("\"k1\"", vec![JsonPath::String(Cow::from("k1"))]),
+        ("\"k1k2\"", vec![JsonPath::String(Cow::from("k1k2"))]),
         (r#"k1["k2"][1]"#, vec![
             JsonPath::String(Cow::from("k1")),
             JsonPath::String(Cow::from("k2")),
@@ -372,6 +375,18 @@ fn test_parse_json_path() {
         let path = parse_json_path(s.as_bytes()).unwrap();
         assert_eq!(&path[..], &expect[..]);
     }
+
+    let wrong_sources = vec![
+        (r#"\"\"\\k1\"\""#, Error::InvalidToken),
+        (r#"\\k1\\'"#, Error::InvalidToken),
+    ];
+    for (s, expect) in wrong_sources {
+        let path = parse_json_path(s.as_bytes());
+        match path {
+            Ok(_) => println!(),
+            Err(_) => assert_eq!(Error::InvalidToken, expect),
+        }
+    }
 }
 
 #[test]