Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

shrink_to_fit after removing hashes. #580

Merged
merged 2 commits into from
Mar 3, 2016
Merged

shrink_to_fit after removing hashes. #580

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadc2a9
shrink_to_fit after removing hashes.
gavofyork Mar 3, 2016
f8dc1f2
Avoid leaking block_details.
gavofyork Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ethcore/src/blockchain/blockchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@ impl BlockChain {
let mut write_details = self.block_details.write().unwrap();
for (hash, details) in update.block_details.into_iter() {
batch.put_extras(&hash, &details);
write_details.insert(hash, details);
write_details.insert(hash.clone(), details);
self.note_used(CacheID::Extras(ExtrasIndex::BlockDetails, hash));
}

let mut write_receipts = self.block_receipts.write().unwrap();
Expand Down Expand Up @@ -759,6 +760,14 @@ impl BlockChain {

// TODO: handle block_hashes properly.
block_hashes.clear();

blocks.shrink_to_fit();
block_details.shrink_to_fit();
block_hashes.shrink_to_fit();
transaction_addresses.shrink_to_fit();
block_logs.shrink_to_fit();
blocks_blooms.shrink_to_fit();
block_receipts.shrink_to_fit();
}
if self.cache_size().total() < self.max_cache_size { break; }
}
Expand Down