*: move util as a component

Cargo.toml

@@ -83,7 +83,6 @@ backtrace = "0.2.3"
 clap = "2.32"
 url = "1.5"
 regex = "1.0"
-fnv = "1.0"
 sys-info = "0.5.1"
 indexmap = { version = "1.0", features = ["serde-1"] }
 futures = "0.1"
@@ -122,6 +121,7 @@ tipb = { git = "https://github.com/pingcap/tipb.git" }
 kvproto = { git = "https://github.com/pingcap/kvproto.git" }
 log_wrappers = { path = "components/log_wrappers" }
 engine = { path = "components/engine" }
+tikv_util = { path = "components/tikv_util" }
 
 [dependencies.murmur3]
 git = "https://github.com/pingcap/murmur3.git"
@@ -165,6 +165,7 @@ members = [
   "components/panic_hook",
   "components/cop_datatype",
   "components/log_wrappers",
+  "components/tikv_util",
 ]
 
 [profile.dev]

benches/misc/coprocessor/dag/expr/scalar.rs

@@ -1,6 +1,6 @@
 use std::usize;
 use test::{black_box, Bencher};
-use tikv::util::collections::HashMap;
+use tikv_util::collections::HashMap;
 use tipb::expression::ScalarFuncSig;
 
 fn get_scalar_args_with_match(sig: ScalarFuncSig) -> (usize, usize) {

benches/misc/mod.rs

@@ -4,7 +4,6 @@
 
 extern crate test;
 
-mod channel;
 mod coprocessor;
 mod raftkv;
 mod serialization;
@@ -14,5 +13,5 @@ mod writebatch;
 
 #[bench]
 fn _bench_check_requirement(_: &mut test::Bencher) {
-    tikv::util::config::check_max_open_fds(4096).unwrap();
+    tikv_util::config::check_max_open_fds(4096).unwrap();
 }

benches/misc/serialization/bench_serialization.rs

@@ -7,7 +7,7 @@ use protobuf::{self, Message};
 use rand::{thread_rng, Rng};
 use test::Bencher;
 
-use tikv::util::collections::HashMap;
+use tikv_util::collections::HashMap;
 
 #[inline]
 fn gen_rand_str(len: usize) -> Vec<u8> {

benches/raftstore/mod.rs

@@ -171,7 +171,7 @@ impl fmt::Debug for ServerClusterFactory {
 }
 
 fn main() {
-    ::tikv::util::config::check_max_open_fds(4096).unwrap();
+    tikv_util::config::check_max_open_fds(4096).unwrap();
 
     let mut criterion = Criterion::default().configure_from_args().sample_size(10);
     bench_raft_cluster(&mut criterion, NodeClusterFactory {});

components/engine/src/lib.rs

@@ -56,7 +56,7 @@ pub const LARGE_CFS: &[CfName] = &[CF_DEFAULT, CF_WRITE];
 pub const ALL_CFS: &[CfName] = &[CF_DEFAULT, CF_LOCK, CF_WRITE, CF_RAFT];
 pub const DATA_CFS: &[CfName] = &[CF_DEFAULT, CF_LOCK, CF_WRITE];
 
-// A copy of `tikv::util::escape`.
+// A copy of `tikv_util::escape`.
 // TODO: remove it once util becomes a component.
 fn escape(data: &[u8]) -> String {
     let mut escaped = Vec::with_capacity(data.len() * 4);

components/test_coprocessor/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
+tikv_util = { path = "../tikv_util" }
 tikv = { path = "../../", default-features = false }
 tipb = { git = "https://github.com/pingcap/tipb.git" }
 kvproto = { git = "https://github.com/pingcap/kvproto.git" }

components/test_coprocessor/src/dag.rs

@@ -16,7 +16,7 @@ use tipb::select::{Chunk, DAGRequest};
 
 use tikv::coprocessor::codec::{datum, Datum};
 use tikv::coprocessor::REQ_TYPE_DAG;
-use tikv::util::codec::number::NumberEncoder;
+use tikv_util::codec::number::NumberEncoder;
 
 pub struct DAGSelect {
     pub execs: Vec<Executor>,

components/test_coprocessor/src/fixture.rs

@@ -10,7 +10,7 @@ use tikv::server::readpool::{self, ReadPool};
 use tikv::server::Config;
 use tikv::storage::kv::RocksEngine;
 use tikv::storage::{Engine, TestEngineBuilder};
-use tikv::util::worker::FutureWorker;
+use tikv_util::worker::FutureWorker;
 
 #[derive(Clone)]
 pub struct ProductTable(Table);

components/test_coprocessor/src/store.rs

@@ -9,7 +9,7 @@ use kvproto::kvrpcpb::Context;
 use test_storage::{SyncTestStorage, SyncTestStorageBuilder};
 use tikv::coprocessor::codec::{datum, table, Datum};
 use tikv::storage::{Engine, FixtureStore, Key, Mutation, RocksEngine, TestEngineBuilder};
-use tikv::util::collections::HashMap;
+use tikv_util::collections::HashMap;
 
 pub struct Insert<'a, E: Engine> {
     store: &'a mut Store<E>,

components/test_coprocessor/src/table.rs

@@ -11,7 +11,7 @@ use protobuf::RepeatedField;
 
 use tikv::coprocessor;
 use tikv::coprocessor::codec::table;
-use tikv::util::codec::number::NumberEncoder;
+use tikv_util::codec::number::NumberEncoder;
 
 #[derive(Clone)]
 pub struct Table {

components/test_raftstore/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
+tikv_util = { path = "../tikv_util" }
 tikv = { path = "../../", default-features = false }
 kvproto = { git = "https://github.com/pingcap/kvproto.git" }
 protobuf = "~2.0"

components/test_raftstore/src/cluster.rs

@@ -23,8 +23,8 @@ use tikv::raftstore::store::fsm::{create_raft_batch_system, RaftBatchSystem, Raf
 use tikv::raftstore::store::*;
 use tikv::raftstore::{Error, Result};
 use tikv::server::Result as ServerResult;
-use tikv::util::collections::{HashMap, HashSet};
-use tikv::util::{escape, HandyRwLock};
+use tikv_util::collections::{HashMap, HashSet};
+use tikv_util::{escape, HandyRwLock};
 
 use super::*;
 

components/test_raftstore/src/lib.rs

@@ -14,7 +14,7 @@ extern crate slog;
 #[macro_use]
 extern crate slog_global;
 #[macro_use]
-extern crate tikv;
+extern crate tikv_util;
 
 mod cluster;
 mod node;

components/test_raftstore/src/node.rs

@@ -21,8 +21,8 @@ use tikv::raftstore::Result;
 use tikv::server::transport::{RaftStoreRouter, ServerRaftStoreRouter};
 use tikv::server::Node;
 use tikv::server::Result as ServerResult;
-use tikv::util::collections::{HashMap, HashSet};
-use tikv::util::worker::{FutureWorker, Worker};
+use tikv_util::collections::{HashMap, HashSet};
+use tikv_util::worker::{FutureWorker, Worker};
 
 use super::*;
 

components/test_raftstore/src/pd.rs

@@ -18,9 +18,9 @@ use raft::eraftpb;
 use tikv::pd::{Error, Key, PdClient, PdFuture, RegionStat, Result};
 use tikv::raftstore::store::keys::{self, data_key, enc_end_key, enc_start_key};
 use tikv::raftstore::store::util::check_key_in_region;
-use tikv::util::collections::{HashMap, HashMapEntry, HashSet};
-use tikv::util::timer::GLOBAL_TIMER_HANDLE;
-use tikv::util::{escape, Either, HandyRwLock};
+use tikv_util::collections::{HashMap, HashMapEntry, HashSet};
+use tikv_util::timer::GLOBAL_TIMER_HANDLE;
+use tikv_util::{escape, Either, HandyRwLock};
 
 use super::*;
 

components/test_raftstore/src/server.rs

@@ -29,9 +29,9 @@ use tikv::server::{
     ServerTransport,
 };
 use tikv::storage::{self, RaftKv};
-use tikv::util::collections::{HashMap, HashSet};
-use tikv::util::security::SecurityManager;
-use tikv::util::worker::{FutureWorker, Worker};
+use tikv_util::collections::{HashMap, HashSet};
+use tikv_util::security::SecurityManager;
+use tikv_util::worker::{FutureWorker, Worker};
 
 use super::*;
 

components/test_raftstore/src/transport_simulate.rs

@@ -16,8 +16,8 @@ use raft::eraftpb::MessageType;
 use tikv::raftstore::store::{Callback, CasualMessage, SignificantMsg, Transport};
 use tikv::raftstore::{DiscardReason, Error, Result};
 use tikv::server::transport::*;
-use tikv::util::collections::{HashMap, HashSet};
-use tikv::util::{Either, HandyRwLock};
+use tikv_util::collections::{HashMap, HashSet};
+use tikv_util::{Either, HandyRwLock};
 
 pub fn check_messages(msgs: &[RaftMessage]) -> Result<()> {
     if msgs.is_empty() {

components/test_raftstore/src/util.rs

@@ -25,8 +25,8 @@ use tikv::raftstore::Result;
 use tikv::server::Config as ServerConfig;
 use tikv::storage::kv::CompactionListener;
 use tikv::storage::Config as StorageConfig;
-use tikv::util::config::*;
-use tikv::util::escape;
+use tikv_util::config::*;
+use tikv_util::escape;
 
 use super::*;
 

components/test_storage/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
+tikv_util = { path = "../tikv_util" }
 tikv = { path = "../../", default-features = false }
 test_raftstore = { path = "../test_raftstore" }
 kvproto = { git = "https://github.com/pingcap/kvproto.git" }

components/test_storage/src/assert_storage.rs

@@ -7,7 +7,7 @@ use tikv::storage::kv::{self, RocksEngine};
 use tikv::storage::mvcc::{self, MAX_TXN_WRITE_SIZE};
 use tikv::storage::txn;
 use tikv::storage::{self, Engine, Key, KvPair, Mutation, Value};
-use tikv::util::HandyRwLock;
+use tikv_util::HandyRwLock;
 
 use super::*;
 

components/test_storage/src/lib.rs

@@ -1,7 +1,7 @@
 // Copyright 2018 TiKV Project Authors. Licensed under Apache-2.0.
 
 #[macro_use]
-extern crate tikv;
+extern crate tikv_util;
 
 mod assert_storage;
 mod sync_storage;

components/test_storage/src/sync_storage.rs

@@ -10,7 +10,7 @@ use tikv::storage::{
     Result, Storage, Value,
 };
 use tikv::storage::{TestEngineBuilder, TestStorageBuilder};
-use tikv::util::collections::HashMap;
+use tikv_util::collections::HashMap;
 
 /// A builder to build a `SyncTestStorage`.
 ///

components/test_storage/src/util.rs

@@ -3,7 +3,7 @@
 use kvproto::kvrpcpb::Context;
 
 use test_raftstore::{new_server_cluster, Cluster, ServerCluster, SimulateEngine};
-use tikv::util::HandyRwLock;
+use tikv_util::HandyRwLock;
 
 use super::*;
 

components/test_util/Cargo.toml

@@ -5,7 +5,8 @@ edition = "2018"
 publish = false
 
 [dependencies]
-tikv = { path = "../../", default-features = false }
+tikv_util = { path = "../tikv_util" }
+tikv_alloc = { path = "../tikv_alloc", default-features = false }
 time = "0.1"
 rand = "0.5"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }

components/test_util/src/lib.rs

@@ -37,8 +37,8 @@ pub fn setup_for_ci() {
     if env::var("PANIC_ABORT").is_ok() {
         // Panics as aborts, it's helpful for debugging,
         // but also stops tests immediately.
-        tikv::util::set_panic_hook(true, "./");
+        tikv_util::set_panic_hook(true, "./");
     }
 
-    tikv::util::check_environment_variables();
+    tikv_util::check_environment_variables();
 }