From d110ad1ecb1deb3380702b3c68990a29a78a5cdd Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Thu, 23 Jul 2020 21:05:50 +1200 Subject: [PATCH] Move region and store from common to store crate Signed-off-by: Nick Cameron --- src/lib.rs | 2 ++ src/mock.rs | 3 +-- src/pd/client.rs | 4 ++-- src/pd/retry.rs | 6 +++--- src/transaction/lock.rs | 4 ++-- tikv-client-common/src/lib.rs | 6 ------ tikv-client-store/src/lib.rs | 15 ++++++++++----- .../src/region.rs | 2 +- .../src/store_builder.rs | 0 9 files changed, 21 insertions(+), 21 deletions(-) rename {tikv-client-common => tikv-client-store}/src/region.rs (97%) rename {tikv-client-common => tikv-client-store}/src/store_builder.rs (100%) diff --git a/src/lib.rs b/src/lib.rs index 352e6f1..2fd714b 100644 --- a/src/lib.rs +++ b/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}; diff --git a/src/mock.rs b/src/mock.rs index 47fd5e9..c33bd14 100644 --- a/src/mock.rs +++ b/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, Store}; +use tikv_client_store::{HasError, KvClient, KvConnect, Region, RegionId, Store}; /// Create a `PdRpcClient` with it's internals replaced with mocks so that the /// client can be tested without doing any RPC calls. diff --git a/src/pd/client.rs b/src/pd/client.rs index c4f08b5..e1730ad 100644 --- a/src/pd/client.rs +++ b/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}; diff --git a/src/pd/retry.rs b/src/pd/retry.rs index a37818f..dfeed52 100644 --- a/src/pd/retry.rs +++ b/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::{ - security::SecurityManager, stats::pd_stats, Error, Region, RegionId, Result, StoreId, Timestamp, -}; +use tikv_client_common::{security::SecurityManager, stats::pd_stats, Error, Result, Timestamp}; use tikv_client_pd::cluster::{Cluster, Connection}; use tokio::sync::RwLock; diff --git a/src/transaction/lock.rs b/src/transaction/lock.rs index 0f2180d..ef4e581 100644 --- a/src/transaction/lock.rs +++ b/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; diff --git a/tikv-client-common/src/lib.rs b/tikv-client-common/src/lib.rs index ba3c73d..10914c9 100644 --- a/tikv-client-common/src/lib.rs +++ b/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; diff --git a/tikv-client-store/src/lib.rs b/tikv-client-store/src/lib.rs index 758b851..e552003 100644 --- a/tikv-client-store/src/lib.rs +++ b/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::{ - security::SecurityManager, stats::tikv_stats, ErrorKind, Region, Result, StoreBuilder, -}; +use tikv_client_common::{security::SecurityManager, stats::tikv_stats, ErrorKind, Result}; /// A trait for connecting to TiKV stores. pub trait KvConnect: Sized + Send + Sync + 'static { diff --git a/tikv-client-common/src/region.rs b/tikv-client-store/src/region.rs similarity index 97% rename from tikv-client-common/src/region.rs rename to tikv-client-store/src/region.rs index 7504754..c1e5a6a 100644 --- a/tikv-client-common/src/region.rs +++ b/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; diff --git a/tikv-client-common/src/store_builder.rs b/tikv-client-store/src/store_builder.rs similarity index 100% rename from tikv-client-common/src/store_builder.rs rename to tikv-client-store/src/store_builder.rs