Skip to content

Remove deprecated gen_ascii_letters and use sample_iter instead #5

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

Open
NavyaZaveri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove deprecated gen_ascii_letters and use sample_iter instead #5

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
11 changes: 6 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ impl <K: KeyType, V: ValueType> BTree<K, V> {
let wal_file_path = tree_file_path.to_owned() + ".wal";

// construct our WAL file
let mut wal_file = try!(RecordFile::<K,V>::new(&wal_file_path, key_size, value_size));
let mut wal_file = RecordFile::<K,V>::new(&wal_file_path, key_size, value_size)?;

// if we have a WAL file, replay it into the mem_tree
if try!(wal_file.is_new()) {
if wal_file.is_new()? {
for kv in &mut wal_file {
mem_tree.insert(kv.key, kv.value);
}
Expand All @@ -71,14 +71,14 @@ impl <K: KeyType, V: ValueType> BTree<K, V> {
let record = KeyValuePair{key: key, value: value};

// should wrap this in a read-write lock
try!(self.wal_file.insert_record(&record));
self.wal_file.insert_record(&record)?;

let KeyValuePair{key, value} = record;

let size = self.mem_tree.insert(key, value);

if size > MAX_MEMORY_ITEMS {
try!(self.compact());
self.compact()?;
}

return Ok( () );
Expand Down Expand Up @@ -117,9 +117,10 @@ mod tests {
use ::BTree;
use rand::{thread_rng, Rng};
use std::collections::BTreeSet;
use rand::distributions::Alphanumeric;

pub fn gen_temp_name() -> String {
let file_name: String = thread_rng().gen_ascii_chars().take(10).collect();
let file_name: String = thread_rng().sample_iter(&Alphanumeric).take(10).collect();

return String::from("/tmp/") + &file_name + &String::from(".btr");
}
Expand Down