mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 20:36:07 +01:00 
			
		
		
		
	Memory usage improvements (#3013)
* govendor update code.gitea.io/git Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com> * Greatly improve memory usage Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
This commit is contained in:
		
				
					committed by
					
						
						Lunny Xiao
					
				
			
			
				
	
			
			
			
						parent
						
							4035ab05fa
						
					
				
				
					commit
					551f3cbe42
				
			
							
								
								
									
										50
									
								
								vendor/code.gitea.io/git/blob.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										50
									
								
								vendor/code.gitea.io/git/blob.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -6,7 +6,11 @@ package git
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"io/ioutil"
 | 
			
		||||
	"os"
 | 
			
		||||
	"os/exec"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Blob represents a Git object.
 | 
			
		||||
@@ -18,14 +22,52 @@ 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
 | 
			
		||||
func (b *Blob) DataPipeline(stdout, stderr io.Writer) error {
 | 
			
		||||
	return NewCommand("show", b.ID.String()).RunInDirPipeline(b.repo.Path, stdout, stderr)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type cmdReadCloser struct {
 | 
			
		||||
	cmd    *exec.Cmd
 | 
			
		||||
	stdout io.Reader
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (c cmdReadCloser) Read(p []byte) (int, error) {
 | 
			
		||||
	return c.stdout.Read(p)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (c cmdReadCloser) Close() error {
 | 
			
		||||
	io.Copy(ioutil.Discard, c.stdout)
 | 
			
		||||
	return c.cmd.Wait()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// DataAsync gets a ReadCloser for the contents of a blob without reading it all.
 | 
			
		||||
// Calling the Close function on the result will discard all unread output.
 | 
			
		||||
func (b *Blob) DataAsync() (io.ReadCloser, error) {
 | 
			
		||||
	cmd := exec.Command("git", "show", b.ID.String())
 | 
			
		||||
	cmd.Dir = b.repo.Path
 | 
			
		||||
	cmd.Stderr = os.Stderr
 | 
			
		||||
 | 
			
		||||
	stdout, err := cmd.StdoutPipe()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, fmt.Errorf("StdoutPipe: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if err = cmd.Start(); err != nil {
 | 
			
		||||
		return nil, fmt.Errorf("Start: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return cmdReadCloser{stdout: stdout, cmd: cmd}, nil
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user