Search backend: simplify repo:contains resolution
#40280
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff 57bf297...1e478e5.
|
camdencheek
changed the base branch from
main
to
backend-integration/cc/global-contains
camdencheek
added
the
team/search-product
camdencheek
commented
Aug 11, 2022
| and = append(and, &zoekt.Type{Type: zoekt.TypeRepo, Child: zoekt.NewAnd(repoHasFilters...)}) | ||
| and = append(and, zoekt.NewAnd(repoHasFilters...)) |
There was a problem hiding this comment.
QueryForFileContentArgs now returns a zoekt.Type query, so we don't need to wrap here anymore
| @@ -586,25 +585,23 @@ func (r *Resolver) filterRepoHasFileContent( | |||
| q := searchzoekt.QueryForFileContentArgs(opt, op.CaseSensitiveRepoFilters) | |||
| q = zoektquery.NewAnd(&zoektquery.BranchesRepos{List: indexed.BranchRepos()}, q) | |||
|
|
|||
| repos, err := r.zoekt.List(ctx, q, &zoekt.ListOptions{Minimal: true}) | |||
There was a problem hiding this comment.
Becuase QueryForFileContentArgs now returns a zoekt.Type{} query, the query will only ever return repos and it will work with zoekt.List().
camdencheek
force-pushed
the
backend-integration/cc/global-contains
branch
from
25596b0
to
f062cde
Compare
Base automatically changed from
backend-integration/cc/global-contains
to
main
August 12, 2022 20:16
camdencheek
force-pushed
the
backend-integration/cc/simplify-list
branch
from
98a876c
to
1e478e5
Compare
jdorfman
pushed a commit
that referenced
this pull request
Aug 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think I figured out the right way to use Zoekt's
TypeandList()queries, which simplifies therepo:contains...resolution during repo resolution. This change is also required for correct behavior of the negated form of the predicate (which is in the works).Stacked on #40239
Test plan
Integration tests, manual testing, pulled this off another larger change that I've been testing more extensively.