rename package to haizhi-rocksdb; fix test bug error; ignore doctest to avoid too many changes

liuyihua-cn · yangweijian · commit e1b0eb46be1e · 2025-02-12T12:57:26.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rocksdb"
+name = "haizhi-rocksdb"
 description = "Rust wrapper for Facebook's RocksDB embeddable database"
 version = "0.2.8"
 edition = "2021"
@@ -52,3 +52,6 @@ tempfile = "3.1"
 pretty_assertions = "1.0"
 bincode = "1.3"
 serde = { version = "1", features = [ "derive" ] }
+
+[lib]
+doctest = false
diff --git a/tests/fail/checkpoint_outlive_db.rs b/tests/fail/checkpoint_outlive_db.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{DB, checkpoint::Checkpoint};
 
 fn main() {
diff --git a/tests/fail/checkpoint_outlive_db.stderr b/tests/fail/checkpoint_outlive_db.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `db` does not live long enough
- --> tests/fail/checkpoint_outlive_db.rs:6:25
+ --> tests/fail/checkpoint_outlive_db.rs:7:25
   |
-4 |     let _checkpoint = {
+5 |     let _checkpoint = {
   |         ----------- borrow later stored here
-5 |         let db = DB::open_default("foo").unwrap();
+6 |         let db = DB::open_default("foo").unwrap();
   |             -- binding `db` declared here
-6 |         Checkpoint::new(&db)
+7 |         Checkpoint::new(&db)
   |                         ^^^ borrowed value does not live long enough
-7 |     };
+8 |     };
   |     - `db` dropped here while still borrowed
diff --git a/tests/fail/iterator_outlive_db.rs b/tests/fail/iterator_outlive_db.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{IteratorMode, DB};
 
 fn main() {
diff --git a/tests/fail/iterator_outlive_db.stderr b/tests/fail/iterator_outlive_db.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `db` does not live long enough
- --> tests/fail/iterator_outlive_db.rs:6:9
+ --> tests/fail/iterator_outlive_db.rs:7:9
   |
-4 |     let _iter = {
+5 |     let _iter = {
   |         ----- borrow later stored here
-5 |         let db = DB::open_default("foo").unwrap();
+6 |         let db = DB::open_default("foo").unwrap();
   |             -- binding `db` declared here
-6 |         db.iterator(IteratorMode::Start)
+7 |         db.iterator(IteratorMode::Start)
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ borrowed value does not live long enough
-7 |     };
+8 |     };
   |     - `db` dropped here while still borrowed
diff --git a/tests/fail/open_with_multiple_refs_as_single_threaded.rs b/tests/fail/open_with_multiple_refs_as_single_threaded.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{SingleThreaded, DBWithThreadMode, Options};
 
 fn main() {
diff --git a/tests/fail/open_with_multiple_refs_as_single_threaded.stderr b/tests/fail/open_with_multiple_refs_as_single_threaded.stderr
@@ -1,21 +1,21 @@
 error[E0596]: cannot borrow `*db_ref1` as mutable, as it is behind a `&` reference
- --> tests/fail/open_with_multiple_refs_as_single_threaded.rs:8:5
+ --> tests/fail/open_with_multiple_refs_as_single_threaded.rs:9:5
   |
-8 |     db_ref1.create_cf("cf1", &opts).unwrap();
+9 |     db_ref1.create_cf("cf1", &opts).unwrap();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `db_ref1` is a `&` reference, so the data it refers to cannot be borrowed as mutable
   |
 help: consider changing this to be a mutable reference
   |
-5 |     let db_ref1 = &mut db;
+6 |     let db_ref1 = &mut db;
   |                   ~~~~~~~
 
 error[E0596]: cannot borrow `*db_ref2` as mutable, as it is behind a `&` reference
- --> tests/fail/open_with_multiple_refs_as_single_threaded.rs:9:5
-  |
-9 |     db_ref2.create_cf("cf2", &opts).unwrap();
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `db_ref2` is a `&` reference, so the data it refers to cannot be borrowed as mutable
-  |
+  --> tests/fail/open_with_multiple_refs_as_single_threaded.rs:10:5
+   |
+10 |     db_ref2.create_cf("cf2", &opts).unwrap();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `db_ref2` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
 help: consider changing this to be a mutable reference
-  |
-6 |     let db_ref2 = &mut db;
-  |                   ~~~~~~~
+   |
+7  |     let db_ref2 = &mut db;
+   |                   ~~~~~~~
diff --git a/tests/fail/snapshot_outlive_db.rs b/tests/fail/snapshot_outlive_db.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::DB;
 
 fn main() {
diff --git a/tests/fail/snapshot_outlive_db.stderr b/tests/fail/snapshot_outlive_db.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `db` does not live long enough
- --> tests/fail/snapshot_outlive_db.rs:6:9
+ --> tests/fail/snapshot_outlive_db.rs:7:9
   |
-4 |     let _snapshot = {
+5 |     let _snapshot = {
   |         --------- borrow later stored here
-5 |         let db = DB::open_default("foo").unwrap();
+6 |         let db = DB::open_default("foo").unwrap();
   |             -- binding `db` declared here
-6 |         db.snapshot()
+7 |         db.snapshot()
   |         ^^^^^^^^^^^^^ borrowed value does not live long enough
-7 |     };
+8 |     };
   |     - `db` dropped here while still borrowed
diff --git a/tests/fail/snapshot_outlive_transaction.rs b/tests/fail/snapshot_outlive_transaction.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{TransactionDB, SingleThreaded};
 
 fn main() {
diff --git a/tests/fail/snapshot_outlive_transaction.stderr b/tests/fail/snapshot_outlive_transaction.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `txn` does not live long enough
- --> tests/fail/snapshot_outlive_transaction.rs:7:9
+ --> tests/fail/snapshot_outlive_transaction.rs:8:9
   |
-5 |     let _snapshot = {
+6 |     let _snapshot = {
   |         --------- borrow later stored here
-6 |         let txn = db.transaction();
+7 |         let txn = db.transaction();
   |             --- binding `txn` declared here
-7 |         txn.snapshot()
+8 |         txn.snapshot()
   |         ^^^^^^^^^^^^^^ borrowed value does not live long enough
-8 |     };
+9 |     };
   |     - `txn` dropped here while still borrowed
diff --git a/tests/fail/snapshot_outlive_transaction_db.rs b/tests/fail/snapshot_outlive_transaction_db.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{TransactionDB, SingleThreaded};
 
 fn main() {
diff --git a/tests/fail/snapshot_outlive_transaction_db.stderr b/tests/fail/snapshot_outlive_transaction_db.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `db` does not live long enough
- --> tests/fail/snapshot_outlive_transaction_db.rs:6:9
+ --> tests/fail/snapshot_outlive_transaction_db.rs:7:9
   |
-4 |     let _snapshot = {
+5 |     let _snapshot = {
   |         --------- borrow later stored here
-5 |         let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
+6 |         let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
   |             -- binding `db` declared here
-6 |         db.snapshot()
+7 |         db.snapshot()
   |         ^^^^^^^^^^^^^ borrowed value does not live long enough
-7 |     };
+8 |     };
   |     - `db` dropped here while still borrowed
diff --git a/tests/fail/transaction_outlive_transaction_db.rs b/tests/fail/transaction_outlive_transaction_db.rs
@@ -1,3 +1,4 @@
+use haizhi_rocksdb as rocksdb;
 use rocksdb::{TransactionDB, SingleThreaded};
 
 fn main() {
diff --git a/tests/fail/transaction_outlive_transaction_db.stderr b/tests/fail/transaction_outlive_transaction_db.stderr
@@ -1,11 +1,11 @@
 error[E0597]: `db` does not live long enough
- --> tests/fail/transaction_outlive_transaction_db.rs:6:9
+ --> tests/fail/transaction_outlive_transaction_db.rs:7:9
   |
-4 |     let _txn = {
+5 |     let _txn = {
   |         ---- borrow later stored here
-5 |         let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
+6 |         let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
   |             -- binding `db` declared here
-6 |         db.transaction()
+7 |         db.transaction()
   |         ^^^^^^^^^^^^^^^^ borrowed value does not live long enough
-7 |     };
+8 |     };
   |     - `db` dropped here while still borrowed
diff --git a/tests/test_approximate.rs b/tests/test_approximate.rs
@@ -1,5 +1,7 @@
 use std::time::Duration;
 
+use haizhi_rocksdb as rocksdb;
+
 use rocksdb::Ranges;
 use rocksdb::{ColumnFamilyDescriptor, Options, DB};
 #[test]
diff --git a/tests/test_backup.rs b/tests/test_backup.rs
@@ -16,6 +16,8 @@ mod util;
 
 use pretty_assertions::assert_eq;
 
+use haizhi_rocksdb as rocksdb;
+
 use rocksdb::{
     backup::{BackupEngine, BackupEngineOptions, RestoreOptions},
     Env, DB,
diff --git a/tests/test_checkpoint.rs b/tests/test_checkpoint.rs
@@ -16,6 +16,8 @@ mod util;
 
 use pretty_assertions::assert_eq;
 
+use haizhi_rocksdb as rocksdb;
+
 use rocksdb::{
     checkpoint::{Checkpoint, ExportImportFilesMetaData},
     Options, DB,
diff --git a/tests/test_column_family.rs b/tests/test_column_family.rs
@@ -16,6 +16,8 @@ mod util;
 
 use pretty_assertions::assert_eq;
 
+use haizhi_rocksdb as rocksdb;
+
 use rocksdb::checkpoint::{Checkpoint, ExportImportFilesMetaData};
 use rocksdb::{ColumnFamilyDescriptor, MergeOperands, Options, DB, DEFAULT_COLUMN_FAMILY_NAME};
 use rocksdb::{TransactionDB, TransactionDBOptions};
diff --git a/tests/test_compactionfilter.rs b/tests/test_compactionfilter.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 mod util;
+use haizhi_rocksdb as rocksdb;
 
 use pretty_assertions::assert_eq;
 
diff --git a/tests/test_db.rs b/tests/test_db.rs
@@ -14,6 +14,8 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
+
 use std::convert::TryInto;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{mem, sync::Arc, thread, time::Duration};
diff --git a/tests/test_iterator.rs b/tests/test_iterator.rs
@@ -14,6 +14,8 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
+
 use pretty_assertions::assert_eq;
 
 use rocksdb::{Direction, IteratorMode, MemtableFactory, Options, DB};
diff --git a/tests/test_merge_operator.rs b/tests/test_merge_operator.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{merge_operator::MergeFn, DBCompactionStyle, MergeOperands, Options, DB};
diff --git a/tests/test_multithreaded.rs b/tests/test_multithreaded.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use std::{sync::Arc, thread};
 
 use rocksdb::DB;
diff --git a/tests/test_optimistic_transaction_db.rs b/tests/test_optimistic_transaction_db.rs
@@ -14,6 +14,7 @@
 //
 
 mod util;
+use haizhi_rocksdb as rocksdb;
 
 use rocksdb::{
     CuckooTableOptions, DBAccess, Direction, Error, ErrorKind, IteratorMode,
diff --git a/tests/test_pinnable_slice.rs b/tests/test_pinnable_slice.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{Options, DB};
diff --git a/tests/test_property.rs b/tests/test_property.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{properties, Options, DB};
diff --git a/tests/test_raw_iterator.rs b/tests/test_raw_iterator.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{DBAccess, DBRawIteratorWithThreadMode, DB};
diff --git a/tests/test_rocksdb_options.rs b/tests/test_rocksdb_options.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use std::{fs, io::Read as _};
 
 use rocksdb::checkpoint::Checkpoint;
diff --git a/tests/test_slice_transform.rs b/tests/test_slice_transform.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{Options, SliceTransform, DB};
diff --git a/tests/test_sst_file_writer.rs b/tests/test_sst_file_writer.rs
@@ -14,6 +14,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{Error, Options, ReadOptions, SstFileWriter, DB};
diff --git a/tests/test_transaction_db.rs b/tests/test_transaction_db.rs
@@ -15,6 +15,7 @@
 
 mod util;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
 
 use rocksdb::{
diff --git a/tests/test_write_batch.rs b/tests/test_write_batch.rs
@@ -14,8 +14,8 @@
 
 use std::collections::HashMap;
 
+use haizhi_rocksdb as rocksdb;
 use pretty_assertions::assert_eq;
-
 use rocksdb::{WriteBatch, WriteBatchIterator};
 
 #[test]
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
@@ -1,12 +1,14 @@
 #![allow(dead_code)]
 
+use haizhi_rocksdb as rocksdb;
 use std::{
     cmp::Ordering,
     convert::TryInto,
     path::{Path, PathBuf},
 };
 
 use rocksdb::{Error, Options, DB};
+use std::path::{Path, PathBuf};
 
 /// Temporary database path which calls DB::Destroy when DBPath is dropped.
 pub struct DBPath {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use haizhi_rocksdb as rocksdb;`
`1`	`2`	`use rocksdb::{DB, checkpoint::Checkpoint};`
`2`	`3`
`3`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use haizhi_rocksdb as rocksdb;`
`1`	`2`	`use rocksdb::{IteratorMode, DB};`
`2`	`3`
`3`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use haizhi_rocksdb as rocksdb;`
`1`	`2`	`use rocksdb::{SingleThreaded, DBWithThreadMode, Options};`
`2`	`3`
`3`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use haizhi_rocksdb as rocksdb;`
`1`	`2`	`use rocksdb::DB;`
`2`	`3`
`3`	`4`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use haizhi_rocksdb as rocksdb;`
`1`	`2`	`use rocksdb::{TransactionDB, SingleThreaded};`
`2`	`3`
`3`	`4`	`fn main() {`