Merge pull request #10684 from nvanbenschoten/nvanbenschoten/appendAn…

…dCopy raft: Avoid multiple allocs when merging stable and unstable log
etcd-io · Apr 30, 2019 · e3f3753 · e3f3753
2 parents 0bc219a + b5593de
commit e3f3753
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/raft/log.go b/raft/log.go
@@ -332,8 +332,10 @@ func (l *raftLog) slice(lo, hi, maxSize uint64) ([]pb.Entry, error) {
 	if hi > l.unstable.offset {
 		unstable := l.unstable.slice(max(lo, l.unstable.offset), hi)
 		if len(ents) > 0 {
-			ents = append([]pb.Entry{}, ents...)
-			ents = append(ents, unstable...)
+			combined := make([]pb.Entry, len(ents)+len(unstable))
+			n := copy(combined, ents)
+			copy(combined[n:], unstable)
+			ents = combined
 		} else {
 			ents = unstable
 		}