artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

search: make some functions private on indexed search path (#25417)

Browse Source
This commit is contained in:
Rijnard van Tonder 2021-09-28 10:20:49 -07:00 committed by GitHub
parent 62d6a610fe
commit d642ab5608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/search/zoekt/indexed_search.go
View File

@ -152,9 +152,9 @@ func NewIndexedSearchRequest(ctx context.Context, args *search.TextParameters, t
if args.Zoekt != nil && args.Mode == search.ZoektGlobalSearch {
// performance: optimize global searches where Zoekt searches
// all shards anyway.
return NewIndexedUniverseSearchRequest(ctx, args, typ, args.RepoOptions, args.UserPrivateRepos)
return newIndexedUniverseSearchRequest(ctx, args, typ, args.RepoOptions, args.UserPrivateRepos)
}
return NewIndexedSubsetSearchRequest(ctx, args, typ, onMissing)
return newIndexedSubsetSearchRequest(ctx, args, typ, onMissing)
}
// IndexedUniverseSearchRequest represents a request to run a search over the universe of indexed repositories.
@ -184,8 +184,12 @@ func (s *IndexedUniverseSearchRequest) UnindexedRepos() []*search.RepositoryRevi
return nil
}
func NewIndexedUniverseSearchRequest(ctx context.Context, args *search.TextParameters, typ search.IndexedRequestType, repoOptions search.RepoOptions, userPrivateRepos []types.RepoName) (_ *IndexedUniverseSearchRequest, err error) {
tr, _ := trace.New(ctx, "NewIndexedUniverseSearchRequest", "text")
// newIndexedUniverseSearchRequest creates a search request for indexed search
// on all indexed repositories. Strongly avoid calling this constructor
// directly, and use NewIndexedSearchRequest instead, which will validate your
// inputs and figure out the kind of indexed search to run.
func newIndexedUniverseSearchRequest(ctx context.Context, args *search.TextParameters, typ search.IndexedRequestType, repoOptions search.RepoOptions, userPrivateRepos []types.RepoName) (_ *IndexedUniverseSearchRequest, err error) {
tr, _ := trace.New(ctx, "newIndexedUniverseSearchRequest", "text")
defer func() {
tr.SetError(err)
tr.Finish()
@ -292,8 +296,12 @@ func MissingRepoRevStatus(stream streaming.Sender) OnMissingRepoRevs {
}
}
func NewIndexedSubsetSearchRequest(ctx context.Context, args *search.TextParameters, typ search.IndexedRequestType, onMissing OnMissingRepoRevs) (_ *IndexedSubsetSearchRequest, err error) {
tr, ctx := trace.New(ctx, "NewIndexedSubsetSearchRequest", string(typ))
// newIndexedSubsetSearchRequest creates a search request for indexed search on
// a subset of repos. Strongly avoid calling this constructor directly, and use
// NewIndexedSearchRequest instead, which will validate your inputs and figure
// out the kind of indexed search to run.
func newIndexedSubsetSearchRequest(ctx context.Context, args *search.TextParameters, typ search.IndexedRequestType, onMissing OnMissingRepoRevs) (_ *IndexedSubsetSearchRequest, err error) {
tr, ctx := trace.New(ctx, "newIndexedSubsetSearchRequest", string(typ))
tr.LogFields(trace.Stringer("global_search_mode", args.Mode))
defer func() {
tr.SetError(err)

2
internal/search/zoekt/indexed_search_test.go
View File

@ -267,7 +267,7 @@ func TestIndexedSearch(t *testing.T) {
},
}
indexed, err := NewIndexedSubsetSearchRequest(context.Background(), args, search.TextRequest, MissingRepoRevStatus(streaming.StreamFunc(func(streaming.SearchEvent) {})))
indexed, err := newIndexedSubsetSearchRequest(context.Background(), args, search.TextRequest, MissingRepoRevStatus(streaming.StreamFunc(func(streaming.SearchEvent) {})))
if err != nil {
t.Fatal(err)
}