diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2022-11-07 16:55:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 16:55:53 +0100 |
| commit | f37bb587b6634435afb5069b2101cb4e0ff78d63 (patch) | |
| tree | 9e6ace8591fff4e95f982304842f0bf8512bd612 /plumbing/format/packfile/patch_delta.go | |
| parent | 652bc83fe45c114440de41d7e0fecf3e4b9e517d (diff) | |
| parent | a2c309de872dc18053acb186b1ec125d1f723a90 (diff) | |
| download | go-git-f37bb587b6634435afb5069b2101cb4e0ff78d63.tar.gz | |
Merge pull request #608 from pjbgf/optimise-zlib-reader
Optimise zlib reader and consolidate sync.Pools
Diffstat (limited to 'plumbing/format/packfile/patch_delta.go')
| -rw-r--r-- | plumbing/format/packfile/patch_delta.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/plumbing/format/packfile/patch_delta.go b/plumbing/format/packfile/patch_delta.go index 053466d..f00562d 100644 --- a/plumbing/format/packfile/patch_delta.go +++ b/plumbing/format/packfile/patch_delta.go @@ -9,6 +9,7 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/utils/ioutil" + "github.com/go-git/go-git/v5/utils/sync" ) // See https://github.com/git/git/blob/49fa3dc76179e04b0833542fa52d0f287a4955ac/delta.h @@ -34,18 +35,16 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) (err error) { defer ioutil.CheckClose(w, &err) - buf := bufPool.Get().(*bytes.Buffer) - defer bufPool.Put(buf) - buf.Reset() + buf := sync.GetBytesBuffer() + defer sync.PutBytesBuffer(buf) _, err = buf.ReadFrom(r) if err != nil { return err } src := buf.Bytes() - dst := bufPool.Get().(*bytes.Buffer) - defer bufPool.Put(dst) - dst.Reset() + dst := sync.GetBytesBuffer() + defer sync.PutBytesBuffer(dst) err = patchDelta(dst, src, delta) if err != nil { return err @@ -53,10 +52,9 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) (err error) { target.SetSize(int64(dst.Len())) - bufp := byteSlicePool.Get().(*[]byte) - b := *bufp - _, err = io.CopyBuffer(w, dst, b) - byteSlicePool.Put(bufp) + b := sync.GetByteSlice() + _, err = io.CopyBuffer(w, dst, *b) + sync.PutByteSlice(b) return err } |