Browse Source

wal: reorgnize wal file

Xiang Li 11 years ago
parent
commit
d70df4a15d
2 changed files with 11 additions and 11 deletions
  1. 7 0
      wal/block.go
  2. 4 11
      wal/wal.go

+ 7 - 0
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
+}

+ 4 - 11
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