Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

backport 5.1: update zoekt - Removal of RepositoryRankRequest, include ngram sort optimization#56200

Merged
jdpleiness merged 10 commits into
5.1from
wb/attempt-2
Aug 24, 2023
Merged

backport 5.1: update zoekt - Removal of RepositoryRankRequest, include ngram sort optimization#56200
jdpleiness merged 10 commits into
5.1from
wb/attempt-2

Conversation

@burmudar

Copy link
Copy Markdown
Contributor

Combined backport of the following:

Test plan

Green CI and testing backcompat locally

@keegancsmith

Copy link
Copy Markdown
Member

GH isn't happy. Are you basing this PR on the latest 5.1 branch?

@keegancsmith

Copy link
Copy Markdown
Member

@burmudar FYI I cherry-picked in a license check PR to https://github.com/sourcegraph/sourcegraph/pull/56088. Should we hold off on that PR and just focus on this one?

@burmudar

Copy link
Copy Markdown
Contributor Author

@burmudar FYI I cherry-picked in a license check PR to #56088. Should we hold off on that PR and just focus on this one?

Yeah I think so, since this one contains that one too

@sourcegraph-bot

sourcegraph-bot commented Aug 24, 2023

Copy link
Copy Markdown
Contributor

📖 Storybook live preview

@burmudar

burmudar commented Aug 24, 2023

Copy link
Copy Markdown
Contributor Author
  • fixing the linting issue
  • rebasing on latest 5.1

keegancsmith and others added 5 commits August 24, 2023 15:37
Main motivation is to see the effect on performance for attribution
search.

Note that this included a bump in the otel version used since zoekt is
using a new version. This had a bit of a cascading effect on our third
party deps since they removed a package. So this bumps most 3rd party
packages that directly interacted with otel.

The changed commits are
sourcegraph/zoekt@7643f3b...45f608f

- a176bde1a3 go get -u -t ./...
- e2e8aede00 Fix template documentation comments
- 25c1ea5177 all: observe missing Stats RegexpsConsidered and FlushReason
- 9abbb8b0d3 zoekt-indexserver: Prevent invalid config from causing an NPE
- 008a775ba8 zoekt-indexserver: use value format directive for bad conf warning
- f9d3a0e2e4 zoekt: add fgprof for full profiling
- 3d0bdd5c9c remove ngram offset code
- 45f608ff95 sort ngrams before looking them up

Test Plan: tested in the zoekt repo. Our CI will handle the dep updates.
I eyeballed them and they all look low risk.

Co-authored-by: Jean-Hadrien Chabran <jh@chabran.fr>
This endpoint was unused which was why it was removed in Zoekt. The
changes from Zoekt included in this dep bump:

- 1686b50d50 indexserver: remove unused GetRepoRank
- 7078a585a9 shards: populate RepoList.Stats.Repos
- b9e6d9433e zoekt-indexserver: Check stderr for git fetch
- 93f7b0c983 matchtree: capture Stats before pruning
- 7643f3b313 matchiter: capture metric NgramLookups

Test Plan: CI
@sourcegraph-bot

sourcegraph-bot commented Aug 24, 2023

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in CODENOTIFY files for diff 974669e...74d0675.

Notify File(s)
@bobheadxi docker-images/prometheus/cmd/prom-wrapper/mocks/BUILD.bazel
docker-images/prometheus/cmd/prom-wrapper/mocks/mocks_temp.go

@sourcegraph-bot

sourcegraph-bot commented Aug 24, 2023

Copy link
Copy Markdown
Contributor

Codenotify: Notifying subscribers in OWNERS files for diff 974669e...74d0675.

Notify File(s)
@mrnugget dev/sg/sg_start_test.go
@sourcegraph/dev-experience dev/sg/sg_start_test.go

@camdencheek

Copy link
Copy Markdown
Member

@ggilmore, this PR is obsoleted by https://github.com/sourcegraph/sourcegraph/pull/56077, right?

@camdencheek

Copy link
Copy Markdown
Member

Oh wait. That only backports one of the two commits

@ggilmore

Copy link
Copy Markdown
Contributor

@ggilmore, this PR is obsoleted by #56077, right?

No. This includes the ngram PR as well. This PR only techincally includes bazel configuration changes from https://github.com/sourcegraph/sourcegraph/pull/56077, see 9459011 (#56200).

@jdpleiness jdpleiness merged commit 0ae241c into 5.1 Aug 24, 2023
@jdpleiness jdpleiness deleted the wb/attempt-2 branch August 24, 2023 18:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants