From db4aaedcbdb409e17ea3de161e7b24a80ba0a58c Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 8 Jan 2015 11:47:04 +0100
Subject: Moved ptrie => trie. Removed old trie

---
 trie/cache.go | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 trie/cache.go

(limited to 'trie/cache.go')

diff --git a/trie/cache.go b/trie/cache.go
new file mode 100644
index 000000000..e03702b25
--- /dev/null
+++ b/trie/cache.go
@@ -0,0 +1,42 @@
+package trie
+
+type Backend interface {
+	Get([]byte) ([]byte, error)
+	Put([]byte, []byte)
+}
+
+type Cache struct {
+	store   map[string][]byte
+	backend Backend
+}
+
+func NewCache(backend Backend) *Cache {
+	return &Cache{make(map[string][]byte), backend}
+}
+
+func (self *Cache) Get(key []byte) []byte {
+	data := self.store[string(key)]
+	if data == nil {
+		data, _ = self.backend.Get(key)
+	}
+
+	return data
+}
+
+func (self *Cache) Put(key []byte, data []byte) {
+	self.store[string(key)] = data
+}
+
+func (self *Cache) Flush() {
+	for k, v := range self.store {
+		self.backend.Put([]byte(k), v)
+	}
+
+	// This will eventually grow too large. We'd could
+	// do a make limit on storage and push out not-so-popular nodes.
+	//self.Reset()
+}
+
+func (self *Cache) Reset() {
+	self.store = make(map[string][]byte)
+}
-- 
cgit v1.2.3


From 3c7181d28f1f24aaea2da5cce664ffac52f369df Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 2 Feb 2015 19:58:34 -0800
Subject: Fixed a copy issue in the trie which could cause a consensus failure

---
 trie/cache.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'trie/cache.go')

diff --git a/trie/cache.go b/trie/cache.go
index e03702b25..2143785fa 100644
--- a/trie/cache.go
+++ b/trie/cache.go
@@ -37,6 +37,14 @@ func (self *Cache) Flush() {
 	//self.Reset()
 }
 
+func (self *Cache) Copy() *Cache {
+	cache := NewCache(self.backend)
+	for k, v := range self.store {
+		cache.store[k] = v
+	}
+	return cache
+}
+
 func (self *Cache) Reset() {
-	self.store = make(map[string][]byte)
+	//self.store = make(map[string][]byte)
 }
-- 
cgit v1.2.3