Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more fixes after renaming package #4

Merged
merged 1 commit into from
Feb 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
more fixes after renaming package
zaidoon1 committed Feb 10, 2024
commit 39bd787627d5dba4d83acf0b0b0eae44abf63165
4 changes: 2 additions & 2 deletions src/backup.rs
Original file line number Diff line number Diff line change
@@ -120,10 +120,10 @@ impl BackupEngine {
/// # Examples
///
/// ```ignore
/// use rocksdb::backup::{BackupEngine, BackupEngineOptions};
/// use rust_rocksdb::backup::{BackupEngine, BackupEngineOptions};
/// let backup_opts = BackupEngineOptions::default();
/// let mut backup_engine = BackupEngine::open(&backup_opts, &backup_path).unwrap();
/// let mut restore_option = rocksdb::backup::RestoreOptions::default();
/// let mut restore_option = rust_rocksdb::backup::RestoreOptions::default();
/// restore_option.set_keep_log_files(true); /// true to keep log files
/// if let Err(e) = backup_engine.restore_from_latest_backup(&db_path, &wal_dir, &restore_option) {
/// error!("Failed to restore from the backup. Error:{:?}", e);
12 changes: 6 additions & 6 deletions src/db_iterator.rs
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ pub type DBRawIterator<'a> = DBRawIteratorWithThreadMode<'a, DB>;
/// widely recognised Rust idioms.
///
/// ```
/// use rocksdb::{DB, Options};
/// use rust_rocksdb::{DB, Options};
///
/// let path = "_path_for_rocksdb_storage4";
/// {
@@ -141,7 +141,7 @@ impl<'a, D: DBAccess> DBRawIteratorWithThreadMode<'a, D> {
/// # Examples
///
/// ```rust
/// use rocksdb::{DB, Options};
/// use rust_rocksdb::{DB, Options};
///
/// let path = "_path_for_rocksdb_storage5";
/// {
@@ -178,7 +178,7 @@ impl<'a, D: DBAccess> DBRawIteratorWithThreadMode<'a, D> {
/// # Examples
///
/// ```rust
/// use rocksdb::{DB, Options};
/// use rust_rocksdb::{DB, Options};
///
/// let path = "_path_for_rocksdb_storage6";
/// {
@@ -218,7 +218,7 @@ impl<'a, D: DBAccess> DBRawIteratorWithThreadMode<'a, D> {
/// # Examples
///
/// ```rust
/// use rocksdb::{DB, Options};
/// use rust_rocksdb::{DB, Options};
///
/// let path = "_path_for_rocksdb_storage7";
/// {
@@ -257,7 +257,7 @@ impl<'a, D: DBAccess> DBRawIteratorWithThreadMode<'a, D> {
/// # Examples
///
/// ```rust
/// use rocksdb::{DB, Options};
/// use rust_rocksdb::{DB, Options};
///
/// let path = "_path_for_rocksdb_storage8";
/// {
@@ -375,7 +375,7 @@ pub type DBIterator<'a> = DBIteratorWithThreadMode<'a, DB>;
/// ranges and direction.
///
/// ```
/// use rocksdb::{DB, Direction, IteratorMode, Options};
/// use rust_rocksdb::{DB, Direction, IteratorMode, Options};
///
/// let path = "_path_for_rocksdb_storage2";
/// {
142 changes: 71 additions & 71 deletions src/db_options.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ffi_util.rs
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ macro_rules! ffi_try_impl {
///
/// ```
/// use std::ffi::{CStr, CString};
/// use rocksdb::CStrLike;
/// use rust_rocksdb::CStrLike;
///
/// fn strlen(arg: impl CStrLike) -> std::result::Result<usize, String> {
/// let baked = arg.bake().map_err(|err| err.to_string())?;
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
//! # Examples
//!
//! ```
//! use rocksdb::{DB, Options};
//! use rust_rocksdb::{DB, Options};
//! // NB: db is automatically closed at end of lifetime
//! let path = "_path_for_rocksdb_storage";
//! {
@@ -37,7 +37,7 @@
//! Opening a database and a single column family with custom options:
//!
//! ```
//! use rocksdb::{DB, ColumnFamilyDescriptor, Options};
//! use rust_rocksdb::{DB, ColumnFamilyDescriptor, Options};
//!
//! let path = "_path_for_rocksdb_storage_with_cfs";
//! let mut cf_opts = Options::default();
2 changes: 1 addition & 1 deletion src/merge_operator.rs
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
//! rustic merge operator
//!
//! ```
//! use rocksdb::{Options, DB, MergeOperands};
//! use rust_rocksdb::{Options, DB, MergeOperands};
//!
//! fn concat_merge(new_key: &[u8],
//! existing_val: Option<&[u8]>,
2 changes: 1 addition & 1 deletion src/snapshot.rs
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ pub type Snapshot<'a> = SnapshotWithThreadMode<'a, DB>;
/// # Examples
///
/// ```
/// use rocksdb::{DB, IteratorMode, Options};
/// use rust_rocksdb::{DB, IteratorMode, Options};
///
/// let path = "_path_for_rocksdb_storage3";
/// {
2 changes: 1 addition & 1 deletion src/transactions/optimistic_transaction_db.rs
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ use crate::{
/// # Examples
///
/// ```
/// use rocksdb::{DB, Options, OptimisticTransactionDB, SingleThreaded};
/// use rust_rocksdb::{DB, Options, OptimisticTransactionDB, SingleThreaded};
/// let path = "_path_for_optimistic_transaction_db";
/// {
/// let db: OptimisticTransactionDB = OptimisticTransactionDB::open_default(path).unwrap();
2 changes: 1 addition & 1 deletion src/transactions/transaction_db.rs
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ type DefaultThreadMode = crate::MultiThreaded;
/// if feature `multi-threaded-cf` is not enabled.
///
/// ```
/// use rocksdb::{DB, Options, TransactionDB, SingleThreaded};
/// use rust_rocksdb::{DB, Options, TransactionDB, SingleThreaded};
/// let path = "_path_for_transaction_db";
/// {
/// let db: TransactionDB = TransactionDB::open_default(path).unwrap();
2 changes: 1 addition & 1 deletion src/write_batch.rs
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ pub type WriteBatch = WriteBatchWithTransaction<false>;
/// Making an atomic commit of several writes:
///
/// ```
/// use rocksdb::{DB, Options, WriteBatchWithTransaction};
/// use rust_rocksdb::{DB, Options, WriteBatchWithTransaction};
///
/// let path = "_path_for_rocksdb_storage1";
/// {
2 changes: 1 addition & 1 deletion tests/fail/checkpoint_outlive_db.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rocksdb::{DB, checkpoint::Checkpoint};
use rust_rocksdb::{checkpoint::Checkpoint, DB};

fn main() {
let _checkpoint = {
2 changes: 1 addition & 1 deletion tests/fail/iterator_outlive_db.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rocksdb::{IteratorMode, DB};
use rust_rocksdb::{IteratorMode, DB};

fn main() {
let _iter = {
2 changes: 1 addition & 1 deletion tests/fail/open_with_multiple_refs_as_single_threaded.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rocksdb::{SingleThreaded, DBWithThreadMode, Options};
use rust_rocksdb::{DBWithThreadMode, Options, SingleThreaded};

fn main() {
let db = DBWithThreadMode::<SingleThreaded>::open_default("/path/to/dummy").unwrap();
2 changes: 1 addition & 1 deletion tests/fail/snapshot_outlive_db.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rocksdb::DB;
use rust_rocksdb::DB;

fn main() {
let _snapshot = {
4 changes: 2 additions & 2 deletions tests/fail/snapshot_outlive_transaction.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use rocksdb::{TransactionDB, SingleThreaded};
use rust_rocksdb::{SingleThreaded, TransactionDB};

fn main() {
let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
let _snapshot = {
let txn = db.transaction();
txn.snapshot()
};
}
}
4 changes: 2 additions & 2 deletions tests/fail/snapshot_outlive_transaction_db.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use rocksdb::{TransactionDB, SingleThreaded};
use rust_rocksdb::{SingleThreaded, TransactionDB};

fn main() {
let _snapshot = {
let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
db.snapshot()
};
}
}
4 changes: 2 additions & 2 deletions tests/fail/transaction_outlive_transaction_db.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use rocksdb::{TransactionDB, SingleThreaded};
use rust_rocksdb::{SingleThreaded, TransactionDB};

fn main() {
let _txn = {
let db = TransactionDB::<SingleThreaded>::open_default("foo").unwrap();
db.transaction()
};
}
}