dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
340 lines
10 KiB
Rust
340 lines
10 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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 Ethereum 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 Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Disk-backed `HashDB` implementation.
|
|
|
|
use std::collections::HashMap;
|
|
use std::collections::hash_map::Entry;
|
|
use std::io;
|
|
use std::sync::Arc;
|
|
|
|
use ethereum_types::H256;
|
|
use rlp::{Rlp, RlpStream, Encodable, DecoderError, Decodable, encode, decode};
|
|
use hash_db::{HashDB};
|
|
use keccak_hasher::KeccakHasher;
|
|
use memory_db::*;
|
|
use kvdb::{KeyValueDB, DBTransaction, DBValue};
|
|
use super::{error_negatively_reference_hash};
|
|
|
|
/// Implementation of the `HashDB` trait for a disk-backed database with a memory overlay.
|
|
///
|
|
/// The operations `insert()` and `remove()` take place on the memory overlay; batches of
|
|
/// such operations may be flushed to the disk-backed DB with `commit()` or discarded with
|
|
/// `revert()`.
|
|
///
|
|
/// `lookup()` and `contains()` maintain normal behaviour - all `insert()` and `remove()`
|
|
/// queries have an immediate effect in terms of these functions.
|
|
#[derive(Clone)]
|
|
pub struct OverlayDB {
|
|
overlay: MemoryDB<KeccakHasher, DBValue>,
|
|
backing: Arc<KeyValueDB>,
|
|
column: Option<u32>,
|
|
}
|
|
|
|
struct Payload {
|
|
count: u32,
|
|
value: DBValue,
|
|
}
|
|
|
|
impl Payload {
|
|
fn new(count: u32, value: DBValue) -> Self {
|
|
Payload {
|
|
count,
|
|
value,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Encodable for Payload {
|
|
fn rlp_append(&self, s: &mut RlpStream) {
|
|
s.begin_list(2);
|
|
s.append(&self.count);
|
|
s.append(&&*self.value);
|
|
}
|
|
}
|
|
|
|
impl Decodable for Payload {
|
|
fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
|
|
let payload = Payload {
|
|
count: rlp.val_at(0)?,
|
|
value: DBValue::from_slice(rlp.at(1)?.data()?),
|
|
};
|
|
|
|
Ok(payload)
|
|
}
|
|
}
|
|
|
|
impl OverlayDB {
|
|
/// Create a new instance of OverlayDB given a `backing` database.
|
|
pub fn new(backing: Arc<KeyValueDB>, col: Option<u32>) -> OverlayDB {
|
|
OverlayDB{ overlay: ::new_memory_db(), backing: backing, column: col }
|
|
}
|
|
|
|
/// Create a new instance of OverlayDB with an anonymous temporary database.
|
|
#[cfg(test)]
|
|
pub fn new_temp() -> OverlayDB {
|
|
let backing = Arc::new(::kvdb_memorydb::create(0));
|
|
Self::new(backing, None)
|
|
}
|
|
|
|
/// Commit all operations in a single batch.
|
|
#[cfg(test)]
|
|
pub fn commit(&mut self) -> io::Result<u32> {
|
|
let mut batch = self.backing.transaction();
|
|
let res = self.commit_to_batch(&mut batch)?;
|
|
self.backing.write(batch).map(|_| res).map_err(|e| e.into())
|
|
}
|
|
|
|
/// Commit all operations to given batch.
|
|
pub fn commit_to_batch(&mut self, batch: &mut DBTransaction) -> io::Result<u32> {
|
|
let mut ret = 0u32;
|
|
let mut deletes = 0usize;
|
|
for i in self.overlay.drain() {
|
|
let (key, (value, rc)) = i;
|
|
if rc != 0 {
|
|
match self.payload(&key) {
|
|
Some(x) => {
|
|
let total_rc: i32 = x.count as i32 + rc;
|
|
if total_rc < 0 {
|
|
return Err(error_negatively_reference_hash(&key));
|
|
}
|
|
let payload = Payload::new(total_rc as u32, x.value);
|
|
deletes += if self.put_payload_in_batch(batch, &key, &payload) {1} else {0};
|
|
}
|
|
None => {
|
|
if rc < 0 {
|
|
return Err(error_negatively_reference_hash(&key));
|
|
}
|
|
let payload = Payload::new(rc as u32, value);
|
|
self.put_payload_in_batch(batch, &key, &payload);
|
|
}
|
|
};
|
|
ret += 1;
|
|
}
|
|
}
|
|
trace!("OverlayDB::commit() deleted {} nodes", deletes);
|
|
Ok(ret)
|
|
}
|
|
|
|
/// Revert all operations on this object (i.e. `insert()`s and `remove()`s) since the
|
|
/// last `commit()`.
|
|
pub fn revert(&mut self) { self.overlay.clear(); }
|
|
|
|
/// Get the number of references that would be committed.
|
|
pub fn commit_refs(&self, key: &H256) -> i32 { self.overlay.raw(key).map_or(0, |(_, refs)| refs) }
|
|
|
|
/// Get the refs and value of the given key.
|
|
fn payload(&self, key: &H256) -> Option<Payload> {
|
|
self.backing.get(self.column, key.as_bytes())
|
|
.expect("Low-level database error. Some issue with your hard disk?")
|
|
.map(|ref d| decode(d).expect("decoding db value failed") )
|
|
}
|
|
|
|
/// Put the refs and value of the given key, possibly deleting it from the db.
|
|
fn put_payload_in_batch(&self, batch: &mut DBTransaction, key: &H256, payload: &Payload) -> bool {
|
|
if payload.count > 0 {
|
|
batch.put(self.column, key.as_bytes(), &encode(payload));
|
|
false
|
|
} else {
|
|
batch.delete(self.column, key.as_bytes());
|
|
true
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
impl crate::KeyedHashDB for OverlayDB {
|
|
fn keys(&self) -> HashMap<H256, i32> {
|
|
let mut ret: HashMap<H256, i32> = self.backing.iter(self.column)
|
|
.map(|(key, _)| {
|
|
let h = H256::from_slice(&*key);
|
|
let r = self.payload(&h).unwrap().count;
|
|
(h, r as i32)
|
|
})
|
|
.collect();
|
|
|
|
for (key, refs) in self.overlay.keys() {
|
|
match ret.entry(key) {
|
|
Entry::Occupied(mut entry) => {
|
|
*entry.get_mut() += refs;
|
|
},
|
|
Entry::Vacant(entry) => {
|
|
entry.insert(refs);
|
|
}
|
|
}
|
|
}
|
|
ret
|
|
}
|
|
|
|
}
|
|
|
|
impl HashDB<KeccakHasher, DBValue> for OverlayDB {
|
|
fn get(&self, key: &H256) -> Option<DBValue> {
|
|
// return ok if positive; if negative, check backing - might be enough references there to make
|
|
// it positive again.
|
|
let k = self.overlay.raw(key);
|
|
let memrc = {
|
|
if let Some((d, rc)) = k {
|
|
if rc > 0 { return Some(d.clone()); }
|
|
rc
|
|
} else {
|
|
0
|
|
}
|
|
};
|
|
match self.payload(key) {
|
|
Some(x) => {
|
|
if x.count as i32 + memrc > 0 {
|
|
Some(x.value)
|
|
}
|
|
else {
|
|
None
|
|
}
|
|
}
|
|
// Replace above match arm with this once https://github.com/rust-lang/rust/issues/15287 is done.
|
|
//Some((d, rc)) if rc + memrc > 0 => Some(d),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn contains(&self, key: &H256) -> bool {
|
|
// return ok if positive; if negative, check backing - might be enough references there to make
|
|
// it positive again.
|
|
let k = self.overlay.raw(key);
|
|
match k {
|
|
Some((_, rc)) if rc > 0 => true,
|
|
_ => {
|
|
let memrc = k.map_or(0, |(_, rc)| rc);
|
|
match self.payload(key) {
|
|
Some(x) => {
|
|
x.count as i32 + memrc > 0
|
|
}
|
|
// Replace above match arm with this once https://github.com/rust-lang/rust/issues/15287 is done.
|
|
//Some((d, rc)) if rc + memrc > 0 => true,
|
|
_ => false,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn insert(&mut self, value: &[u8]) -> H256 { self.overlay.insert(value) }
|
|
fn emplace(&mut self, key: H256, value: DBValue) { self.overlay.emplace(key, value); }
|
|
fn remove(&mut self, key: &H256) { self.overlay.remove(key); }
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_revert() {
|
|
let mut m = OverlayDB::new_temp();
|
|
let foo = m.insert(b"foo"); // insert foo.
|
|
let mut batch = m.backing.transaction();
|
|
m.commit_to_batch(&mut batch).unwrap(); // commit - new operations begin here...
|
|
m.backing.write(batch).unwrap();
|
|
let bar = m.insert(b"bar"); // insert bar.
|
|
m.remove(&foo); // remove foo.
|
|
assert!(!m.contains(&foo)); // foo is gone.
|
|
assert!(m.contains(&bar)); // bar is here.
|
|
m.revert(); // revert the last two operations.
|
|
assert!(m.contains(&foo)); // foo is here.
|
|
assert!(!m.contains(&bar)); // bar is gone.
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_overlay_insert_and_remove() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let h = trie.insert(b"hello world");
|
|
assert_eq!(trie.get(&h).unwrap(), DBValue::from_slice(b"hello world"));
|
|
trie.remove(&h);
|
|
assert_eq!(trie.get(&h), None);
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_backing_insert_revert() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let h = trie.insert(b"hello world");
|
|
assert_eq!(trie.get(&h).unwrap(), DBValue::from_slice(b"hello world"));
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&h).unwrap(), DBValue::from_slice(b"hello world"));
|
|
trie.revert();
|
|
assert_eq!(trie.get(&h).unwrap(), DBValue::from_slice(b"hello world"));
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_backing_remove() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let h = trie.insert(b"hello world");
|
|
trie.commit().unwrap();
|
|
trie.remove(&h);
|
|
assert_eq!(trie.get(&h), None);
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&h), None);
|
|
trie.revert();
|
|
assert_eq!(trie.get(&h), None);
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_backing_remove_revert() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let h = trie.insert(b"hello world");
|
|
trie.commit().unwrap();
|
|
trie.remove(&h);
|
|
assert_eq!(trie.get(&h), None);
|
|
trie.revert();
|
|
assert_eq!(trie.get(&h).unwrap(), DBValue::from_slice(b"hello world"));
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_negative() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let h = trie.insert(b"hello world");
|
|
trie.commit().unwrap();
|
|
trie.remove(&h);
|
|
trie.remove(&h); //bad - sends us into negative refs.
|
|
assert_eq!(trie.get(&h), None);
|
|
assert!(trie.commit().is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn overlaydb_complex() {
|
|
let mut trie = OverlayDB::new_temp();
|
|
let hfoo = trie.insert(b"foo");
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
let hbar = trie.insert(b"bar");
|
|
assert_eq!(trie.get(&hbar).unwrap(), DBValue::from_slice(b"bar"));
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
assert_eq!(trie.get(&hbar).unwrap(), DBValue::from_slice(b"bar"));
|
|
trie.insert(b"foo"); // two refs
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
assert_eq!(trie.get(&hbar).unwrap(), DBValue::from_slice(b"bar"));
|
|
trie.remove(&hbar); // zero refs - delete
|
|
assert_eq!(trie.get(&hbar), None);
|
|
trie.remove(&hfoo); // one ref - keep
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
trie.remove(&hfoo); // zero ref - would delete, but...
|
|
assert_eq!(trie.get(&hfoo), None);
|
|
trie.insert(b"foo"); // one ref - keep after all.
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
trie.commit().unwrap();
|
|
assert_eq!(trie.get(&hfoo).unwrap(), DBValue::from_slice(b"foo"));
|
|
trie.remove(&hfoo); // zero ref - delete
|
|
assert_eq!(trie.get(&hfoo), None);
|
|
trie.commit().unwrap(); //
|
|
assert_eq!(trie.get(&hfoo), None);
|
|
}
|