Move region and store from common to store crate

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

src/lib.rs

@@ -100,3 +100,5 @@ pub use crate::transaction::{Client as TransactionClient, Snapshot, Transaction}
 pub use tikv_client_common::{
     BoundRange, Config, Error, ErrorKind, Key, KvPair, Result, Timestamp, ToOwnedRange, Value,
 };
+#[doc(inline)]
+pub use tikv_client_store::region::{Region, RegionId, RegionVerId, StoreId};

src/mock.rs

@@ -15,8 +15,7 @@ use futures::future::{ready, BoxFuture, FutureExt};
 use grpcio::CallOption;
 use kvproto::{errorpb, kvrpcpb, metapb, tikvpb::TikvClient};
 use std::{future::Future, sync::Arc, time::Duration};
-use tikv_client_common::{Region, RegionId};
+use tikv_client_store::{HasError, KvClient, KvConnect, Region, RegionId, Store};
-use tikv_client_store::{HasError, KvClient, KvConnect, Store};
 
 /// Create a `PdRpcClient` with it's internals replaced with mocks so that the
 /// client can be tested without doing any RPC calls.

src/pd/client.rs

@@ -1,6 +1,6 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
-use crate::{pd::RetryClient, Config, Key};
+use crate::{pd::RetryClient, Config, Key, Region, RegionId};
 use futures::{
     future::{ready, BoxFuture, Either},
     prelude::*,
@@ -15,7 +15,7 @@ use std::{
 use tikv_client_common::{
     compat::{stream_fn, ClientFutureExt},
     security::SecurityManager,
-    BoundRange, Region, RegionId, Result, Timestamp,
+    BoundRange, Result, Timestamp,
 };
 use tikv_client_pd::Cluster;
 use tikv_client_store::{KvClient, KvConnect, Store, TikvConnect};

src/pd/retry.rs

@@ -2,6 +2,8 @@
 
 //! A utility module for managing and retrying PD requests.
 
+use crate::{Region, RegionId, StoreId};
+
 use async_trait::async_trait;
 use futures_timer::Delay;
 use grpcio::Environment;
@@ -11,9 +13,7 @@ use std::{
     sync::Arc,
     time::{Duration, Instant},
 };
-use tikv_client_common::{
+use tikv_client_common::{security::SecurityManager, stats::pd_stats, Error, Result, Timestamp};
-    security::SecurityManager, stats::pd_stats, Error, Region, RegionId, Result, StoreId, Timestamp,
-};
 use tikv_client_pd::cluster::{Cluster, Connection};
 use tokio::sync::RwLock;
 

src/transaction/lock.rs

@@ -1,10 +1,10 @@
-use crate::{pd::PdClient, request::KvRequest, transaction::requests};
+use crate::{pd::PdClient, request::KvRequest, transaction::requests, RegionVerId};
 use kvproto::kvrpcpb;
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
 };
-use tikv_client_common::{timestamp::TimestampExt, ErrorKind, Key, RegionVerId, Result, Timestamp};
+use tikv_client_common::{timestamp::TimestampExt, ErrorKind, Key, Result, Timestamp};
 
 const RESOLVE_LOCK_RETRY_LIMIT: usize = 10;
 

tikv-client-common/src/lib.rs

@@ -4,10 +4,8 @@ pub mod compat;
 pub mod config;
 pub mod errors;
 pub mod kv;
-pub mod region;
 pub mod security;
 pub mod stats;
-pub mod store_builder;
 pub mod timestamp;
 
 #[macro_use]
@@ -28,8 +26,4 @@ pub use crate::errors::Result;
 #[doc(inline)]
 pub use crate::kv::{BoundRange, Key, KvPair, ToOwnedRange, Value};
 #[doc(inline)]
-pub use crate::region::{Region, RegionId, RegionVerId, StoreId};
-#[doc(inline)]
-pub use crate::store_builder::StoreBuilder;
-#[doc(inline)]
 pub use crate::timestamp::Timestamp;

tikv-client-store/src/lib.rs

@@ -4,16 +4,21 @@
 extern crate log;
 
 mod errors;
+pub mod region;
+mod store_builder;
+
+pub use crate::errors::{HasError, HasRegionError};
+#[doc(inline)]
+pub use crate::region::{Region, RegionId, RegionVerId, StoreId};
+#[doc(inline)]
+pub use crate::store_builder::StoreBuilder;
+pub use kvproto::tikvpb::TikvClient;
 
-pub use self::errors::{HasError, HasRegionError};
 use derive_new::new;
 use futures::{future::BoxFuture, prelude::*};
 use grpcio::{CallOption, Environment};
-pub use kvproto::tikvpb::TikvClient;
 use std::{sync::Arc, time::Duration};
-use tikv_client_common::{
+use tikv_client_common::{security::SecurityManager, stats::tikv_stats, ErrorKind, Result};
-    security::SecurityManager, stats::tikv_stats, ErrorKind, Region, Result, StoreBuilder,
-};
 
 /// A trait for connecting to TiKV stores.
 pub trait KvConnect: Sized + Send + Sync + 'static {

tikv-client-store/src/region.rs

@@ -1,6 +1,6 @@
-use crate::{Error, Key, Result};
 use derive_new::new;
 use kvproto::{kvrpcpb, metapb};
+use tikv_client_common::{Error, Key, Result};
 
 pub type RegionId = u64;
 pub type StoreId = u64;