perf: use hashmap in owned object to optimize search performance (#156)

Author: Ggiggle

Cargo.toml

@@ -15,6 +15,7 @@ version       = "0.4.0-rc4"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+ahash        = "0.8"
 bumpalo      = "3.13"
 bytes        = "1.9"
 cfg-if       = "1.0"

benchmarks/benches/value_operator.rs

@@ -177,10 +177,12 @@ fn bench_object_insert(c: &mut Criterion) {
         b.iter_batched(
             || (),
             |_| {
-                let mut val = sonic_rs::Object::new();
+                let mut val = sonic_rs::Object::with_capacity(100);
                 for i in 0..100 {
                     let mut obj = sonic_rs::json!({"a":{"b":{"c":{"d":{}}}}});
-                    for j in 0..100 {
+                    *obj["a"]["b"]["c"]["d"].as_object_mut().unwrap() =
+                        sonic_rs::Object::with_capacity(1000);
+                    for j in 0..1000 {
                         obj["a"]["b"]["c"]["d"]
                             .as_object_mut()
                             .unwrap()
@@ -200,7 +202,7 @@ fn bench_object_insert(c: &mut Criterion) {
                 let mut val = serde_json::Map::new();
                 for i in 0..100 {
                     let mut obj = serde_json::json!({"a":{"b":{"c":{"d":{}}}}});
-                    for j in 0..100 {
+                    for j in 0..1000 {
                         obj["a"]["b"]["c"]["d"]
                             .as_object_mut()
                             .unwrap()

src/index.rs

@@ -170,7 +170,7 @@ macro_rules! impl_str_index {
                     if !v.is_object() {
                         return None;
                     }
-                    v.get_key_mut(*self).map(|v| v.0)
+                    v.get_key_mut(*self)
                 }
 
                 #[inline]
@@ -184,11 +184,11 @@ macro_rules! impl_str_index {
                     obj.as_object_mut()
                         .expect(&format!("cannot access key in non-object value {:?}", typ))
                         .0
-                        .get_key_mut(*self).map_or_else(|| {
+                        .get_key_mut(*self).unwrap_or_else(|| {
                             let o =  unsafe { dormant_obj.reborrow() };
-                            let inserted = o.append_pair((Into::<Value>::into((*self)), Value::new_null()));
-                            &mut inserted.1
-                        }, |v| v.0)
+                            let inserted = o.insert(&self, Value::new_null());
+                            inserted
+                        })
                 }
 
                 #[inline]

src/lazyvalue/value.rs

@@ -272,19 +272,11 @@ impl<'a> JsonValueTrait for LazyValue<'a> {
     }
 
     fn as_number(&self) -> Option<Number> {
-        if let Ok(num) = from_str(self.as_raw_str()) {
-            Some(num)
-        } else {
-            None
-        }
+        from_str(self.as_raw_str()).ok()
     }
 
     fn as_raw_number(&self) -> Option<RawNumber> {
-        if let Ok(num) = from_str(self.as_raw_str()) {
-            Some(num)
-        } else {
-            None
-        }
+        from_str(self.as_raw_str()).ok()
     }
 
     fn as_str(&self) -> Option<&str> {

src/value/from.rs

@@ -563,10 +563,10 @@ mod test {
         let x: Value = map.iter().collect();
         assert_eq!(x, json!({"sonic_rs": 40, "json": 2}));
 
-        let v = std::iter::repeat(6).take(3);
+        let v = std::iter::repeat_n(6, 3);
         let x1: Vec<_> = v.collect();
         dbg!(x1);
-        let v = std::iter::repeat(6).take(3);
+        let v = std::iter::repeat_n(6, 3);
         let x: Value = v.collect();
         assert_eq!(x, json!([6, 6, 6]));
 

src/value/macros.rs

@@ -226,8 +226,7 @@ macro_rules! json_internal {
     // Insert the current entry followed by trailing comma.
     (@object $object:ident [$($key:tt)+] ($value:expr) , $($rest:tt)*) => {
         let key: &str = ($($key)+).as_ref();
-        let pair = ($crate::Value::copy_str(key), $value);
-        let _ = $object.append_pair(pair);
+        let _ = $object.insert(key, $value);
         json_internal!(@object $object () ($($rest)*) ($($rest)*));
     };
 
@@ -239,8 +238,7 @@ macro_rules! json_internal {
     // Insert the last entry without trailing comma.
     (@object $object:ident [$($key:tt)+] ($value:expr)) => {
         let key: &str = ($($key)+).as_ref();
-        let pair = ($crate::Value::copy_str(key), $value);
-        let _ = $object.append_pair(pair);
+        let _ = $object.insert(key, $value);
     };
 
     // Next value is `null`.