move default impl into RequestCodecExt

Signed-off-by: iosmanthus <[email protected]>

Author: iosmanthus

src/request/codec.rs

@@ -1,5 +1,6 @@
 use core::intrinsics::copy;
 use std::ops::{Deref, DerefMut};
+
 use tikv_client_common::Error;
 use tikv_client_proto::{errorpb, kvrpcpb, metapb::Region};
 
@@ -23,6 +24,28 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
         key
     }
 
+    fn decode_key(&self, _key: &mut Vec<u8>) -> Result<()> {
+        Ok(())
+    }
+
+    fn encode_range(&self, start: Vec<u8>, end: Vec<u8>) -> (Vec<u8>, Vec<u8>) {
+        (start, end)
+    }
+
+    fn encode_pd_query(&self, key: Vec<u8>) -> Vec<u8> {
+        key
+    }
+
+    fn decode_region(&self, _region: &mut Region) -> Result<()> {
+        Ok(())
+    }
+
+    fn is_plain(&self) -> bool {
+        true
+    }
+}
+
+pub trait RequestCodecExt: RequestCodec {
     fn encode_primary_lock(&self, lock: Vec<u8>) -> Vec<u8> {
         self.encode_key(lock)
     }
@@ -54,8 +77,14 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
         pairs
     }
 
-    fn decode_key(&self, _key: &mut Vec<u8>) -> Result<()> {
-        Ok(())
+    fn encode_ranges(&self, mut ranges: Vec<kvrpcpb::KeyRange>) -> Vec<kvrpcpb::KeyRange> {
+        for range in ranges.iter_mut() {
+            let (start, end) = self.encode_range(range.take_start_key(), range.take_end_key());
+            *range.mut_start_key() = start;
+            *range.mut_end_key() = end;
+        }
+
+        ranges
     }
 
     fn decode_keys(&self, keys: &mut [Vec<u8>]) -> Result<()> {
@@ -139,28 +168,6 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
         self.decode_pairs(kvs)
     }
 
-    fn encode_range(&self, start: Vec<u8>, end: Vec<u8>) -> (Vec<u8>, Vec<u8>) {
-        (start, end)
-    }
-
-    fn encode_ranges(&self, mut ranges: Vec<kvrpcpb::KeyRange>) -> Vec<kvrpcpb::KeyRange> {
-        for range in ranges.iter_mut() {
-            let (start, end) = self.encode_range(range.take_start_key(), range.take_end_key());
-            *range.mut_start_key() = start;
-            *range.mut_end_key() = end;
-        }
-
-        ranges
-    }
-
-    fn encode_pd_query(&self, key: Vec<u8>) -> Vec<u8> {
-        key
-    }
-
-    fn decode_region(&self, _region: &mut Region) -> Result<()> {
-        Ok(())
-    }
-
     fn decode_regions(&self, regions: &mut [Region]) -> Result<()> {
         for region in regions.iter_mut() {
             self.decode_region(region)?;
@@ -174,12 +181,10 @@ pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
         }
         Ok(())
     }
-
-    fn is_plain(&self) -> bool {
-        true
-    }
 }
 
+impl<T: RequestCodec> RequestCodecExt for T {}
+
 #[derive(Clone)]
 pub struct TxnApiV1;
 

src/request/mod.rs

@@ -54,14 +54,14 @@ impl<T: PartialEq + Default> IsDefault for T {
 macro_rules! impl_decode_response {
     ($($o:ident)*) => {
         fn decode_response(&self, codec: &C, mut resp: Self::Response) -> Result<Self::Response> {
+            #[allow(unused_imports)]
+            use $crate::request::{IsDefault, codec::RequestCodecExt};
+
             // decode errors
             if resp.has_region_error() {
                 codec.decode_region_error(resp.mut_region_error())?;
             }
 
-            #[allow(unused_imports)]
-            use $crate::request::IsDefault;
-
             $(
                 paste::paste! {
                     if !resp.[<get_ $o>]().is_default() {
@@ -84,6 +84,9 @@ macro_rules! impl_kv_request {
             type Response = $resp;
 
             fn encode_request(mut self, codec: &C) -> Self {
+                #[allow(unused_imports)]
+                use $crate::request::codec::RequestCodecExt;
+
                 $(
                     paste::paste! {
                         *self.[<mut_ $i>]() = codec.[<encode_ $i>](self.[<take_ $i>]());