status-im/ethereumj-personal
2
0
Fork 0
mirror of https://github.com/status-im/ethereumj-personal.git synced 2025-01-11 12:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Use ByteArrayWrapper for Trie cache

Browse Source
This commit is contained in:
nicksavers 2014-06-23 19:20:25 +02:00
parent 4f1fa49c05
commit b69c6aad44
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ethereumj-core/src/main/java/org/ethereum/trie/Cache.java
View File

@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.Map;
import org.ethereum.crypto.HashUtil;
import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.util.Value;
import org.iq80.leveldb.DB;
@ -15,13 +16,13 @@ import org.iq80.leveldb.DB;
*/
public class Cache {
private Map<byte[], Node> nodes;
private Map<ByteArrayWrapper, Node> nodes;
private DB db;
private boolean isDirty;
public Cache(DB db) {
this.db = db;
nodes = new HashMap<byte[], Node>();
nodes = new HashMap<ByteArrayWrapper, Node>();
}
/**
@ -35,7 +36,7 @@ public class Cache {
byte[] enc = value.encode();
if (enc.length >= 32) {
byte[] sha = HashUtil.sha3(enc);
this.nodes.put(sha, new Node(value, true));
this.nodes.put(new ByteArrayWrapper(sha), new Node(value, true));
this.isDirty = true;
return sha;
}
@ -43,21 +44,23 @@ public class Cache {
}
public Value get(byte[] key) {
ByteArrayWrapper keyObj = new ByteArrayWrapper(key);
// First check if the key is the cache
if (this.nodes.get(key) != null) {
return this.nodes.get(key).getValue();
if (this.nodes.get(keyObj) != null) {
return this.nodes.get(keyObj).getValue();
}
// Get the key of the database instead and cache it
byte[] data = this.db.get(key);
Value value = new Value(data);
// Create caching node
this.nodes.put(key, new Node(value, false));
this.nodes.put(keyObj, new Node(value, false));
return value;
}
public void delete(byte[] key) {
this.nodes.remove(key);
ByteArrayWrapper keyObj = new ByteArrayWrapper(key);
this.nodes.remove(keyObj);
this.db.delete(key);
}
@ -67,10 +70,10 @@ public class Cache {
return;
}
for (byte[] key : this.nodes.keySet()) {
for (ByteArrayWrapper key : this.nodes.keySet()) {
Node node = this.nodes.get(key);
if (node.isDirty()) {
this.db.put(key, node.getValue().encode());
this.db.put(key.getData(), node.getValue().encode());
node.setDirty(false);
}
}
@ -79,12 +82,12 @@ public class Cache {
// If the nodes grows beyond the 200 entries we simple empty it
// FIXME come up with something better
if (this.nodes.size() > 200) {
this.nodes = new HashMap<byte[], Node>();
this.nodes = new HashMap<ByteArrayWrapper, Node>();
}
}
public void undo() {
Iterator<Map.Entry<byte[], Node>> iter = this.nodes.entrySet().iterator();
Iterator<Map.Entry<ByteArrayWrapper, Node>> iter = this.nodes.entrySet().iterator();
while (iter.hasNext()) {
if(iter.next().getValue().isDirty()){
iter.remove();
@ -101,7 +104,7 @@ public class Cache {
this.isDirty = isDirty;
}
public Map<byte[], Node> getNodes() {
public Map<ByteArrayWrapper, Node> getNodes() {
return nodes;
}

3
ethereumj-core/src/main/java/org/ethereum/trie/Trie.java
View File

@ -7,6 +7,7 @@ import static org.ethereum.util.CompactEncoder.*;
import java.util.Arrays;
import org.ethereum.crypto.HashUtil;
import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.util.Value;
import org.iq80.leveldb.DB;
import org.spongycastle.util.encoders.Hex;
@ -372,7 +373,7 @@ public class Trie implements TrieFacade{
// Returns a copy of this trie
public Trie copy() {
Trie trie = new Trie(this.cache.getDb(), this.root);
for (byte[] key : this.cache.getNodes().keySet()) {
for (ByteArrayWrapper key : this.cache.getNodes().keySet()) {
Node node = this.cache.getNodes().get(key);
trie.cache.getNodes().put(key, node.copy());
}