From d70df4a15d9da3ca544956ffa1babb0dcae25605 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Sun, 27 Jul 2014 21:01:39 -0700 Subject: [PATCH] wal: reorgnize wal file --- wal/block.go | 7 +++++++ wal/wal.go | 15 ++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wal/block.go b/wal/block.go index a08ac83a6..937cca562 100644 --- a/wal/block.go +++ b/wal/block.go @@ -58,3 +58,10 @@ func readBlock(r io.Reader, b *block) error { b.d = d return nil } + +func unexpectedEOF(err error) error { + if err == io.EOF { + return io.ErrUnexpectedEOF + } + return err +} diff --git a/wal/wal.go b/wal/wal.go index 6f0685df4..554dbb7b3 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -65,6 +65,10 @@ func Open(path string) (*WAL, error) { return newWAL(f), nil } +func (w *WAL) Flush() error { + return w.bw.Flush() +} + func (w *WAL) Close() { if w.f != nil { w.Flush() @@ -102,10 +106,6 @@ func (w *WAL) SaveState(s *raft.State) error { return writeBlock(w.bw, stateType, w.buf.Bytes()) } -func (w *WAL) Flush() error { - return w.bw.Flush() -} - func (w *WAL) checkAtHead() error { o, err := w.f.Seek(0, os.SEEK_CUR) if err != nil { @@ -199,13 +199,6 @@ func readInt64(r io.Reader) (int64, error) { return n, err } -func unexpectedEOF(err error) error { - if err == io.EOF { - return io.ErrUnexpectedEOF - } - return err -} - func max(a, b int64) int64 { if a > b { return a