wal: not export unnecessary public functions

etcdserver/force_cluster.go

@@ -51,11 +51,9 @@ func restartAsStandaloneNode(cfg *ServerConfig, snapshot *raftpb.Snapshot) (type
 	ents = append(ents, toAppEnts...)
 
 	// force commit newly appended entries
-	for _, e := range toAppEnts {
-		err := w.SaveEntry(&e)
-		if err != nil {
-			log.Fatalf("etcdserver: %v", err)
-		}
+	err := w.Save(raftpb.HardState{}, toAppEnts)
+	if err != nil {
+		log.Fatalf("etcdserver: %v", err)
 	}
 	if len(ents) != 0 {
 		st.Commit = ents[len(ents)-1].Index

wal/wal.go

@@ -307,7 +307,7 @@ func (w *WAL) Cut() error {
 	if err := w.encoder.encode(&walpb.Record{Type: metadataType, Data: w.metadata}); err != nil {
 		return err
 	}
-	if err := w.SaveState(&w.state); err != nil {
+	if err := w.saveState(&w.state); err != nil {
 		return err
 	}
 	return w.sync()
@@ -363,7 +363,7 @@ func (w *WAL) Close() error {
 	return nil
 }
 
-func (w *WAL) SaveEntry(e *raftpb.Entry) error {
+func (w *WAL) saveEntry(e *raftpb.Entry) error {
 	b := pbutil.MustMarshal(e)
 	rec := &walpb.Record{Type: entryType, Data: b}
 	if err := w.encoder.encode(rec); err != nil {
@@ -373,7 +373,7 @@ func (w *WAL) SaveEntry(e *raftpb.Entry) error {
 	return nil
 }
 
-func (w *WAL) SaveState(s *raftpb.HardState) error {
+func (w *WAL) saveState(s *raftpb.HardState) error {
 	if raft.IsEmptyHardState(*s) {
 		return nil
 	}
@@ -385,11 +385,11 @@ func (w *WAL) SaveState(s *raftpb.HardState) error {
 
 func (w *WAL) Save(st raftpb.HardState, ents []raftpb.Entry) error {
 	// TODO(xiangli): no more reference operator
-	if err := w.SaveState(&st); err != nil {
+	if err := w.saveState(&st); err != nil {
 		return err
 	}
 	for i := range ents {
-		if err := w.SaveEntry(&ents[i]); err != nil {
+		if err := w.saveEntry(&ents[i]); err != nil {
 			return err
 		}
 	}

wal/wal_bench_test.go

@@ -40,7 +40,7 @@ func benchmarkWriteEntry(b *testing.B, size int, batch int) {
 	b.ResetTimer()
 	n := 0
 	for i := 0; i < b.N; i++ {
-		err := w.SaveEntry(e)
+		err := w.saveEntry(e)
 		if err != nil {
 			b.Fatal(err)
 		}

wal/wal_test.go

@@ -153,12 +153,9 @@ func TestCut(t *testing.T) {
 	}
 	defer w.Close()
 
-	// TODO(unihorn): remove this when cut can operate on an empty file
-	if err := w.SaveEntry(&raftpb.Entry{}); err != nil {
-		t.Fatal(err)
-	}
 	state := raftpb.HardState{Term: 1}
-	if err := w.SaveState(&state); err != nil {
+	// TODO(unihorn): remove this when cut can operate on an empty file
+	if err := w.Save(state, []raftpb.Entry{{}}); err != nil {
 		t.Fatal(err)
 	}
 	if err := w.Cut(); err != nil {
@@ -169,8 +166,8 @@ func TestCut(t *testing.T) {
 		t.Errorf("name = %s, want %s", g, wname)
 	}
 
-	e := &raftpb.Entry{Index: 1, Term: 1, Data: []byte{1}}
-	if err := w.SaveEntry(e); err != nil {
+	es := []raftpb.Entry{{Index: 1, Term: 1, Data: []byte{1}}}
+	if err := w.Save(raftpb.HardState{}, es); err != nil {
 		t.Fatal(err)
 	}
 	if err := w.Cut(); err != nil {
@@ -221,14 +218,12 @@ func TestRecover(t *testing.T) {
 		t.Fatal(err)
 	}
 	ents := []raftpb.Entry{{Index: 1, Term: 1, Data: []byte{1}}, {Index: 2, Term: 2, Data: []byte{2}}}
-	for _, e := range ents {
-		if err = w.SaveEntry(&e); err != nil {
-			t.Fatal(err)
-		}
+	if err = w.Save(raftpb.HardState{}, ents); err != nil {
+		t.Fatal(err)
 	}
 	sts := []raftpb.HardState{{Term: 1, Vote: 1, Commit: 1}, {Term: 2, Vote: 2, Commit: 2}}
 	for _, s := range sts {
-		if err = w.SaveState(&s); err != nil {
+		if err = w.Save(s, nil); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -338,8 +333,8 @@ func TestRecoverAfterCut(t *testing.T) {
 		if err = w.SaveSnapshot(walpb.Snapshot{Index: uint64(i)}); err != nil {
 			t.Fatal(err)
 		}
-		e := raftpb.Entry{Index: uint64(i)}
-		if err = w.SaveEntry(&e); err != nil {
+		es := []raftpb.Entry{{Index: uint64(i)}}
+		if err = w.Save(raftpb.HardState{}, es); err != nil {
 			t.Fatal(err)
 		}
 		if err = w.Cut(); err != nil {
@@ -395,7 +390,7 @@ func TestOpenAtUncommittedIndex(t *testing.T) {
 	if err := w.SaveSnapshot(walpb.Snapshot{}); err != nil {
 		t.Fatal(err)
 	}
-	if err := w.SaveEntry(&raftpb.Entry{Index: 0}); err != nil {
+	if err := w.Save(raftpb.HardState{}, []raftpb.Entry{{Index: 0}}); err != nil {
 		t.Fatal(err)
 	}
 	w.Close()
@@ -417,7 +412,7 @@ func TestSaveEmpty(t *testing.T) {
 	w := WAL{
 		encoder: newEncoder(&buf, 0),
 	}
-	if err := w.SaveState(&est); err != nil {
+	if err := w.saveState(&est); err != nil {
 		t.Errorf("err = %v, want nil", err)
 	}
 	if len(buf.Bytes()) != 0 {