fix: Marker Deserialize & QueryExpr encode use bincode

cnosdb · Mar 16, 2023 · 4e7cfef · 4e7cfef
1 parent 45a8638
commit 4e7cfef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/common/models/src/errors.rs b/common/models/src/errors.rs
@@ -41,7 +41,7 @@ pub enum Error {
     ))]
     Internal { err: String },
 
-    #[snafu(display("Invalid query expr message: {}", err))]
+    #[snafu(display("IO operator: {}", err))]
     IOErrors { err: String },
 
     #[snafu(display("Failed to convert vec to string"))]

diff --git a/common/models/src/predicate/domain.rs b/common/models/src/predicate/domain.rs
@@ -180,11 +180,7 @@ impl<'a> Deserialize<'a> for Marker {
     where
         D: serde::Deserializer<'a>,
     {
-        let mark = deserializer.deserialize_struct(
-            "ValueEntry",
-            &["data_type", "value", "bound"],
-            MarkerVisitor,
-        )?;
+        let mark = MarkerSerialize::deserialize(deserializer)?;
 
         Ok(mark.into())
     }
@@ -1201,16 +1197,16 @@ pub struct QueryExpr {
 
 impl QueryExpr {
     pub fn encode(option: &QueryExpr) -> Result<Vec<u8>> {
-        let bytes = serde_json::to_vec(option).map_err(|err| Error::InvalidQueryExprMsg {
-            err: err.to_string(),
+        let bytes = bincode::serialize(option).map_err(|e| Error::InvalidQueryExprMsg {
+            err: format!("encode error {}", e),
         })?;
 
         Ok(bytes)
     }
 
     pub fn decode(buf: &[u8]) -> Result<QueryExpr> {
-        serde_json::from_slice::<QueryExpr>(buf).map_err(|err| Error::InvalidQueryExprMsg {
-            err: err.to_string(),
+        bincode::deserialize::<QueryExpr>(buf).map_err(|e| Error::InvalidQueryExprMsg {
+            err: format!("decode error {}", e),
         })
     }
 }