From 09fe749913972b14ac05bb27d91265ac0f7c23c5 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Fri, 16 Jan 2015 13:33:35 -0500 Subject: [PATCH] default to autocompaction for forestdb --- index/store/forestdb/store.go | 4 +++- index/store/forestdb/store_test.go | 29 +++++++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/index/store/forestdb/store.go b/index/store/forestdb/store.go index 9893e7f5..d3636b19 100644 --- a/index/store/forestdb/store.go +++ b/index/store/forestdb/store.go @@ -59,7 +59,9 @@ func Open(path string, createIfMissing bool, config = map[string]interface{}{} } - forestDBConfig, err := applyConfig(forestdb.DefaultConfig(), config) + forestDBDefaultConfig := forestdb.DefaultConfig() + forestDBDefaultConfig.SetCompactionMode(forestdb.COMPACT_AUTO) + forestDBConfig, err := applyConfig(forestDBDefaultConfig, config) if err != nil { return nil, err } diff --git a/index/store/forestdb/store_test.go b/index/store/forestdb/store_test.go index a9cea194..39d18f40 100644 --- a/index/store/forestdb/store_test.go +++ b/index/store/forestdb/store_test.go @@ -20,9 +20,10 @@ import ( ) func TestLevelDBStore(t *testing.T) { - defer os.RemoveAll("test") + defer os.RemoveAll("testdir") - s, err := Open("test", true, nil) + os.MkdirAll("testdir", 0700) + s, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } @@ -32,9 +33,10 @@ func TestLevelDBStore(t *testing.T) { } func TestReaderIsolation(t *testing.T) { - defer os.RemoveAll("test") + defer os.RemoveAll("testdir") - s, err := Open("test", true, nil) + os.MkdirAll("testdir", 0700) + s, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } @@ -47,9 +49,10 @@ func TestReaderIsolation(t *testing.T) { // and ensure that subsequent reads from it also // reflect the rollback func TestRollbackSameHandle(t *testing.T) { - defer os.RemoveAll("test") + defer os.RemoveAll("testdir") - s, err := Open("test", true, nil) + os.MkdirAll("testdir", 0700) + s, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } @@ -127,9 +130,10 @@ func TestRollbackSameHandle(t *testing.T) { // database, then opens a new handle, and ensures // that the rollback is reflected there as well func TestRollbackNewHandle(t *testing.T) { - defer os.RemoveAll("test") + defer os.RemoveAll("testdir") - s, err := Open("test", true, nil) + os.MkdirAll("testdir", 0700) + s, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } @@ -189,7 +193,7 @@ func TestRollbackNewHandle(t *testing.T) { } // now lets open another handle - s2, err := Open("test", true, nil) + s2, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } @@ -214,16 +218,17 @@ func TestRollbackNewHandle(t *testing.T) { // at the beginning, then rollback one of them // and ensure it affects the other func TestRollbackOtherHandle(t *testing.T) { - defer os.RemoveAll("test") + defer os.RemoveAll("testdir") - s, err := Open("test", true, nil) + os.MkdirAll("testdir", 0700) + s, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) } defer s.Close() // open another handle at the same time - s2, err := Open("test", true, nil) + s2, err := Open("testdir/test", true, nil) if err != nil { t.Fatal(err) }