Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions apps/src/lib/node/ledger/storage/rocksdb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1188,9 +1188,9 @@ impl DB for RocksDB {
impl<'iter> DBIter<'iter> for RocksDB {
type PrefixIter = PersistentPrefixIterator<'iter>;

fn iter_prefix(
fn iter_optional_prefix(
&'iter self,
prefix: &Key,
prefix: Option<&Key>,
) -> PersistentPrefixIterator<'iter> {
iter_subspace_prefix(self, prefix)
}
Expand Down Expand Up @@ -1228,13 +1228,17 @@ impl<'iter> DBIter<'iter> for RocksDB {

fn iter_subspace_prefix<'iter>(
db: &'iter RocksDB,
prefix: &Key,
prefix: Option<&Key>,
) -> PersistentPrefixIterator<'iter> {
let subspace_cf = db
.get_column_family(SUBSPACE_CF)
.expect("{SUBSPACE_CF} column family should exist");
let db_prefix = "".to_owned();
iter_prefix(db, subspace_cf, db_prefix, prefix.to_string())
let prefix_string = match prefix {
Some(prefix) => prefix.to_string(),
None => "".to_string(),
};
iter_prefix(db, subspace_cf, db_prefix, prefix_string)
}

fn iter_diffs_prefix(
Expand Down
16 changes: 14 additions & 2 deletions core/src/ledger/storage/mockdb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,21 @@ impl DB for MockDB {
impl<'iter> DBIter<'iter> for MockDB {
type PrefixIter = MockPrefixIterator;

fn iter_prefix(&'iter self, prefix: &Key) -> MockPrefixIterator {
fn iter_optional_prefix(
&'iter self,
prefix: Option<&Key>,
) -> MockPrefixIterator {
let db_prefix = "subspace/".to_owned();
let prefix = format!("{}{}", db_prefix, prefix);
let prefix = format!(
"{}{}",
db_prefix,
match prefix {
None => "".to_string(),
Some(prefix) => {
prefix.to_string()
}
}
);
let iter = self.0.borrow().clone().into_iter();
MockPrefixIterator::new(MockIterator { prefix, iter }, db_prefix)
}
Expand Down
15 changes: 14 additions & 1 deletion core/src/ledger/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,20 @@ pub trait DBIter<'iter> {
///
/// Read account subspace key value pairs with the given prefix from the DB,
/// ordered by the storage keys.
fn iter_prefix(&'iter self, prefix: &Key) -> Self::PrefixIter;
fn iter_prefix(&'iter self, prefix: &Key) -> Self::PrefixIter {
self.iter_optional_prefix(Some(prefix))
}

/// Iterate over all subspace keys
fn iter_all(&'iter self) -> Self::PrefixIter {
self.iter_optional_prefix(None)
}

/// Iterate over subspace keys, with optional prefix
fn iter_optional_prefix(
&'iter self,
prefix: Option<&Key>,
) -> Self::PrefixIter;

/// Read results subspace key value pairs from the DB
fn iter_results(&'iter self) -> Self::PrefixIter;
Expand Down