Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

format: packfile, avoid allocating in teeReader.ReadByte #800

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions plumbing/format/packfile/scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ func NewScanner(r io.Reader) *Scanner {
crc := crc32.NewIEEE()
return &Scanner{
r: &teeReader{
newByteReadSeeker(seeker),
crc,
reader: newByteReadSeeker(seeker),
w: crc,
},
crc: crc,
IsSeekable: ok,
Expand Down Expand Up @@ -400,7 +400,8 @@ type reader interface {

type teeReader struct {
reader
w hash.Hash32
w hash.Hash32
buf [1]byte
}

func (r *teeReader) Read(p []byte) (n int, err error) {
Expand All @@ -416,7 +417,8 @@ func (r *teeReader) Read(p []byte) (n int, err error) {
func (r *teeReader) ReadByte() (b byte, err error) {
b, err = r.reader.ReadByte()
if err == nil {
_, err := r.w.Write([]byte{b})
r.buf[0] = b
_, err := r.w.Write(r.buf[:])
if err != nil {
return 0, err
}
Expand Down