Merge pull request #7738 from andylokandy/alloc

refactor(function): eliminate an allocation in parse_json()

Author: mergify[bot]

src/common/jsonb/src/value.rs

@@ -14,11 +14,10 @@
 
 use std::borrow::Cow;
 use std::collections::BTreeMap;
+use std::fmt;
 use std::fmt::Debug;
 use std::fmt::Display;
 use std::fmt::Formatter;
-use std::fmt::{self};
-use std::io::Write;
 use std::ops::Neg;
 
 use decimal_rs::Decimal;
@@ -214,11 +213,9 @@ impl<'a> Value<'a> {
     }
 
     /// Attempts to serialize the JSONB Value into a byte stream.
-    pub fn to_writer<W: Write>(&self, mut writer: W) -> Result<(), Error> {
-        let mut buf = Vec::new();
-        let mut encoder = Encoder::new(&mut buf);
+    pub fn to_vec(&self, buf: &mut Vec<u8>) -> Result<(), Error> {
+        let mut encoder = Encoder::new(buf);
         encoder.encode(self)?;
-        writer.write_all(&buf)?;
         Ok(())
     }
 }

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

@@ -24,7 +24,7 @@ fn test_parse_null() {
     assert_eq!(value.as_null(), Some(()));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\0\0\0\0");
 }
 
@@ -35,7 +35,7 @@ fn test_parse_boolean() {
     assert_eq!(value.as_bool(), Some(true));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x40\0\0\0");
 
     let s = r#"false"#;
@@ -44,7 +44,7 @@ fn test_parse_boolean() {
     assert_eq!(value.as_bool(), Some(false));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x30\0\0\0");
 }
 
@@ -56,7 +56,7 @@ fn test_parse_number_int64() {
     assert_eq!(value.as_i64(), Some(-1234));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x20\0\0\x04\x03\0\xd2\x04");
 
     let s = r#"34567890"#;
@@ -65,7 +65,7 @@ fn test_parse_number_int64() {
     assert_eq!(value.as_i64(), Some(34567890));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x20\0\0\x06\x02\0\xd2\x76\x0f\x02");
 }
 
@@ -77,7 +77,7 @@ fn test_parse_number_float64() {
     assert_eq!(value.as_f64(), Some(0.0123));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x20\0\0\x03\x02\x04\x7b");
 
     let s = r#"12.34e5"#;
@@ -86,7 +86,7 @@ fn test_parse_number_float64() {
     assert_eq!(value.as_f64(), Some(1234000.0));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x20\0\0\x04\0\x03\xd2\x04");
 }
 
@@ -98,7 +98,7 @@ fn test_parse_string() {
     assert_eq!(value.as_str(), Some(&Cow::from("asd")));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x10\0\0\x03\x61\x73\x64");
 
     let s = r#""\\\"abc\\\"""#;
@@ -107,7 +107,7 @@ fn test_parse_string() {
     assert_eq!(value.as_str(), Some(&Cow::from("\\\"abc\\\"")));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x10\0\0\x07\x5c\x22\x61\x62\x63\x5c\x22");
 
     let s = r#""测试abc""#;
@@ -116,7 +116,7 @@ fn test_parse_string() {
     assert_eq!(value.as_str(), Some(&Cow::from("测试abc")));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(
         buf,
         b"\x20\0\0\0\x10\0\0\x09\xe6\xb5\x8b\xe8\xaf\x95\x61\x62\x63"
@@ -128,7 +128,7 @@ fn test_parse_string() {
     assert_eq!(value.as_str(), Some(&Cow::from("€")));
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x20\0\0\0\x10\0\0\x03\xe2\x82\xac");
 }
 
@@ -139,15 +139,15 @@ fn test_parse_array() {
     assert!(value.is_array());
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x80\0\0\x06\x40\0\0\0\x20\0\0\x02\x20\0\0\x03\x20\0\0\x05\x10\0\0\x03\x50\0\0\x04\x39\x30\x03\0\xc8\x02\x04\xc2\x12\x0c\x61\x73\x64\x80\0\0\0");
 
     let s = r#"[1,2,3,["a","b","c"]]"#;
     let value = parse_value(s.as_bytes()).unwrap();
     assert!(value.is_array());
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x80\0\0\x04\x20\0\0\x01\x20\0\0\x01\x20\0\0\x01\x50\0\0\x13\x01\x02\x03\x80\0\0\x03\x10\0\0\x01\x10\0\0\x01\x10\0\0\x01\x61\x62\x63");
 }
 
@@ -158,15 +158,15 @@ fn test_parse_object() {
     assert!(value.is_object());
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(buf, b"\x40\0\0\x02\x10\0\0\x02\x10\0\0\x02\x10\0\0\x02\x10\0\0\x02\x6b\x31\x6b\x32\x76\x31\x76\x32");
 
     let s = r#"{"k":"v","a":"b"}"#;
     let value = parse_value(s.as_bytes()).unwrap();
     assert!(value.is_object());
 
     let mut buf: Vec<u8> = Vec::new();
-    value.to_writer(&mut buf).unwrap();
+    value.to_vec(&mut buf).unwrap();
     assert_eq!(
         buf,
         b"\x40\0\0\x02\x10\0\0\x01\x10\0\0\x01\x10\0\0\x01\x10\0\0\x01\x61\x6b\x62\x76"

src/query/functions-v2/src/scalars/variant.rs

@@ -35,11 +35,9 @@ pub fn register(registry: &mut FunctionRegistry) {
             let value = parse_value(s).map_err(|err| {
                 format!("unable to parse '{}': {}", &String::from_utf8_lossy(s), err)
             })?;
-            let mut buf: Vec<u8> = Vec::new();
             value
-                .to_writer(&mut buf)
+                .to_vec(&mut output.data)
                 .map_err(|_| "unable to encode jsonb".to_string())?;
-            output.put_slice(buf.as_slice());
             output.commit_row();
 
             Ok(())