gitbase: fix squash_iterator tests and skip partition errors

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

partition.go

@@ -4,8 +4,8 @@ import (
 	"io"
 
 	"github.com/src-d/go-borges"
-	errors "gopkg.in/src-d/go-errors.v1"
 	"github.com/src-d/go-mysql-server/sql"
+	errors "gopkg.in/src-d/go-errors.v1"
 )
 
 // partitioned is an embeddable helper that contains the methods for a table
@@ -49,10 +49,9 @@ func (p RepositoryPartition) Key() []byte {
 }
 
 type repositoryPartitionIter struct {
-	// repos []string
-	// pos   int
-	repoIter borges.RepositoryIterator
-	lib      borges.Library
+	repoIter   borges.RepositoryIterator
+	lib        borges.Library
+	skipErrors bool
 }
 
 func newRepositoryPartitionIter(ctx *sql.Context) (sql.PartitionIter, error) {
@@ -67,32 +66,29 @@ func newRepositoryPartitionIter(ctx *sql.Context) (sql.PartitionIter, error) {
 	}
 
 	return &repositoryPartitionIter{
-		repoIter: it,
-		lib:      s.Pool.library,
+		repoIter:   it,
+		lib:        s.Pool.library,
+		skipErrors: s.SkipGitErrors,
 	}, nil
-
-	// return &repositoryPartitionIter{repos: s.Pool.idOrder}, nil
 }
 
 func (i *repositoryPartitionIter) Next() (sql.Partition, error) {
-	// if i.pos >= len(i.repos) {
-	// 	return nil, io.EOF
-	// }
-
-	// i.pos++
-	// return RepositoryPartition(i.repos[i.pos-1]), nil
-
-	r, err := i.repoIter.Next()
-	if err != nil {
-		return nil, err
+	var r borges.Repository
+	var err error
+	for {
+		r, err = i.repoIter.Next()
+		if err == nil {
+			break
+		}
+		if err == io.EOF || !i.skipErrors {
+			return nil, err
+		}
 	}
 
-	// br := borgesRepo(i.lib, r, cache.NewObjectLRU(64*cache.MiByte))
 	return RepositoryPartition(r.ID().String()), nil
 }
 
 func (i *repositoryPartitionIter) Close() error {
-	// i.pos = len(i.repos)
 	if i.repoIter != nil {
 		i.repoIter.Close()
 	}

squash_iterator_test.go

@@ -51,9 +51,6 @@ func TestSquashContextCancelled(t *testing.T) {
 	require.NoError(err)
 
 	for _, it := range iters {
-		// repo, err := session.Pool.GetPos(0)
-		// require.NoError(err)
-
 		iter, err := it.New(ctx, repo)
 		require.NoError(err)
 
@@ -789,7 +786,6 @@ func setupIterWithErrors(t *testing.T, badRepo bool, skipErrors bool) (*sql.Cont
 		require.NoError(err)
 		if ok {
 			lib.AddPlain(pathToName(path), path, nil)
-			// pool.AddGit(f.Worktree().Root())
 		}
 	}
 
@@ -974,8 +970,6 @@ func TestRefsIterSiva(t *testing.T) {
 	require.NoError(t, err)
 
 	path := filepath.Join(cwd, "_testdata", "05893125684f2d3943cd84a7ab2b75e53668fba1.siva")
-	// pool := NewRepositoryPool(cache.DefaultMaxSize)
-	// require.NoError(t, pool.AddSivaFile(path))
 
 	lib, pool, err := newMultiPool()
 	require.NoError(t, err)
@@ -996,14 +990,12 @@ func TestRefsIterSiva(t *testing.T) {
 
 	expected := []sql.Row{
 		{
-			path,
-			// "refs/heads/HEAD/015da2f4-6d89-7ec8-5ac9-a38329ea875b",
+			"015da2f4-6d89-7ec8-5ac9-a38329ea875b",
 			"HEAD",
 			"dbfab055c70379219cbcf422f05316fdf4e1aed3",
 		},
 		{
-			path,
-			// "refs/heads/master/015da2f4-6d89-7ec8-5ac9-a38329ea875b",
+			"015da2f4-6d89-7ec8-5ac9-a38329ea875b",
 			"refs/heads/master",
 			"dbfab055c70379219cbcf422f05316fdf4e1aed3",
 		},