From 2f02d5d6e2f50c8cb993ed7d8c72420e98b33a44 Mon Sep 17 00:00:00 2001
From: siddontang <siddontang@gmail.com>
Date: Wed, 30 Apr 2014 08:56:51 +0800
Subject: [PATCH] config use bytes for all size

---
 leveldb/db.go           | 29 ++++++++++++++++-------------
 leveldb/leveldb_test.go |  6 +++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/leveldb/db.go b/leveldb/db.go
index d55a410..6da4160 100644
--- a/leveldb/db.go
+++ b/leveldb/db.go
@@ -33,13 +33,7 @@ type DB struct {
 	filter *levigo.FilterPolicy
 }
 
-func Open(configJson json.RawMessage) (*DB, error) {
-	cfg := new(Config)
-	err := json.Unmarshal(configJson, cfg)
-	if err != nil {
-		return nil, err
-	}
-
+func OpenWithConfig(cfg *Config) (*DB, error) {
 	db := new(DB)
 	db.cfg = cfg
 
@@ -50,10 +44,21 @@ func Open(configJson json.RawMessage) (*DB, error) {
 	db.iteratorOpts = levigo.NewReadOptions()
 	db.iteratorOpts.SetFillCache(false)
 
+	var err error
 	db.db, err = levigo.Open(cfg.Path, db.opts)
 	return db, err
 }
 
+func Open(configJson json.RawMessage) (*DB, error) {
+	cfg := new(Config)
+	err := json.Unmarshal(configJson, cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return OpenWithConfig(cfg)
+}
+
 func (db *DB) initOptions(cfg *Config) *levigo.Options {
 	opts := levigo.NewOptions()
 
@@ -72,14 +77,12 @@ func (db *DB) initOptions(cfg *Config) *levigo.Options {
 		opts.SetCompression(levigo.NoCompression)
 	}
 
-	blockSize := cfg.BlockSize * 1024
-	if blockSize > 0 {
-		opts.SetBlockSize(blockSize)
+	if cfg.BlockSize > 0 {
+		opts.SetBlockSize(cfg.BlockSize)
 	}
 
-	writeBufferSize := cfg.WriteBufferSize * 1024 * 1024
-	if writeBufferSize > 0 {
-		opts.SetWriteBufferSize(writeBufferSize)
+	if cfg.WriteBufferSize > 0 {
+		opts.SetWriteBufferSize(cfg.WriteBufferSize)
 	}
 
 	return opts
diff --git a/leveldb/leveldb_test.go b/leveldb/leveldb_test.go
index a5207a2..a31e5b4 100644
--- a/leveldb/leveldb_test.go
+++ b/leveldb/leveldb_test.go
@@ -12,9 +12,9 @@ var testConfigJson = []byte(`
     {
         "path" : "./testdb",
         "compression":true,
-        "block_size" : 32,
-        "write_buffer_size" : 2,
-        "cache_size" : 20
+        "block_size" : 32768,
+        "write_buffer_size" : 2097152,
+        "cache_size" : 20971520
     }
     `)