gibheer/bleve
0
0
Fork 0
Code

switch from bolt format to zap in the persister

Browse Source
This commit is contained in:
Marty Schoch 2017-12-09 14:28:50 -05:00
parent 9781d9b089
commit 414899618b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
index/scorch/persister.go
View File

@ -23,8 +23,8 @@ import (
"github.com/RoaringBitmap/roaring" "github.com/RoaringBitmap/roaring"
"github.com/blevesearch/bleve/index/scorch/segment" "github.com/blevesearch/bleve/index/scorch/segment"
scorchBolt "github.com/blevesearch/bleve/index/scorch/segment/bolt"
"github.com/blevesearch/bleve/index/scorch/segment/mem" "github.com/blevesearch/bleve/index/scorch/segment/mem"
"github.com/blevesearch/bleve/index/scorch/segment/zap"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
) )
@ -142,9 +142,9 @@ func (s *Scorch) persistSnapshot(snapshot *IndexSnapshot) error {
switch seg := segmentSnapshot.segment.(type) { switch seg := segmentSnapshot.segment.(type) {
case *mem.Segment: case *mem.Segment:
// need to persist this to disk // need to persist this to disk
filename := fmt.Sprintf("%x.bolt", segmentSnapshot.id) filename := fmt.Sprintf("%x.zap", segmentSnapshot.id)
path := s.path + string(os.PathSeparator) + filename path := s.path + string(os.PathSeparator) + filename
err2 := scorchBolt.PersistSegment(seg, path, 1024) err2 := zap.PersistSegment(seg, path, 1024)
if err2 != nil { if err2 != nil {
return fmt.Errorf("error persisting segment: %v", err2) return fmt.Errorf("error persisting segment: %v", err2)
} }
@ -153,8 +153,7 @@ func (s *Scorch) persistSnapshot(snapshot *IndexSnapshot) error {
if err != nil { if err != nil {
return err return err
} }
case *scorchBolt.Segment: case *zap.Segment:
path := seg.Path() path := seg.Path()
filename := strings.TrimPrefix(path, s.path+string(os.PathSeparator)) filename := strings.TrimPrefix(path, s.path+string(os.PathSeparator))
err = snapshotSegmentBucket.Put(boltPathKey, []byte(filename)) err = snapshotSegmentBucket.Put(boltPathKey, []byte(filename))
@ -181,7 +180,7 @@ func (s *Scorch) persistSnapshot(snapshot *IndexSnapshot) error {
// now try to open all the new snapshots // now try to open all the new snapshots
newSegments := make(map[uint64]segment.Segment) newSegments := make(map[uint64]segment.Segment)
for segmentID, path := range newSegmentPaths { for segmentID, path := range newSegmentPaths {
newSegments[segmentID], err = scorchBolt.Open(path) newSegments[segmentID], err = zap.Open(path)
if err != nil { if err != nil {
return fmt.Errorf("error opening new segment at %s, %v", path, err) return fmt.Errorf("error opening new segment at %s, %v", path, err)
} }
@ -321,7 +320,7 @@ func (s *Scorch) loadSegment(segmentBucket *bolt.Bucket) (*SegmentSnapshot, erro
return nil, fmt.Errorf("segment path missing") return nil, fmt.Errorf("segment path missing")
} }
segmentPath := s.path + string(os.PathSeparator) + string(pathBytes) segmentPath := s.path + string(os.PathSeparator) + string(pathBytes)
segment, err := scorchBolt.Open(segmentPath) segment, err := zap.Open(segmentPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("error opening bolt segment: %v", err) return nil, fmt.Errorf("error opening bolt segment: %v", err)
} }