Refactor some types in rpc/pd

Signed-off-by: Nick Cameron <nrc@ncameron.org>

Author: nrc

src/rpc/client.rs

@@ -372,7 +372,7 @@ impl RpcClient {
             inner.locate_key(scan.start_key()).and_then(|location| {
                 let region = location;
                 let cf = scan.state.cf.clone();
-                Self::region_context_by_id(Arc::clone(&inner), region.id)
+                Self::region_context_by_id(Arc::clone(&inner), region.id())
                     .map_ok(|(region, client)| {
                         (scan, region.range(), RawContext::new(region, client, cf))
                     })
@@ -428,7 +428,7 @@ impl RpcClient {
             inner.locate_key(scan.start_key()).and_then(|location| {
                 let region = location;
                 let cf = scan.state.clone();
-                Self::region_context_by_id(Arc::clone(&inner), region.id)
+                Self::region_context_by_id(Arc::clone(&inner), region.id())
                     .map_ok(|(region, client)| {
                         (scan, region.range(), RawContext::new(region, client, cf))
                     })
@@ -484,9 +484,9 @@ impl RegionContext {
 impl From<RegionContext> for kvrpcpb::Context {
     fn from(mut ctx: RegionContext) -> kvrpcpb::Context {
         let mut kvctx = kvrpcpb::Context::default();
-        kvctx.set_region_id(ctx.region.id);
-        kvctx.set_region_epoch(ctx.region.take_region_epoch());
-        kvctx.set_peer(ctx.region.peer().expect("leader must exist").into_inner());
+        kvctx.set_region_id(ctx.region.id());
+        kvctx.set_region_epoch(ctx.region.region.take_region_epoch());
+        kvctx.set_peer(ctx.region.peer().expect("leader must exist"));
         kvctx
     }
 }

src/rpc/pd/client.rs

@@ -195,7 +195,7 @@ impl PdClient {
                 cli.get_store_async_opt(&req, opt).map(Compat01As03::new)
             },
         ))
-        .map_ok(|mut resp| resp.take_store().into())
+        .map_ok(|mut resp| resp.take_store())
     }
 
     pub fn get_region(&self, key: &[u8]) -> impl Future<Output = Result<Region>> {

src/rpc/pd/mod.rs

@@ -3,8 +3,7 @@
 // TODO: Remove this when txn is done.
 #![allow(dead_code)]
 
-use std::ops::{Deref, DerefMut};
-
+pub use kvproto::metapb::{Peer, Store};
 use kvproto::{kvrpcpb, metapb};
 
 pub use crate::rpc::pd::client::PdClient;
@@ -32,26 +31,9 @@ pub struct Region {
     pub leader: Option<Peer>,
 }
 
-impl Deref for Region {
-    type Target = metapb::Region;
-
-    fn deref(&self) -> &Self::Target {
-        &self.region
-    }
-}
-
-impl DerefMut for Region {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.region
-    }
-}
-
 impl Region {
     pub fn new(region: metapb::Region, leader: Option<metapb::Peer>) -> Self {
-        Region {
-            region,
-            leader: leader.map(Peer),
-        }
+        Region { region, leader }
     }
 
     pub fn switch_peer(&mut self, _to: StoreId) -> Result<()> {
@@ -109,59 +91,7 @@ impl Region {
     }
 
     pub fn meta(&self) -> metapb::Region {
-        Clone::clone(&self.region)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Store(metapb::Store);
-
-impl From<metapb::Store> for Store {
-    fn from(store: metapb::Store) -> Store {
-        Store(store)
-    }
-}
-
-impl Deref for Store {
-    type Target = metapb::Store;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Store {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-#[derive(Clone, Default, Debug, PartialEq)]
-pub struct Peer(metapb::Peer);
-
-impl From<metapb::Peer> for Peer {
-    fn from(peer: metapb::Peer) -> Peer {
-        Peer(peer)
-    }
-}
-
-impl Deref for Peer {
-    type Target = metapb::Peer;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Peer {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl Peer {
-    pub fn into_inner(self) -> metapb::Peer {
-        self.0
+        self.region.clone()
     }
 }