make clear_prefix count optional

bencher/src/bencher.rs

@@ -45,6 +45,11 @@ impl Bencher {
 		}
 	}
 
+	pub fn count_clear_prefix(&mut self) {
+		#[cfg(not(feature = "std"))]
+		crate::bench::count_clear_prefix();
+	}
+
 	pub fn bench<T, F>(&mut self, mut inner: F) -> T
 	where
 		F: FnMut() -> T,

bencher/src/tracker.rs

@@ -87,7 +87,7 @@ pub enum Warning {
 	#[error("clear prefix without limit, cannot be tracked")]
 	ClearPrefixWithoutLimit,
 	#[error("child storage is not supported")]
-	ChildStorageNoSupported,
+	ChildStorageNotSupported,
 }
 
 pub struct BenchTracker {
@@ -99,6 +99,7 @@ pub struct BenchTracker {
 	clear_prefixes: RwLock<HashMap<StorageKey, u32>>,
 	warnings: RwLock<Vec<Warning>>,
 	whitelisted_keys: RwLock<HashMap<StorageKey, (bool, bool)>>,
+	count_clear_prefix: RwLock<bool>,
 }
 
 impl BenchTracker {
@@ -112,6 +113,7 @@ impl BenchTracker {
 			clear_prefixes: RwLock::new(HashMap::new()),
 			warnings: RwLock::new(Vec::new()),
 			whitelisted_keys: RwLock::new(HashMap::new()),
+			count_clear_prefix: RwLock::new(false),
 		}
 	}
 
@@ -152,7 +154,10 @@ impl BenchTracker {
 	}
 
 	pub fn on_read_child_storage(&self, _child_info: &ChildInfo, _key: StorageKey) {
-		self.warn(Warning::ChildStorageNoSupported);
+		if self.is_redundant() {
+			return;
+		}
+		self.warn(Warning::ChildStorageNotSupported);
 	}
 
 	pub fn on_update_storage(&self, key: StorageKey) {
@@ -172,11 +177,14 @@ impl BenchTracker {
 	}
 
 	pub fn on_update_child_storage(&self, _child_info: &ChildInfo, _key: StorageKey) {
-		self.warn(Warning::ChildStorageNoSupported);
+		if self.is_redundant() {
+			return;
+		}
+		self.warn(Warning::ChildStorageNotSupported);
 	}
 
 	pub fn on_clear_prefix(&self, prefix: &[u8], limit: Option<u32>) {
-		if self.is_redundant() {
+		if self.is_redundant() || !(*self.count_clear_prefix.read()) {
 			return;
 		}
 		if let Some(limit) = limit {
@@ -196,11 +204,17 @@ impl BenchTracker {
 	}
 
 	pub fn on_clear_child_prefix(&self, _child_info: &ChildInfo, _prefix: &[u8], _limit: Option<u32>) {
-		self.warn(Warning::ChildStorageNoSupported);
+		if self.is_redundant() {
+			return;
+		}
+		self.warn(Warning::ChildStorageNotSupported);
 	}
 
 	pub fn on_kill_child_storage(&self, _child_info: &ChildInfo, _limit: Option<u32>) {
-		self.warn(Warning::ChildStorageNoSupported);
+		if self.is_redundant() {
+			return;
+		}
+		self.warn(Warning::ChildStorageNotSupported);
 	}
 
 	/// Get the benchmark summary
@@ -325,6 +339,10 @@ impl BenchTracker {
 		whitelisted.insert(key, (read, write));
 	}
 
+	pub fn count_clear_prefix(&self) {
+		*self.count_clear_prefix.write() = true;
+	}
+
 	/// Reset for the next benchmark
 	pub fn reset(&self) {
 		*self.depth.write() = 0;
@@ -334,6 +352,7 @@ impl BenchTracker {
 		self.clear_prefixes.write().clear();
 		self.warnings.write().clear();
 		self.whitelisted_keys.write().clear();
+		*self.count_clear_prefix.write() = false;
 	}
 }
 

bencher/src/utils.rs

@@ -92,4 +92,11 @@ pub trait Bench {
 			.expect("No `bench_tracker` associated for the current context!");
 		tracker.reset();
 	}
+
+	fn count_clear_prefix(&mut self) {
+		let tracker = &***self
+			.extension::<BenchTrackerExt>()
+			.expect("No `bench_tracker` associated for the current context!");
+		tracker.count_clear_prefix();
+	}
 }

bencher/test/src/benches.rs

@@ -25,6 +25,7 @@ fn remove_all_bar(b: &mut Bencher) {
 }
 
 fn remove_all_bar_with_limit(b: &mut Bencher) {
+	b.count_clear_prefix();
 	Bar::<Runtime>::insert(1, 1);
 	b.bench(|| {
 		Test::remove_all_bar_with_limit();

bencher/test/src/lib.rs

@@ -77,12 +77,12 @@ pub mod pallet {
 
 		#[orml_weight_meter::weight(0)]
 		pub(crate) fn remove_all_bar() {
-			Bar::<T>::remove_all(None);
+			_ = Bar::<T>::clear(10, None);
 		}
 
 		#[orml_weight_meter::weight(0)]
 		pub(crate) fn remove_all_bar_with_limit() {
-			Bar::<T>::remove_all(Some(10));
+			_ = Bar::<T>::clear(10, None);
 		}
 	}
 }