Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 8a35a14

Browse files
authored
fix bench db wipe (#6965)
1 parent 35fe3cd commit 8a35a14

File tree

1 file changed

+32
-27
lines changed

1 file changed

+32
-27
lines changed

client/db/src/bench.rs

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ impl<B: BlockT> BenchmarkingState<B> {
178178

179179
fn wipe_tracker(&self) {
180180
*self.main_key_tracker.borrow_mut() = HashMap::new();
181+
*self.child_key_tracker.borrow_mut() = HashMap::new();
181182
self.add_whitelist_to_tracker();
182183
*self.read_write_tracker.borrow_mut() = Default::default();
183184
}
@@ -512,32 +513,36 @@ mod test {
512513
let bench_state = BenchmarkingState::<crate::tests::Block>::new(Default::default(), None)
513514
.unwrap();
514515

515-
let child1 = sp_core::storage::ChildInfo::new_default(b"child1");
516-
let child2 = sp_core::storage::ChildInfo::new_default(b"child2");
517-
518-
bench_state.storage(b"foo").unwrap();
519-
bench_state.child_storage(&child1, b"foo").unwrap();
520-
bench_state.child_storage(&child2, b"foo").unwrap();
521-
522-
bench_state.storage(b"bar").unwrap();
523-
bench_state.child_storage(&child1, b"bar").unwrap();
524-
bench_state.child_storage(&child2, b"bar").unwrap();
525-
526-
bench_state.commit(
527-
Default::default(),
528-
Default::default(),
529-
vec![
530-
("foo".as_bytes().to_vec(), None)
531-
],
532-
vec![
533-
("child1".as_bytes().to_vec(), vec![("foo".as_bytes().to_vec(), None)])
534-
]
535-
).unwrap();
536-
537-
let rw_tracker = bench_state.read_write_tracker.borrow();
538-
assert_eq!(rw_tracker.reads, 6);
539-
assert_eq!(rw_tracker.repeat_reads, 0);
540-
assert_eq!(rw_tracker.writes, 2);
541-
assert_eq!(rw_tracker.repeat_writes, 0);
516+
for _ in 0..2 {
517+
let child1 = sp_core::storage::ChildInfo::new_default(b"child1");
518+
let child2 = sp_core::storage::ChildInfo::new_default(b"child2");
519+
520+
bench_state.storage(b"foo").unwrap();
521+
bench_state.child_storage(&child1, b"foo").unwrap();
522+
bench_state.child_storage(&child2, b"foo").unwrap();
523+
524+
bench_state.storage(b"bar").unwrap();
525+
bench_state.child_storage(&child1, b"bar").unwrap();
526+
bench_state.child_storage(&child2, b"bar").unwrap();
527+
528+
bench_state.commit(
529+
Default::default(),
530+
Default::default(),
531+
vec![
532+
("foo".as_bytes().to_vec(), None)
533+
],
534+
vec![
535+
("child1".as_bytes().to_vec(), vec![("foo".as_bytes().to_vec(), None)])
536+
]
537+
).unwrap();
538+
539+
let rw_tracker = bench_state.read_write_tracker.borrow();
540+
assert_eq!(rw_tracker.reads, 6);
541+
assert_eq!(rw_tracker.repeat_reads, 0);
542+
assert_eq!(rw_tracker.writes, 2);
543+
assert_eq!(rw_tracker.repeat_writes, 0);
544+
drop(rw_tracker);
545+
bench_state.wipe().unwrap();
546+
}
542547
}
543548
}

0 commit comments

Comments
 (0)