Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

storage: add delete prefix #1632

Merged
merged 7 commits into from
Jul 6, 2023
Merged

storage: add delete prefix #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05ab1e0
ledger/db: ensure that prefix iter only matches full key segments
tzemanovic Jul 3, 2023
f8d765c
test/storage/rocksdb: check that prefix_iter matches only full segments
tzemanovic Jul 3, 2023
fd9d849
changelog: add #1642
tzemanovic Jul 3, 2023
4d19abe
core/storage_api: add `StorageWrite::delete_prefix`
tzemanovic Jun 30, 2023
03a8a74
test/core/wl_storage: extend prefix iter test to include delete prefix
tzemanovic Jun 30, 2023
efe7ceb
storage_api/lazy_map: remove entries by prefixed key
brentstone Jul 2, 2023
d9b6dd9
changelog: add #1632
tzemanovic Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changelog/unreleased/features/1632-delete-prefix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Storage: Add a function to delete key-vals matching a given prefix.
([\#1632](https://github.com/anoma/namada/pull/1632))
3 changes: 3 additions & 0 deletions .changelog/unreleased/improvements/1642-iter-prefix-full-match.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Storage: Ensure that prefix iterator only returns key-
vals in which the prefix key segments are matched fully.
([\#1642](https://github.com/anoma/namada/pull/1642))
40 changes: 23 additions & 17 deletions apps/src/lib/node/ledger/storage/rocksdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,18 @@ fn iter_subspace_prefix<'iter>(
.get_column_family(SUBSPACE_CF)
.expect("{SUBSPACE_CF} column family should exist");
let db_prefix = "".to_owned();
let prefix = prefix.map(|k| k.to_string()).unwrap_or_default();
iter_prefix(db, subspace_cf, db_prefix, Some(prefix))
iter_prefix(
db,
subspace_cf,
db_prefix,
prefix.map(|k| {
if k == &Key::default() {
k.to_string()
} else {
format!("{k}/")
}
}),
)
}

fn iter_diffs_prefix(
Expand Down Expand Up @@ -1609,28 +1619,24 @@ mod test {
let key_1_a = prefix_1.push(&"a".to_string()).unwrap();
let key_1_b = prefix_1.push(&"b".to_string()).unwrap();
let key_1_c = prefix_1.push(&"c".to_string()).unwrap();
let prefix_01 = Key::parse("01").unwrap();
let key_01_a = prefix_01.push(&"a".to_string()).unwrap();

let keys_0 = vec![key_0_a.clone(), key_0_b.clone(), key_0_c.clone()];
let keys_1 = vec![key_1_a.clone(), key_1_b.clone(), key_1_c.clone()];
let all_keys = vec![keys_0.clone(), keys_1.clone()].concat();
let keys_0 = vec![key_0_a, key_0_b, key_0_c];
let keys_1 = vec![key_1_a, key_1_b, key_1_c];
let keys_01 = vec![key_01_a];
let all_keys = vec![keys_0.clone(), keys_01, keys_1.clone()].concat();

// Write the keys
let mut batch = RocksDB::batch();
let height = BlockHeight(1);
db.batch_write_subspace_val(&mut batch, height, &key_0_a, [0_u8])
.unwrap();
db.batch_write_subspace_val(&mut batch, height, &key_0_b, [0_u8])
.unwrap();
db.batch_write_subspace_val(&mut batch, height, &key_0_c, [0_u8])
.unwrap();
db.batch_write_subspace_val(&mut batch, height, &key_1_a, [0_u8])
.unwrap();
db.batch_write_subspace_val(&mut batch, height, &key_1_b, [0_u8])
.unwrap();
db.batch_write_subspace_val(&mut batch, height, &key_1_c, [0_u8])
.unwrap();
for key in &all_keys {
db.batch_write_subspace_val(&mut batch, height, key, [0_u8])
.unwrap();
}
db.exec_batch(batch.0).unwrap();

// Prefix "0" shouldn't match prefix "01"
let itered_keys: Vec<Key> = db
.iter_prefix(Some(&prefix_0))
.map(|(key, _val, _)| Key::parse(key).unwrap())
Expand Down
8 changes: 8 additions & 0 deletions core/proptest-regressions/ledger/storage/wl_storage.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Seeds for failure cases proptest has generated in the past. It is
# automatically read and these particular cases re-run before any
# novel cases are generated.
#
# It is recommended to check this file in to source control so that
# everyone who runs the test benefits from these saved cases.
cc dda57e313536d5b8da109e808f0ea8af87981e843db9907ab75adcf58c3ad7a0 # shrinks to key_vals = [(Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("_"), StringSeg("0")] }, Storage(0)), (Key { segments: [StringSeg("_"), StringSeg("_")] }, Storage(0)), (Key { segments: [StringSeg("_A"), StringSeg("A")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("_"), StringSeg("0")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [StringSeg("_"), StringSeg("0")] }, BlockWriteLog(Write(0))), (Key { segments: [StringSeg("_"), StringSeg("0")] }, BlockWriteLog(Delete)), (Key { segments: [StringSeg("_"), StringSeg("0")] }, BlockWriteLog(Delete)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [StringSeg("_")] }, BlockWriteLog(DeletePrefix))]
cc be5b2533eaa2312359cefbe482c60fa93524e9decae0905af2b9aec936c05a56 # shrinks to key_vals = [(Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("a"), StringSeg("0")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("_"), StringSeg("_")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("a"), StringSeg("A")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [StringSeg("_0"), StringSeg("_")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, Storage(0)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu), StringSeg("?")] }, BlockWriteLog(Write(0))), (Key { segments: [StringSeg("_"), StringSeg("_")] }, BlockWriteLog(Delete)), (Key { segments: [StringSeg("a"), StringSeg("0")] }, BlockWriteLog(Delete)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [AddressSeg(Established: atest1v4ehgw36gym52vfnxqmrjdp3xcmyx3zz8y65yv29x9pyys69xdrryv29x3zyy3pkxdrrgdjylcyclu)] }, BlockWriteLog(DeletePrefix)), (Key { segments: [StringSeg("_")] }, TxWriteLog(DeletePrefix))]
16 changes: 14 additions & 2 deletions core/src/ledger/storage/mockdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,20 @@ impl<'iter> DBIter<'iter> for MockDB {

fn iter_prefix(&'iter self, prefix: Option<&Key>) -> MockPrefixIterator {
let db_prefix = "subspace/".to_owned();
let prefix_str = prefix.map(|k| k.to_string()).unwrap_or_default();
let prefix = format!("{}{}", db_prefix, prefix_str);
let prefix = format!(
"{}{}",
db_prefix,
match prefix {
Some(prefix) => {
if prefix == &Key::default() {
prefix.to_string()
} else {
format!("{prefix}/")
}
}
None => "".to_string(),
}
);
let iter = self.0.borrow().clone().into_iter();
MockPrefixIterator::new(MockIterator { prefix, iter }, db_prefix)
}
Expand Down
Loading