Merge branch 'master' into docs/perf-early-filters

Author: ajnavarro

integration_test.go

@@ -554,6 +554,21 @@ func TestSquashCorrectness(t *testing.T) {
 		ORDER BY num_files DESC
 		LIMIT 10`,
 
+		`SELECT
+			SUBSTRING(repository_id_part, 1, ARRAY_LENGTH(SPLIT(repository_id_part, ''))-4) AS repository_id,
+			commit_author_when,
+			commit_type
+		FROM (
+		SELECT
+			SUBSTRING(remote_fetch_url, 18) AS repository_id_part,
+			commit_author_when,
+			CASE ARRAY_LENGTH(commit_parents) WHEN 0 THEN 'Commit' WHEN 1 THEN 'Commit' ELSE 'Merge' END AS commit_type
+		FROM remotes
+		NATURAL JOIN refs
+		NATURAL JOIN commits
+		) AS q
+		LIMIT 1000`,
+
 		// Squash with non-squashable joins
 		`SELECT * FROM refs NATURAL JOIN blobs`,
 		`SELECT * FROM remotes NATURAL JOIN commits`,

ref_commits.go

@@ -292,10 +292,10 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 		if i.commits == nil {
 			var ref *plumbing.Reference
 			if i.head == nil {
-				var err_ error
-				ref, err_ = i.refs.Next()
-				if err_ != nil {
-					if err_ == io.EOF {
+				var err error
+				ref, err = i.refs.Next()
+				if err != nil {
+					if err == io.EOF {
 						i.repo.Close()
 						return nil, io.EOF
 					}
@@ -305,7 +305,7 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 					}
 
 					i.repo.Close()
-					return nil, err_
+					return nil, err
 				}
 			} else {
 				ref = plumbing.NewHashReference(plumbing.ReferenceName("HEAD"), i.head.Hash())

remotes.go

@@ -179,11 +179,7 @@ func remoteToRow(repoID string, config *config.RemoteConfig, pos int) sql.Row {
 		url = config.URLs[pos]
 	}
 
-	var fetch interface{}
-	if pos < len(config.Fetch) {
-		fetch = config.Fetch[pos].String()
-	}
-
+	fetch := remoteFetchURL(config, pos)
 	return sql.NewRow(
 		repoID,
 		config.Name,
@@ -326,3 +322,15 @@ func (i *remotesIndexIter) Close() error {
 
 	return i.index.Close()
 }
+
+func remoteFetchURL(config *config.RemoteConfig, pos int) string {
+	if len(config.Fetch) > 0 {
+		var fpos = pos
+		if fpos >= len(config.Fetch) {
+			fpos = len(config.Fetch) - 1
+		}
+		return config.Fetch[fpos].String()
+	}
+
+	return config.URLs[pos]
+}

squash_iterator.go

@@ -201,16 +201,11 @@ func (i *squashRemoteIter) Advance() error {
 			config = remote.Config()
 		}
 
-		fetch := i.urlPos
-		if fetch >= len(config.Fetch) {
-			fetch = len(config.Fetch) - 1
-		}
-
 		i.remote = &Remote{
 			RepoID: i.repo.ID,
 			Name:   config.Name,
 			URL:    config.URLs[i.urlPos],
-			Fetch:  config.Fetch[fetch].String(),
+			Fetch:  remoteFetchURL(config, i.urlPos),
 		}
 
 		i.row = sql.NewRow(
@@ -330,16 +325,11 @@ func (i *squashRepoRemotesIter) Advance() error {
 			config = remote.Config()
 		}
 
-		fetch := i.urlPos
-		if fetch >= len(config.Fetch) {
-			fetch = len(config.Fetch) - 1
-		}
-
 		i.remote = &Remote{
 			RepoID: i.repos.Repository().ID,
 			Name:   config.Name,
 			URL:    config.URLs[i.urlPos],
-			Fetch:  config.Fetch[fetch].String(),
+			Fetch:  remoteFetchURL(config, i.urlPos),
 		}
 
 		i.urlPos++