Update some dependencies (#392)

- Update `rand` to v0.7
- Move `crc` to `dev-dependencies`
- Remove `byteorder`
- Replace `tempdir` with `tempfile`

Signed-off-by: koushiro <[email protected]>

Author: koushiro

Cargo.toml

@@ -23,12 +23,11 @@ valgrind = []
 
 [dependencies]
 libc = "0.2.11"
-crc = "1.2"
 
 [dependencies.librocksdb_sys]
 path = "librocksdb_sys"
 
 [dev-dependencies]
-byteorder = "1.0.0"
-rand = "0.3"
-tempdir = "0.3"
+rand = "0.7"
+crc = "1.8"
+tempfile = "3.1"

benches/cases/bench_wal.rs

@@ -12,12 +12,10 @@
 // limitations under the License.
 
 use super::rocksdb::{ColumnFamilyOptions, DBOptions, WriteOptions, DB};
-use super::tempdir::TempDir;
-
 use super::test::Bencher;
 
 fn run_bench_wal(b: &mut Bencher, name: &str, mut opts: DBOptions, wopts: WriteOptions) {
-    let path = TempDir::new(name).expect("");
+    let path = tempfile::Builder::new().prefix(name).tempdir().expect("");
     let path_str = path.path().to_str().unwrap();
     opts.create_if_missing(true);
     opts.set_max_background_jobs(6);

benches/cases/mod.rs

@@ -1,9 +1,8 @@
 extern crate test;
 
-extern crate byteorder;
 extern crate crc;
 extern crate rand;
 extern crate rocksdb;
-extern crate tempdir;
+extern crate tempfile;
 
 mod bench_wal;

librocksdb_sys/Cargo.toml

@@ -10,7 +10,7 @@ libc = "0.2.11"
 libtitan_sys = { path = "libtitan_sys" }
 
 [dev-dependencies]
-tempdir = "0.3"
+tempfile = "3.1"
 
 [features]
 default = []

librocksdb_sys/src/lib.rs

@@ -16,12 +16,13 @@
 extern crate bzip2_sys;
 extern crate libc;
 #[cfg(test)]
-extern crate tempdir;
+extern crate tempfile;
 
-use libc::{c_char, c_double, c_int, c_uchar, c_void, size_t};
 use std::ffi::CStr;
 use std::fmt;
 
+use libc::{c_char, c_double, c_int, c_uchar, c_void, size_t};
+
 // FFI-safe opaque types.
 //
 // These represent opaque RocksDB types. They are used behind pointers, but are
@@ -2118,7 +2119,10 @@ mod test {
     use libc::{self, c_void};
     use std::ffi::{CStr, CString};
     use std::{fs, ptr, slice};
-    use tempdir::TempDir;
+
+    fn tempdir_with_prefix(prefix: &str) -> tempfile::TempDir {
+        tempfile::Builder::new().prefix(prefix).tempdir().expect()
+    }
 
     #[test]
     fn internal() {
@@ -2129,8 +2133,7 @@ mod test {
             crocksdb_options_increase_parallelism(opts, 0);
             crocksdb_options_optimize_level_style_compaction(opts, 0);
             crocksdb_options_set_create_if_missing(opts, true);
-
-            let rustpath = TempDir::new("_rust_rocksdb_internaltest").expect("");
+            let rustpath = tempdir_with_prefix("_rust_rocksdb_internaltest");
             let cpath = CString::new(rustpath.path().to_str().unwrap()).unwrap();
             let cpath_ptr = cpath.as_ptr();
 
@@ -2236,7 +2239,7 @@ mod test {
             let opts = crocksdb_options_create();
             crocksdb_options_set_create_if_missing(opts, true);
 
-            let rustpath = TempDir::new("_rust_rocksdb_internaltest").expect("");
+            let rustpath = tempdir_with_prefix("_rust_rocksdb_internaltest");
             let cpath = CString::new(rustpath.path().to_str().unwrap()).unwrap();
             let cpath_ptr = cpath.as_ptr();
 
@@ -2248,7 +2251,7 @@ mod test {
             let io_options = crocksdb_options_create();
             let writer = crocksdb_sstfilewriter_create(env_opt, io_options);
 
-            let sst_dir = TempDir::new("_rust_rocksdb_internaltest").expect("");
+            let sst_dir = tempdir_with_prefix("_rust_rocksdb_internaltest");
             let sst_path = sst_dir.path().join("sstfilename");
             let c_sst_path = CString::new(sst_path.to_str().unwrap()).unwrap();
             let c_sst_path_ptr = c_sst_path.as_ptr();

src/lib.rs

@@ -18,7 +18,7 @@ extern crate libc;
 #[macro_use]
 pub extern crate librocksdb_sys;
 #[cfg(test)]
-extern crate tempdir;
+extern crate tempfile;
 
 pub use compaction_filter::CompactionFilter;
 pub use event_listener::{
@@ -68,3 +68,8 @@ mod table_properties;
 mod table_properties_collector;
 mod table_properties_collector_factory;
 mod titan;
+
+#[cfg(test)]
+fn tempdir_with_prefix(prefix: &str) -> tempfile::TempDir {
+    tempfile::Builder::new().prefix(prefix).tempdir().expect("")
+}

src/merge_operator.rs

@@ -145,10 +145,11 @@ impl<'a> Iterator for &'a mut MergeOperands {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use rocksdb::{DBVector, Writable, DB};
     use rocksdb_options::{ColumnFamilyOptions, DBOptions};
-    use tempdir::TempDir;
+
+    use super::*;
+    use crate::tempdir_with_prefix;
 
     #[allow(unused_variables)]
     #[allow(dead_code)]
@@ -175,7 +176,7 @@ mod test {
     #[allow(dead_code)]
     #[test]
     fn mergetest() {
-        let path = TempDir::new("_rust_rocksdb_mergetest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_mergetest");
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
         let mut cf_opts = ColumnFamilyOptions::new();

src/perf_context.rs

@@ -396,16 +396,15 @@ impl IOStatsContext {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-
-    use tempdir::TempDir;
-
     use rocksdb::{SeekKey, Writable, DB};
     use rocksdb_options::{DBOptions, WriteOptions};
 
+    use super::*;
+    use crate::tempdir_with_prefix;
+
     #[test]
     fn test_perf_context() {
-        let temp_dir = TempDir::new("test_perf_context").unwrap();
+        let temp_dir = tempdir_with_prefix("test_perf_context");
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
         let db = DB::open(opts, temp_dir.path().to_str().unwrap()).unwrap();
@@ -451,7 +450,7 @@ mod test {
 
     #[test]
     fn test_iostats_context() {
-        let temp_dir = TempDir::new("test_iostats_context").unwrap();
+        let temp_dir = tempdir_with_prefix("test_iostats_context");
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
         let db = DB::open(opts, temp_dir.path().to_str().unwrap()).unwrap();

src/rocksdb.rs

@@ -2647,17 +2647,18 @@ pub fn run_ldb_tool(ldb_args: &[String], opts: &DBOptions) {
 
 #[cfg(test)]
 mod test {
-    use super::*;
     use std::fs;
     use std::path::Path;
     use std::str;
     use std::string::String;
     use std::thread;
-    use tempdir::TempDir;
+
+    use super::*;
+    use crate::tempdir_with_prefix;
 
     #[test]
     fn external() {
-        let path = TempDir::new("_rust_rocksdb_externaltest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_externaltest");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
         let p = db.put(b"k1", b"v1111");
         assert!(p.is_ok());
@@ -2670,7 +2671,7 @@ mod test {
     #[allow(unused_variables)]
     #[test]
     fn errors_do_stuff() {
-        let path = TempDir::new("_rust_rocksdb_error").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_error");
         let path_str = path.path().to_str().unwrap();
         let db = DB::open_default(path_str).unwrap();
         let opts = DBOptions::new();
@@ -2689,7 +2690,7 @@ mod test {
 
     #[test]
     fn writebatch_works() {
-        let path = TempDir::new("_rust_rocksdb_writebacktest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_writebacktest");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
 
         // test put
@@ -2760,7 +2761,7 @@ mod test {
 
     #[test]
     fn iterator_test() {
-        let path = TempDir::new("_rust_rocksdb_iteratortest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_iteratortest");
 
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
         db.put(b"k1", b"v1111").expect("");
@@ -2779,7 +2780,7 @@ mod test {
 
     #[test]
     fn approximate_size_test() {
-        let path = TempDir::new("_rust_rocksdb_iteratortest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_iteratortest");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
         for i in 1..8000 {
             db.put(
@@ -2807,7 +2808,7 @@ mod test {
 
     #[test]
     fn property_test() {
-        let path = TempDir::new("_rust_rocksdb_propertytest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_propertytest");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
         db.put(b"a1", b"v1").unwrap();
         db.flush(true).unwrap();
@@ -2822,7 +2823,7 @@ mod test {
 
     #[test]
     fn list_column_families_test() {
-        let path = TempDir::new("_rust_rocksdb_list_column_families_test").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_list_column_families_test");
         let mut cfs = ["default", "cf1", "cf2", "cf3"];
         {
             let mut cfs_opts = vec![];
@@ -2853,13 +2854,13 @@ mod test {
         let key = b"foo";
         let value = b"bar";
 
-        let db_dir = TempDir::new("_rust_rocksdb_backuptest").unwrap();
+        let db_dir = tempdir_with_prefix("_rust_rocksdb_backuptest");
         let db = DB::open_default(db_dir.path().to_str().unwrap()).unwrap();
         let p = db.put(key, value);
         assert!(p.is_ok());
 
         // Make a backup.
-        let backup_dir = TempDir::new("_rust_rocksdb_backuptest_backup").unwrap();
+        let backup_dir = tempdir_with_prefix("_rust_rocksdb_backuptest_backup");
         let backup_engine = db.backup_at(backup_dir.path().to_str().unwrap()).unwrap();
 
         // Restore it.
@@ -2868,7 +2869,7 @@ mod test {
         ropt2.set_keep_log_files(true);
         let ropts = [ropt1, ropt2];
         for ropt in &ropts {
-            let restore_dir = TempDir::new("_rust_rocksdb_backuptest_restore").unwrap();
+            let restore_dir = tempdir_with_prefix("_rust_rocksdb_backuptest_restore");
             let restored_db = DB::restore_from(
                 &backup_engine,
                 restore_dir.path().to_str().unwrap(),
@@ -2884,7 +2885,7 @@ mod test {
 
     #[test]
     fn log_dir_test() {
-        let db_dir = TempDir::new("_rust_rocksdb_logdirtest").unwrap();
+        let db_dir = tempdir_with_prefix("_rust_rocksdb_logdirtest");
         let db_path = db_dir.path().to_str().unwrap();
         let log_path = format!("{}", Path::new(&db_path).join("log_path").display());
         fs::create_dir_all(&log_path).unwrap();
@@ -2910,7 +2911,7 @@ mod test {
 
     #[test]
     fn single_delete_test() {
-        let path = TempDir::new("_rust_rocksdb_singledeletetest").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_singledeletetest");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
 
         db.put(b"a", b"v1").unwrap();
@@ -2945,7 +2946,7 @@ mod test {
 
     #[test]
     fn test_pause_bg_work() {
-        let path = TempDir::new("_rust_rocksdb_pause_bg_work").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_pause_bg_work");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
         let db = Arc::new(db);
         let db1 = db.clone();
@@ -3000,7 +3001,7 @@ mod test {
 
     #[test]
     fn block_cache_usage() {
-        let path = TempDir::new("_rust_rocksdb_block_cache_usage").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_block_cache_usage");
         let db = DB::open_default(path.path().to_str().unwrap()).unwrap();
 
         for i in 0..200 {
@@ -3018,7 +3019,7 @@ mod test {
 
     #[test]
     fn flush_cf() {
-        let path = TempDir::new("_rust_rocksdb_flush_cf").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_flush_cf");
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
         let mut db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
@@ -3058,7 +3059,7 @@ mod test {
     fn test_get_all_key_versions() {
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
-        let path = TempDir::new("_rust_rocksdb_get_all_key_version_test").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_get_all_key_version_test");
         let db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
 
         let samples = vec![
@@ -3084,7 +3085,7 @@ mod test {
     fn test_get_approximate_memtable_stats() {
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
-        let path = TempDir::new("_rust_rocksdb_get_approximate_memtable_stats").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_get_approximate_memtable_stats");
         let db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
 
         let samples = [
@@ -3114,7 +3115,7 @@ mod test {
     fn test_set_options() {
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
-        let path = TempDir::new("_rust_rocksdb_set_option").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_set_option");
 
         let db = DB::open(opts, path.path().to_str().unwrap()).unwrap();
         let cf = db.cf_handle("default").unwrap();
@@ -3135,7 +3136,7 @@ mod test {
 
     #[test]
     fn test_load_latest_options() {
-        let path = TempDir::new("_rust_rocksdb_load_latest_option").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_load_latest_option");
         let dbpath = path.path().to_str().unwrap().clone();
         let cf_name: &str = "cf_dynamic_level_bytes";
 
@@ -3170,7 +3171,7 @@ mod test {
 
     #[test]
     fn test_sequence_number() {
-        let path = TempDir::new("_rust_rocksdb_sequence_number").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_sequence_number");
 
         let mut opts = DBOptions::new();
         opts.create_if_missing(true);
@@ -3188,7 +3189,7 @@ mod test {
 
     #[test]
     fn test_map_property() {
-        let path = TempDir::new("_rust_rocksdb_get_map_property").expect("");
+        let path = tempdir_with_prefix("_rust_rocksdb_get_map_property");
         let dbpath = path.path().to_str().unwrap().clone();
 
         let mut opts = DBOptions::new();

tests/cases/mod.rs

@@ -1,9 +1,3 @@
-extern crate byteorder;
-extern crate crc;
-extern crate rand;
-extern crate rocksdb;
-extern crate tempdir;
-
 mod test_column_family;
 mod test_compact_range;
 mod test_compaction_filter;
@@ -25,3 +19,7 @@ mod test_statistics;
 mod test_table_properties;
 mod test_titan;
 mod test_ttl;
+
+fn tempdir_with_prefix(prefix: &str) -> tempfile::TempDir {
+    tempfile::Builder::new().prefix(prefix).tempdir().expect("")
+}