diff options
Diffstat (limited to 'log_db/benches')
| -rw-r--r-- | log_db/benches/benchmark.rs | 10 | ||||
| -rw-r--r-- | log_db/benches/utils.rs | 40 |
2 files changed, 23 insertions, 27 deletions
diff --git a/log_db/benches/benchmark.rs b/log_db/benches/benchmark.rs index aa4b1bb..d8e6280 100644 --- a/log_db/benches/benchmark.rs +++ b/log_db/benches/benchmark.rs @@ -18,8 +18,6 @@ pub fn upsert_compacted(c: &mut Criterion) { .fields(Inst::fields()) .primary_key(Inst::primary_key()) .secondary_keys(Inst::secondary_keys()) - .from_record(Inst::from_record) - .into_record(Inst::into_record) .data_dir(data_dir) .initialize() .expect("Failed to initialize DB"); @@ -50,8 +48,6 @@ pub fn delete_existing_compacted(c: &mut Criterion) { .fields(Inst::fields()) .primary_key(Inst::primary_key()) .secondary_keys(Inst::secondary_keys()) - .from_record(Inst::from_record) - .into_record(Inst::into_record) .data_dir(data_dir) .initialize() .expect("Failed to initialize DB"); @@ -89,8 +85,6 @@ pub fn upsert_write_durability(c: &mut Criterion) { .fields(Inst::fields()) .primary_key(Inst::primary_key()) .secondary_keys(Inst::secondary_keys()) - .from_record(Inst::from_record) - .into_record(Inst::into_record) .data_dir(data_dir) .write_durability(mode.clone()) .initialize() @@ -117,8 +111,6 @@ pub fn get_existing_compacted(c: &mut Criterion) { .fields(Inst::fields()) .primary_key(Inst::primary_key()) .secondary_keys(Inst::secondary_keys()) - .from_record(Inst::from_record) - .into_record(Inst::into_record) .data_dir(data_dir) .initialize() .expect("Failed to initialize DB"); @@ -153,8 +145,6 @@ pub fn find_by_existing_compacted(c: &mut Criterion) { .fields(Inst::fields()) .primary_key(Inst::primary_key()) .secondary_keys(Inst::secondary_keys()) - .from_record(Inst::from_record) - .into_record(Inst::into_record) .data_dir(data_dir) .initialize() .expect("Failed to initialize DB"); diff --git a/log_db/benches/utils.rs b/log_db/benches/utils.rs index d25a5af..33a45cf 100644 --- a/log_db/benches/utils.rs +++ b/log_db/benches/utils.rs @@ -33,25 +33,19 @@ impl Into<String> for Field { } } -impl Inst { - pub fn fields() -> Vec<Field> { - vec![Field::Id, Field::Name, Field::Data] - } - pub fn primary_key() -> Field { - Field::Id - } - pub fn secondary_keys() -> Vec<Field> { - vec![Field::Name] - } - - pub fn into_record(self) -> Vec<Value> { +impl From<Inst> for Record { + fn from(inst: Inst) -> Self { vec![ - Value::Int(self.id), - Value::String(self.name), - Value::Bytes(self.data), + Value::Int(inst.id), + Value::String(inst.name), + Value::Bytes(inst.data), ] + .into() } - pub fn from_record(record: Vec<Value>) -> Self { +} + +impl From<Record> for Inst { + fn from(record: Record) -> Self { let mut it = record.into_iter(); Inst { id: match it.next().unwrap() { @@ -70,6 +64,18 @@ impl Inst { } } +impl Inst { + pub fn fields() -> Vec<Field> { + vec![Field::Id, Field::Name, Field::Data] + } + pub fn primary_key() -> Field { + Field::Id + } + pub fn secondary_keys() -> Vec<Field> { + vec![Field::Name] + } +} + // Function to generate a random integer pub fn random_int(from: i64, to: i64) -> i64 { let mut rng = rand::thread_rng(); @@ -98,7 +104,7 @@ pub fn random_inst(from_id: i64, to_id: i64) -> Inst { } pub fn prefill_db( - db: &mut DB<Inst>, + db: &mut DB, insts: &mut Vec<Inst>, n_records: usize, compact: bool, |