Merge branch 'master' into fix-701/uast_extract

Author: ajnavarro

.circleci/config.yml

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "2ea67817f6a1d08a352c31608f9bd426987acdc0"
+  revision = "v0.5.1"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -50,7 +50,7 @@
 
 [[constraint]]
   name = "gopkg.in/src-d/enry.v1"
-  version = "1.7.1"
+  version = "1.7.2"
 
 [[constraint]]
   name = "gopkg.in/bblfsh/client-go.v3"

Gopkg.lock

@@ -4,6 +4,7 @@ pipeline {
       label 'regression-gitbase'
       inheritFrom 'performance'
       defaultContainer 'regression-gitbase'
+      nodeSelector 'srcd.host/type=jenkins-worker'
       containerTemplate {
         name 'regression-gitbase'
         image 'srcd/regression-gitbase:v0.2.0'

Gopkg.toml

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"io"
 
-	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
@@ -103,6 +102,7 @@ func (t *commitBlobsTable) PartitionRows(
 			return &commitBlobsRowIter{
 				repo:          repo,
 				commits:       stringsToHashes(commits),
+				iter:          nil,
 				index:         indexValues,
 				skipGitErrors: shouldSkipErrors(ctx),
 			}, nil
@@ -216,16 +216,18 @@ func (i *commitBlobsRowIter) Next() (sql.Row, error) {
 }
 
 func (i *commitBlobsRowIter) init() error {
-	var err error
 	if len(i.commits) > 0 {
-		i.iter, err = NewCommitsByHashIter(i.repo, i.commits)
+		i.iter = newCommitsByHashIter(i.repo, i.commits)
 	} else {
-		i.iter, err = i.repo.Log(&git.LogOptions{
-			All: true,
-		})
+		iter, err := newCommitIter(i.repo, i.skipGitErrors)
+		if err != nil {
+			return err
+		}
+
+		i.iter = iter
 	}
 
-	return err
+	return nil
 }
 
 var commitBlobsCommitIdx = CommitBlobsSchema.IndexOf("commit_hash", CommitBlobsTableName)

Jenkinsfile

@@ -193,17 +193,18 @@ func (i *commitFilesRowIter) Next() (sql.Row, error) {
 }
 
 func (i *commitFilesRowIter) init() error {
-	var err error
 	if len(i.commitHashes) > 0 {
-		i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)
+		i.commits = newCommitsByHashIter(i.repo, i.commitHashes)
 	} else {
-		i.commits, err = i.repo.
-			Log(&git.LogOptions{
-				All: true,
-			})
+		iter, err := newCommitIter(i.repo, i.skipGitErrors)
+		if err != nil {
+			return err
+		}
+
+		i.commits = iter
 	}
 
-	return err
+	return nil
 }
 
 func (i *commitFilesRowIter) nextFromIndex() (sql.Row, error) {

commit_blobs.go

@@ -65,7 +65,7 @@ func TestCommitFilesTableRowIter(t *testing.T) {
 		}
 	}
 
-	require.Equal(expected, rows)
+	require.ElementsMatch(expected, rows)
 }
 
 func TestCommitFilesIndex(t *testing.T) {
@@ -130,8 +130,6 @@ func TestCommitFilesIterClosed(t *testing.T) {
 }
 
 func TestPartitionRowsWithIndex(t *testing.T) {
-
-	t.Helper()
 	require := require.New(t)
 	ctx, _, cleanup := setup(t)
 	defer cleanup()
@@ -143,21 +141,8 @@ func TestPartitionRowsWithIndex(t *testing.T) {
 	lookup := tableIndexLookup(t, table, ctx)
 	tbl := table.WithIndexLookup(lookup)
 
-	pit, err := tbl.Partitions(ctx)
+	result, err := tableToRows(ctx, tbl)
 	require.NoError(err)
 
-	i := 0
-	for p, e := pit.Next(); e != io.EOF; p, e = pit.Next() {
-		require.NoError(e)
-
-		rit, err := tbl.PartitionRows(ctx, p)
-		require.NoError(err)
-
-		for r, e := rit.Next(); e != io.EOF; r, e = rit.Next() {
-			require.NoError(e)
-
-			require.ElementsMatch(expected[i], r)
-			i++
-		}
-	}
+	require.ElementsMatch(expected, result)
 }

commit_files.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"io"
 
-	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/filemode"
@@ -212,16 +211,18 @@ func (i *commitTreesRowIter) Next() (sql.Row, error) {
 }
 
 func (i *commitTreesRowIter) init() error {
-	var err error
 	if len(i.commitHashes) > 0 {
-		i.commits, err = NewCommitsByHashIter(i.repo, i.commitHashes)
+		i.commits = newCommitsByHashIter(i.repo, i.commitHashes)
 	} else {
-		i.commits, err = i.repo.Log(&git.LogOptions{
-			All: true,
-		})
+		iter, err := newCommitIter(i.repo, i.skipGitErrors)
+		if err != nil {
+			return err
+		}
+
+		i.commits = iter
 	}
 
-	return err
+	return nil
 }
 
 var commitTreesHashIdx = CommitTreesSchema.IndexOf("commit_hash", CommitTreesTableName)

commit_files_test.go

@@ -53,7 +53,7 @@ func TestCommitTreesRowIter(t *testing.T) {
 		{"b8e471f58bcbca63b07bda20e428190409c2db47", "c2d30fa8ef288618f65f6eed6e168e0d514886f4"},
 	}
 
-	require.Equal(expected, rows)
+	require.ElementsMatch(expected, rows)
 }
 
 func TestCommitTreesPushdown(t *testing.T) {
@@ -109,7 +109,7 @@ func TestCommitTreesPushdown(t *testing.T) {
 				rows[i] = row[1:]
 			}
 
-			require.Equal(tt.expected, rows)
+			require.ElementsMatch(tt.expected, rows)
 		})
 	}
 }