fix: add the default value len when turn on the encode default value …

…feature (#276)
cloudwego · Oct 18, 2024 · 69f4396 · 69f4396
1 parent cddd656
commit 69f4396
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/src/lib.rs b/examples/src/lib.rs
@@ -29,5 +29,8 @@ fn test_pb_encode_zero_value() {
     a.encode(&mut buf).unwrap();
 
     println!("{:?}", buf);
-    println!("{:?}", buf.freeze().as_ref());
+    // println!("{:?}", buf.freeze().as_ref());
+
+    let parsed_a = zero_value::zero_value::A::decode(buf).unwrap();
+    println!("{:?}", parsed_a);
 }
diff --git a/pilota/Cargo.toml b/pilota/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pilota"
-version = "0.11.5"
+version = "0.11.6"
 edition = "2021"
 description = "Pilota is a thrift and protobuf implementation in pure rust with high performance and extensibility."
 documentation = "https://docs.rs/pilota"

diff --git a/pilota/src/prost/encoding.rs b/pilota/src/prost/encoding.rs
@@ -1658,15 +1658,21 @@ macro_rules! map {
             KL: Fn(u32, &K) -> usize,
             VL: Fn(u32, &V) -> usize,
         {
+            let mut skip_default_value = false;
+            #[cfg(feature = "pb-encode-default-value")]
+            {
+                skip_default_value = true;
+            }
+
             key_len(tag) * values.len()
                 + values
                     .iter()
                     .map(|(key, val)| {
-                        let len = (if key == &K::default() {
+                        let len = (if key == &K::default() && skip_default_value {
                             0
                         } else {
                             key_encoded_len(1, key)
-                        }) + (if val == val_default {
+                        }) + (if val == val_default && skip_default_value {
                             0
                         } else {
                             val_encoded_len(2, val)