From d40c9dce1d8439f80fb50f521e1625df9199b162 Mon Sep 17 00:00:00 2001 From: mpl Date: Tue, 21 Feb 2012 11:51:33 +0100 Subject: [PATCH] update memindex: use default for db r/w options, update secring path in test, -> all tests in index now pass Change-Id: I8fdd99aad1d0d009cf99c773801a9ae875b56137 --- pkg/index/index_test.go | 4 +++- pkg/index/memindex.go | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkg/index/index_test.go b/pkg/index/index_test.go index 7d410f22d..0dfee3f95 100644 --- a/pkg/index/index_test.go +++ b/pkg/index/index_test.go @@ -144,7 +144,9 @@ func (id *IndexDeps) UploadFile(fileName string, contents string) (fileRef, whol } func NewIndexDeps(index *Index) *IndexDeps { - secretRingFile := "../../../../lib/go/camli/jsonsign/testdata/test-secring.gpg" + // TODO(mpl): figure out why this wrong path wasn't making the mongo tests fail +// secretRingFile := "../../../../lib/go/camli/jsonsign/testdata/test-secring.gpg" + secretRingFile := "../jsonsign/testdata/test-secring.gpg" pubKey := &test.Blob{Contents: `-----BEGIN PGP PUBLIC KEY BLOCK----- xsBNBEzgoVsBCAC/56aEJ9BNIGV9FVP+WzenTAkg12k86YqlwJVAB/VwdMlyXxvi diff --git a/pkg/index/memindex.go b/pkg/index/memindex.go index 3295db68b..4efe6a2b1 100644 --- a/pkg/index/memindex.go +++ b/pkg/index/memindex.go @@ -23,8 +23,8 @@ import ( "camlistore.org/pkg/blobserver" "camlistore.org/pkg/jsonconfig" - "code.google.com/p/leveldb-go/leveldb/db" - "code.google.com/p/leveldb-go/leveldb/memdb" + "camlistore.org/third_party/code.google.com/p/leveldb-go/leveldb/db" + "camlistore.org/third_party/code.google.com/p/leveldb-go/leveldb/memdb" ) func init() { @@ -82,7 +82,7 @@ func (s stringIterator) Value() string { func (mk *memKeys) Get(key string) (string, error) { mk.mu.Lock() defer mk.mu.Unlock() - k, err := mk.db.Get([]byte(key)) + k, err := mk.db.Get([]byte(key), nil) if err == db.ErrNotFound { return "", ErrNotFound } @@ -92,20 +92,20 @@ func (mk *memKeys) Get(key string) (string, error) { func (mk *memKeys) Find(key string) Iterator { mk.mu.Lock() defer mk.mu.Unlock() - dit := mk.db.Find([]byte(key)) + dit := mk.db.Find([]byte(key), nil) return stringIterator{dit} } func (mk *memKeys) Set(key, value string) error { mk.mu.Lock() defer mk.mu.Unlock() - return mk.db.Set([]byte(key), []byte(value)) + return mk.db.Set([]byte(key), []byte(value), nil) } func (mk *memKeys) Delete(key string) error { mk.mu.Lock() defer mk.mu.Unlock() - return mk.db.Delete([]byte(key)) + return mk.db.Delete([]byte(key), nil) } func (mk *memKeys) BeginBatch() BatchMutation { @@ -121,11 +121,11 @@ func (mk *memKeys) CommitBatch(bm BatchMutation) error { defer mk.mu.Unlock() for _, m := range b.m { if m.delete { - if err := mk.db.Delete([]byte(m.key)); err != nil { + if err := mk.db.Delete([]byte(m.key), nil); err != nil { return err } } else { - if err := mk.db.Set([]byte(m.key), []byte(m.value)); err != nil { + if err := mk.db.Set([]byte(m.key), []byte(m.value), nil); err != nil { return err } }