From 8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 20 Jul 2015 11:44:41 +0200 Subject: [PATCH] ethdb, trie: removed RLE compression --- ethdb/database.go | 10 +++++----- trie/cache.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ethdb/database.go b/ethdb/database.go index 9c9dfe9a1..bf27df592 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -23,7 +23,6 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/compression/rle" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/metrics" @@ -100,12 +99,12 @@ func (self *LDBDatabase) Put(key []byte, value []byte) error { defer self.putTimer.UpdateSince(time.Now()) } // Generate the data to write to disk, update the meter and write - dat := rle.Compress(value) + //value = rle.Compress(value) if self.writeMeter != nil { - self.writeMeter.Mark(int64(len(dat))) + self.writeMeter.Mark(int64(len(value))) } - return self.db.Put(key, dat, nil) + return self.db.Put(key, value, nil) } // Get returns the given key if it's present. @@ -126,7 +125,8 @@ func (self *LDBDatabase) Get(key []byte) ([]byte, error) { if self.readMeter != nil { self.readMeter.Mark(int64(len(dat))) } - return rle.Decompress(dat) + return dat, nil + //return rle.Decompress(dat) } // Delete deletes the key from the queue and database diff --git a/trie/cache.go b/trie/cache.go index 2949a5d64..fdaba5de1 100644 --- a/trie/cache.go +++ b/trie/cache.go @@ -17,7 +17,6 @@ package trie import ( - "github.com/ethereum/go-ethereum/compression/rle" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger/glog" "github.com/syndtr/goleveldb/leveldb" @@ -49,7 +48,8 @@ func (self *Cache) Get(key []byte) []byte { func (self *Cache) Put(key []byte, data []byte) { // write the data to the ldb batch - self.batch.Put(key, rle.Compress(data)) + //self.batch.Put(key, rle.Compress(data)) + self.batch.Put(key, data) self.store[string(key)] = data }