Mercurial > lbo > hg > leveldb-rs
changeset 262:a0738bf82fa3
table_cache: Tighten table_file and rename it for general use.
author | Lewin Bormann <lbo@spheniscida.de> |
---|---|
date | Tue, 19 Sep 2017 20:07:44 +0200 |
parents | aaa04ca165c4 |
children | 95fd92fcffcb |
files | src/table_cache.rs src/version.rs |
diffstat | 2 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/table_cache.rs Tue Sep 19 20:06:43 2017 +0200 +++ b/src/table_cache.rs Tue Sep 19 20:07:44 2017 +0200 @@ -14,11 +14,9 @@ use std::path::Path; use std::rc::Rc; -const DEFAULT_SUFFIX: &str = "ldb"; - -pub fn table_name(name: &str, num: FileNum, suff: &str) -> String { +pub fn table_file_name(name: &str, num: FileNum) -> String { assert!(num > 0); - format!("{}/{:06}.{}", name, num, suff) + format!("{}/{:06}.ldb", name, num) } fn filenum_to_key(num: FileNum) -> cache::CacheKey { @@ -64,7 +62,7 @@ /// Open a table on the file system and read it. fn open_table(&mut self, file_num: FileNum) -> Result<Table> { - let name = table_name(&self.dbname, file_num, DEFAULT_SUFFIX); + let name = table_file_name(&self.dbname, file_num); let path = Path::new(&name); let file_size = self.opts.env.size_of(&path)?; if file_size == 0 { @@ -88,9 +86,9 @@ use test_util::LdbIteratorIter; #[test] - fn test_table_name() { - assert_eq!("abc/000122.ldb", table_name("abc", 122, "ldb")); - assert_eq!("abc/1234567.ldb", table_name("abc", 1234567, "ldb")); + fn test_table_file_name() { + assert_eq!("abc/000122.ldb", table_file_name("abc", 122)); + assert_eq!("abc/1234567.ldb", table_file_name("abc", 1234567)); } fn make_key(a: u8, b: u8, c: u8) -> cache::CacheKey { @@ -123,7 +121,7 @@ let mut opt = options::for_test(); opt.set_env(Box::new(MemEnv::new())); let dbname = "testdb1"; - let tablename = table_name(dbname, 123, DEFAULT_SUFFIX); + let tablename = table_file_name(dbname, 123); let tblpath = Path::new(&tablename); write_table_to(opt.clone(), tblpath);
--- a/src/version.rs Tue Sep 19 20:06:43 2017 +0200 +++ b/src/version.rs Tue Sep 19 20:07:44 2017 +0200 @@ -513,7 +513,7 @@ use mem_env::MemEnv; use options::{self, Options}; use table_builder::TableBuilder; - use table_cache::table_name; + use table_cache::table_file_name; use types::{share, FileMetaData, FileNum}; use std::path::Path; @@ -540,7 +540,7 @@ startseq: u64, num: FileNum) -> FileMetaHandle { - let dst = me.open_writable_file(Path::new(&table_name("db", num, "ldb"))).unwrap(); + let dst = me.open_writable_file(Path::new(&table_file_name("db", num))).unwrap(); let mut seq = startseq; let keys: Vec<Vec<u8>> = contents.iter() .map(|&(k, _)| { @@ -637,7 +637,7 @@ use merging_iter::MergingIter; use options; use table_builder::TableBuilder; - use table_cache::{table_name, TableCache}; + use table_cache::{table_file_name, TableCache}; use test_util::{test_iterator_properties, LdbIteratorIter}; use types::share;