aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-07-20 17:44:41 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-23 18:57:33 +0800
commit8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b (patch)
treeedbed374284460f2d62dfe1329dc54cc56dad9d3
parent0cff61bedaca42c94d162853cd55eb1e013dadb9 (diff)
downloaddexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar.gz
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar.bz2
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar.lz
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar.xz
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.tar.zst
dexon-8f56eea77d9d4cd0218c9b0ca7b8c0501780b62b.zip
ethdb, trie: removed RLE compression
-rw-r--r--ethdb/database.go10
-rw-r--r--trie/cache.go4
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
}