grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Bloom migration (#9992)

Browse Source 
* Fix wrong block number in blooms migration

* Fix wrong `const` type (usize -> u64) 😬
This commit is contained in:
Nicolas Gotchac 2018-11-30 05:08:20 +01:00 committed by Wei Tang
parent f092c10de5
commit 7c0d894ccf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parity/db/rocksdb/blooms.rs
View File

@ -23,6 +23,8 @@ use rlp;
use super::kvdb_rocksdb::DatabaseConfig; use super::kvdb_rocksdb::DatabaseConfig;
use super::open_database; use super::open_database;
const LOG_BLOOMS_ELEMENTS_PER_INDEX: u64 = 16;
pub fn migrate_blooms<P: AsRef<Path>>(path: P, config: &DatabaseConfig) -> Result<(), Error> { pub fn migrate_blooms<P: AsRef<Path>>(path: P, config: &DatabaseConfig) -> Result<(), Error> {
// init // init
let db = open_database(&path.as_ref().to_string_lossy(), config)?; let db = open_database(&path.as_ref().to_string_lossy(), config)?;
@ -41,11 +43,12 @@ pub fn migrate_blooms<P: AsRef<Path>>(path: P, config: &DatabaseConfig) -> Resul
key[0] == 3u8 && key[1] == 0u8 key[0] == 3u8 && key[1] == 0u8
}) })
.map(|(key, group)| { .map(|(key, group)| {
let number = let index =
(key[2] as u64) << 24 | (key[2] as u64) << 24 |
(key[3] as u64) << 16 | (key[3] as u64) << 16 |
(key[4] as u64) << 8 | (key[4] as u64) << 8 |
(key[5] as u64); (key[5] as u64);
let number = index * LOG_BLOOMS_ELEMENTS_PER_INDEX;
let blooms = rlp::decode_list::<Bloom>(&group); let blooms = rlp::decode_list::<Bloom>(&group);
(number, blooms) (number, blooms)
@ -66,11 +69,12 @@ pub fn migrate_blooms<P: AsRef<Path>>(path: P, config: &DatabaseConfig) -> Resul
key[0] == 1u8 && key[1] == 0u8 key[0] == 1u8 && key[1] == 0u8
}) })
.map(|(key, group)| { .map(|(key, group)| {
let number = let index =
(key[2] as u64) | (key[2] as u64) |
(key[3] as u64) << 8 | (key[3] as u64) << 8 |
(key[4] as u64) << 16 | (key[4] as u64) << 16 |
(key[5] as u64) << 24; (key[5] as u64) << 24;
let number = index * LOG_BLOOMS_ELEMENTS_PER_INDEX;
let blooms = rlp::decode_list::<Bloom>(&group); let blooms = rlp::decode_list::<Bloom>(&group);
(number, blooms) (number, blooms)