Skip to content
This repository was archived by the owner on Apr 12, 2019. It is now read-only.

Improve memory usage for Blob.Data() by ~50% #96

Merged
merged 1 commit into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@ type Blob struct {
// Data gets content of blob all at once and wrap it as io.Reader.
// This can be very slow and memory consuming for huge content.
func (b *Blob) Data() (io.Reader, error) {
stdout, err := NewCommand("show", b.ID.String()).RunInDirBytes(b.repo.Path)
if err != nil {
return nil, err
stdout := new(bytes.Buffer)
stderr := new(bytes.Buffer)

// Preallocate memory to save ~50% memory usage on big files.
stdout.Grow(int(b.Size() + 2048))

if err := b.DataPipeline(stdout, stderr); err != nil {
return nil, concatenateError(err, stderr.String())
}
return bytes.NewBuffer(stdout), nil
return stdout, nil
}

// DataPipeline gets content of blob and write the result or error to stdout or stderr
Expand Down
3 changes: 3 additions & 0 deletions blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ var testBlob = &Blob{
repo: &Repository{},
TreeEntry: &TreeEntry{
ID: MustIDFromString("176d8dfe018c850d01851b05fb8a430096247353"),
ptree: &Tree{
repo: &Repository{},
},
},
}

Expand Down