added cznicb in-memory kvstore (no reader isolation)
This commit is contained in:
Steve Yen
parent
568a068105
commit
ea0a8657f3
|
|
@ -100,6 +100,7 @@ import (
|
|||
|
||||
// kv stores
|
||||
_ "github.com/blevesearch/bleve/index/store/boltdb"
|
||||
_ "github.com/blevesearch/bleve/index/store/cznicb"
|
||||
_ "github.com/blevesearch/bleve/index/store/gtreap"
|
||||
_ "github.com/blevesearch/bleve/index/store/inmem"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,268 @@
|
|||
// 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 cznicb provides an in-memory implementation of the KVStore
|
||||
// interfaces using the cznic/b in-memory btree. Of note: this
|
||||
// implementation does not have reader isolation.
|
||||
package cznicb
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"sync"
|
||||
|
||||
"github.com/blevesearch/bleve/index/store"
|
||||
"github.com/blevesearch/bleve/registry"
|
||||
|
||||
"github.com/cznic/b"
|
||||
)
|
||||
|
||||
const Name = "cznicb"
|
||||
|
||||
var iteratorDoneErr = errors.New("iteratorDoneErr") // A sentinel value.
|
||||
|
||||
func init() {
|
||||
registry.RegisterKVStore(Name, StoreConstructor)
|
||||
}
|
||||
|
||||
func StoreConstructor(config map[string]interface{}) (
|
||||
store.KVStore, error) {
|
||||
return &Store{t: b.TreeNew(itemCompare)}, nil
|
||||
}
|
||||
|
||||
func itemCompare(a, b interface{}) int {
|
||||
return bytes.Compare(a.([]byte), b.([]byte))
|
||||
}
|
||||
|
||||
type Store struct {
|
||||
m sync.Mutex
|
||||
t *b.Tree
|
||||
}
|
||||
|
||||
type Iterator struct { // Assuming that iterators are used single-threaded.
|
||||
s *Store
|
||||
e *b.Enumerator
|
||||
|
||||
currK interface{}
|
||||
currV interface{}
|
||||
currErr error
|
||||
}
|
||||
|
||||
type Batch struct {
|
||||
s *Store
|
||||
|
||||
m sync.Mutex
|
||||
ks [][]byte
|
||||
vs [][]byte
|
||||
ms map[string]store.AssociativeMergeChain
|
||||
}
|
||||
|
||||
func (s *Store) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) Reader() (store.KVReader, error) {
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func (s *Store) Writer() (store.KVWriter, error) {
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func (s *Store) Get(k []byte) ([]byte, error) {
|
||||
s.m.Lock()
|
||||
v, ok := s.t.Get(k)
|
||||
s.m.Unlock()
|
||||
if !ok || v == nil {
|
||||
return nil, nil
|
||||
}
|
||||
return v.([]byte), nil
|
||||
}
|
||||
|
||||
func (s *Store) Iterator(k []byte) store.KVIterator {
|
||||
iter := &Iterator{s: s}
|
||||
iter.Seek(k)
|
||||
return iter
|
||||
}
|
||||
|
||||
func (s *Store) Set(k, v []byte) (err error) {
|
||||
s.m.Lock()
|
||||
s.t.Set(k, v)
|
||||
s.m.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) Delete(k []byte) (err error) {
|
||||
s.m.Lock()
|
||||
s.t.Delete(k)
|
||||
s.m.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Store) NewBatch() store.KVBatch {
|
||||
return &Batch{s: s, ms: map[string]store.AssociativeMergeChain{}}
|
||||
}
|
||||
|
||||
func (w *Iterator) SeekFirst() {
|
||||
w.currK = nil
|
||||
w.currV = nil
|
||||
w.currErr = nil
|
||||
|
||||
var err error
|
||||
w.s.m.Lock()
|
||||
w.e, err = w.s.t.SeekFirst()
|
||||
w.s.m.Unlock()
|
||||
if err != nil {
|
||||
w.currK = nil
|
||||
w.currV = nil
|
||||
w.currErr = iteratorDoneErr
|
||||
}
|
||||
|
||||
w.Next()
|
||||
}
|
||||
|
||||
func (w *Iterator) Seek(k []byte) {
|
||||
w.currK = nil
|
||||
w.currV = nil
|
||||
w.currErr = nil
|
||||
|
||||
w.s.m.Lock()
|
||||
w.e, _ = w.s.t.Seek(k)
|
||||
w.s.m.Unlock()
|
||||
|
||||
w.Next()
|
||||
}
|
||||
|
||||
func (w *Iterator) Next() {
|
||||
if w.currErr != nil {
|
||||
w.currK = nil
|
||||
w.currV = nil
|
||||
w.currErr = iteratorDoneErr
|
||||
return
|
||||
}
|
||||
|
||||
w.s.m.Lock()
|
||||
w.currK, w.currV, w.currErr = w.e.Next()
|
||||
w.s.m.Unlock()
|
||||
}
|
||||
|
||||
func (w *Iterator) Current() ([]byte, []byte, bool) {
|
||||
if w.currErr == iteratorDoneErr ||
|
||||
w.currK == nil ||
|
||||
w.currV == nil {
|
||||
return nil, nil, false
|
||||
}
|
||||
|
||||
return w.currK.([]byte), w.currV.([]byte), true
|
||||
}
|
||||
|
||||
func (w *Iterator) Key() []byte {
|
||||
k, _, ok := w.Current()
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
return k
|
||||
}
|
||||
|
||||
func (w *Iterator) Value() []byte {
|
||||
_, v, ok := w.Current()
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
func (w *Iterator) Valid() bool {
|
||||
_, _, ok := w.Current()
|
||||
return ok
|
||||
}
|
||||
|
||||
func (w *Iterator) Close() error {
|
||||
if w.e != nil {
|
||||
w.e.Close()
|
||||
}
|
||||
w.e = nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *Batch) Set(k, v []byte) {
|
||||
w.m.Lock()
|
||||
w.ks = append(w.ks, k)
|
||||
w.vs = append(w.vs, v)
|
||||
w.m.Unlock()
|
||||
}
|
||||
|
||||
func (w *Batch) Delete(k []byte) {
|
||||
w.m.Lock()
|
||||
w.ks = append(w.ks, k)
|
||||
w.vs = append(w.vs, nil)
|
||||
w.m.Unlock()
|
||||
}
|
||||
|
||||
func (w *Batch) Merge(k []byte, oper store.AssociativeMerge) {
|
||||
key := string(k)
|
||||
w.m.Lock()
|
||||
w.ms[key] = append(w.ms[key], oper)
|
||||
w.m.Unlock()
|
||||
}
|
||||
|
||||
func (w *Batch) Execute() (err error) {
|
||||
w.m.Lock()
|
||||
ks := w.ks
|
||||
w.ks = nil
|
||||
vs := w.vs
|
||||
w.vs = nil
|
||||
ms := w.ms
|
||||
w.ms = map[string]store.AssociativeMergeChain{}
|
||||
w.m.Unlock()
|
||||
|
||||
w.s.m.Lock()
|
||||
defer w.s.m.Unlock()
|
||||
|
||||
t := w.s.t
|
||||
for key, mc := range ms {
|
||||
k := []byte(key)
|
||||
b := []byte(nil)
|
||||
v, ok := t.Get(k)
|
||||
if ok && v != nil {
|
||||
b = v.([]byte)
|
||||
}
|
||||
b, err := mc.Merge(k, b)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if b != nil {
|
||||
t.Set(k, b)
|
||||
} else {
|
||||
t.Delete(k)
|
||||
}
|
||||
}
|
||||
|
||||
for i, k := range ks {
|
||||
v := vs[i]
|
||||
if v != nil {
|
||||
t.Set(k, v)
|
||||
} else {
|
||||
t.Delete(k)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *Batch) Close() error {
|
||||
w.m.Lock()
|
||||
w.ks = nil
|
||||
w.vs = nil
|
||||
w.ms = nil
|
||||
w.m.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
// 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 cznicb
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/blevesearch/bleve/index/store"
|
||||
)
|
||||
|
||||
func TestCznicBStore(t *testing.T) {
|
||||
s, err := StoreConstructor(nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
CommonTestKVStore(t, s)
|
||||
}
|
||||
|
||||
func CommonTestKVStore(t *testing.T, s store.KVStore) {
|
||||
|
||||
writer, err := s.Writer()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
err = writer.Set([]byte("a"), []byte("val-a"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
v, err := writer.Get([]byte("a"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if string(v) != "val-a" {
|
||||
t.Errorf("expected val-a")
|
||||
}
|
||||
v, err = writer.Get([]byte("not-there"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if v != nil {
|
||||
t.Errorf("expected nil v")
|
||||
}
|
||||
err = writer.Set([]byte("z"), []byte("val-z"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = writer.Delete([]byte("z"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
batch := writer.NewBatch()
|
||||
batch.Set([]byte("b"), []byte("val-b"))
|
||||
batch.Set([]byte("c"), []byte("val-c"))
|
||||
batch.Set([]byte("d"), []byte("val-d"))
|
||||
batch.Set([]byte("e"), []byte("val-e"))
|
||||
batch.Set([]byte("f"), []byte("val-f"))
|
||||
batch.Set([]byte("g"), []byte("val-g"))
|
||||
batch.Set([]byte("h"), []byte("val-h"))
|
||||
batch.Set([]byte("i"), []byte("val-i"))
|
||||
batch.Set([]byte("j"), []byte("val-j"))
|
||||
|
||||
err = batch.Execute()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
writer.Close()
|
||||
|
||||
reader, err := s.Reader()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
defer reader.Close()
|
||||
it := reader.Iterator([]byte("b"))
|
||||
key, val, valid := it.Current()
|
||||
if !valid {
|
||||
t.Fatalf("valid false, expected true")
|
||||
}
|
||||
if string(key) != "b" {
|
||||
t.Fatalf("expected key b, got %s", key)
|
||||
}
|
||||
if string(val) != "val-b" {
|
||||
t.Fatalf("expected value val-b, got %s", val)
|
||||
}
|
||||
|
||||
it.Next()
|
||||
key, val, valid = it.Current()
|
||||
if !valid {
|
||||
t.Fatalf("valid false, expected true")
|
||||
}
|
||||
if string(key) != "c" {
|
||||
t.Fatalf("expected key c, got %s", key)
|
||||
}
|
||||
if string(val) != "val-c" {
|
||||
t.Fatalf("expected value val-c, got %s", val)
|
||||
}
|
||||
|
||||
it.Seek([]byte("i"))
|
||||
key, val, valid = it.Current()
|
||||
if !valid {
|
||||
t.Fatalf("valid false, expected true")
|
||||
}
|
||||
if string(key) != "i" {
|
||||
t.Fatalf("expected key i, got %s", key)
|
||||
}
|
||||
if string(val) != "val-i" {
|
||||
t.Fatalf("expected value val-i, got %s", val)
|
||||
}
|
||||
|
||||
it.Close()
|
||||
}
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
// 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 upside_down
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/blevesearch/bleve/index/store/cznicb"
|
||||
)
|
||||
|
||||
func BenchmarkCznicBIndexing1Workers(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndex(b, s, 1)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing2Workers(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndex(b, s, 2)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing4Workers(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndex(b, s, 4)
|
||||
}
|
||||
|
||||
// batches
|
||||
|
||||
func BenchmarkCznicBIndexing1Workers10Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 1, 10)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing2Workers10Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 2, 10)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing4Workers10Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 4, 10)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing1Workers100Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 1, 100)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing2Workers100Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 2, 100)
|
||||
}
|
||||
|
||||
func BenchmarkCznicBIndexing4Workers100Batch(b *testing.B) {
|
||||
s, err := cznicb.StoreConstructor(nil)
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
defer s.Close()
|
||||
|
||||
CommonBenchmarkIndexBatch(b, s, 4, 100)
|
||||
}
|
||||
Loading…
Reference in New Issue