Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wal: reorgnize wal file

Browse Source
This commit is contained in:
Xiang Li 2014-07-27 21:01:39 -07:00 committed by Yicheng Qin
parent a25cd45876
commit d70df4a15d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wal/block.go
View File

@ -58,3 +58,10 @@ func readBlock(r io.Reader, b *block) error {
b.d = d b.d = d
return nil return nil
} }
func unexpectedEOF(err error) error {
if err == io.EOF {
return io.ErrUnexpectedEOF
}
return err
}

15
wal/wal.go
View File

@ -65,6 +65,10 @@ func Open(path string) (*WAL, error) {
return newWAL(f), nil return newWAL(f), nil
} }
func (w *WAL) Flush() error {
return w.bw.Flush()
}
func (w *WAL) Close() { func (w *WAL) Close() {
if w.f != nil { if w.f != nil {
w.Flush() w.Flush()
@ -102,10 +106,6 @@ func (w *WAL) SaveState(s *raft.State) error {
return writeBlock(w.bw, stateType, w.buf.Bytes()) return writeBlock(w.bw, stateType, w.buf.Bytes())
} }
func (w *WAL) Flush() error {
return w.bw.Flush()
}
func (w *WAL) checkAtHead() error { func (w *WAL) checkAtHead() error {
o, err := w.f.Seek(0, os.SEEK_CUR) o, err := w.f.Seek(0, os.SEEK_CUR)
if err != nil { if err != nil {
@ -199,13 +199,6 @@ func readInt64(r io.Reader) (int64, error) {
return n, err return n, err
} }
func unexpectedEOF(err error) error {
if err == io.EOF {
return io.ErrUnexpectedEOF
}
return err
}
func max(a, b int64) int64 { func max(a, b int64) int64 {
if a > b { if a > b {
return a return a