Merge branch 'master' into minor

nrc · web-flow · commit 19a7a41678b6 · 2019-06-05T08:19:20.000+12:00
diff --git a/src/rpc/client.rs b/src/rpc/client.rs
@@ -4,9 +4,8 @@
 #![allow(dead_code)]
 
 use std::{
-    collections::HashMap,
+    collections::hash_map::{self, HashMap},
     fmt,
-    ops::Deref,
     sync::{Arc, RwLock},
     time::Duration,
 };
@@ -107,7 +106,7 @@ impl RpcClientInner {
     }
 
     fn locate_key(&self, key: &Key) -> impl Future<Output = Result<KeyLocation>> {
-        self.load_region(key).map_ok(KeyLocation::new)
+        self.load_region(key)
     }
 
     fn kv_client(&self, context: RegionContext) -> Result<(RegionContext, Arc<KvClient>)> {
@@ -197,7 +196,7 @@ impl RpcClient {
                 let peer = location.peer().expect("leader must exist");
                 let store_id = peer.get_store_id();
                 inner.load_store(store_id).map_ok(|store| RegionContext {
-                    region: location.into_inner(),
+                    region: location,
                     store,
                 })
             })
@@ -257,7 +256,6 @@ impl RpcClient {
         let inner = self.inner();
         self.group_tasks_by_region(keys)
             .and_then(move |task_groups| {
-                let task_groups = task_groups.into_inner();
                 let mut tasks = Vec::with_capacity(task_groups.len());
                 for (region, keys) in task_groups.into_iter() {
                     let inner = Arc::clone(&inner);
@@ -302,7 +300,6 @@ impl RpcClient {
             Either::Right(
                 self.group_tasks_by_region(pairs)
                     .and_then(move |task_groups| {
-                        let task_groups = task_groups.into_inner();
                         let mut tasks = Vec::with_capacity(task_groups.len());
                         for (region, pairs) in task_groups.into_iter() {
                             let inner = Arc::clone(&inner);
@@ -336,7 +333,6 @@ impl RpcClient {
         let inner = self.inner();
         self.group_tasks_by_region(keys)
             .and_then(move |task_groups| {
-                let task_groups = task_groups.into_inner();
                 let mut tasks = Vec::with_capacity(task_groups.len());
                 for (region, keys) in task_groups.into_iter() {
                     let inner = Arc::clone(&inner);
@@ -374,21 +370,27 @@ impl RpcClient {
         let inner = Arc::clone(&self.inner);
         loop_fn((inner, scan), |(inner, scan)| {
             inner.locate_key(scan.start_key()).and_then(|location| {
-                let region = location.into_inner();
-                let cf = scan.cf.clone();
-                Self::region_context_by_id(Arc::clone(&inner), region.id)
+                let region = location;
+                let cf = scan.state.cf.clone();
+                Self::region_context_by_id(Arc::clone(&inner), region.id())
                     .map_ok(|(region, client)| {
                         (scan, region.range(), RawContext::new(region, client, cf))
                     })
                     .and_then(|(mut scan, region_range, context)| {
                         let (start_key, end_key) = scan.range();
                         context
                             .client()
-                            .raw_scan(context, start_key, end_key, scan.limit, scan.key_only)
+                            .raw_scan(
+                                context,
+                                start_key,
+                                end_key,
+                                scan.state.limit,
+                                scan.state.key_only,
+                            )
                             .map_ok(|pairs| (scan, region_range, pairs))
                     })
                     .map_ok(|(mut scan, region_range, mut pairs)| {
-                        let limit = scan.limit;
+                        let limit = scan.state.limit;
                         scan.result_mut().append(&mut pairs);
                         if scan.result().len() as u32 >= limit {
                             Loop::Break(scan.into_inner())
@@ -424,9 +426,9 @@ impl RpcClient {
         let inner = Arc::clone(&self.inner);
         loop_fn((inner, scan), |(inner, scan)| {
             inner.locate_key(scan.start_key()).and_then(|location| {
-                let region = location.into_inner();
-                let cf = scan.clone();
-                Self::region_context_by_id(Arc::clone(&inner), region.id)
+                let region = location;
+                let cf = scan.state.clone();
+                Self::region_context_by_id(Arc::clone(&inner), region.id())
                     .map_ok(|(region, client)| {
                         (scan, region.range(), RawContext::new(region, client, cf))
                     })
@@ -482,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
     }
 }
@@ -523,25 +525,7 @@ impl TxnContext {
     }
 }
 
-struct KeyLocation(Region);
-
-impl KeyLocation {
-    fn new(region: Region) -> Self {
-        KeyLocation(region)
-    }
-
-    fn into_inner(self) -> Region {
-        self.0
-    }
-}
-
-impl Deref for KeyLocation {
-    type Target = Region;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
+type KeyLocation = Region;
 
 trait GroupingTask: Clone + Default + Sized {
     fn key(&self) -> &Key;
@@ -550,36 +534,33 @@ trait GroupingTask: Clone + Default + Sized {
 #[derive(Default)]
 struct GroupedTasks<Task: GroupingTask>(HashMap<RegionVerId, Vec<Task>>, RegionVerId);
 
-impl<Task> GroupedTasks<Task>
-where
-    Task: GroupingTask,
-{
+impl<Task: GroupingTask> GroupedTasks<Task> {
     fn new(ver_id: RegionVerId, task: Task) -> Self {
         let mut map = HashMap::with_capacity(1);
         map.insert(ver_id.clone(), vec![task]);
         GroupedTasks(map, ver_id)
     }
 
+    #[inline]
     fn add(&mut self, ver_id: RegionVerId, task: Task) {
         self.0
             .entry(ver_id)
             .or_insert_with(|| Vec::with_capacity(1))
             .push(task)
     }
 
-    fn into_inner(self) -> HashMap<RegionVerId, Vec<Task>> {
-        self.0
+    #[inline]
+    fn len(&self) -> usize {
+        self.0.len()
     }
 }
 
-impl<Task> Deref for GroupedTasks<Task>
-where
-    Task: GroupingTask,
-{
-    type Target = HashMap<RegionVerId, Vec<Task>>;
+impl<Task: GroupingTask> IntoIterator for GroupedTasks<Task> {
+    type Item = (RegionVerId, Vec<Task>);
+    type IntoIter = hash_map::IntoIter<RegionVerId, Vec<Task>>;
 
-    fn deref(&self) -> &Self::Target {
-        &self.0
+    fn into_iter(self) -> hash_map::IntoIter<RegionVerId, Vec<Task>> {
+        self.0.into_iter()
     }
 }
 
@@ -666,15 +647,3 @@ where
         &self.result
     }
 }
-
-impl<Res, State> Deref for ScanRegionsContext<Res, State>
-where
-    Res: Default,
-    State: Sized,
-{
-    type Target = State;
-
-    fn deref(&self) -> &Self::Target {
-        &self.state
-    }
-}
diff --git a/src/rpc/pd/client.rs b/src/rpc/pd/client.rs
@@ -193,7 +193,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>> {
diff --git a/src/rpc/pd/mod.rs b/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()
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ impl PdClient {`
`193`	`193`	`cli.get_store_async_opt(&req, opt).map(Compat01As03::new)`
`194`	`194`	`},`
`195`	`195`	`))`
`196`		`- .map_ok(\|mut resp\| resp.take_store().into())`
	`196`	`+ .map_ok(\|mut resp\| resp.take_store())`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`pub fn get_region(&self, key: &[u8]) -> impl Future<Output = Result<Region>> {`