Storage chains: indexing, renewals and reference counting (#8265)

* Transaction indexing

* Tests and fixes

* Fixed a comment

* Style

* Build

* Style

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Code review suggestions

* Add missing impl

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* impl JoinInput

* Don't store empty slices

* JoinInput operates on slices

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Arkadiy Paronyan
2021-03-18 12:46:27 +01:00
committed by GitHub
parent f69f79cc20
commit 4a0d6d9490
22 changed files with 600 additions and 246 deletions
+60 -5
View File
@@ -33,18 +33,73 @@ fn handle_err<T>(result: std::io::Result<T>) -> T {
}
/// Wrap RocksDb database into a trait object that implements `sp_database::Database`
pub fn as_database<D: KeyValueDB + 'static, H: Clone>(db: D) -> std::sync::Arc<dyn Database<H>> {
pub fn as_database<D, H>(db: D) -> std::sync::Arc<dyn Database<H>>
where D: KeyValueDB + 'static, H: Clone + AsRef<[u8]>
{
std::sync::Arc::new(DbAdapter(db))
}
impl<D: KeyValueDB, H: Clone> Database<H> for DbAdapter<D> {
impl <D: KeyValueDB> DbAdapter<D> {
// Returns counter key and counter value if it exists.
fn read_counter(&self, col: ColumnId, key: &[u8]) -> error::Result<(Vec<u8>, Option<u32>)> {
// Add a key suffix for the counter
let mut counter_key = key.to_vec();
counter_key.push(0);
Ok(match self.0.get(col, &counter_key).map_err(|e| error::DatabaseError(Box::new(e)))? {
Some(data) => {
let mut counter_data = [0; 4];
if data.len() != 4 {
return Err(error::DatabaseError(Box::new(
std::io::Error::new(std::io::ErrorKind::Other,
format!("Unexpected counter len {}", data.len())))
))
}
counter_data.copy_from_slice(&data);
let counter = u32::from_le_bytes(counter_data);
(counter_key, Some(counter))
},
None => (counter_key, None)
})
}
}
impl<D: KeyValueDB, H: Clone + AsRef<[u8]>> Database<H> for DbAdapter<D> {
fn commit(&self, transaction: Transaction<H>) -> error::Result<()> {
let mut tx = DBTransaction::new();
for change in transaction.0.into_iter() {
match change {
Change::Set(col, key, value) => tx.put_vec(col, &key, value),
Change::Remove(col, key) => tx.delete(col, &key),
_ => unimplemented!(),
Change::Store(col, key, value) => {
match self.read_counter(col, key.as_ref())? {
(counter_key, Some(mut counter)) => {
counter += 1;
tx.put(col, &counter_key, &counter.to_le_bytes());
},
(counter_key, None) => {
let d = 1u32.to_le_bytes();
tx.put(col, &counter_key, &d);
tx.put_vec(col, key.as_ref(), value);
},
}
}
Change::Reference(col, key) => {
if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
counter += 1;
tx.put(col, &counter_key, &counter.to_le_bytes());
}
}
Change::Release(col, key) => {
if let (counter_key, Some(mut counter)) = self.read_counter(col, key.as_ref())? {
counter -= 1;
if counter == 0 {
tx.delete(col, &counter_key);
tx.delete(col, key.as_ref());
} else {
tx.put(col, &counter_key, &counter.to_le_bytes());
}
}
}
}
}
self.0.write(tx).map_err(|e| error::DatabaseError(Box::new(e)))
@@ -54,7 +109,7 @@ impl<D: KeyValueDB, H: Clone> Database<H> for DbAdapter<D> {
handle_err(self.0.get(col, key))
}
fn lookup(&self, _hash: &H) -> Option<Vec<u8>> {
unimplemented!();
fn contains(&self, col: ColumnId, key: &[u8]) -> bool {
handle_err(self.0.has_key(col, key))
}
}