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

refactor out common parts of write_chunk

Browse Source
This commit is contained in:
Robert Habermeier 2016-06-14 13:37:17 +02:00
parent dfb603dd08
commit 8ed2b9c7d9
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/client/client.rs
View File

@ -777,11 +777,13 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
let best_hash = best_header.hash(); let best_hash = best_header.hash();
let genesis_hash = self.chain.genesis_hash(); let genesis_hash = self.chain.genesis_hash();
let block_chunk_hashes = chunk_blocks(self, best_hash, genesis_hash, &path).unwrap(); let block_hashes = chunk_blocks(self, best_hash, genesis_hash, &path).unwrap();
trace!(target: "snapshot", "produced {} state chunks and {} block chunks.", state_hashes.len(), block_hashes.len());
let manifest_data = ManifestData { let manifest_data = ManifestData {
state_hashes: state_hashes, state_hashes: state_hashes,
block_hashes: block_chunk_hashes, block_hashes: block_hashes,
state_root: state_root, state_root: state_root,
}; };

51
ethcore/src/snapshot/mod.rs
View File

@ -57,6 +57,22 @@ fn compression_helper(input: &[u8], output: &mut Vec<u8>) -> usize {
} }
} }
// shared portion of write_chunk
// returns either a (hash, compressed_size) pair or an io error.
fn write_chunk(raw_data: &[u8], compression_buffer: &mut Vec<u8>, path: &Path) -> Result<(H256, usize), Error> {
let compressed_size = compression_helper(raw_data, compression_buffer);
let compressed = &compression_buffer[..compressed_size];
let hash = compressed.sha3();
let mut file_path = path.to_owned();
file_path.push(hash.hex());
let mut file = try!(File::create(file_path));
try!(file.write_all(compressed));
Ok((hash, compressed_size))
}
/// Used to build block chunks. /// Used to build block chunks.
struct BlockChunker<'a> { struct BlockChunker<'a> {
client: &'a BlockChainClient, client: &'a BlockChainClient,
@ -116,19 +132,9 @@ impl<'a> BlockChunker<'a> {
rlp_stream.append(&pair); rlp_stream.append(&pair);
} }
let uncompressed = rlp_stream.out(); let raw_data = rlp_stream.out();
let compressed_size = compression_helper(&uncompressed, &mut self.snappy_buffer); let (hash, size) = try!(write_chunk(&raw_data, &mut self.snappy_buffer, path));
let raw_data = &self.snappy_buffer[..compressed_size]; trace!(target: "snapshot", "wrote block chunk. hash: {}, size: {}, uncompressed size: {}", hash.hex(), size, raw_data.len());
let hash = raw_data.sha3();
trace!(target: "snapshot", "writing block chunk. hash: {}, size: {} bytes", hash.hex(), raw_data.len());
let mut file_path = path.to_owned();
file_path.push(hash.hex());
let mut file = try!(File::create(file_path));
try!(file.write_all(&raw_data));
self.hashes.push(hash); self.hashes.push(hash);
Ok(()) Ok(())
@ -193,26 +199,13 @@ impl<'a> StateChunker<'a> {
// Write out the buffer to disk, pushing the created chunk's hash to // Write out the buffer to disk, pushing the created chunk's hash to
// the list. // the list.
fn write_chunk(&mut self) -> Result<(), Error> { fn write_chunk(&mut self) -> Result<(), Error> {
trace!(target: "snapshot", "writing state chunk. uncompressed size: {}", self.cur_size);
let compressed_size = {
let mut stream = RlpStream::new(); let mut stream = RlpStream::new();
stream.append(&&self.rlps[..]); stream.append(&&self.rlps[..]);
compression_helper(&stream.out(), &mut self.snappy_buffer)
};
self.rlps.clear(); self.rlps.clear();
let bytes = &self.snappy_buffer[..compressed_size]; let raw_data = stream.out();
let (hash, compressed_size) = try!(write_chunk(&raw_data, &mut self.snappy_buffer, self.snapshot_path));
let hash = bytes.sha3(); trace!(target: "snapshot", "wrote state chunk. size: {}, uncompressed size: {}", compressed_size, raw_data.len());
let mut path = self.snapshot_path.to_owned();
path.push(hash.hex());
let mut file = try!(File::create(path));
try!(file.write_all(bytes));
self.hashes.push(hash); self.hashes.push(hash);
self.cur_size = 0; self.cur_size = 0;