From 81bef38ccef819aa62f5bd16dbeb76d57bc80e2d Mon Sep 17 00:00:00 2001 From: indraniel Date: Fri, 10 Apr 2015 11:06:03 -0500 Subject: [PATCH] Revert "+ make copies of the []bytes returned by goleveldb" This reverts commit cb8c1741289a0f00b30733e0d52d9d81d1199603. This commit is no longer desired. The KV store API has been changed to better address this issue. For more details, see the google group conversation thread at: https://groups.google.com/forum/#!topic/bleve/aHZ8gmihLiY --- index/store/goleveldb/iterator.go | 10 ++-------- index/store/goleveldb/store.go | 8 ++------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/index/store/goleveldb/iterator.go b/index/store/goleveldb/iterator.go index 2bc7f90c..f067aeb5 100644 --- a/index/store/goleveldb/iterator.go +++ b/index/store/goleveldb/iterator.go @@ -59,17 +59,11 @@ func (ldi *Iterator) Current() ([]byte, []byte, bool) { } func (ldi *Iterator) Key() []byte { - k := ldi.iterator.Key() - rv := make([]byte, len(k)) - copy(rv, k) - return rv + return ldi.iterator.Key() } func (ldi *Iterator) Value() []byte { - v := ldi.iterator.Value() - rv := make([]byte, len(v)) - copy(rv, v) - return rv + return ldi.iterator.Value() } func (ldi *Iterator) Valid() bool { diff --git a/index/store/goleveldb/store.go b/index/store/goleveldb/store.go index f202045c..f4ee0952 100644 --- a/index/store/goleveldb/store.go +++ b/index/store/goleveldb/store.go @@ -52,9 +52,7 @@ func (ldbs *Store) get(key []byte) ([]byte, error) { if err == leveldb.ErrNotFound { return nil, nil } - rv := make([]byte, len(b)) - copy(rv, b) - return rv, err + return b, err } func (ldbs *Store) getWithSnapshot(key []byte, snapshot *leveldb.Snapshot) ([]byte, error) { @@ -63,9 +61,7 @@ func (ldbs *Store) getWithSnapshot(key []byte, snapshot *leveldb.Snapshot) ([]by if err == leveldb.ErrNotFound { return nil, nil } - rv := make([]byte, len(b)) - copy(rv, b) - return rv, err + return b, err } func (ldbs *Store) set(key, val []byte) error {