git fire!: wip impl RequestCodec for requests

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

Author: iosmanthus

src/raw/requests.rs

@@ -12,10 +12,9 @@ use super::RawRpcRequest;
 use crate::{
     collect_first,
     pd::PdClient,
-    plain_request, plain_response,
     request::{
-        plan::ResponseWithShard, codec::RequestCodec, Collect, CollectSingle,
-        DefaultProcessor, KvRequest, Merge, Process, Shardable, SingleKey,
+        codec::RequestCodec, plan::ResponseWithShard, Collect, CollectSingle, DefaultProcessor,
+        KvRequest, Merge, Process, Shardable, SingleKey,
     },
     store::{store_stream_for_keys, store_stream_for_ranges, RegionStore},
     transaction::HasLocks,
@@ -31,20 +30,7 @@ pub fn new_raw_get_request(key: Vec<u8>, cf: Option<ColumnFamily>) -> kvrpcpb::R
     req
 }
 
-impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawGetRequest {
-    type Response = kvrpcpb::RawGetResponse;
-
-    fn encode_request(&self, codec: &C) -> Cow<Self> {
-        plain_request!(self, codec);
-        todo!()
-    }
-
-    fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
-        plain_response!(resp, codec);
-        todo!()
-    }
-}
-
+kv_request_with_key!(kvrpcpb::RawGetRequest, kvrpcpb::RawGetResponse);
 shardable_key!(kvrpcpb::RawGetRequest);
 collect_first!(kvrpcpb::RawGetResponse);
 
@@ -78,20 +64,7 @@ pub fn new_raw_batch_get_request(
     req
 }
 
-impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawBatchGetRequest {
-    type Response = kvrpcpb::RawBatchGetResponse;
-
-    fn encode_request(&self, codec: &C) -> Cow<Self> {
-        plain_request!(self, codec);
-        todo!()
-    }
-
-    fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
-        plain_response!(resp, codec);
-        todo!()
-    }
-}
-
+kv_request_with_key!(kvrpcpb::RawBatchGetRequest, kvrpcpb::RawBatchGetResponse);
 shardable_keys!(kvrpcpb::RawBatchGetRequest);
 
 impl Merge<kvrpcpb::RawBatchGetResponse> for Collect {
@@ -120,22 +93,10 @@ pub fn new_raw_put_request(
     req
 }
 
-impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawPutRequest {
-    type Response = kvrpcpb::RawPutResponse;
-
-    fn encode_request(&self, codec: &C) -> Cow<Self> {
-        plain_request!(self, codec);
-        todo!()
-    }
-
-    fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
-        plain_response!(resp, codec);
-        todo!()
-    }
-}
-
+kv_request_with_key!(kvrpcpb::RawPutRequest, kvrpcpb::RawPutResponse);
 shardable_key!(kvrpcpb::RawPutRequest);
 collect_first!(kvrpcpb::RawPutResponse);
+
 impl SingleKey for kvrpcpb::RawPutRequest {
     fn key(&self) -> &Vec<u8> {
         &self.key

src/request/codec.rs

@@ -14,24 +14,6 @@ const RAW_MODE_MAX_KEY: Prefix = [RAW_MODE_PREFIX + 1, 0, 0, 0];
 const TXN_MODE_MIN_KEY: Prefix = [TXN_MODE_PREFIX, 0, 0, 0];
 const TXN_MODE_MAX_KEY: Prefix = [TXN_MODE_PREFIX + 1, 0, 0, 0];
 
-#[macro_export]
-macro_rules! plain_request {
-    ($req: ident, $codec: ident) => {
-        if $codec.is_plain() {
-            return ::std::borrow::Cow::Borrowed($req);
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! plain_response {
-    ($resp: ident, $codec: ident) => {
-        if $codec.is_plain() {
-            return Ok($resp);
-        }
-    };
-}
-
 pub trait RequestCodec: Sized + Clone + Sync + Send + 'static {
     fn encode_key(&self, key: Key) -> Key {
         key

src/request/mod.rs

@@ -41,6 +41,36 @@ pub trait KvRequest<C>: Request + Sized + Clone + Sync + Send + 'static {
     }
 }
 
+#[macro_export]
+macro_rules! kv_request_with_key {
+    ($req: ty, $resp: ty) => {
+        impl<C> KvRequest<C> for $req
+        where
+            C: RequestCodec,
+        {
+            type Response = $resp;
+
+            fn encode_request(&self, codec: &C) -> Cow<Self> {
+                if codec.is_plain() {
+                    return Cow::Borrowed(self);
+                }
+                unimplemented!()
+            }
+
+            fn decode_response(
+                &self,
+                codec: &C,
+                resp: Self::Response,
+            ) -> crate::Result<Self::Response> {
+                if codec.is_plain() {
+                    return Ok(resp);
+                }
+                unimplemented!()
+            }
+        }
+    };
+}
+
 #[derive(Clone, Debug, new, Eq, PartialEq)]
 pub struct RetryOptions {
     /// How to retry when there is a region error and we need to resolve regions with PD.