Skip to content

Commit

Permalink
Remove persist manager Close completely.
Browse files Browse the repository at this point in the history
  • Loading branch information
notbdu committed Feb 11, 2019
1 parent dd0c66b commit ee40267
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 46 deletions.
4 changes: 0 additions & 4 deletions persist/fs/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ func (pm *persistManager) writeFields(fields []field.DocsField) error {
return pm.writer.WriteFields(fields...)
}

func (pm *persistManager) Close() error {
return pm.writer.Close()
}

// Finish is called to finish the data persistence process.
func (pm *persistManager) Finish() error {
pm.Lock()
Expand Down
38 changes: 3 additions & 35 deletions persist/fs/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package fs
import (
"bytes"
"encoding/binary"
"errors"
"fmt"
"os"
"time"
Expand All @@ -21,24 +20,16 @@ import (
xbytes "github.com/xichen2020/eventdb/x/bytes"
)

var (
errSegmentWriterClosed = errors.New("segment writer is closed")
)

// segmentWriter is responsible for writing segments to filesystem.
type segmentWriter interface {
// Start persisting data to disk.
// Start starts persisting a segment.
Start(opts writerStartOptions) error

// Finish persisting data to disk.
// Finish finishes persisting a segment and performs cleanups as necessary.
Finish() error

// WriteFields writes a set of document fields.
WriteFields(fields ...indexfield.DocsField) error

// Close closes the writer.
// NB(bodu): Close should only be called when the database itself closes.
Close() error
}

// writerStartOptions provide a set of options for opening a writer.
Expand Down Expand Up @@ -70,8 +61,7 @@ type writer struct {
tw encoding.TimeEncoder
values valuesUnion

err error
closed bool
err error
}

// newSegmentWriter creates a new segment writer.
Expand All @@ -98,10 +88,6 @@ func newSegmentWriter(opts *Options) segmentWriter {
}

func (w *writer) Start(opts writerStartOptions) error {
if w.closed {
return errSegmentWriterClosed
}

var (
namespace = opts.Namespace
shard = opts.Shard
Expand All @@ -126,10 +112,6 @@ func (w *writer) Start(opts writerStartOptions) error {
}

func (w *writer) WriteFields(fields ...indexfield.DocsField) error {
if w.closed {
return errSegmentWriterClosed
}

for _, field := range fields {
if err := w.writeField(field); err != nil {
return err
Expand All @@ -146,20 +128,6 @@ func (w *writer) Finish() error {
return w.err
}

func (w *writer) Close() error {
if w.closed {
return errSegmentWriterClosed
}
w.closed = true
w.info = nil
w.bw = nil
w.iw = nil
w.dw = nil
w.sw = nil
w.tw = nil
return nil
}

func (w *writer) writeInfoFile(
segmentDir string,
info *infopb.SegmentInfo,
Expand Down
3 changes: 0 additions & 3 deletions persist/persist.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ import (
type Manager interface {
// StartPersist starts persisting data.
StartPersist() (Persister, error)

// Close all resources owned by the persist manager.
Close() error
}

// Persister is responsible for actually persisting data.
Expand Down
4 changes: 0 additions & 4 deletions storage/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,6 @@ func (d *db) Close() error {
return err
}

if err := d.Options().PersistManager().Close(); err != nil {
return err
}

// Close namespaces.
var multiErr xerrors.MultiError
for _, ns := range d.ownedNamespacesWithLock() {
Expand Down

0 comments on commit ee40267

Please sign in to comment.