From d396a7c05170c7a6ebca070d089605a27c3cdb2c Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Thu, 20 Jul 2023 11:48:59 +0200 Subject: [PATCH] zoekt: update with posting list IO optimization (#55141) This update includes an optimization to avoid IO when looking up posting lists. The target is attribution search. The full list of commits is: - 34f694c386 maximise distance between ngrams - 1d71fd0226 ci: remove sync-zoekt step - cbe083c969 remove ZOEKT_ENABLE_LAZY_DOC_SECTIONS - 0aefb15ec4 rename ngrams to contentNgrams - b7e5070bfb indexdata: read posting list iff all ng exist Test Plan: CI --- CHANGELOG.md | 4 ++++ deps.bzl | 32 +++++--------------------------- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c7c6e4e433..54aa73e540b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ All notable changes to Sourcegraph are documented in this file. - OpenTelemetry Collector has been upgraded to v0.81, and OpenTelemetry packages have been upgraded to v1.16. [#54969](https://github.com/sourcegraph/sourcegraph/pull/54969), [#54999](https://github.com/sourcegraph/sourcegraph/pull/54999) - Bitbucket Cloud code host connections no longer automatically syncs the repository of the username used. The appropriate workspace name will have to be added to the `teams` list if repositories for that account need to be synced. [#55095](https://github.com/sourcegraph/sourcegraph/pull/55095) +### Removed + +- indexed-search has removed the deprecated environment variable ZOEKT_ENABLE_LAZY_DOC_SECTIONS [zoekt#620](https://github.com/sourcegraph/zoekt/pull/620) + ## 5.1.4 ### Fixed diff --git a/deps.bzl b/deps.bzl index f23c501ad2e..5d274bfb1d5 100644 --- a/deps.bzl +++ b/deps.bzl @@ -1961,13 +1961,6 @@ def go_dependencies(): sum = "h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=", version = "v0.10.1", ) - go_repository( - name = "com_github_etcd_io_bbolt", - build_file_proto_mode = "disable_global", - importpath = "github.com/etcd-io/bbolt", - sum = "h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=", - version = "v1.3.3", - ) go_repository( name = "com_github_ethantkoenig_rupture", @@ -4990,14 +4983,6 @@ def go_dependencies(): version = "v1.2.0", ) - go_repository( - name = "com_github_moul_http2curl", - build_file_proto_mode = "disable_global", - importpath = "github.com/moul/http2curl", - sum = "h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=", - version = "v1.0.0", - ) - go_repository( name = "com_github_mpvl_unique", build_file_proto_mode = "disable_global", @@ -6264,8 +6249,8 @@ def go_dependencies(): name = "com_github_sourcegraph_zoekt", build_file_proto_mode = "disable_global", importpath = "github.com/sourcegraph/zoekt", - sum = "h1:qe+Dljxb86MCoUNRM2yAHNBfQ5jj4A9ti+jsy94BaQM=", - version = "v0.0.0-20230717094711-2632acf42d27", + sum = "h1:TJsG99aZ8wBa4yQ7znUrhi2QpbgEDPrfSmwlMohGt+8=", + version = "v0.0.0-20230719140114-b7e5070bfb56", ) go_repository( @@ -7179,12 +7164,12 @@ def go_dependencies(): ) go_repository( name = "com_google_cloud_go_bigquery", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/bigquery", - sum = "h1:JKLNdxI0N+TIUWD6t9KN646X27N5dQWq9dZbbTWZ8hc=", build_directives = [ "gazelle:resolve go google.golang.org/genproto/googleapis/api/annotations @go_googleapis//google/api:annotations_go_proto", # keep ], + build_file_proto_mode = "disable_global", + importpath = "cloud.google.com/go/bigquery", + sum = "h1:JKLNdxI0N+TIUWD6t9KN646X27N5dQWq9dZbbTWZ8hc=", version = "v1.52.0", ) go_repository( @@ -7427,13 +7412,6 @@ def go_dependencies(): sum = "h1:LtAyqvO1TFmNLcROzHZhV0agEJfBi+zfMZsF4RT/a7U=", version = "v1.15.1", ) - go_repository( - name = "com_google_cloud_go_gaming", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/gaming", - sum = "h1:5qZmZEWzMf8GEFgm9NeC3bjFRpt7x4S6U7oLbxaf7N8=", - version = "v1.10.1", - ) go_repository( name = "com_google_cloud_go_gkebackup", diff --git a/go.mod b/go.mod index 0153ac05453..05896d29288 100644 --- a/go.mod +++ b/go.mod @@ -540,7 +540,7 @@ require ( github.com/sourcegraph/conc v0.2.0 github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67 github.com/sourcegraph/sourcegraph/monitoring v0.0.0-20230124144931-b2d81b1accb6 - github.com/sourcegraph/zoekt v0.0.0-20230717094711-2632acf42d27 + github.com/sourcegraph/zoekt v0.0.0-20230719140114-b7e5070bfb56 github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect diff --git a/go.sum b/go.sum index f00f07bb51c..cfbcb8c09f6 100644 --- a/go.sum +++ b/go.sum @@ -2023,8 +2023,8 @@ github.com/sourcegraph/scip v0.3.1-0.20230627154934-45df7f6d33fc h1:o+eq0cjVV3B5 github.com/sourcegraph/scip v0.3.1-0.20230627154934-45df7f6d33fc/go.mod h1:7ZKAtLIUmiMvOIgG5LMcBxdtBXVa0v2GWC4Hm1ASYQ0= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/sourcegraph/zoekt v0.0.0-20230717094711-2632acf42d27 h1:qe+Dljxb86MCoUNRM2yAHNBfQ5jj4A9ti+jsy94BaQM= -github.com/sourcegraph/zoekt v0.0.0-20230717094711-2632acf42d27/go.mod h1:QJc8dPAIRJ9KZbFBXteD4/YbXkSnMe7zK9wJkOoPg7c= +github.com/sourcegraph/zoekt v0.0.0-20230719140114-b7e5070bfb56 h1:TJsG99aZ8wBa4yQ7znUrhi2QpbgEDPrfSmwlMohGt+8= +github.com/sourcegraph/zoekt v0.0.0-20230719140114-b7e5070bfb56/go.mod h1:QJc8dPAIRJ9KZbFBXteD4/YbXkSnMe7zK9wJkOoPg7c= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=