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

Add try-versions of prefix iterators #14392

Closed
wants to merge 7 commits into from
Closed

Add try-versions of prefix iterators #14392

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
27fe2ec
Add `TryKeyPrefixIterator`
ark0f Feb 24, 2023
932f8ac
Add `TryPrefixIterator`
ark0f Jun 13, 2023
c7ef9e0
Add `TryChildTriePrefixIterator`
ark0f Jun 13, 2023
f867dc0
Rm line
ark0f Jun 14, 2023
96c5eec
Fix warnings
ark0f Jun 14, 2023
4fd841f
Fix some UI tests
ark0f Jun 15, 2023
df7a7b3
Update frame/support/src/storage/mod.rs
ark0f Jun 16, 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
84 changes: 30 additions & 54 deletions frame/support/src/storage/generator/double_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,9 @@ where
KArg1: ?Sized + EncodeLike<K1>,
{
let prefix = Self::storage_double_map_final_key1(k1);
storage::PrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |_raw_key, mut raw_value| V::decode(&mut raw_value),
phantom: Default::default(),
}
storage::PrefixIterator::new(prefix.clone(), prefix, |_raw_key, mut raw_value| {
V::decode(&mut raw_value)
})
}

fn mutate<KArg1, KArg2, R, F>(k1: KArg1, k2: KArg2, f: F) -> R
Expand Down Expand Up @@ -369,16 +365,14 @@ where

fn iter_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator {
let prefix = G::storage_double_map_final_key1(k1);
Self::PrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix, mut raw_value| {
Self::PrefixIterator::new(
prefix.clone(),
prefix,
|raw_key_without_prefix, mut raw_value| {
let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
Ok((K2::decode(&mut key_material)?, V::decode(&mut raw_value)?))
},
phantom: Default::default(),
}
)
}

fn iter_prefix_from(
Expand All @@ -392,15 +386,10 @@ where

fn iter_key_prefix(k1: impl EncodeLike<K1>) -> Self::PartialKeyIterator {
let prefix = G::storage_double_map_final_key1(k1);
Self::PartialKeyIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix| {
let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
K2::decode(&mut key_material)
},
}
Self::PartialKeyIterator::new(prefix.clone(), prefix, |raw_key_without_prefix| {
let mut key_material = G::Hasher2::reverse(raw_key_without_prefix);
K2::decode(&mut key_material)
})
}

fn iter_key_prefix_from(
Expand All @@ -413,26 +402,19 @@ where
}

fn drain_prefix(k1: impl EncodeLike<K1>) -> Self::PrefixIterator {
let mut iterator = Self::iter_prefix(k1);
iterator.drain = true;
iterator
let iterator = Self::iter_prefix(k1);
iterator.drain()
}

fn iter() -> Self::Iterator {
let prefix = G::prefix_hash();
Self::Iterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix, mut raw_value| {
let mut k1_k2_material = G::Hasher1::reverse(raw_key_without_prefix);
let k1 = K1::decode(&mut k1_k2_material)?;
let mut k2_material = G::Hasher2::reverse(k1_k2_material);
let k2 = K2::decode(&mut k2_material)?;
Ok((k1, k2, V::decode(&mut raw_value)?))
},
phantom: Default::default(),
}
Self::Iterator::new(prefix.clone(), prefix, |raw_key_without_prefix, mut raw_value| {
let mut k1_k2_material = G::Hasher1::reverse(raw_key_without_prefix);
let k1 = K1::decode(&mut k1_k2_material)?;
let mut k2_material = G::Hasher2::reverse(k1_k2_material);
let k2 = K2::decode(&mut k2_material)?;
Ok((k1, k2, V::decode(&mut raw_value)?))
})
}

fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
Expand All @@ -443,18 +425,13 @@ where

fn iter_keys() -> Self::FullKeyIterator {
let prefix = G::prefix_hash();
Self::FullKeyIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix| {
let mut k1_k2_material = G::Hasher1::reverse(raw_key_without_prefix);
let k1 = K1::decode(&mut k1_k2_material)?;
let mut k2_material = G::Hasher2::reverse(k1_k2_material);
let k2 = K2::decode(&mut k2_material)?;
Ok((k1, k2))
},
}
Self::FullKeyIterator::new(prefix.clone(), prefix, |raw_key_without_prefix| {
let mut k1_k2_material = G::Hasher1::reverse(raw_key_without_prefix);
let k1 = K1::decode(&mut k1_k2_material)?;
let mut k2_material = G::Hasher2::reverse(k1_k2_material);
let k2 = K2::decode(&mut k2_material)?;
Ok((k1, k2))
})
}

fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::FullKeyIterator {
Expand All @@ -464,9 +441,8 @@ where
}

fn drain() -> Self::Iterator {
let mut iterator = Self::iter();
iterator.drain = true;
iterator
let iterator = Self::iter();
iterator.drain()
}

fn translate<O: Decode, F: FnMut(K1, K2, O) -> Option<V>>(mut f: F) {
Expand Down
32 changes: 10 additions & 22 deletions frame/support/src/storage/generator/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,10 @@ where
/// Enumerate all elements in the map.
fn iter() -> Self::Iterator {
let prefix = G::prefix_hash();
PrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix, mut raw_value| {
let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
Ok((K::decode(&mut key_material)?, V::decode(&mut raw_value)?))
},
phantom: Default::default(),
}
PrefixIterator::new(prefix.clone(), prefix, |raw_key_without_prefix, mut raw_value| {
let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
Ok((K::decode(&mut key_material)?, V::decode(&mut raw_value)?))
})
}

/// Enumerate all elements in the map after a given key.
Expand All @@ -152,15 +146,10 @@ where
/// Enumerate all keys in the map.
fn iter_keys() -> Self::KeyIterator {
let prefix = G::prefix_hash();
KeyPrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix| {
let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
K::decode(&mut key_material)
},
}
KeyPrefixIterator::new(prefix.clone(), prefix, |raw_key_without_prefix| {
let mut key_material = G::Hasher::reverse(raw_key_without_prefix);
K::decode(&mut key_material)
})
}

/// Enumerate all keys in the map after a given key.
Expand All @@ -172,9 +161,8 @@ where

/// Enumerate all elements in the map.
fn drain() -> Self::Iterator {
let mut iterator = Self::iter();
iterator.drain = true;
iterator
let iterator = Self::iter();
iterator.drain()
}

fn translate<O: Decode, F: FnMut(K, O) -> Option<V>>(mut f: F) {
Expand Down
68 changes: 20 additions & 48 deletions frame/support/src/storage/generator/nmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,9 @@ where
K: HasKeyPrefix<KP>,
{
let prefix = Self::storage_n_map_partial_key(partial_key);
PrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |_raw_key, mut raw_value| V::decode(&mut raw_value),
phantom: Default::default(),
}
PrefixIterator::new(prefix.clone(), prefix, |_raw_key, mut raw_value| {
V::decode(&mut raw_value)
})
}

fn mutate<KArg, R, F>(key: KArg, f: F) -> R
Expand Down Expand Up @@ -327,16 +323,10 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
K: HasReversibleKeyPrefix<KP>,
{
let prefix = G::storage_n_map_partial_key(kp);
PrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: |raw_key_without_prefix, mut raw_value| {
let partial_key = K::decode_partial_key(raw_key_without_prefix)?;
Ok((partial_key, V::decode(&mut raw_value)?))
},
phantom: Default::default(),
}
PrefixIterator::new(prefix.clone(), prefix, |raw_key_without_prefix, mut raw_value| {
let partial_key = K::decode_partial_key(raw_key_without_prefix)?;
Ok((partial_key, V::decode(&mut raw_value)?))
})
}

fn iter_prefix_from<KP>(
Expand All @@ -356,12 +346,7 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
K: HasReversibleKeyPrefix<KP>,
{
let prefix = G::storage_n_map_partial_key(kp);
KeyPrefixIterator {
prefix: prefix.clone(),
previous_key: prefix,
drain: false,
closure: K::decode_partial_key,
}
KeyPrefixIterator::new(prefix.clone(), prefix, K::decode_partial_key)
}

fn iter_key_prefix_from<KP>(
Expand All @@ -380,9 +365,8 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>
where
K: HasReversibleKeyPrefix<KP>,
{
let mut iter = Self::iter_prefix(kp);
iter.drain = true;
iter
let iter = Self::iter_prefix(kp);
iter.drain()
}

fn iter() -> Self::Iterator {
Expand All @@ -391,16 +375,10 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>

fn iter_from(starting_raw_key: Vec<u8>) -> Self::Iterator {
let prefix = G::prefix_hash();
Self::Iterator {
prefix,
previous_key: starting_raw_key,
drain: false,
closure: |raw_key_without_prefix, mut raw_value| {
let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
Ok((final_key, V::decode(&mut raw_value)?))
},
phantom: Default::default(),
}
Self::Iterator::new(prefix, starting_raw_key, |raw_key_without_prefix, mut raw_value| {
let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
Ok((final_key, V::decode(&mut raw_value)?))
})
}

fn iter_keys() -> Self::KeyIterator {
Expand All @@ -409,21 +387,15 @@ impl<K: ReversibleKeyGenerator, V: FullCodec, G: StorageNMap<K, V>>

fn iter_keys_from(starting_raw_key: Vec<u8>) -> Self::KeyIterator {
let prefix = G::prefix_hash();
Self::KeyIterator {
prefix,
previous_key: starting_raw_key,
drain: false,
closure: |raw_key_without_prefix| {
let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
Ok(final_key)
},
}
Self::KeyIterator::new(prefix, starting_raw_key, |raw_key_without_prefix| {
let (final_key, _) = K::decode_final_key(raw_key_without_prefix)?;
Ok(final_key)
})
}

fn drain() -> Self::Iterator {
let mut iterator = Self::iter();
iterator.drain = true;
iterator
let iterator = Self::iter();
iterator.drain()
}

fn translate<O: Decode, F: FnMut(K::Key, O) -> Option<V>>(mut f: F) {
Expand Down
16 changes: 7 additions & 9 deletions frame/support/src/storage/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ pub fn storage_iter_with_suffix<T: Decode + Sized>(
Ok((raw_key_without_prefix.to_vec(), value))
};

PrefixIterator { prefix, previous_key, drain: false, closure, phantom: Default::default() }
PrefixIterator::new(prefix, previous_key, closure)
}

/// Construct iterator to iterate over map items in `module` for the map called `item`.
Expand Down Expand Up @@ -219,7 +219,7 @@ pub fn storage_key_iter_with_suffix<
let value = T::decode(&mut raw_value)?;
Ok((key, value))
};
PrefixIterator { prefix, previous_key, drain: false, closure, phantom: Default::default() }
PrefixIterator::new(prefix, previous_key, closure)
}

/// Get a particular value in storage by the `module`, the map's `item` name and the key `hash`.
Expand Down Expand Up @@ -375,13 +375,11 @@ pub fn move_prefix(from_prefix: &[u8], to_prefix: &[u8]) {
return
}

let iter = PrefixIterator::<_> {
prefix: from_prefix.to_vec(),
previous_key: from_prefix.to_vec(),
drain: true,
closure: |key, value| Ok((key.to_vec(), value.to_vec())),
phantom: Default::default(),
};
let iter =
PrefixIterator::<_>::new(from_prefix.to_vec(), from_prefix.to_vec(), |key, value| {
Ok((key.to_vec(), value.to_vec()))
})
.drain();

for (key, value) in iter {
let full_key = [to_prefix, &key].concat();
Expand Down
Loading
Loading