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.

Sign up for GitHub

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

Use "&mut self" in methods writing to Database #51

Closed
wants to merge 1 commit into from
Closed

Use "&mut self" in methods writing to Database #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/simple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fn main() {
let db_handle = env.get_default_db(DbFlags::empty()).unwrap();
let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db_handle); // get a database bound to this transaction
let mut db = txn.bind(&db_handle); // get a database bound to this transaction

let pairs = vec![("Albert", "Einstein",),
("Joe", "Smith",),
Expand Down
14 changes: 7 additions & 7 deletions src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,36 +411,36 @@ impl<'a> Database<'a> {
}

/// Sets value for key. In case of DbAllowDups it will add a new item
pub fn set(&self, key: &ToMdbValue, value: &ToMdbValue) -> MdbResult<()> {
pub fn set(&mut self, key: &ToMdbValue, value: &ToMdbValue) -> MdbResult<()> {
self.txn.set(self.handle, key, value)
}

/// Appends new key-value pair to database, starting a new page instead of splitting an
/// existing one if necessary. Requires that key be >= all existing keys in the database
/// (or will return KeyExists error).
pub fn append<K: ToMdbValue, V: ToMdbValue>(&self, key: &K, value: &V) -> MdbResult<()> {
pub fn append<K: ToMdbValue, V: ToMdbValue>(&mut self, key: &K, value: &V) -> MdbResult<()> {
self.txn.append(self.handle, key, value)
}

/// Appends new value for the given key (requires DbAllowDups), starting a new page instead
/// of splitting an existing one if necessary. Requires that value be >= all existing values
/// for the given key (or will return KeyExists error).
pub fn append_duplicate<K: ToMdbValue, V: ToMdbValue>(&self, key: &K, value: &V) -> MdbResult<()> {
pub fn append_duplicate<K: ToMdbValue, V: ToMdbValue>(&mut self, key: &K, value: &V) -> MdbResult<()> {
self.txn.append_duplicate(self.handle, key, value)
}

/// Set value for key. Fails if key already exists, even when duplicates are allowed.
pub fn insert(&self, key: &ToMdbValue, value: &ToMdbValue) -> MdbResult<()> {
pub fn insert(&mut self, key: &ToMdbValue, value: &ToMdbValue) -> MdbResult<()> {
self.txn.insert(self.handle, key, value)
}

/// Deletes value for key.
pub fn del(&self, key: &ToMdbValue) -> MdbResult<()> {
pub fn del(&mut self, key: &ToMdbValue) -> MdbResult<()> {
self.txn.del(self.handle, key)
}

/// Should be used only with DbAllowDups. Deletes corresponding (key, value)
pub fn del_item(&self, key: &ToMdbValue, data: &ToMdbValue) -> MdbResult<()> {
pub fn del_item(&mut self, key: &ToMdbValue, data: &ToMdbValue) -> MdbResult<()> {
self.txn.del_item(self.handle, key, data)
}

Expand All @@ -455,7 +455,7 @@ impl<'a> Database<'a> {
}

/// Removes all key/values from db
pub fn clear(&self) -> MdbResult<()> {
pub fn clear(&mut self) -> MdbResult<()> {
self.txn.clear_db(self.handle)
}

Expand Down
54 changes: 27 additions & 27 deletions src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fn test_environment() {

let db = env.get_default_db(DbFlags::empty()).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let key = "hello";
let value = "world";
Expand All @@ -87,7 +87,7 @@ fn test_single_values() {

let db = env.get_default_db(DbFlags::empty()).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_data1 = "value1";
Expand Down Expand Up @@ -116,7 +116,7 @@ fn test_multiple_values() {

let db = env.get_default_db(core::DbAllowDups).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_data1 = "value1";
Expand Down Expand Up @@ -150,7 +150,7 @@ fn test_append_duplicate() {

let db = env.get_default_db(core::DbAllowDups).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_data1 = "value1";
Expand Down Expand Up @@ -184,7 +184,7 @@ fn test_insert_values() {

let db = env.get_default_db(DbFlags::empty()).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_data1 = "value1";
Expand All @@ -207,7 +207,7 @@ fn test_insert_values() {
#[test]
fn test_resize_map() {
use ffi::MDB_MAP_FULL;

let env = EnvBuilder::new()
.max_dbs(5)
.map_size(0x1000u64)
Expand All @@ -222,7 +222,7 @@ fn test_resize_map() {
let mut write_closure = || {
let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
let test_key = format!("key_{}", key_idx);
try!(db.set(&test_key, &(&test_data[..])));
}
Expand All @@ -244,7 +244,7 @@ fn test_resize_map() {
// next write after resize should not fail
let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
let test_key = "different_key";
assert!(db.set(&test_key, &(&test_data[..])).is_ok(), "set after resize failed");
}
Expand Down Expand Up @@ -272,7 +272,7 @@ fn test_stat() {
let db = env.create_db(name, DbFlags::empty()).unwrap();
let tx = env.new_transaction().unwrap();
{
let db = tx.bind(&db);
let mut db = tx.bind(&db);
for &(k, v) in ds {
assert!(db.set(&k, &v).is_ok());
}
Expand Down Expand Up @@ -300,7 +300,7 @@ fn test_cursors() {

let db = env.get_default_db(core::DbAllowDups).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_key2 = "key2";
Expand Down Expand Up @@ -349,7 +349,7 @@ fn test_cursor_item_manip() {

let db = env.get_default_db(core::DbAllowDups | core::DbAllowIntDups).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";

Expand Down Expand Up @@ -392,7 +392,7 @@ fn test_item_iter() {

let db = env.get_default_db(core::DbAllowDups).unwrap();
let txn = env.new_transaction().unwrap();
let db = txn.bind(&db);
let mut db = txn.bind(&db);

let test_key1 = "key1";
let test_data1 = "value1";
Expand Down Expand Up @@ -482,7 +482,7 @@ fn test_multithread_env() {
let db = shared_env.create_db("test1", DbFlags::empty()).unwrap();
let txn = shared_env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
assert!(db.set(&key, &value).is_ok());
}
assert!(txn.commit().is_ok());
Expand All @@ -507,7 +507,7 @@ fn test_keyrange_to() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for (k, v) in keys.iter().zip(values.iter()) {
assert!(db.set(k, v).is_ok());
}
Expand Down Expand Up @@ -538,7 +538,7 @@ fn test_keyrange_to_init_cursor() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for &(k, v) in recs.iter() {
assert!(db.set(&k, &v).is_ok());
}
Expand Down Expand Up @@ -570,7 +570,7 @@ fn test_keyrange_from() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for (k, v) in keys.iter().zip(values.iter()) {
assert!(db.set(k, v).is_ok());
}
Expand Down Expand Up @@ -600,7 +600,7 @@ fn test_keyrange_from_init_cursor() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for &(k, v) in recs.iter() {
assert!(db.set(&k, &v).is_ok());
}
Expand Down Expand Up @@ -632,7 +632,7 @@ fn test_keyrange() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for (k, v) in keys.iter().zip(values.iter()) {
assert!(db.set(k, v).is_ok());
}
Expand Down Expand Up @@ -668,7 +668,7 @@ fn test_keyrange_init_cursor() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for (k, v) in keys.iter().zip(values.iter()) {
assert!(db.set(k, v).is_ok());
}
Expand Down Expand Up @@ -709,7 +709,7 @@ fn test_keyrange_from_to() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db);
let mut db = txn.bind(&db);
for &(k, v) in recs.iter() {
assert!(db.set(&k, &v).is_ok());
}
Expand Down Expand Up @@ -743,7 +743,7 @@ fn test_readonly_env() {
let dbh = rw_env.get_default_db(core::DbIntKey).unwrap();
let tx = rw_env.new_transaction().unwrap();
{
let db = tx.bind(&dbh);
let mut db = tx.bind(&dbh);
for &rec in recs.iter() {
db.set(&rec.0, &rec.1).unwrap();
}
Expand Down Expand Up @@ -793,7 +793,7 @@ fn test_compare() {
let txn = env.new_transaction().unwrap();
let val: i32 = 0;
{
let db = txn.bind(&db_handle);
let mut db = txn.bind(&db_handle);
assert!(db.set_compare(negative_odd_cmp_fn).is_ok());

let i: i32 = 2;
Expand All @@ -805,7 +805,7 @@ fn test_compare() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db_handle);
let mut db = txn.bind(&db_handle);
let i: i32 = 4;
db.set(&i, &val).unwrap();
let i: i32 = 5;
Expand All @@ -829,7 +829,7 @@ fn test_dupsort() {
let txn = env.new_transaction().unwrap();
let key: i32 = 0;
{
let db = txn.bind(&db_handle);
let mut db = txn.bind(&db_handle);
assert!(db.set_dupsort(negative_odd_cmp_fn).is_ok());

let i: i32 = 2;
Expand All @@ -841,7 +841,7 @@ fn test_dupsort() {

let txn = env.new_transaction().unwrap();
{
let db = txn.bind(&db_handle);
let mut db = txn.bind(&db_handle);
let i: i32 = 4;
db.set(&key, &i).unwrap();
let i: i32 = 5;
Expand Down Expand Up @@ -871,7 +871,7 @@ fn test_conversion_to_vecu8() {
{
let tx = env.new_transaction().unwrap();
{
let db = tx.bind(&db);
let mut db = tx.bind(&db);
db.set(&rec.0, &rec.1).unwrap();
}
tx.commit().unwrap();
Expand Down Expand Up @@ -904,7 +904,7 @@ fn test_conversion_to_string() {
{
let tx = env.new_transaction().unwrap();
{
let db = tx.bind(&db);
let mut db = tx.bind(&db);
db.set(&rec.0, &rec.1).unwrap();
}
tx.commit().unwrap();
Expand Down