From 87d20a7857c73e2dd9a4cee9e0523f2042a7838d Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Wed, 15 Dec 2021 17:46:42 +0100 Subject: [PATCH] fix defaulting names --- tools/iface/src/db/rocksdb.rs | 2 +- tools/iface/src/db/sled.rs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/iface/src/db/rocksdb.rs b/tools/iface/src/db/rocksdb.rs index 8b3f7b5..0007b1a 100644 --- a/tools/iface/src/db/rocksdb.rs +++ b/tools/iface/src/db/rocksdb.rs @@ -62,7 +62,7 @@ impl Database for RocksDB { } fn names<'a>(&'a self) -> Vec> { - self.old_cfs.iter().map(|v| v.as_bytes().to_vec()).collect() + self.old_cfs.iter().filter(|&v| &*v != "default").map(|v| v.as_bytes().to_vec()).collect() } } diff --git a/tools/iface/src/db/sled.rs b/tools/iface/src/db/sled.rs index bf21215..db25b03 100644 --- a/tools/iface/src/db/sled.rs +++ b/tools/iface/src/db/sled.rs @@ -15,11 +15,14 @@ impl SledDB { } } +const SLED_DEFAULT: &[u8] = "__sled__default".as_bytes(); + impl Database for SledDB { fn names<'a>(&'a self) -> Vec> { self.0 .tree_names() .into_iter() + .filter(|v| v != SLED_DEFAULT) .map(|v| v.to_vec()) .collect_vec() }