Revert "Use RepoNames instead of Repos in search code (#16590)" (#16649)

This reverts commit e4b838e.

Author: asdine

cmd/frontend/backend/repos.go

@@ -153,7 +153,7 @@ func (s *repos) List(ctx context.Context, opt db.ReposListOptions) (repos []*typ
 }
 
 // ListDefault calls db.DefaultRepos.List, with tracing.
-func (s *repos) ListDefault(ctx context.Context) (repos []*types.RepoName, err error) {
+func (s *repos) ListDefault(ctx context.Context) (repos []*types.Repo, err error) {
 	ctx, done := trace(ctx, "Repos", "ListDefault", nil, &err)
 	defer func() {
 		if err == nil {

cmd/frontend/graphqlbackend/repositories.go

@@ -317,20 +317,20 @@ func repoNamesToStrings(repoNames []api.RepoName) []string {
 	return strings
 }
 
-func toRepositoryResolvers(repos []*types.RepoName) []*RepositoryResolver {
+func toRepositoryResolvers(repos []*types.Repo) []*RepositoryResolver {
 	if len(repos) == 0 {
 		return []*RepositoryResolver{}
 	}
 
 	resolvers := make([]*RepositoryResolver, len(repos))
 	for i := range repos {
-		resolvers[i] = &RepositoryResolver{repo: repos[i].ToRepo()}
+		resolvers[i] = &RepositoryResolver{repo: repos[i]}
 	}
 
 	return resolvers
 }
 
-func toRepoNames(repos []*types.RepoName) []api.RepoName {
+func toRepoNames(repos []*types.Repo) []api.RepoName {
 	names := make([]api.RepoName, len(repos))
 	for i, repo := range repos {
 		names[i] = repo.Name

cmd/frontend/graphqlbackend/search.go

@@ -907,7 +907,7 @@ func resolveRepositories(ctx context.Context, op resolveRepoOp) (resolvedReposit
 		}
 	}
 
-	var defaultRepos []*types.RepoName
+	var defaultRepos []*types.Repo
 	if envvar.SourcegraphDotComMode() && len(includePatterns) == 0 {
 		start := time.Now()
 		defaultRepos, err = defaultRepositories(ctx, db.DefaultRepos.List, search.Indexed(), excludePatterns)
@@ -922,7 +922,7 @@ func resolveRepositories(ctx context.Context, op resolveRepoOp) (resolvedReposit
 		}
 	}
 
-	var repos []*types.RepoName
+	var repos []*types.Repo
 	var excluded excludedRepos
 	if len(defaultRepos) > 0 {
 		repos = defaultRepos
@@ -952,7 +952,7 @@ func resolveRepositories(ctx context.Context, op resolveRepoOp) (resolvedReposit
 			excludedC <- computeExcludedRepositories(ctx, op.query, options)
 		}()
 
-		repos, err = db.Repos.ListRepoNames(ctx, options)
+		repos, err = db.Repos.List(ctx, options)
 		tr.LazyPrintf("Repos.List - done")
 
 		excluded = <-excludedC
@@ -1065,9 +1065,9 @@ func resolveRepositories(ctx context.Context, op resolveRepoOp) (resolvedReposit
 	}, err
 }
 
-type defaultReposFunc func(ctx context.Context) ([]*types.RepoName, error)
+type defaultReposFunc func(ctx context.Context) ([]*types.Repo, error)
 
-func defaultRepositories(ctx context.Context, getRawDefaultRepos defaultReposFunc, z *searchbackend.Zoekt, excludePatterns []string) ([]*types.RepoName, error) {
+func defaultRepositories(ctx context.Context, getRawDefaultRepos defaultReposFunc, z *searchbackend.Zoekt, excludePatterns []string) ([]*types.Repo, error) {
 	// Get the list of default repos from the db.
 	defaultRepos, err := getRawDefaultRepos(ctx)
 	if err != nil {

cmd/frontend/graphqlbackend/search_alert_test.go

@@ -206,7 +206,7 @@ func TestAlertForOverRepoLimit(t *testing.T) {
 		j := 0
 		for i := range repoRevs {
 			repoRevs[i] = &search.RepositoryRevisions{
-				Repo: &types.RepoName{
+				Repo: &types.Repo{
 					ID:   api.RepoID(i),
 					Name: api.RepoName(chars[j] + "/repoName" + strconv.Itoa(i)),
 				},

cmd/frontend/graphqlbackend/search_commits.go

@@ -307,7 +307,7 @@ func doSearchCommitsInRepoStream(ctx context.Context, op search.CommitParameters
 		}
 	}()
 
-	repoResolver := &RepositoryResolver{repo: op.RepoRevs.Repo.ToRepo()}
+	repoResolver := &RepositoryResolver{repo: op.RepoRevs.Repo}
 	for event := range events {
 		// if the result is incomplete, git log timed out and the client
 		// should be notified of that.
@@ -570,7 +570,7 @@ func searchCommitsInRepos(ctx context.Context, args *search.TextParametersForCom
 		unflattened [][]*CommitSearchResultResolver
 		common      = &searchResultsCommon{}
 	)
-	common.repos = make([]*types.RepoName, len(args.Repos))
+	common.repos = make([]*types.Repo, len(args.Repos))
 	for i, repo := range args.Repos {
 		common.repos[i] = repo.Repo
 	}

cmd/frontend/graphqlbackend/search_commits_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/sourcegraph/sourcegraph/internal/db"
 	"github.com/sourcegraph/sourcegraph/internal/search"
 	"github.com/sourcegraph/sourcegraph/internal/search/query"
+	// "github.com/google/go-cmp/cmp"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 	"github.com/sourcegraph/sourcegraph/internal/vcs/git"
 )
@@ -51,7 +52,7 @@ func TestSearchCommitsInRepo(t *testing.T) {
 		t.Fatal(err)
 	}
 	repoRevs := &search.RepositoryRevisions{
-		Repo: &types.RepoName{ID: 1, Name: "repo"},
+		Repo: &types.Repo{ID: 1, Name: "repo"},
 		Revs: []search.RevisionSpecifier{{RevSpec: "rev"}},
 	}
 	results, limitHit, timedOut, err := searchCommitsInRepo(ctx, search.CommitParameters{

cmd/frontend/graphqlbackend/search_pagination.go

@@ -221,7 +221,7 @@ func (r *searchResolver) paginatedResults(ctx context.Context) (result *SearchRe
 
 // repoIsLess sorts repositories first by name then by ID, suitable for use
 // with sort.Slice.
-func repoIsLess(i, j *types.RepoName) bool {
+func repoIsLess(i, j *types.Repo) bool {
 	if i.Name != j.Name {
 		return i.Name < j.Name
 	}
@@ -391,7 +391,7 @@ func (p *repoPaginationPlan) execute(ctx context.Context, exec executor) (c *sea
 	if len(sliced.results) > 0 {
 		// First, identify what repository corresponds to the last result.
 		lastRepoConsumedName, _ := sliced.results[len(sliced.results)-1].searchResultURIs()
-		var lastRepoConsumed *types.RepoName
+		var lastRepoConsumed *types.Repo
 		for _, repo := range p.repositories {
 			if string(repo.Repo.Name) == lastRepoConsumedName {
 				lastRepoConsumed = repo.Repo
@@ -404,7 +404,7 @@ func (p *repoPaginationPlan) execute(ctx context.Context, exec executor) (c *sea
 		// that out now. For example, a cloning repository could be last or
 		// first in the results and we need to know the position for the cursor
 		// RepositoryOffset.
-		potentialLastRepos := []*types.RepoName{lastRepoConsumed}
+		potentialLastRepos := []*types.Repo{lastRepoConsumed}
 		potentialLastRepos = append(potentialLastRepos, sliced.common.cloning...)
 		potentialLastRepos = append(potentialLastRepos, sliced.common.missing...)
 		sort.Slice(potentialLastRepos, func(i, j int) bool {
@@ -475,11 +475,11 @@ func sliceSearchResults(results []SearchResultResolver, common *searchResultsCom
 
 	// Break results into repositories because for each result we need to add
 	// the respective repository to the new common structure.
-	reposByName := map[string]*types.RepoName{}
+	reposByName := map[string]*types.Repo{}
 	for _, r := range common.repos {
 		reposByName[string(r.Name)] = r
 	}
-	resultsByRepo := map[*types.RepoName][]SearchResultResolver{}
+	resultsByRepo := map[*types.Repo][]SearchResultResolver{}
 	for _, r := range results[:limit] {
 		repoName, _ := r.searchResultURIs()
 		repo := reposByName[repoName]
@@ -549,7 +549,7 @@ func sliceSearchResultsCommon(common *searchResultsCommon, firstResultRepo, last
 		resultCount:      common.resultCount,
 	}
 
-	doAppend := func(dst, src []*types.RepoName) []*types.RepoName {
+	doAppend := func(dst, src []*types.Repo) []*types.Repo {
 		sort.Slice(src, func(i, j int) bool {
 			return repoIsLess(src[i], src[j])
 		})