*: unify using tikv util crate (#5214)

Signed-off-by: siddontang <siddontang@gmail.com>

src/storage/lock_manager/client.rs

@@ -1,14 +1,14 @@
 // Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
 
 use super::{DeadlockFuture, Error, Result};
-use crate::tikv_util::security::SecurityManager;
 use futures::unsync::mpsc::{self, UnboundedSender};
 use futures::{Future, Sink, Stream};
 use grpcio::{ChannelBuilder, EnvBuilder, WriteFlags};
 use kvproto::deadlock::*;
 use kvproto::deadlock_grpc::DeadlockClient;
 use std::sync::Arc;
 use std::time::Duration;
+use tikv_util::security::SecurityManager;
 
 pub type Callback = Box<dyn Fn(DeadlockResponse)>;
 

src/storage/lock_manager/deadlock.rs

@@ -7,10 +7,6 @@ use super::waiter_manager::Scheduler as WaiterMgrScheduler;
 use super::{Error, Lock, Result};
 use crate::pd::{RpcClient, INVALID_ID};
 use crate::server::resolve::StoreAddrResolver;
-use crate::tikv_util::collections::{HashMap, HashSet};
-use crate::tikv_util::future::paired_future_callback;
-use crate::tikv_util::security::SecurityManager;
-use crate::tikv_util::worker::{FutureRunnable, FutureScheduler, Stopped};
 use futures::{Future, Sink, Stream};
 use grpcio::{
     self, DuplexSink, RequestStream, RpcContext, RpcStatus, RpcStatusCode::*, UnarySink, WriteFlags,
@@ -22,7 +18,11 @@ use std::fmt::{self, Display, Formatter};
 use std::rc::Rc;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
+use tikv_util::collections::{HashMap, HashSet};
+use tikv_util::future::paired_future_callback;
+use tikv_util::security::SecurityManager;
 use tikv_util::time;
+use tikv_util::worker::{FutureRunnable, FutureScheduler, Stopped};
 use tokio_core::reactor::Handle;
 use tokio_timer::Interval;
 

src/storage/lock_manager/waiter_manager.rs

@@ -9,8 +9,6 @@ use crate::storage::mvcc::Error as MvccError;
 use crate::storage::txn::Error as TxnError;
 use crate::storage::txn::{execute_callback, ProcessResult};
 use crate::storage::{Error as StorageError, StorageCb};
-use crate::tikv_util::collections::HashMap;
-use crate::tikv_util::worker::{FutureRunnable, FutureScheduler, Stopped};
 use futures::Future;
 use kvproto::deadlock::WaitForEntry;
 use prometheus::HistogramTimer;
@@ -19,6 +17,8 @@ use std::fmt::{self, Debug, Display, Formatter};
 use std::rc::Rc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Duration, Instant};
+use tikv_util::collections::HashMap;
+use tikv_util::worker::{FutureRunnable, FutureScheduler, Stopped};
 use tokio_core::reactor::Handle;
 use tokio_timer::Delay;
 
@@ -510,8 +510,8 @@ mod tests {
 
     #[test]
     fn test_waiter_manager() {
-        use crate::tikv_util::worker::FutureWorker;
         use std::sync::mpsc;
+        use tikv_util::worker::FutureWorker;
 
         let detect_worker = FutureWorker::new("dummy-deadlock");
         let detector_scheduler = DetectorScheduler::new(detect_worker.scheduler());