cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary RwLock from LevelDB

Browse Source
This commit is contained in:
Paul Hauner 2019-05-21 16:36:06 +10:00
parent 7d067926dd
commit b3a94de086
No known key found for this signature in database
GPG Key ID: 5E2CFF9B75FA63DF
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_node/db/src/leveldb_store.rs
View File

@ -4,11 +4,10 @@ use leveldb::database::kv::KV;
use leveldb::database::Database; use leveldb::database::Database;
use leveldb::error::Error as LevelDBError; use leveldb::error::Error as LevelDBError;
use leveldb::options::{Options, ReadOptions, WriteOptions}; use leveldb::options::{Options, ReadOptions, WriteOptions};
use parking_lot::RwLock;
use std::path::Path; use std::path::Path;
pub struct LevelDB<K: Key> { pub struct LevelDB<K: Key> {
db: RwLock<Database<K>>, db: Database<K>,
} }
impl<K: Key> LevelDB<K> { impl<K: Key> LevelDB<K> {
@ -19,9 +18,7 @@ impl<K: Key> LevelDB<K> {
let db = Database::open(path, options)?; let db = Database::open(path, options)?;
Ok(Self { Ok(Self { db })
db: RwLock::new(db),
})
} }
fn read_options(&self) -> ReadOptions<K> { fn read_options(&self) -> ReadOptions<K> {
@ -58,7 +55,6 @@ impl Store for LevelDB<BytesKey> {
let column_key = Self::get_key_for_col(col, key); let column_key = Self::get_key_for_col(col, key);
self.db self.db
.read()
.get(self.read_options(), column_key) .get(self.read_options(), column_key)
.map_err(Into::into) .map_err(Into::into)
} }
@ -67,7 +63,6 @@ impl Store for LevelDB<BytesKey> {
let column_key = Self::get_key_for_col(col, key); let column_key = Self::get_key_for_col(col, key);
self.db self.db
.write()
.put(self.write_options(), column_key, val) .put(self.write_options(), column_key, val)
.map_err(Into::into) .map_err(Into::into)
} }
@ -76,7 +71,6 @@ impl Store for LevelDB<BytesKey> {
let column_key = Self::get_key_for_col(col, key); let column_key = Self::get_key_for_col(col, key);
self.db self.db
.read()
.get(self.read_options(), column_key) .get(self.read_options(), column_key)
.map_err(Into::into) .map_err(Into::into)
.and_then(|val| Ok(val.is_some())) .and_then(|val| Ok(val.is_some()))
@ -85,7 +79,6 @@ impl Store for LevelDB<BytesKey> {
fn key_delete(&self, col: &str, key: &[u8]) -> Result<(), Error> { fn key_delete(&self, col: &str, key: &[u8]) -> Result<(), Error> {
let column_key = Self::get_key_for_col(col, key); let column_key = Self::get_key_for_col(col, key);
self.db self.db
.write()
.delete(self.write_options(), column_key) .delete(self.write_options(), column_key)
.map_err(Into::into) .map_err(Into::into)
} }