Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

search: Make new structural search code path default #17846

Merged
merged 7 commits into from Feb 1, 2021

Conversation

camdencheek
Copy link
Member

This switches over to using the new structural code search path by
default, so now searcher will query zoekt for the file contents directly
rather than copying over a full repository archive from gitserver.

@sourcegraph-bot
Copy link
Contributor

sourcegraph-bot commented Jan 29, 2021

Notifying subscribers in CODENOTIFY files for diff d9c6225...16ad0d9.

Notify File(s)
@beyang cmd/searcher/protocol/searcher.go
cmd/searcher/search/search.go
cmd/searcher/search/search_test.go
@keegancsmith cmd/frontend/graphqlbackend/textsearch.go
cmd/frontend/graphqlbackend/zoekt.go
cmd/searcher/protocol/searcher.go
cmd/searcher/search/search.go
cmd/searcher/search/search_test.go
@rvantonder cmd/frontend/graphqlbackend/textsearch.go
cmd/frontend/graphqlbackend/zoekt.go

Copy link
Contributor

@rvantonder rvantonder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: if this PR touches all the parts where we compare to where "zoekt" == "zoekt" (I think it does) then we could rename it to where "backcompat" == "backcompat"

CHANGELOG.md Outdated Show resolved Hide resolved
@rvantonder
Copy link
Contributor

Oh I also want this to run on master-dry-run. Unfortunately, the build is currently broken so we can't get a clear signal :(

@camdencheek
Copy link
Member Author

For master-dry-run, I don't have to do anything other than have the branch name prefixed, right?

@rvantonder
Copy link
Contributor

yeah it's also possible to just git checkout -b mastery-dry-run/whatever on this branch and push it up to buildkite, it buildkite usually figures out it's the same commit, but also runs the integration tests

@rvantonder
Copy link
Contributor

But again integration tests are failing right now due to other search changes. I'm wondering if we should hold off on this PR until those are fixed or reverted, and rebase on top...

@camdencheek
Copy link
Member Author

This branch is already named like that though, right? Do I need to do anything?

@rvantonder
Copy link
Contributor

missed that :P

camdencheek and others added 5 commits January 29, 2021 14:25
This switches over to using the new structural code search path by
default, so now searcher will query zoekt for the file contents directly
rather than copying over a full repository archive from gitserver.
Co-authored-by: Rijnard van Tonder <rvantonder@gmail.com>
@camdencheek camdencheek force-pushed the master-dry-run/cc/default-new-structural branch from c77fdad to 022ea4b Compare January 29, 2021 21:26
@codecov
Copy link

codecov bot commented Jan 29, 2021

Codecov Report

Merging #17846 (16ad0d9) into main (d9c6225) will decrease coverage by 0.06%.
The diff coverage is 33.33%.

@@            Coverage Diff             @@
##             main   #17846      +/-   ##
==========================================
- Coverage   51.18%   51.11%   -0.07%     
==========================================
  Files        1725     1725              
  Lines       86383    86383              
  Branches     7675     7854     +179     
==========================================
- Hits        44215    44158      -57     
- Misses      38284    38357      +73     
+ Partials     3884     3868      -16     
Flag Coverage Δ
go 49.84% <33.33%> (-0.11%) ⬇️
integration 30.68% <ø> (-0.02%) ⬇️
storybook 30.41% <ø> (+0.04%) ⬆️
typescript 54.23% <ø> (+0.02%) ⬆️
unit 34.48% <ø> (ø)
Impacted Files Coverage Δ
cmd/frontend/graphqlbackend/zoekt.go 77.30% <0.00%> (-0.53%) ⬇️
cmd/searcher/search/search.go 65.80% <0.00%> (ø)
cmd/frontend/graphqlbackend/textsearch.go 56.11% <100.00%> (-4.48%) ⬇️
cmd/frontend/graphqlbackend/search_structural.go 4.04% <0.00%> (-52.53%) ⬇️
.../internal/codeintel/resolvers/graphql/locations.go 85.56% <0.00%> (+6.18%) ⬆️
client/shared/src/search/query/providers.ts 62.06% <0.00%> (+20.68%) ⬆️

@camdencheek camdencheek merged commit dadef0c into main Feb 1, 2021
@camdencheek camdencheek deleted the master-dry-run/cc/default-new-structural branch February 1, 2021 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants