gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-22 15:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redb slasher backend impl (#4529)

Browse Source 
* initial redb impl

* redb impl

* remove phantom data

* fixed table definition

* fighting the borrow checker

* a rough draft that doesnt cause lifetime issues

* refactoring

* refactor

* refactor

* passing unit tests

* refactor

* refactor

* refactor

* commit

* move everything to one database

* remove panics, ready for a review

* merge

* a working redb impl

* passing a ref of txn to cursor

* this tries to create a second write transaction when initializing cursor. breaks everything

* Use 2 lifetimes and subtyping

Also fixes a bug in last_key caused by rev and next_back cancelling out

* Move table into cursor

* Merge remote-tracking branch 'origin/unstable' into redb-slasher-backend-impl

* changes based on feedback

* update lmdb

* fix lifetime issues

* moving everything from Cursor to Transaction

* update

* upgrade to redb 2.0

* Merge branch 'unstable' of https://github.com/sigp/lighthouse into redb-slasher-backend-impl

* bring back cursor

* Merge branch 'unstable' of https://github.com/sigp/lighthouse into redb-slasher-backend-impl

* fix delete while

* linting

* linting

* switch to lmdb

* update redb to v2.1

* build fixes, remove unwrap or default

* another build error

* hopefully this is the last build error

* fmt

* cargo.toml

* fix mdbx

* Merge branch 'unstable' of https://github.com/sigp/lighthouse into redb-slasher-backend-impl

* Remove a collect

* Merge remote-tracking branch 'origin/unstable' into redb-slasher-backend-impl

* Merge branch 'redb-slasher-backend-impl' of https://github.com/eserilev/lighthouse into redb-slasher-backend-impl

* re-enable test

* fix failing slasher test

* Merge remote-tracking branch 'origin/unstable' into redb-slasher-backend-impl

* Rename DB file to `slasher.redb`
This commit is contained in:
Eitan Seri-Levi
2024-07-01 03:36:40 +02:00
committed by GitHub
parent 16b81132ca
commit 70bcba1e6b
18 changed files with 499 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
slasher/src/database/interface.rs
View File

@@ -7,6 +7,8 @@ use std::path::PathBuf;
use crate::database::lmdb_impl;
#[cfg(feature = "mdbx")]
use crate::database::mdbx_impl;
#[cfg(feature = "redb")]
use crate::database::redb_impl;
#[derive(Debug)]
pub enum Environment {
@@ -14,6 +16,8 @@ pub enum Environment {
Mdbx(mdbx_impl::Environment),
#[cfg(feature = "lmdb")]
Lmdb(lmdb_impl::Environment),
#[cfg(feature = "redb")]
Redb(redb_impl::Environment),
Disabled,
}
@@ -23,6 +27,8 @@ pub enum RwTransaction<'env> {
Mdbx(mdbx_impl::RwTransaction<'env>),
#[cfg(feature = "lmdb")]
Lmdb(lmdb_impl::RwTransaction<'env>),
#[cfg(feature = "redb")]
Redb(redb_impl::RwTransaction<'env>),
Disabled(PhantomData<&'env ()>),
}
@@ -32,6 +38,8 @@ pub enum Database<'env> {
Mdbx(mdbx_impl::Database<'env>),
#[cfg(feature = "lmdb")]
Lmdb(lmdb_impl::Database<'env>),
#[cfg(feature = "redb")]
Redb(redb_impl::Database<'env>),
Disabled(PhantomData<&'env ()>),
}
@@ -54,6 +62,8 @@ pub enum Cursor<'env> {
Mdbx(mdbx_impl::Cursor<'env>),
#[cfg(feature = "lmdb")]
Lmdb(lmdb_impl::Cursor<'env>),
#[cfg(feature = "redb")]
Redb(redb_impl::Cursor<'env>),
Disabled(PhantomData<&'env ()>),
}
@@ -67,6 +77,8 @@ impl Environment {
DatabaseBackend::Mdbx => mdbx_impl::Environment::new(config).map(Environment::Mdbx),
#[cfg(feature = "lmdb")]
DatabaseBackend::Lmdb => lmdb_impl::Environment::new(config).map(Environment::Lmdb),
#[cfg(feature = "redb")]
DatabaseBackend::Redb => redb_impl::Environment::new(config).map(Environment::Redb),
DatabaseBackend::Disabled => Err(Error::SlasherDatabaseBackendDisabled),
}
}
@@ -77,6 +89,8 @@ impl Environment {
Self::Mdbx(env) => env.create_databases(),
#[cfg(feature = "lmdb")]
Self::Lmdb(env) => env.create_databases(),
#[cfg(feature = "redb")]
Self::Redb(env) => env.create_databases(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -87,6 +101,8 @@ impl Environment {
Self::Mdbx(env) => env.begin_rw_txn().map(RwTransaction::Mdbx),
#[cfg(feature = "lmdb")]
Self::Lmdb(env) => env.begin_rw_txn().map(RwTransaction::Lmdb),
#[cfg(feature = "redb")]
Self::Redb(env) => env.begin_rw_txn().map(RwTransaction::Redb),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -98,6 +114,8 @@ impl Environment {
Self::Mdbx(env) => env.filenames(config),
#[cfg(feature = "lmdb")]
Self::Lmdb(env) => env.filenames(config),
#[cfg(feature = "redb")]
Self::Redb(env) => env.filenames(config),
_ => vec![],
}
}
@@ -106,7 +124,7 @@ impl Environment {
impl<'env> RwTransaction<'env> {
pub fn get<K: AsRef<[u8]> + ?Sized>(
&'env self,
db: &Database<'env>,
db: &'env Database,
key: &K,
) -> Result<Option<Cow<'env, [u8]>>, Error> {
match (self, db) {
@@ -114,6 +132,8 @@ impl<'env> RwTransaction<'env> {
(Self::Mdbx(txn), Database::Mdbx(db)) => txn.get(db, key),
#[cfg(feature = "lmdb")]
(Self::Lmdb(txn), Database::Lmdb(db)) => txn.get(db, key),
#[cfg(feature = "redb")]
(Self::Redb(txn), Database::Redb(db)) => txn.get(db, key),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -129,6 +149,8 @@ impl<'env> RwTransaction<'env> {
(Self::Mdbx(txn), Database::Mdbx(db)) => txn.put(db, key, value),
#[cfg(feature = "lmdb")]
(Self::Lmdb(txn), Database::Lmdb(db)) => txn.put(db, key, value),
#[cfg(feature = "redb")]
(Self::Redb(txn), Database::Redb(db)) => txn.put(db, key, value),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -139,16 +161,8 @@ impl<'env> RwTransaction<'env> {
(Self::Mdbx(txn), Database::Mdbx(db)) => txn.del(db, key),
#[cfg(feature = "lmdb")]
(Self::Lmdb(txn), Database::Lmdb(db)) => txn.del(db, key),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
pub fn cursor<'a>(&'a mut self, db: &Database) -> Result<Cursor<'a>, Error> {
match (self, db) {
#[cfg(feature = "mdbx")]
(Self::Mdbx(txn), Database::Mdbx(db)) => txn.cursor(db).map(Cursor::Mdbx),
#[cfg(feature = "lmdb")]
(Self::Lmdb(txn), Database::Lmdb(db)) => txn.cursor(db).map(Cursor::Lmdb),
#[cfg(feature = "redb")]
(Self::Redb(txn), Database::Redb(db)) => txn.del(db, key),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -159,6 +173,20 @@ impl<'env> RwTransaction<'env> {
Self::Mdbx(txn) => txn.commit(),
#[cfg(feature = "lmdb")]
Self::Lmdb(txn) => txn.commit(),
#[cfg(feature = "redb")]
Self::Redb(txn) => txn.commit(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
pub fn cursor<'a>(&'a mut self, db: &'a Database) -> Result<Cursor<'a>, Error> {
match (self, db) {
#[cfg(feature = "mdbx")]
(Self::Mdbx(txn), Database::Mdbx(db)) => txn.cursor(db).map(Cursor::Mdbx),
#[cfg(feature = "lmdb")]
(Self::Lmdb(txn), Database::Lmdb(db)) => txn.cursor(db).map(Cursor::Lmdb),
#[cfg(feature = "redb")]
(Self::Redb(txn), Database::Redb(db)) => txn.cursor(db).map(Cursor::Redb),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -172,6 +200,8 @@ impl<'env> Cursor<'env> {
Cursor::Mdbx(cursor) => cursor.first_key(),
#[cfg(feature = "lmdb")]
Cursor::Lmdb(cursor) => cursor.first_key(),
#[cfg(feature = "redb")]
Cursor::Redb(cursor) => cursor.first_key(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -183,6 +213,8 @@ impl<'env> Cursor<'env> {
Cursor::Mdbx(cursor) => cursor.last_key(),
#[cfg(feature = "lmdb")]
Cursor::Lmdb(cursor) => cursor.last_key(),
#[cfg(feature = "redb")]
Cursor::Redb(cursor) => cursor.last_key(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -193,17 +225,8 @@ impl<'env> Cursor<'env> {
Cursor::Mdbx(cursor) => cursor.next_key(),
#[cfg(feature = "lmdb")]
Cursor::Lmdb(cursor) => cursor.next_key(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
/// Get the key value pair at the current position.
pub fn get_current(&mut self) -> Result<Option<(Key, Value)>, Error> {
match self {
#[cfg(feature = "mdbx")]
Cursor::Mdbx(cursor) => cursor.get_current(),
#[cfg(feature = "lmdb")]
Cursor::Lmdb(cursor) => cursor.get_current(),
#[cfg(feature = "redb")]
Cursor::Redb(cursor) => cursor.next_key(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -214,6 +237,8 @@ impl<'env> Cursor<'env> {
Cursor::Mdbx(cursor) => cursor.delete_current(),
#[cfg(feature = "lmdb")]
Cursor::Lmdb(cursor) => cursor.delete_current(),
#[cfg(feature = "redb")]
Cursor::Redb(cursor) => cursor.delete_current(),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
@@ -224,6 +249,23 @@ impl<'env> Cursor<'env> {
Self::Mdbx(cursor) => cursor.put(key, value),
#[cfg(feature = "lmdb")]
Self::Lmdb(cursor) => cursor.put(key, value),
#[cfg(feature = "redb")]
Self::Redb(cursor) => cursor.put(key, value),
_ => Err(Error::MismatchedDatabaseVariant),
}
}
pub fn delete_while(
&mut self,
f: impl Fn(&[u8]) -> Result<bool, Error>,
) -> Result<Vec<Cow<'_, [u8]>>, Error> {
match self {
#[cfg(feature = "mdbx")]
Self::Mdbx(txn) => txn.delete_while(f),
#[cfg(feature = "lmdb")]
Self::Lmdb(txn) => txn.delete_while(f),
#[cfg(feature = "redb")]
Self::Redb(txn) => txn.delete_while(f),
_ => Err(Error::MismatchedDatabaseVariant),
}
}