Adding upstream version 2.5.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

index/upsidedown/store/goleveldb/batch.go

@@ -0,0 +1,50 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"github.com/blevesearch/goleveldb/leveldb"
+	store "github.com/blevesearch/upsidedown_store_api"
+)
+
+type Batch struct {
+	store *Store
+	merge *store.EmulatedMerge
+	batch *leveldb.Batch
+}
+
+func (b *Batch) Set(key, val []byte) {
+	b.batch.Put(key, val)
+}
+
+func (b *Batch) Delete(key []byte) {
+	b.batch.Delete(key)
+}
+
+func (b *Batch) Merge(key, val []byte) {
+	b.merge.Merge(key, val)
+}
+
+func (b *Batch) Reset() {
+	b.batch.Reset()
+	b.merge = store.NewEmulatedMerge(b.store.mo)
+}
+
+func (b *Batch) Close() error {
+	b.batch.Reset()
+	b.batch = nil
+	b.merge = nil
+	return nil
+}

index/upsidedown/store/goleveldb/config.go

@@ -0,0 +1,66 @@
+//  Copyright (c) 2015 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"github.com/blevesearch/goleveldb/leveldb/filter"
+	"github.com/blevesearch/goleveldb/leveldb/opt"
+)
+
+func applyConfig(o *opt.Options, config map[string]interface{}) (*opt.Options, error) {
+
+	ro, ok := config["read_only"].(bool)
+	if ok {
+		o.ReadOnly = ro
+	}
+
+	cim, ok := config["create_if_missing"].(bool)
+	if ok {
+		o.ErrorIfMissing = !cim
+	}
+
+	eie, ok := config["error_if_exists"].(bool)
+	if ok {
+		o.ErrorIfExist = eie
+	}
+
+	wbs, ok := config["write_buffer_size"].(float64)
+	if ok {
+		o.WriteBuffer = int(wbs)
+	}
+
+	bs, ok := config["block_size"].(float64)
+	if ok {
+		o.BlockSize = int(bs)
+	}
+
+	bri, ok := config["block_restart_interval"].(float64)
+	if ok {
+		o.BlockRestartInterval = int(bri)
+	}
+
+	lcc, ok := config["lru_cache_capacity"].(float64)
+	if ok {
+		o.BlockCacheCapacity = int(lcc)
+	}
+
+	bfbpk, ok := config["bloom_filter_bits_per_key"].(float64)
+	if ok {
+		bf := filter.NewBloomFilter(int(bfbpk))
+		o.Filter = bf
+	}
+
+	return o, nil
+}

index/upsidedown/store/goleveldb/iterator.go

@@ -0,0 +1,54 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import "github.com/blevesearch/goleveldb/leveldb/iterator"
+
+type Iterator struct {
+	store    *Store
+	iterator iterator.Iterator
+}
+
+func (ldi *Iterator) Seek(key []byte) {
+	ldi.iterator.Seek(key)
+}
+
+func (ldi *Iterator) Next() {
+	ldi.iterator.Next()
+}
+
+func (ldi *Iterator) Current() ([]byte, []byte, bool) {
+	if ldi.Valid() {
+		return ldi.Key(), ldi.Value(), true
+	}
+	return nil, nil, false
+}
+
+func (ldi *Iterator) Key() []byte {
+	return ldi.iterator.Key()
+}
+
+func (ldi *Iterator) Value() []byte {
+	return ldi.iterator.Value()
+}
+
+func (ldi *Iterator) Valid() bool {
+	return ldi.iterator.Valid()
+}
+
+func (ldi *Iterator) Close() error {
+	ldi.iterator.Release()
+	return nil
+}

index/upsidedown/store/goleveldb/reader.go

@@ -0,0 +1,68 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"github.com/blevesearch/goleveldb/leveldb"
+	"github.com/blevesearch/goleveldb/leveldb/util"
+	store "github.com/blevesearch/upsidedown_store_api"
+)
+
+type Reader struct {
+	store    *Store
+	snapshot *leveldb.Snapshot
+}
+
+func (r *Reader) Get(key []byte) ([]byte, error) {
+	b, err := r.snapshot.Get(key, r.store.defaultReadOptions)
+	if err == leveldb.ErrNotFound {
+		return nil, nil
+	}
+	return b, err
+}
+
+func (r *Reader) MultiGet(keys [][]byte) ([][]byte, error) {
+	return store.MultiGet(r, keys)
+}
+
+func (r *Reader) PrefixIterator(prefix []byte) store.KVIterator {
+	byteRange := util.BytesPrefix(prefix)
+	iter := r.snapshot.NewIterator(byteRange, r.store.defaultReadOptions)
+	iter.First()
+	rv := Iterator{
+		store:    r.store,
+		iterator: iter,
+	}
+	return &rv
+}
+
+func (r *Reader) RangeIterator(start, end []byte) store.KVIterator {
+	byteRange := &util.Range{
+		Start: start,
+		Limit: end,
+	}
+	iter := r.snapshot.NewIterator(byteRange, r.store.defaultReadOptions)
+	iter.First()
+	rv := Iterator{
+		store:    r.store,
+		iterator: iter,
+	}
+	return &rv
+}
+
+func (r *Reader) Close() error {
+	r.snapshot.Release()
+	return nil
+}

index/upsidedown/store/goleveldb/store.go

@@ -0,0 +1,152 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+
+	"github.com/blevesearch/bleve/v2/registry"
+	"github.com/blevesearch/goleveldb/leveldb"
+	"github.com/blevesearch/goleveldb/leveldb/opt"
+	"github.com/blevesearch/goleveldb/leveldb/util"
+	store "github.com/blevesearch/upsidedown_store_api"
+)
+
+const (
+	Name                    = "goleveldb"
+	defaultCompactBatchSize = 250
+)
+
+type Store struct {
+	path string
+	opts *opt.Options
+	db   *leveldb.DB
+	mo   store.MergeOperator
+
+	defaultWriteOptions *opt.WriteOptions
+	defaultReadOptions  *opt.ReadOptions
+}
+
+func New(mo store.MergeOperator, config map[string]interface{}) (store.KVStore, error) {
+
+	path, ok := config["path"].(string)
+	if !ok {
+		return nil, fmt.Errorf("must specify path")
+	}
+	if path == "" {
+		return nil, os.ErrInvalid
+	}
+
+	opts, err := applyConfig(&opt.Options{}, config)
+	if err != nil {
+		return nil, err
+	}
+
+	db, err := leveldb.OpenFile(path, opts)
+	if err != nil {
+		return nil, err
+	}
+
+	rv := Store{
+		path:                path,
+		opts:                opts,
+		db:                  db,
+		mo:                  mo,
+		defaultReadOptions:  &opt.ReadOptions{},
+		defaultWriteOptions: &opt.WriteOptions{},
+	}
+	rv.defaultWriteOptions.Sync = true
+	return &rv, nil
+}
+
+func (ldbs *Store) Close() error {
+	return ldbs.db.Close()
+}
+
+func (ldbs *Store) Reader() (store.KVReader, error) {
+	snapshot, _ := ldbs.db.GetSnapshot()
+	return &Reader{
+		store:    ldbs,
+		snapshot: snapshot,
+	}, nil
+}
+
+func (ldbs *Store) Writer() (store.KVWriter, error) {
+	return &Writer{
+		store: ldbs,
+	}, nil
+}
+
+// CompactWithBatchSize removes DictionaryTerm entries with a count of zero (in batchSize batches), then
+// compacts the underlying goleveldb store.  Removing entries is a workaround for github issue #374.
+func (ldbs *Store) CompactWithBatchSize(batchSize int) error {
+	// workaround for github issue #374 - remove DictionaryTerm keys with count=0
+	batch := &leveldb.Batch{}
+	for {
+		t, err := ldbs.db.OpenTransaction()
+		if err != nil {
+			return err
+		}
+		iter := t.NewIterator(util.BytesPrefix([]byte("d")), ldbs.defaultReadOptions)
+
+		for iter.Next() {
+			if bytes.Equal(iter.Value(), []byte{0}) {
+				k := append([]byte{}, iter.Key()...)
+				batch.Delete(k)
+			}
+			if batch.Len() == batchSize {
+				break
+			}
+		}
+		iter.Release()
+		if iter.Error() != nil {
+			t.Discard()
+			return iter.Error()
+		}
+
+		if batch.Len() > 0 {
+			err := t.Write(batch, ldbs.defaultWriteOptions)
+			if err != nil {
+				t.Discard()
+				return err
+			}
+			err = t.Commit()
+			if err != nil {
+				return err
+			}
+		} else {
+			t.Discard()
+			break
+		}
+		batch.Reset()
+	}
+
+	return ldbs.db.CompactRange(util.Range{Start: nil, Limit: nil})
+}
+
+// Compact compacts the underlying goleveldb store.  The current implementation includes a workaround
+// for github issue #374 (see CompactWithBatchSize).
+func (ldbs *Store) Compact() error {
+	return ldbs.CompactWithBatchSize(defaultCompactBatchSize)
+}
+
+func init() {
+	err := registry.RegisterKVStore(Name, New)
+	if err != nil {
+		panic(err)
+	}
+}

index/upsidedown/store/goleveldb/store_test.go

@@ -0,0 +1,99 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"os"
+	"testing"
+
+	store "github.com/blevesearch/upsidedown_store_api"
+	"github.com/blevesearch/upsidedown_store_api/test"
+)
+
+func open(t *testing.T, mo store.MergeOperator) store.KVStore {
+	rv, err := New(mo, map[string]interface{}{
+		"path":              "test",
+		"create_if_missing": true,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return rv
+}
+
+func cleanup(t *testing.T, s store.KVStore) {
+	err := s.Close()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = os.RemoveAll("test")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestGoLevelDBKVCrud(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestKVCrud(t, s)
+}
+
+func TestGoLevelDBReaderIsolation(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestReaderIsolation(t, s)
+}
+
+func TestGoLevelDBReaderOwnsGetBytes(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestReaderOwnsGetBytes(t, s)
+}
+
+func TestGoLevelDBWriterOwnsBytes(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestWriterOwnsBytes(t, s)
+}
+
+func TestGoLevelDBPrefixIterator(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestPrefixIterator(t, s)
+}
+
+func TestGoLevelDBPrefixIteratorSeek(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestPrefixIteratorSeek(t, s)
+}
+
+func TestGoLevelDBRangeIterator(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestRangeIterator(t, s)
+}
+
+func TestGoLevelDBRangeIteratorSeek(t *testing.T) {
+	s := open(t, nil)
+	defer cleanup(t, s)
+	test.CommonTestRangeIteratorSeek(t, s)
+}
+
+func TestGoLevelDBMerge(t *testing.T) {
+	s := open(t, &test.TestMergeCounter{})
+	defer cleanup(t, s)
+	test.CommonTestMerge(t, s)
+}

index/upsidedown/store/goleveldb/writer.go

@@ -0,0 +1,68 @@
+//  Copyright (c) 2014 Couchbase, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package goleveldb
+
+import (
+	"fmt"
+
+	"github.com/blevesearch/goleveldb/leveldb"
+	store "github.com/blevesearch/upsidedown_store_api"
+)
+
+type Writer struct {
+	store *Store
+}
+
+func (w *Writer) NewBatch() store.KVBatch {
+	rv := Batch{
+		store: w.store,
+		merge: store.NewEmulatedMerge(w.store.mo),
+		batch: new(leveldb.Batch),
+	}
+	return &rv
+}
+
+func (w *Writer) NewBatchEx(options store.KVBatchOptions) ([]byte, store.KVBatch, error) {
+	return make([]byte, options.TotalBytes), w.NewBatch(), nil
+}
+
+func (w *Writer) ExecuteBatch(b store.KVBatch) error {
+	batch, ok := b.(*Batch)
+	if !ok {
+		return fmt.Errorf("wrong type of batch")
+	}
+
+	// first process merges
+	for k, mergeOps := range batch.merge.Merges {
+		kb := []byte(k)
+		existingVal, err := w.store.db.Get(kb, w.store.defaultReadOptions)
+		if err != nil && err != leveldb.ErrNotFound {
+			return err
+		}
+		mergedVal, fullMergeOk := w.store.mo.FullMerge(kb, existingVal, mergeOps)
+		if !fullMergeOk {
+			return fmt.Errorf("merge operator returned failure")
+		}
+		// add the final merge to this batch
+		batch.batch.Put(kb, mergedVal)
+	}
+
+	// now execute the batch
+	return w.store.db.Write(batch.batch, w.store.defaultWriteOptions)
+}
+
+func (w *Writer) Close() error {
+	return nil
+}