Merge pull request #390 from erizocosmico/fix/cancel-squash

gitbase: make squash iterators cancellable

Author: ajnavarro

squash_iterator.go

@@ -80,6 +80,12 @@ func (i *squashReposIter) Repository() *Repository { return i.repo }
 func (i *squashReposIter) Row() sql.Row            { return i.row }
 func (i *squashReposIter) Advance() error {
 	for {
+		select {
+		case <-i.ctx.Done():
+			return ErrSessionCanceled.New()
+		default:
+		}
+
 		var err error
 		i.repo, err = i.iter.Next()
 		if err != nil {
@@ -167,6 +173,12 @@ func (i *squashRemoteIter) Repository() *Repository { return i.repo }
 func (i *squashRemoteIter) Row() sql.Row            { return i.row }
 func (i *squashRemoteIter) Advance() error {
 	for {
+		select {
+		case <-i.ctx.Done():
+			return ErrSessionCanceled.New()
+		default:
+		}
+
 		if i.repo == nil {
 			var err error
 			i.repo, err = i.repos.Next()
@@ -443,6 +455,12 @@ func (i *squashRefIter) Row() sql.Row {
 
 func (i *squashRefIter) Advance() error {
 	for {
+		select {
+		case <-i.ctx.Done():
+			return ErrSessionCanceled.New()
+		default:
+		}
+
 		if i.repo == nil {
 			var err error
 			i.repo, err = i.repos.Next()
@@ -1254,6 +1272,12 @@ func (i *squashCommitsIter) Row() sql.Row {
 
 func (i *squashCommitsIter) Advance() error {
 	for {
+		select {
+		case <-i.ctx.Done():
+			return ErrSessionCanceled.New()
+		default:
+		}
+
 		if i.repo == nil {
 			var err error
 			i.repo, err = i.repos.Next()
@@ -2219,6 +2243,12 @@ func (i *squashTreeEntriesIter) New(ctx *sql.Context, pool *RepositoryPool) (Cha
 func (i *squashTreeEntriesIter) Row() sql.Row { return i.row }
 func (i *squashTreeEntriesIter) Advance() error {
 	for {
+		select {
+		case <-i.ctx.Done():
+			return ErrSessionCanceled.New()
+		default:
+		}
+
 		if i.repo == nil {
 			var err error
 			i.repo, err = i.repos.Next()

squash_iterator_test.go

@@ -18,6 +18,36 @@ func TestAllReposIter(t *testing.T) {
 	require.Len(chainableIterRows(t, ctx, NewAllReposIter(nil)), 2)
 }
 
+func TestSquashContextCancelled(t *testing.T) {
+	require := require.New(t)
+	ctx, cleanup := setupIter(t)
+	defer cleanup()
+
+	var cancel context.CancelFunc
+	ctx.Context, cancel = context.WithCancel(ctx.Context)
+	cancel()
+
+	iters := []ChainableIter{
+		NewAllReposIter(nil),
+		NewAllRemotesIter(nil),
+		NewAllRefsIter(nil, false),
+		NewAllCommitsIter(nil, false),
+		NewAllTreeEntriesIter(nil),
+	}
+
+	session, err := getSession(ctx)
+	require.NoError(err)
+
+	for _, it := range iters {
+		iter, err := it.New(ctx, session.Pool)
+		require.NoError(err)
+
+		err = iter.Advance()
+		require.Error(err)
+		require.True(ErrSessionCanceled.Is(err))
+	}
+}
+
 func TestAllRemotesIter(t *testing.T) {
 	require := require.New(t)
 	ctx, cleanup := setupIter(t)