Merge pull request #466 from jfontan/improvement/use-storer-options-partitions

Improvement/use storer options partitions

Author: ajnavarro

Gopkg.lock

@@ -17,7 +17,7 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-git.v4"
   source = "github.com/src-d/go-git"
-  revision = "5cc316baa64287c7e56cb7372a5046c30fd955c1"
+  revision = "d3cec13ac0b195bfb897ed038a08b5130ab9969e"
 
 [[constraint]]
   name = "gopkg.in/src-d/go-git-fixtures.v3"

Gopkg.toml

@@ -239,6 +239,8 @@ func (i *blobRowIter) Close() error {
 		i.iter.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

blobs.go

@@ -314,5 +314,7 @@ func (i *commitBlobsRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }

commit_blobs.go

@@ -326,5 +326,7 @@ func (i *commitTreesRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }

commit_trees.go

@@ -193,6 +193,8 @@ func (i *commitIter) Close() error {
 		i.iter.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

commits.go

@@ -282,6 +282,8 @@ func (i *filesRowIter) Close() error {
 		i.commits.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 

files.go

@@ -263,6 +263,8 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 		if i.refs == nil {
 			i.refs, err = i.repo.References()
 			if err != nil {
+				i.repo.Close()
+
 				if i.skipGitErrors {
 					return nil, io.EOF
 				}
@@ -275,6 +277,8 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 				if i.skipGitErrors {
 					continue
 				}
+
+				i.repo.Close()
 				return nil, err
 			}
 		}
@@ -286,13 +290,15 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 				ref, err = i.refs.Next()
 				if err != nil {
 					if err == io.EOF {
+						i.repo.Close()
 						return nil, io.EOF
 					}
 
 					if i.skipGitErrors {
 						continue
 					}
 
+					i.repo.Close()
 					return nil, err
 				}
 
@@ -315,6 +321,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 					continue
 				}
 
+				i.repo.Close()
 				return nil, err
 			}
 
@@ -332,6 +339,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 				continue
 			}
 
+			i.repo.Close()
 			return nil, err
 		}
 
@@ -353,6 +361,8 @@ func (i *refCommitsRowIter) Close() error {
 		return i.index.Close()
 	}
 
+	i.repo.Close()
+
 	return nil
 }
 
@@ -387,6 +397,7 @@ type stackFrame struct {
 func (i *indexedCommitIter) Next() (*object.Commit, int, error) {
 	for {
 		if len(i.stack) == 0 {
+			i.repo.Close()
 			return nil, -1, io.EOF
 		}
 
@@ -408,6 +419,7 @@ func (i *indexedCommitIter) Next() (*object.Commit, int, error) {
 				continue
 			}
 
+			i.repo.Close()
 			return nil, -1, err
 		}
 

ref_commits.go

@@ -35,10 +35,47 @@ func NewRepository(id string, repo *git.Repository) *Repository {
 	}
 }
 
+// Close closes all opened files in the repository.
+func (r *Repository) Close() {
+	if r != nil && r.Repository != nil {
+		f, ok := r.Storer.(*filesystem.Storage)
+		if ok {
+			// The only type of error returned is "file already closed" and
+			// we don't want to do anything with it.
+			f.Close()
+		}
+	}
+}
+
 // NewRepositoryFromPath creates and initializes a new Repository structure
 // and initializes a go-git repository
 func NewRepositoryFromPath(id, path string) (*Repository, error) {
-	repo, err := git.PlainOpen(path)
+	op := filesystem.Options{
+		ExclusiveAccess: true,
+		KeepDescriptors: true,
+	}
+
+	var wt billy.Filesystem
+	fs := osfs.New(path)
+	f, err := fs.Stat(git.GitDirName)
+	if err != nil && !os.IsNotExist(err) {
+		return nil, err
+	}
+
+	if f != nil && f.IsDir() {
+		wt = fs
+		fs, err = fs.Chroot(git.GitDirName)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	sto, err := filesystem.NewStorageWithOptions(fs, op)
+	if err != nil {
+		return nil, err
+	}
+
+	repo, err := git.Open(sto, wt)
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +100,12 @@ func NewSivaRepositoryFromPath(id, path string) (*Repository, error) {
 		return nil, err
 	}
 
-	sto, err := filesystem.NewStorage(fs)
+	op := filesystem.Options{
+		ExclusiveAccess: true,
+		KeepDescriptors: true,
+	}
+
+	sto, err := filesystem.NewStorageWithOptions(fs, op)
 	if err != nil {
 		return nil, err
 	}

repository_pool.go

@@ -213,10 +213,12 @@ func (i *squashRowIter) Next() (sql.Row, error) {
 		row, err := i.iter.Next()
 		if err != nil {
 			if err == io.EOF {
+				i.iter.Close()
 				i.iter = nil
 				continue
 			}
 
+			i.iter.Close()
 			return nil, err
 		}