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

search: simplify search type filter logic (2/2) (#43441)

Browse Source
This commit is contained in:
Rijnard van Tonder 2022-10-25 14:20:14 -07:00 committed by GitHub
parent 0c99e114c9
commit 12a67271ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/search/job/jobutil/job.go
View File

@ -82,8 +82,7 @@ func NewBasicJob(inputs *search.Inputs, b query.Basic) (job.Job, error) {
// This block generates jobs that can be built directly from
// a basic query rather than first being expanded into
// flat queries.
types, _ := b.IncludeExcludeValues(query.FieldType)
resultTypes := computeResultTypes(types, b, inputs.PatternType)
resultTypes := computeResultTypes(b, inputs.PatternType)
fileMatchLimit := int32(computeFileMatchLimit(b, inputs.Protocol))
selector, _ := filter.SelectPathFromString(b.FindValue(query.FieldSelect)) // Invariant: select is validated
repoOptions := toRepoOptions(b, inputs.UserSettings)
@ -278,8 +277,7 @@ func orderSearcherJob(j job.Job) job.Job {
// NewFlatJob creates all jobs that are built from a query.Flat.
func NewFlatJob(searchInputs *search.Inputs, f query.Flat) (job.Job, error) {
maxResults := f.MaxResults(searchInputs.DefaultLimit())
types, _ := f.IncludeExcludeValues(query.FieldType)
resultTypes := computeResultTypes(types, f.ToBasic(), searchInputs.PatternType)
resultTypes := computeResultTypes(f.ToBasic(), searchInputs.PatternType)
patternInfo := toTextPatternInfo(f.ToBasic(), resultTypes, searchInputs.Protocol)
// searcher to use full deadline if timeout: set or we are streaming.
@ -600,11 +598,12 @@ func toTextPatternInfo(b query.Basic, resultTypes result.Types, p search.Protoco
// computeResultTypes returns result types based three inputs: `type:...` in the query,
// the `pattern`, and top-level `searchType` (coming from a GQL value).
func computeResultTypes(types []string, b query.Basic, searchType query.SearchType) result.Types {
func computeResultTypes(b query.Basic, searchType query.SearchType) result.Types {
if searchType == query.SearchTypeStructural && !b.IsEmptyPattern() {
return result.TypeStructural
}
types, _ := b.IncludeExcludeValues(query.FieldType)
if len(types) == 0 {
return result.TypeFile | result.TypePath | result.TypeRepo
}

3
internal/search/job/jobutil/job_test.go
View File

@ -865,9 +865,8 @@ func TestToTextPatternInfo(t *testing.T) {
return "Empty"
}
b := plan[0]
types, _ := b.ToParseTree().StringValues(query.FieldType)
mode := search.Batch
resultTypes := computeResultTypes(types, b, query.SearchTypeLiteral)
resultTypes := computeResultTypes(b, query.SearchTypeLiteral)
p := toTextPatternInfo(b, resultTypes, mode)
v, _ := json.Marshal(p)
return string(v)