diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs index 4d1bec884..a35b14124 100644 --- a/ethcore/src/blockchain/blockchain.rs +++ b/ethcore/src/blockchain/blockchain.rs @@ -30,7 +30,7 @@ use blockchain::bloom_indexer::BloomIndexer; use blockchain::tree_route::TreeRoute; use blockchain::update::ExtrasUpdate; use blockchain::{CacheSize, ImportRoute}; -use db::{Writable, Readable, Key, DatabaseReader, BatchWriter, CacheUpdatePolicy}; +use db::{Writable, Readable, Key, CacheUpdatePolicy}; const BLOOM_INDEX_SIZE: usize = 16; const BLOOM_LEVELS: u8 = 3; @@ -183,7 +183,7 @@ impl BlockProvider for BlockChain { /// Returns true if the given block is known /// (though not necessarily a part of the canon chain). fn is_known(&self, hash: &H256) -> bool { - DatabaseReader::new(&self.extras_db, &self.block_details).exists(hash) + self.extras_db.exists_with_cache(&self.block_details, hash) } // We do not store tracing information. @@ -471,20 +471,17 @@ impl BlockChain { } let mut write_details = self.block_details.write().unwrap(); - BatchWriter::new(&batch, &mut write_details) - .extend(update.block_details, CacheUpdatePolicy::Overwrite); + batch.extend_with_cache(&mut write_details, update.block_details, CacheUpdatePolicy::Overwrite); } { let mut write_receipts = self.block_receipts.write().unwrap(); - BatchWriter::new(&batch, &mut write_receipts) - .extend(update.block_receipts, CacheUpdatePolicy::Remove); + batch.extend_with_cache(&mut write_receipts, update.block_receipts, CacheUpdatePolicy::Remove); } { let mut write_blocks_blooms = self.blocks_blooms.write().unwrap(); - BatchWriter::new(&batch, &mut write_blocks_blooms) - .extend(update.blocks_blooms, CacheUpdatePolicy::Remove); + batch.extend_with_cache(&mut write_blocks_blooms, update.blocks_blooms, CacheUpdatePolicy::Remove); } // These cached values must be updated last and togeterh @@ -505,11 +502,8 @@ impl BlockChain { } } - BatchWriter::new(&batch, &mut write_hashes) - .extend(update.block_hashes, CacheUpdatePolicy::Remove); - - BatchWriter::new(&batch, &mut write_txs) - .extend(update.transactions_addresses, CacheUpdatePolicy::Remove); + batch.extend_with_cache(&mut write_hashes, update.block_hashes, CacheUpdatePolicy::Remove); + batch.extend_with_cache(&mut write_txs, update.transactions_addresses, CacheUpdatePolicy::Remove); // update extras database self.extras_db.write(batch).unwrap(); @@ -745,7 +739,7 @@ impl BlockChain { K: Key + Eq + Hash + Clone, H256: From { self.note_used(CacheID::Extras(T::index(), H256::from(hash.clone()))); - DatabaseReader::new(&self.extras_db, cache).read(hash) + self.extras_db.read_with_cache(cache, hash) } /// Get current cache size. diff --git a/ethcore/src/db/db.rs b/ethcore/src/db/db.rs index 23e2d74d1..3dca6ca19 100644 --- a/ethcore/src/db/db.rs +++ b/ethcore/src/db/db.rs @@ -16,9 +16,18 @@ //! Extras db utils. +use std::hash::Hash; +use std::sync::RwLock; +use std::collections::HashMap; use util::{H264, DBTransaction, Database}; use util::rlp::{encode, Encodable, decode, Decodable}; +#[derive(Clone, Copy)] +pub enum CacheUpdatePolicy { + Overwrite, + Remove, +} + /// Should be used to get database key associated with given value. pub trait Key { /// Returns db key. @@ -27,16 +36,82 @@ pub trait Key { /// Should be used to write value into database. pub trait Writable { - /// Writes key into database. + /// Writes the value into the database. fn write(&self, key: &Key, value: &T) where T: Encodable; + + /// Writes the value into the database and updates the cache. + fn write_with_cache(&self, cache: &mut HashMap, key: K, value: T, policy: CacheUpdatePolicy) where + K: Key + Hash + Eq, + T: Encodable { + self.write(&key, &value); + match policy { + CacheUpdatePolicy::Overwrite => { + cache.insert(key, value); + }, + CacheUpdatePolicy::Remove => { + cache.remove(&key); + } + } + } + + /// Writes the values into the database and updates the cache. + fn extend_with_cache(&self, cache: &mut HashMap, values: HashMap, policy: CacheUpdatePolicy) + where K: Key + Hash + Eq, T: Encodable { + match policy { + CacheUpdatePolicy::Overwrite => { + for (key, value) in values.into_iter() { + self.write(&key, &value); + cache.insert(key, value); + } + }, + CacheUpdatePolicy::Remove => { + for (key, value) in &values { + self.write(key, value); + cache.remove(key); + } + }, + } + } } /// Should be used to read values from database. pub trait Readable { /// Returns value for given key. fn read(&self, key: &Key) -> Option where T: Decodable; + + /// Returns value for given key either in cache or in database. + fn read_with_cache(&self, cache: &RwLock>, key: &K) -> Option where + K: Key + Eq + Hash + Clone, + T: Clone + Decodable { + { + let read = cache.read().unwrap(); + if let Some(v) = read.get(key) { + return Some(v.clone()); + } + } + + self.read(key).map(|value: T|{ + let mut write = cache.write().unwrap(); + write.insert(key.clone(), value.clone()); + value + }) + } + /// Returns true if given value exists. fn exists(&self, key: &Key) -> bool; + + /// Returns true if given value exists either in cache or in database. + fn exists_with_cache(&self, cache: &RwLock>, key: &K) -> bool where + K: Eq + Hash + Key { + { + let read = cache.read().unwrap(); + if read.get(key).is_some() { + return true; + } + } + + self.exists::(key) + } } impl Writable for DBTransaction { diff --git a/ethcore/src/db/mod.rs b/ethcore/src/db/mod.rs index 199614b79..f56ff3cfc 100644 --- a/ethcore/src/db/mod.rs +++ b/ethcore/src/db/mod.rs @@ -15,9 +15,4 @@ // along with Parity. If not, see . pub mod db; -mod reader; -mod writer; - -pub use self::db::{Key, Writable, Readable}; -pub use self::reader::DatabaseReader; -pub use self::writer::{BatchWriter, CacheUpdatePolicy}; +pub use self::db::{Key, Writable, Readable, CacheUpdatePolicy}; diff --git a/ethcore/src/db/reader.rs b/ethcore/src/db/reader.rs deleted file mode 100644 index 4e4755b11..000000000 --- a/ethcore/src/db/reader.rs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -use std::hash::Hash; -use std::sync::RwLock; -use std::collections::HashMap; -use util::Database; -use util::rlp::Decodable; -use super::{Readable, Key}; - -pub struct DatabaseReader<'a, K, V> where K: 'a, V: 'a { - db: &'a Database, - cache: &'a RwLock>, -} - -impl<'a, K, V> DatabaseReader<'a, K, V> { - pub fn new(db: &'a Database, cache: &'a RwLock>) -> Self { - DatabaseReader { - db: db, - cache: cache, - } - } - - pub fn read(&self, key: &K) -> Option where - K: Eq + Hash + Clone + Key, - V: Clone + Decodable { - { - let read = self.cache.read().unwrap(); - if let Some(v) = read.get(key) { - return Some(v.clone()); - } - } - - self.db.read(key).map(|value: V|{ - let mut write = self.cache.write().unwrap(); - write.insert(key.clone(), value.clone()); - value - }) - } - - pub fn exists(&self, key: &K) -> bool where - K: Eq + Hash + Key { - { - let read = self.cache.read().unwrap(); - if read.get(key).is_some() { - return true; - } - } - - self.db.exists::(key) - } -} diff --git a/ethcore/src/db/writer.rs b/ethcore/src/db/writer.rs deleted file mode 100644 index 35658eadc..000000000 --- a/ethcore/src/db/writer.rs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -use std::collections::HashMap; -use std::hash::Hash; -use util::DBTransaction; -use util::rlp::Encodable; -use super::{Key, Writable}; - -#[derive(Clone, Copy)] -pub enum CacheUpdatePolicy { - Overwrite, - Remove, -} - -pub struct BatchWriter<'a, K, V> where K: 'a, V: 'a { - batch: &'a DBTransaction, - cache: &'a mut HashMap, -} - -impl<'a, K, V> BatchWriter<'a, K, V> { - pub fn new(batch: &'a DBTransaction, cache: &'a mut HashMap) -> Self { - BatchWriter { - batch: batch, - cache: cache, - } - } - - pub fn extend(&mut self, map: HashMap, policy: CacheUpdatePolicy) where - K: Key + Hash + Eq, - V: Encodable { - match policy { - CacheUpdatePolicy::Overwrite => { - for (key, value) in map.into_iter() { - self.batch.write(&key, &value); - self.cache.insert(key, value); - } - }, - CacheUpdatePolicy::Remove => { - for (key, value) in &map { - self.batch.write(key, value); - self.cache.remove(key); - } - }, - } - } -}